diff --git a/Makefile b/Makefile index 4436ccd..f251361 100644 --- a/Makefile +++ b/Makefile @@ -8,10 +8,10 @@ PNG: essai.png scene.png essai.png: essai.pov Makefile $(POVDEP) - povray $(POVOPT) -W640 -H480 -i$< -o$@ + povray $(POVOPT) -W800 -H600 -i$< -o$@ CK=130 scene.png: scene.pov Makefile $(POVDEP) - povray $(POVOPT) -W1280 -H1024 +K${CK} -i$< -o$@ + povray $(POVOPT) -W1920 -H1080 +K${CK} -i$< -o$@ diff --git a/elements.inc b/elements.inc index a20ae40..7049034 100644 --- a/elements.inc +++ b/elements.inc @@ -47,10 +47,10 @@ texture { New_Penny } #local Branche_radar = object { #local D1 = 0.08; -#local D2 = 0.0035; +#local D2 = 0.0045; merge { - cone { 0, D2, 0.04*y, 0.00007 } - sphere { 0, D2*2.2 scale <1, 1.77, 1> } + cone { 0, D2, 0.08*y, 0.00007 } + sphere { 0, D2*2.3 scale <1, 1.77, 1> } intersection { torus { D1, D2 } box { <2, -2, 2>, <0, 2, 0> } @@ -74,20 +74,20 @@ union { #end torus { R2, 0.0034 translate -0.08*y } } -texture { Soft_Silver scale 6.0 } +texture { Soft_Silver scale 6.50 } } -/* +/* --------------------------------------------------------- * new Mon Dec 16 12:44:44 PM UTC 2024 */ #local Une_derive = object { difference { merge { - sphere { 0, 0.009 scale <1, 1, 4.70> + sphere { 0, 0.0137 scale <1, 1, 4.70> translate <0, 0.26, -0.17> } - cone { <0, -0.1, 0>, 0.09, <0, 0.26, -0.17>, 0.0096 - scale <0.14, 1, 1> } + cone { <0, -0.1, 0>, 0.114, <0, 0.26, -0.17>, 0.0096 + scale <0.15, 1, 1> } } box { <-1, -1, -1>, <1, 0, 1> } } @@ -119,7 +119,7 @@ merge { texture { Orange_Glass } } -/* +/* ------------------------------------------------------ * */ #local Rtuy = 0.06; diff --git a/essai.pov b/essai.pov index 77de66d..85fe623 100644 --- a/essai.pov +++ b/essai.pov @@ -14,17 +14,48 @@ global_settings { #include "metals.inc" #include "textures.inc" -#include "elements.inc" +#declare NormClock = clock / 360.0; #include "contexte.inc" +#include "elements.inc" +// ======================================================= -object { HexaCone translate y } +/* ------------------------------------------ + * new Sat Dec 21 11:17:36 PM UTC 2024 + */ +#declare DXail = 0.001; +#declare DYail = 0.0025; +#declare DZail = 0.028; + +#declare Une_Ailettte = object +{ +box { <-DXail, -DYail, -DZail> , } +pigment { color Cyan } +} + +#declare Le_rotor = object +{ +union { + cylinder { <-0.1, 0, 0>, <0.1, 0, 0>, 0.001 + pigment { color Magenta } } + #for (foo, 0, 18) + object { Une_Ailettte + rotate (foo*27)*x + translate ((foo*0.01)-0.05)*x } + #end + } +} + +// ======================================================= + +object { Tuyere translate <0, 1, 0> } +object { Le_rotor translate <0, 1, 0> } light_source { <-6, 7, -4>, rgb <0.81, 0.65, 0.40> } light_source { <-6, 7, 4>, rgb <0.31, 0.65, 0.80> } camera { - location <-1.8, 1.1, 0.3> + location <-0.99, 1.01, 0.24> look_at <0, 1.0, 0> - angle 38 + angle 37 } diff --git a/mkloop.sh b/mkloop.sh index fbfbbcf..f08c4aa 100755 --- a/mkloop.sh +++ b/mkloop.sh @@ -5,7 +5,7 @@ source fonctions.sh set -e ; set -u TYPE="mp4" -NBFRAMES=180 +NBFRAMES=360 case $TYPE in "gif89a") DIMS="-W640 -H480" ;; @@ -16,7 +16,7 @@ echo $POVOPT ; echo ; sleep 2 TMPIMG=/dev/shm/tmpimg.png -for frame in $(seq 0 $((NBFRAMES-1))) +for frame in $(seq 0 $((NBFRAMES-1))) do img=$(printf "frames/%05d.png" $frame) @@ -26,13 +26,14 @@ do err=$? if [ $err != 0 ] ; then echo "fail $frame" >> WS/log + sleep 4 continue fi set -e txt=$(printf "#%03d" $frame) echo $frame $img $txt convert ${TMPIMG} \ - -pointsize 20 \ + -pointsize 24 \ -fill orange \ -gravity south \ -annotate +0+0 "$txt" \ @@ -47,7 +48,7 @@ echo case $TYPE in "gif89a") convert -delay 8 -dither none \ - -colors 109 frames/* foo.gif ;; + -colors 102 frames/* foo.gif ;; "mp4") ff_encodage ;; esac ls -lh foo.gif diff --git a/plot-timing.sh b/plot-timing.sh index 9080b70..693ce76 100755 --- a/plot-timing.sh +++ b/plot-timing.sh @@ -5,13 +5,13 @@ set -ue TMPFILE="/dev/shm/plot-timing.tmp" IMAGE="timing.png" -tail -3600 WS/mp4.timing | awk ' \ +tail -3600 WS/mp4.timing | awk ' \ BEGIN { \ - for (foo=0; foo<180; foo++) { \ + nbrames=360; + for (foo=0; foo $2) mini[$1] = $2; \ if (maxi[$1] < $2) maxi[$1] = $2; \ last[$1] = $2; \ - maxidx = $1; \ } \ END { \ - for (foo=0; foo<180; foo++) { \ - mean = accu[foo] / count[foo]; \ - printf "%4d %4f %4d %4d %4d\n", foo, mean, \ - mini[foo], maxi[foo], last[foo]; \ - } \ + for (foo=0; foo 0) { \ + mean = accu[foo] / count[foo]; \ + printf "%4d %4f %4d %4d %4d\n", foo, mean, \ + mini[foo], maxi[foo], last[foo]; \ + } \ + } } \ ' > $TMPFILE @@ -34,6 +35,7 @@ gnuplot << __EOC__ set term png size 800,480 set output "timing.png" set grid + set xrange [:360] set yrange [:300] set title "HexaCone : temps de tracé vs. numéro de séquence" set xlabel "numéro de la trame" diff --git a/scene.pov b/scene.pov index a76e640..d8924a0 100644 --- a/scene.pov +++ b/scene.pov @@ -14,13 +14,13 @@ global_settings { #include "metals.inc" #include "textures.inc" -#declare NormClock = clock / 180.0; +#declare NormClock = clock / 360.0; #include "contexte.inc" #include "elements.inc" object { HexaCone rotate y*17 translate y*1.11 } -#declare CK = 56 + (clock * 2); +#declare CK = 56 + (clock * 1); #declare Dcam = 2.04; #declare CamX = Dcam * sin(radians(CK)); #declare CamZ = Dcam * 1.20 * cos(radians(CK)); @@ -31,8 +31,8 @@ camera { location look_at Lat focal_point Lat - aperture 0.052 - blur_samples 33 + aperture 0.046 + blur_samples 30 angle 70 }