diff --git a/circular.pov b/circular.pov index 9996a73..25cbf3c 100644 --- a/circular.pov +++ b/circular.pov @@ -28,9 +28,10 @@ object { Le_Decor } #declare CamY = 3.08 + abs(sin(CK/4.00)); #declare CamZ = R_circ * sin(CK); -#declare LatX = R_circ * 0.95 * cos(CK + 0.09); +#declare AV = 0.06; +#declare LatX = R_circ * 0.98 * cos(CK + AV); #declare LatY = 3; -#declare LatZ = R_circ * 0.95 * sin(CK + 0.09); +#declare LatZ = R_circ * 0.99 * sin(CK + AV); camera { location diff --git a/contexte.inc b/contexte.inc index 8393bf2..cd07c04 100644 --- a/contexte.inc +++ b/contexte.inc @@ -65,7 +65,7 @@ union { #macro GyroPhare_lampe () union { difference { - cylinder { 0, y*H_gylampe, R_gyro } + cylinder { 0, y*H_gylampe, R_gyro * 1.12345678 } cylinder { y*0.01, y*(H_gylampe-0.01), R_gyro*0.97 } #local WB = 0.017; union { @@ -111,7 +111,8 @@ union { } #end /* ======================================================= */ -/* 11 avril 2025, je pose un grand cercle d'hexapoles +/* 11 avril 2025, je pose un grand cercle d'hexapoles + * 9 octobre 2025, je rajoute un rail circulaire */ #declare Les_HexaPoles = object { @@ -128,7 +129,14 @@ union { #local Xp = E * cos(Ra); #local Zp = E * sin(Ra); object { HexaPole () translate } - #end + #end // for + + torus { R_circular, 0.25 + scale <1, 0.3210, 1> + translate 0.33*y + // !!! pigment { color Cyan } + texture { T_Planete_A scale 3 } + } } } /* ======================================================= */ diff --git a/cutoff.pov b/cutoff.pov index 5bef47d..29902f8 100644 --- a/cutoff.pov +++ b/cutoff.pov @@ -28,9 +28,9 @@ difference { translate y*TY + POS_Cutoff } -// object { Repere scale 2 translate y*2.6 + POS_Cutoff } -/* this one is for debugging */ +/* this two objects are for debugging */ +// object { Repere scale 2 translate y*2.6 + POS_Cutoff } // object { OpenBox translate y*TY + POS_Cutoff } // ======================================================= @@ -45,12 +45,12 @@ object { Le_Decor } // ======================================================= -#local CamX = -25.4 + (2.39*Cos_01(NormClock)); -#local CamY = 1.6 - (0.24*sqrt(NormClock)); +#local CamX = -25.4 + (3.14*Cos_01(NormClock)); +#local CamY = 1.9 - (0.27*sqrt(NormClock)); #local CamZ = -1.85 + (4.02*NormClock); camera { location look_at <0, 1.5, 0> + POS_Cutoff - angle 39 - 5*Cos_01(NormClock) + angle 39 - 6*Cos_01(NormClock) } diff --git a/dynamic.inc b/dynamic.inc index a6e31ad..7a94787 100644 --- a/dynamic.inc +++ b/dynamic.inc @@ -28,7 +28,7 @@ union { object { HexaCone () rotate <4, 1, 6> translate < K, 1.9, 0> } } } -object { BiCone rotate -y*(Cos_010(NormClock)*666) translate Pos_RedB_1 } +object { BiCone rotate -y*(Cos_010(NormClock)*55.38) translate Pos_RedB_1 } /* * on fait passer un hexatruc dans le ciel diff --git a/escadrille.pov b/escadrille.pov index fc1e8db..761e581 100644 --- a/escadrille.pov +++ b/escadrille.pov @@ -55,7 +55,7 @@ object { Le_Decor } // object { Repere scale 5 translate y } #local CamX = -8.7 + ( 6.9 * Cos_01(NormClock)); -#local CamY = 0.95 + (26.64 * Cos_01(NormClock)); +#local CamY = 0.42 + (27.89 * Cos_01(NormClock)); #local CamZ = 16.86 + (14.9 * Cos_01(NormClock)); camera { diff --git a/essai.pov b/essai.pov index 2953c03..d423e59 100644 --- a/essai.pov +++ b/essai.pov @@ -14,17 +14,45 @@ #include "hexacone.inc" #include "hexabenz.inc" #include "hexawood.inc" - -// ======================================================= -// #include "dynamic.inc" - -// ======================================================= - #include "trident.inc" +// ======================================================= +/* nouveau du 7 octobre 2025 */ +#macro Une_Boule () +sphere { + 0, 0.25 + #local R = rand(Rng1); + #if (R < 0.333) + pigment { color Red } + #elseif (R < 0.666) + pigment { color Green } + #else + pigment { color Blue } + #end + } +#end // macro + +#declare Les_Boules = object +{ +union { + #for (A, 0, 12, 1) + object { Une_Boule () + #local TX = 1.2 * (0.5 - NormClock); + #local TY = 2 * Cos_010(abs(sin(clock))); + #local TZ = 3.31 * cos(NormClock*888); + translate + } + #end // for + } +finish { ambient 0 phong 1 } +//translate <-0.5, -0.5, -0.5> // recalage de l'objet fini + +scale 1.3333333 +} +// ======================================================= + #debug " ACTION !!!\n" -// ------------------------------------------------------ ## // ------------------------------------------------------ ## #declare Tridents = object @@ -33,9 +61,9 @@ #local RZ = 96 - (54*Cos_010(NormClock)); union { object { Trident_A () rotate - translate < -1.4, 3, 0> } + translate < -1.4, 1.2, 0> } object { Trident_A () rotate <0, clock, 0> - translate < 1.4, 2, 0> } + translate < 1.4, 2.0, 0> } } } @@ -44,7 +72,7 @@ union { #declare Gyros = object { union { - #for (I, 0, 359, 60) + #for (I, 0, 359, 30) #declare E = 9; #declare Dx = E * sin(radians(I)); #declare Dz = E * cos(radians(I)); @@ -55,42 +83,42 @@ union { } // ------------------------------------------------------ ## -object { Gyros } +// object { Gyros } -#declare Selector = mod(int(clock/17), 6); +#declare Selector = mod(int(clock/32), 6); #debug concat("Selector = ", str(Selector, 6, 0), "\n") #switch (Selector) #case (0) - object { Cabane_Compteur scale 2 rotate y*clock } - #debug " Cabane+Compteur !!!\n" + object { Tridents scale 1.2 rotate -y*(clock*0.666) } + #debug " Tridents\n" #break #case (1) object { HexaPole () } - #debug " Hexapole !!!\n" + #debug " Hexapole\n" #break #case (2) - object { HexaWood translate y*2 } - #debug " HexaWood !!!\n" + object { HexaWood translate y } + #debug " Hexawood !!!\n" #break #case (3) object { Chose rotate y*clock } #debug " Chose\n" #break #case (4) - object { Chose rotate -y*clock } - #debug " Chose\n" + object { HexaBenz () scale 2 translate 2.7*y rotate -y*clock } + #debug " HexaBenz\n" #break #case (5) - object { Horloge } - #debug " Horloge !!!\n" + object { Les_Boules translate y*1.33 } + #debug " boules\n" #break #end // switch selector plane { y, 0 - texture { T_Planete_B scale 0.3333 } + texture { T_Planete_B scale 0.666 } } object { Repere translate y*0.8 } @@ -98,17 +126,17 @@ object { Repere translate y*0.8 } // ======================================================= #local CamX = -2.7 + (1.8*Cos_010(NormClock)); -#local CamY = 0.91 + (1.3*exp(NormClock)); -#local CamZ = -5.777 + (0.8*Cos_01(NormClock)); +#local CamY = 0.41 + (1.2*exp(NormClock)); +#local CamZ = -5.777 + (1.2*Cos_01(NormClock)); #local K = 8.6; #local CamX = CamX * K; -#local CamY = CamY * K * 0.5; +#local CamY = CamY * K * 0.65; #local CamZ = CamZ * K; camera { - orthographic + // orthographic location look_at <0, 1.4, 0> - angle 26 - 3*Cos_01(NormClock) + angle 12 - 3*Cos_01(NormClock) } diff --git a/gadgets.inc b/gadgets.inc index 1b33491..2a99207 100644 --- a/gadgets.inc +++ b/gadgets.inc @@ -20,15 +20,20 @@ merge { #for (Foo, 0, 7) #local C2X = 4 * sin(CK+rand(Rng1)) * sin(CK*3); #local C2Z = 3 * (sin(-CK+rand(Rng1)) * cos(CK*(5+rand(Rng1)))); - #local R = 0.05+(0.02*Cos_010(NormClock)); + #local R = 0.05+(0.04*Cos_010(NormClock)); cylinder { 0, , R } sphere { , R } #end } -texture { tPlasticOrange } -scale <0.62, 0.5, 0.65> +#if (NormClock < 225) + texture { tPlasticOrange } +#else + texture { Ruby_Glass } +#end + +scale <0.62, 0.5, 0.61> rotate -y*clock -translate y*1.6666666 +translate y*1.50 } /* ======================================================= */ @@ -110,8 +115,8 @@ union { #macro HexaPole () union { - object { Base_hexapole () scale <0.27, 0.2, 0.27> } - object { HexaPole_tubes () translate y*0.2 } + object { Base_hexapole () scale <0.24, 0.2, 0.24> } + object { HexaPole_tubes () translate y*0.25 } rotate y*(53*rand(Rng1)) } #end // macro diff --git a/globals.inc b/globals.inc index 4e6b659..d0b0df4 100644 --- a/globals.inc +++ b/globals.inc @@ -66,8 +66,8 @@ finish { phong 0.70 reflection 0.05 } } #declare T_Planete_B = texture { -pigment { rgb <0.40, 0.50, 0.70> } -finish { metallic 0.55 reflection 0.55 } +pigment { rgb <0.42, 0.50, 0.70> } +finish { metallic 0.50 reflection 0.33 } } /* diff --git a/hexabenz.inc b/hexabenz.inc index c760b25..3eb40f8 100644 --- a/hexabenz.inc +++ b/hexabenz.inc @@ -43,7 +43,7 @@ union { } torus { E, E*0.05 scale <1, 2.4, 1> rotate x*90 - #if ( rand(Rng1) < 0.5 ) + #if ( rand(Rng1) < 0.65 ) texture { T_Planete_A } #else texture { T_Planete_B } @@ -67,7 +67,7 @@ merge { #local Tx = E * sin(radians(foo)); #local Ty = E * cos(radians(foo)); #local Dza = z * 0.25; - #local Dzb = z * 0.95; + #local Dzb = z * 0.97; cylinder { -Dza, Dzb, R translate } sphere { -Dza, R*1.8 translate } sphere { Dzb, R*1.8 translate } @@ -88,7 +88,7 @@ difference { cylinder { < 1, 0, -1>, <-1, 0, 1>, R_Tube*0.21 } } scale <1, 1, 4.4> -#if ( rand(Rng1) < 0.360) +#if ( rand(Rng1) < 0.390) texture { Shadow_Clouds scale 0.56 } #else texture { Flashy } @@ -110,7 +110,9 @@ rotate -z*clock*8 } // ------------------------------------------- - +/* + * This part need more work + */ #local Forme_Cockpit = object { difference { @@ -118,11 +120,11 @@ difference { sphere { 0, R_Tube*0.72 scale 0.99 } #for (Foo, 0, 359, 36) cylinder { x, 0, R_Tube*0.15 - translate y*(R_Tube*0.32) + translate y*(R_Tube*0.34) rotate y*Foo } #end } -scale <1, 0.87, 1> +scale <1, 0.92, 1> translate z*L_Tube*1.18 } @@ -135,9 +137,9 @@ difference { cylinder { z*L_Tube*1.6, -z*L_Tube, R_Tube } /* les deux bouts du cylindre creux */ #local R2 = (R_Tube + R_int) / 2; - torus { R2, E_tube scale <1, 4, 1> + torus { R2, E_tube scale <1, 5, 1> rotate x*90 translate z*L_Tube*1.6 } - torus { R2, E_tube scale <1, 4, 1> + torus { R2, E_tube scale <1, 5, 1> rotate x*90 translate -z*L_Tube } /* cette sphere devrait devenir @@ -150,6 +152,12 @@ difference { texture { Soft_Silver scale 6.0 } } +// ------------------------------------------------------ + +#warning "------> inserer ici antenne pour hexabenz" + +// ------------------------------------------------------ + #macro Benz_Tube () // #declare Benz_Tube = object // { @@ -167,7 +175,7 @@ union { // #declare HexaBenz = object // { union { - #local Rk = (rand(Rng1)-0.5) * 1312; + #local Rk = (rand(Rng1)-0.54) * 1312; object { Benz_Cones () rotate z*NormClock*Rk} object { Benz_Tube () } } diff --git a/hexacone.pov b/hexacone.pov index dd458dd..7021922 100644 --- a/hexacone.pov +++ b/hexacone.pov @@ -32,6 +32,6 @@ camera { // focal_point <0.37, 0.90, 0> // aperture 0.046 // blur_samples 30 - angle 55 - 25 * Cos_01(NormClock) + angle 55 - 26 * Cos_01(NormClock) } diff --git a/hexawood.pov b/hexawood.pov index 1d9a267..6508516 100644 --- a/hexawood.pov +++ b/hexawood.pov @@ -22,9 +22,15 @@ object { Le_Decor } // object { Repere translate <10, 1, 10> } +#declare P1 = <-25, 0.4, (SzSol/2)+4>; + +#declare Pos = Interpolate(P1, P_hexawood, 0.95); +#declare Pos2 = ; +// object { Repere translate Pos } + camera { - location <39, 2+NormClock, 14> - look_at <-20, 1.7, 25.6> - angle 26 + 2*NormClock + location <18-NormClock, 1.60, 11.9-NormClock> + look_at Pos2 + angle 26 + 2.11*NormClock } diff --git a/orbite.pov b/orbite.pov index 8735ced..1c48376 100644 --- a/orbite.pov +++ b/orbite.pov @@ -69,14 +69,15 @@ object { HexaCone () } object { Planete rotate (-clock*0.21)*y } -light_source { <19, 6, 15>, rgb <0.77, 0.79, 0.80> } +light_source { <23, 6, 15>, rgb <0.77, 0.79, 0.80> } +// ------------------------------------------------------------- camera { - location <3, -1.0+(2*NormClock), 8.59> + location <3, -1.0+(6.789*NormClock), 8.59> look_at <0.0, 0.0, 0> focal_point <0.0, 0.0, 0> aperture 0.046 blur_samples 30 - angle 62 + angle 60 } diff --git a/panoramic.pov b/panoramic.pov index c3babba..b1ecc64 100644 --- a/panoramic.pov +++ b/panoramic.pov @@ -20,12 +20,9 @@ object { Le_Decor } #debug "ACTION !!!\n" #include "dynamic.inc" -// ------------------------------------------------------ ## -// ------------------------------------------------------ ## - // ======================================================= -#declare CK = 2.59 * Cos_01(NormClock); +#declare CK = 2.79 * Cos_01(NormClock); #declare CamY = 7 + (4*Cos_01(NormClock)); diff --git a/passage.pov b/passage.pov index 35e40c1..2a56a15 100644 --- a/passage.pov +++ b/passage.pov @@ -51,7 +51,7 @@ light_source { #end camera { - location <-2.76, 1.83, 8.76> + location <-2.76, 1.53, 8.76> look_at // focal_point <0, 1, 0> // aperture 0.046 diff --git a/remote.pov b/remote.pov index d17734a..217f0df 100644 --- a/remote.pov +++ b/remote.pov @@ -36,7 +36,7 @@ object { Le_Decor } // object { Repere scale 3 translate } #local DistCam = 280; -#local CK = 0.56 + (0.52 * NormClock); +#local CK = 0.333 + (0.52 * NormClock); #declare CamX = DistCam * sin(CK); #declare CamY = 28; #declare CamZ = DistCam * cos(CK); diff --git a/scene.pov b/scene.pov index bf853b9..0c87fdc 100644 --- a/scene.pov +++ b/scene.pov @@ -1,5 +1,5 @@ /* - * H E X A C O N E + * H E X A C O N E - S C E N E * nouveau projet Thu Dec 5 11:37:05 AM UTC 2024 */ diff --git a/survol.pov b/survol.pov index 13d75c0..d5abc81 100644 --- a/survol.pov +++ b/survol.pov @@ -23,8 +23,8 @@ object { Le_Decor } // ======================================================= -#declare Debut = <-3, 87, 151> ; -#declare Fin = < 2, 91, 41> ; +#declare Debut = <-3, 87, 161> ; +#declare Fin = < 2, 91, 81> ; #declare Pos = Cos_01(NormClock); #declare PosCam = Interpolate(Debut, Fin, Pos); diff --git a/tools/config.sh b/tools/config.sh index 4a3c859..aaac4da 100644 --- a/tools/config.sh +++ b/tools/config.sh @@ -3,7 +3,8 @@ Img_Width=1024 Img_Height=720 -TEXTCOL="White" +# for imagemagick +TEXTCOL="Red" STROKOL="OliveDrab" -NBFRAMES=400 +NBFRAMES=450 diff --git a/tools/plot-timing.sh b/tools/plot-timing.sh index 89f056a..beec693 100755 --- a/tools/plot-timing.sh +++ b/tools/plot-timing.sh @@ -16,7 +16,10 @@ fi # echo "plot timing $sequence" >> WS/log -grep $sequence WS/mp4.timing | tail -3600 | awk \ +count=$( grep $sequence WS/mp4.timing | wc -l ) +echo "$count samples for $sequence" | tee -a WS/log + +grep $sequence WS/mp4.timing | tail -4000 | awk \ -v nbframes=$NBFRAMES \ ' \ BEGIN { \ @@ -56,7 +59,7 @@ gnuplot << __EOC__ set term png size $Img_Width,$Img_Height set output "timing.png" set grid - set xrange [:400] + set xrange [:450] set yrange [0:] set title "Séquence '${sequence}'" set xlabel "numéro de la trame" diff --git a/trident.inc b/trident.inc index 14399bd..4c6dd43 100644 --- a/trident.inc +++ b/trident.inc @@ -28,7 +28,7 @@ difference { #macro Trid_A_head () union { #for (A, 0, 360, 120) - #local E = 0.26; + #local E = 0.28; #local Tx = E * sin(radians(A)); #local Tz = E * cos(radians(A)); object { Trid_A_cone () translate } @@ -36,7 +36,7 @@ union { #undef Tx #undef Tz torus { E*1.80, 0.02 - scale <1, 4, 1> translate -y*0.12 + scale <1, 4, 1> translate y*0.05 texture { T_Chrome_3B } } } #end