diff --git a/contexte.inc b/contexte.inc index 49881d2..0c03660 100644 --- a/contexte.inc +++ b/contexte.inc @@ -208,9 +208,9 @@ union { #for (Idx, 0, 5) #local Angle = (Idx + 0.19) * 1.09; // magic numbers ? - #local Kr = 6 - (rand(Rng1)*3); + #local Kr = 5 - (rand(Rng1)*2.5); #local Px = Kr + sin(Angle) * (SzSol * 0.98); - #local Kr = 6 - (rand(Rng1)*3); + #local Kr = 5 - (rand(Rng1)*2.5); #local Pz = Kr + cos(Angle) * (SzSol * 1.02); #ifdef (DEBUG_LEVEL) #write (Trid, "Def_", Idx, " ", NormClock, " ", Px, " ", Pz, "\n") @@ -290,8 +290,8 @@ union { /* a l'exterieur du 'circular' */ #for (foo, 0, 359, 18) #local CK = radians(foo + (9*rand(Rng1))); - #local DX = 66 * sin(CK); - #local DZ = 64 * cos(CK); + #local DX = 76 * sin(CK); + #local DZ = 74 * cos(CK); object { Chose () translate < DX, 0, DZ> } // XXX #end } @@ -379,7 +379,7 @@ union { object { Les_GyroPhares () } object { Les_HexaPoles } object { HorlogeDouble rotate y*(27*NormClock) - translate < 3, 0, -30> } + translate < 8, 0, -30> } object { Les_Choses } object { Les_Arches (1.9) rotate y*132 translate <-34, 0, -26> } diff --git a/gadgets.inc b/gadgets.inc index 7ef8a45..7732fc1 100644 --- a/gadgets.inc +++ b/gadgets.inc @@ -157,19 +157,19 @@ translate <-4.5, 0.046, 0> #local Horloge2 = object { object { Horloge scale <1, 0.28, 1> rotate -x*90 - translate <0.442, 0.14, 0> } + translate <0.802, 0.18, 0> } } #declare HorlogeDouble = object { union { - box { <-3.20, 0.0, -0.07>, <3.20, 1.64, 0.07> + box { <-3.20, 0.0, -0.07>, <3.20, 1.68, 0.07> texture { LeGris } } - #local EC = 0.19; + #local EC = 0.12; object { Horloge2 rotate y*180 translate z*EC } object { Horloge2 translate -z*EC } } scale 0.51 -translate y*1.35 +translate y*0.999 } // ======================================================= /*