big commit, a lot of small adjustemnst

This commit is contained in:
Tonton Th
2025-11-25 02:36:52 +01:00
parent fa8f9578b5
commit c56db2a87d
15 changed files with 170 additions and 207 deletions

View File

@@ -6,7 +6,6 @@
#version 3.7;
#include "globals.inc"
#debug "\n GLOBALS INCLUDED\n"
#include "contexte.inc"
#include "gadgets.inc"
@@ -24,15 +23,15 @@
* rail circulaire
*/
#declare Un_Wagonnet = object
#declare Les_Wagonnets = object
{
#local R = 3.2;
#local L = 2.4;
object { Wagonnet_0 (R)
rotate y*clock*2
union {
object { Wagonnet_0(L) translate <0, 1, 1.6> }
object { Wagonnet_0(L+1) translate <0, 1+NormClock, 0> }
object { Wagonnet_0(L) translate <0, 1, -1.6> }
}
}
// =======================================================
@@ -56,14 +55,14 @@ sphere {
{
union {
#for (A, 0, 32, 1)
#local CK = (NormClock*55.00) + (A*0.08);
#local CK = (NormClock*55.00) + (A*0.28);
object { Une_Boule ()
#local TX = 1.6 * sin(CK);
#local TX = 1.9 * sin(CK);
#local TY = 1.4 * cos(sin(CK));
#local TZ = 2.0 * cos(1-CK);
translate <TX, TY, TZ>
}
object { Repere scale 2 }
// object { Repere scale 2 }
#end // for
}
}
@@ -104,13 +103,16 @@ union {
}
}
// =======================================================
/* Les choses, c'est l'espèce de vase avec des tiges
qui bougent, je devrais trouver un nom plus parlant */
#declare Des_Choses = object
{
union {
object { Chose () translate -<-1.7, 0, 0.8> }
object { Chose () translate -< 1.5, 0, 1.2> rotate -y*clock }
object { Chose () translate -< 1.1, 0, -1.2> rotate y*clock }
object { Chose () translate < 2.0, 0, 2.32> }
object { Chose () translate <-2.9, 0, 3.91> }
object { Chose () translate < 2.9, 0, -4.07> }
object { Chose () translate <-3.4, 0, -3+NormClock> }
object { Repere scale <3, 4, 3> translate 0.05*y }
}
}
// =======================================================
@@ -120,7 +122,7 @@ union {
// #debug " Les gyros !!!\n"
union {
#for (I, 0, 359, 30)
#declare E = 12;
#declare E = 12 + rand(Rng1);
#declare Dx = E * sin(radians(I));
#declare Dz = E * cos(radians(I));
object { GyroPhare () translate <Dx, 0, Dz> }
@@ -134,6 +136,13 @@ object { Gyros }
#debug " !!! ACTION !!!\n"
light_source {
<-18, 54, -7>
colour Gray40
parallel
point_at 0
}
// ------------------------------------------------------ ##
#declare Selector = mod(int(clock/60)+19, 8);
@@ -146,7 +155,8 @@ object { Gyros }
union {
object { OpenBox(1, 0.03) }
object { OpenBox(0.55, 0.03)
translate <0.4*rand(Rnd2), NormClock*0.74,cos(NormClock)> }
translate
<0.4*rand(Rng1), NormClock*1.2, 2*cos(NormClock*9)> }
translate y*2.1
}
#break
@@ -155,21 +165,19 @@ object { Gyros }
#declare AngleCam = 22;
#break
#case (2)
object { HexaPole translate y }
object { HexaPole () translate y }
#break
#case (3)
object { Des_Choses }
#break
#case (4)
object { HexaCone () scale 2 translate 2.7*y rotate -y*clock }
object { HexaWood scale 2 translate 0.7*y rotate -y*clock }
#break
#case (5)
object { Les_Boules translate y*0.8 }
#break
#case (6)
object { Un_Wagonnet translate < 1, 1, 0> }
object { Un_Wagonnet translate y+NormClock }
object { Un_Wagonnet translate <-1, 1, 0> }
object { Les_Wagonnets rotate y*(clock) }
#break
#case (7)
#local Pos = <0, 0, 0>;