diff --git a/Makefile b/Makefile index bb98ded..68e392d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ DIMS = -W1600 -H1200 -POVOPT = +q9 +A Declare=NbFrames=450 -d +POVOPT = +q9 +A0.05 Declare=NbFrames=450 -d POVDEP = contexte.inc hexacone.inc hexabenz.inc \ hexastar.inc \ diff --git a/circular.pov b/circular.pov index ddbfea3..24733e9 100644 --- a/circular.pov +++ b/circular.pov @@ -30,7 +30,7 @@ object { Le_Decor } #declare AV = 0.070; #declare LatX = R_circ * 0.96 * cos(CK + AV); -#declare LatY = 2; +#declare LatY = 2.65; #declare LatZ = R_circ * 0.97 * sin(CK + AV); camera { diff --git a/contexte.inc b/contexte.inc index 37728f2..57d1603 100644 --- a/contexte.inc +++ b/contexte.inc @@ -101,7 +101,7 @@ union { #macro Les_GyroPhares () union { - #local E = SzSol * 0.431; + #local E = SzSol * 0.455; #for (Idx, 0, 359, 60) #local Ang = radians(Idx+9.33); #local Dx = E * sin(Ang); @@ -175,13 +175,13 @@ union { object { HexaBalls texture { Lightning1 scale 0.44 } rotate - translate <2, 0.51+Cos_010(NormClock), 4> + translate <2, 0.57+Cos_010(NormClock), 4> } object { HexaBalls texture { Lightning2 scale 0.56 } rotate <-clock, clock*0.33333, clock*3> - translate <4, 0.31+Cos_010(NormClock), -3> + translate <4, 0.61+Cos_010(NormClock), -3> } } } @@ -196,7 +196,7 @@ blob { threshold 0.01 sphere { <0, 0, 0>, RHBlo, 1 } #local E = RHBlo * 1.210; - #local W = 0.1; + #local W = 0.15; sphere { <-E, 0, 0>, RHBlo2, W } sphere { < E, 0, 0>, RHBlo2, W } sphere { < 0, -E, 0>, RHBlo2, W } @@ -213,15 +213,12 @@ blob { /* * on rempli le tableau avec la place des trous */ -// XXX #fopen Holes "WS/holes.log" write #for (Idx, 0, 5) #local Angle = (Idx + 0.19) * 1.090; #local Px = sin(Angle) * (SzSol * 0.97); #local Pz = cos(Angle) * (SzSol * 1.04); #declare UnderHoles[Idx] = ; -// XXX #write (Holes, Idx, " ", Angle, " ", UnderHoles[Idx], "\n") #end -// XXX #fclose Holes #declare Underground = object { @@ -249,8 +246,6 @@ union { } } -// XXX object { Repere scale 25 translate y + Pos_RedB_2 } - /* ======================================================= */ /* * nouvel éclairage du 10 février 2025 @@ -288,7 +283,7 @@ union { object { Chose () translate < 20, 0, -32> } /* a l'exterieur du 'circular' */ #for (foo, 0, 359, 18) - #local CK = radians(foo + (5*rand(Rng1))); + #local CK = radians(foo + (9*rand(Rng1))); #local DX = 66 * sin(CK); #local DZ = 64 * cos(CK); object { Chose () translate < DX, 0, DZ> } // XXX @@ -372,12 +367,13 @@ union { object { Les_HexaPoles } object { Horloge rotate y*27 translate < 3, 0, -30> } object { Les_Choses } - object { Les_Arches (1) rotate y*59 translate <-22, 0, -20> } - object { Les_Arches (2) rotate y*152 translate <-34, 0, -26> } + object { Les_Arches (1.9) rotate y*152 translate <-34, 0, -26> } - object { Les_Cahutes () translate <23, 0, -10> } + object { Les_Cahutes () rotate y*90 translate <24, 0, -10> } /* les trucs dans le Y négatif */ + object { Les_Arches (4.9) translate <0, 0, -111> } + object { OpenBox(1.5, 0.06) translate <-16, 1.49, -88> } object { OpenBox(1.5, 0.06) translate <-18, 1.52, -104> } object { OpenBox(1.5, 0.06) translate <-17, 1.52, -134> } diff --git a/dynamic.inc b/dynamic.inc index 4b7f45b..3b7f272 100644 --- a/dynamic.inc +++ b/dynamic.inc @@ -1,9 +1,6 @@ /* */ -#include "gadgets.inc" - - // ======================================================= // on va tenter de placer quelques trucs // qui bougent sur le rail circulaire @@ -47,21 +44,21 @@ object { BiBenz rotate -y*(clock*0.26) translate Pos_RedB_0 } #local K = 1.27; union { object { HexaCone () rotate y*90 translate <-K, 1.7, 0> } - object { HexaCone () rotate <4, 1, 6> translate < K, 1.9, 0> } + object { HexaCone () rotate <4, 1, 7> translate < K, 1.9, 0> } } } -object { BiCone rotate -y*(Cos_010(NormClock)*55.38) translate Pos_RedB_1 } +object { BiCone rotate -y*(Cos_010(NormClock)*65.38) translate Pos_RedB_1 } /* les tridents posés sur leur estrade */ #declare BiTrident = object { union { - object { Trident_A () rotate -z * 3.5 translate -x*0.90 } - object { Trident_A () rotate z * 3.5 translate x*0.90 } + object { Trident_A () rotate -z * 9.9 translate -x*0.92 } + object { Trident_A () rotate z * 8.4 translate x*0.90 } } } -object { BiTrident translate x*0.80 - rotate y*(520*Cos_01(NormClock)) +object { BiTrident + rotate y*(570*Cos_01(NormClock)) translate Pos_RedB_2 + (y*2) } diff --git a/essai.pov b/essai.pov index d321467..ef3c273 100644 --- a/essai.pov +++ b/essai.pov @@ -311,7 +311,7 @@ plane { // ======================================================= #local CamX = -2.7 + (1.8*Cos_010(NormClock)); -#local CamY = 0.41 + (1.2*exp(NormClock)); +#local CamY = 0.61 + (1.1*exp(NormClock)); #local CamZ = -5.777 + (1.2*Cos_01(NormClock)); #local K = 8.6; diff --git a/gadgets.inc b/gadgets.inc index 2d6abb8..f2b6b44 100644 --- a/gadgets.inc +++ b/gadgets.inc @@ -4,7 +4,7 @@ */ /* ======================================================= */ -#declare R_C = 0.42; +#declare R_C = 0.35; /* ce truc mérite un nom plus parlant ! */ #macro Chose_le_pied () @@ -37,7 +37,7 @@ union { cos(CK*(rand(Rng1)))); #local Rt = 0.015+(0.03*Cos_010(NormClock)); #local B = <0, -0.05, 0>; - #local H = 1.16; + #local H = 0.80; cylinder { B, , Rt } sphere { , Rt } #end @@ -54,7 +54,7 @@ union { // ------------------------------------------------------ ## #macro Chose_le_corps () // = object difference { - #local H = 0.50 + (0.10 * rand(Rng1)); + #local H = 0.42 + (0.10 * rand(Rng1)); cone { 0, R_C*0.52, y*H, R_C } sphere { y*H, R_C*0.75 } #local R = rand(Rng1); @@ -121,7 +121,7 @@ prism { #macro HexaPole_tubes () #local R = 0.04; #local E = 0.51; -#local H = H_cone*1.25; +#local H = H_cone*0.875; union { #for (A, 0, 359, 60) #local Xp = E * cos(radians(A)); diff --git a/hexacone.inc b/hexacone.inc index 14ce309..135b33f 100644 --- a/hexacone.inc +++ b/hexacone.inc @@ -36,7 +36,7 @@ union { cylinder {-z, z, 0.11 } } // XXX not very tested - #local Sc = 3.87; + #local Sc = 3.57; #local Rt1 = 0.333; #local Rta = Rt1 / Sc; #local Rt2 = 0.0062; diff --git a/trident.inc b/trident.inc index 67492d4..7e0e10c 100644 --- a/trident.inc +++ b/trident.inc @@ -27,7 +27,7 @@ difference { #macro Trid_A_head () union { #for (A, 0, 360, 120) - #local E = 0.28; + #local E = 0.29; #local Tx = E * sin(radians(A)); #local Tz = E * cos(radians(A)); object { Trid_A_cone () translate } @@ -45,8 +45,8 @@ union { #local R = 0.095; merge { cylinder { <0, -L, 0>, <0, L, 0>, R } - sphere { 0, R scale <1, 6.11, 1> translate y*L } - sphere { 0, R scale <1, 0.42, 1> translate -y*L } + sphere { 0, R scale <1, 6.66, 1> translate y*L } + sphere { 0, R scale <1, 0.45, 1> translate -y*L } #local R = rand(Rng1); #if ( R < 0.333) texture { T_Chrome_1C } #elseif ( R < 0.666) texture { T_Silver_1C } diff --git a/trident.pov b/trident.pov index 5a37e1e..a8aae10 100644 --- a/trident.pov +++ b/trident.pov @@ -21,7 +21,7 @@ object { Le_Decor } // object { Repere scale 2 } -#declare CK = NormClock * 1.78; +#declare CK = 0.8 - (NormClock * 0.71); #declare DX_cam = 6.9 * cos(CK); #declare DZ_cam = 5.4 * sin(CK); #declare Loc_cam = + Pos_RedB_2;