diff --git a/GravityField/.gitignore b/GravityField/.gitignore index e84bca6..5ae7084 100644 --- a/GravityField/.gitignore +++ b/GravityField/.gitignore @@ -9,6 +9,7 @@ WS/*/*.pgm WS/*/*.png WS/*/*.gif WS/data/* +WS/log.* *.pgm *.pnm diff --git a/GravityField/raytrace.sh b/GravityField/raytrace.sh index 043833e..b505076 100755 --- a/GravityField/raytrace.sh +++ b/GravityField/raytrace.sh @@ -24,17 +24,17 @@ outfile=$(printf "WS/troid/%05d.png" $clock) echo $timestamp $texte $outfile convert ${TMPF} \ - -pointsize 22 \ + -pointsize 24 \ -font Courier-Bold \ - -fill Orange \ - -annotate +15+22 "$timestamp" \ - -annotate +15+48 "$texte" \ - -pointsize 14 \ + -fill Yellow \ + -annotate +20+32 "$timestamp" \ + -annotate +20+58 "$texte" \ + -pointsize 16 \ -gravity south-west \ -annotate +15+9 "tTh & Konrad" \ ${outfile} -sleep 3 +sleep 6 } # --------------------------------------- diff --git a/GravityField/realfield.f90 b/GravityField/realfield.f90 index 0581e0a..18edf00 100644 --- a/GravityField/realfield.f90 +++ b/GravityField/realfield.f90 @@ -82,7 +82,7 @@ subroutine create_some_planets(planets, coef, sx, sy) !- planets(foo)%posx = rand() * real(sx-1) planets(foo)%posy = rand() * real(sy-1) - planets(foo)%mass = 7.12e6 + coef*foo + planets(foo)%mass = 7.12e6 + coef*foo*3 planets(foo)%heading = 2 * 3.141592654 * rand() if (rand() .LT. 0.15) planets(foo)%speed = 3.14159 planets(foo)%serial = foo*2 + 120 diff --git a/GravityField/runme.sh b/GravityField/runme.sh index c898c66..c34be79 100755 --- a/GravityField/runme.sh +++ b/GravityField/runme.sh @@ -4,7 +4,7 @@ set -e # stop on error make animation -LOG="log.animation" +LOG="WS/log.animation" date >> $LOG diff --git a/GravityField/vision.pov b/GravityField/vision.pov index 002c7ce..5f12dd2 100644 --- a/GravityField/vision.pov +++ b/GravityField/vision.pov @@ -49,25 +49,30 @@ object { GravityField scale <4.10, 0.60, 4.10> } // ---------------------------------------------------------------------- -/* XXX +#if (0) merge { cylinder { <0, -0.5, 0>, <0, 1, 0>, 0.0175 } sphere { <0, 1, 0>, 0.0175 } pigment { color Red } } -XXX */ +#end -light_source { < -2, 9.3, -7> color Gray90 } +light_source { < -2, 9.3, -7> color Gray80 } light_source { < -6, 9.3, -8> color Orange*0.65 } light_source { < -15, 2.3, 17> color Gray70 } // ---------------------------------------------------------------------- +#declare Xcam = -5.05; +#declare Ycam = 2.5 - (1.7*NormClock); +#declare Zcam = -8 + (11.66*NormClock); + camera { - location <-8, 4-(1.7*NormClock), -4 + (11.66*NormClock)> + // omnimax + location look_at <0, 0, 0> right x*image_width/image_height - angle 33 + angle 34 } // ----------------------------------------------------------------------