From 9aa1f37dcf7ae232d6d4789353018ba978bca9cb Mon Sep 17 00:00:00 2001 From: Tonton Th Date: Thu, 18 Dec 2025 22:28:33 +0100 Subject: [PATCH] le commit avant-sieste --- contexte.inc | 14 ++++++++------ gadgets.inc | 13 +++++++------ globals.inc | 6 +++--- groundbase.inc | 8 ++++---- hexacone.inc | 9 +++++---- hexastar.inc | 9 +++++++++ xperiment.inc | 20 ++++++++++---------- 7 files changed, 46 insertions(+), 33 deletions(-) diff --git a/contexte.inc b/contexte.inc index 992535c..0a690d6 100644 --- a/contexte.inc +++ b/contexte.inc @@ -35,9 +35,11 @@ difference { cylinder { 0, y*0.36, R*0.99 } cone { y*0.37, R*0.80, y*0.425, R*0.83 } #for (Foo, 0, 359, 10) - #local Dx = R * sin(radians(Foo)); - #local Dz = R * cos(radians(Foo)); - cone { 0, 0.01, y*0.41, 0.10 translate } + #if (rand(Rng1) > 0.16) + #local Dx = R * sin(radians(Foo)); + #local Dz = R * cos(radians(Foo)); + cone { 0, 0.01, y*0.41, 0.10 translate } + #end // if random #end } texture { T } @@ -376,9 +378,9 @@ union { object { Les_Cahutes () translate <23, 0, -10> } /* les trucs dans le Y négatif */ - object { OpenBox(1.5, 0.08) translate <-16, 1.49, -88> } - object { OpenBox(1.5, 0.08) translate <-18, 1.52, -104> } - object { OpenBox(1.5, 0.08) translate <-17, 1.52, -134> } + 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> } object { Les_Cahutes () translate <27, 0, -79> } object { Les_Cahutes () translate <31, 0, -91> } object { Les_Cahutes () translate <29, 0, -104> } diff --git a/gadgets.inc b/gadgets.inc index b7ebd2c..d64381d 100644 --- a/gadgets.inc +++ b/gadgets.inc @@ -28,16 +28,17 @@ merge { * 29 novembre 2025, je tente l'expérience */ #macro Chose_les_tiges () -merge { +union { #local CK = NormClock * (7.876+rand(Rng1)); #for (Foo, 0, 7) #local CK2 = CK + Foo; - #local C2X = (R_C + 0.2) * sin(CK2+rand(Rng1)) * sin(CK*3); - #local C2Z = (R_C + 0.3) * (sin(-CK2+rand(Rng1)) * + #local C2X = (R_C + 0.1) * sin(CK2+rand(Rng1)) * sin(CK*3); + #local C2Z = (R_C + 0.1) * (sin(-CK2+rand(Rng1)) * cos(CK*(rand(Rng1)))); - #local Rt = 0.02+(0.03*Cos_010(NormClock)); + #local Rt = 0.015+(0.03*Cos_010(NormClock)); + #local B = <0, -0.05, 0>; #local H = 1.26; - cylinder { 0, , Rt } + cylinder { B, , Rt } sphere { , Rt } #end #local R = rand(Rng1); @@ -120,7 +121,7 @@ prism { #macro HexaPole_tubes () #local R = 0.04; #local E = 0.51; -#local H = H_cone*1.5; +#local H = H_cone*1.25; union { #for (A, 0, 359, 60) #local Xp = E * cos(radians(A)); diff --git a/globals.inc b/globals.inc index 7d9559f..e37fb09 100644 --- a/globals.inc +++ b/globals.inc @@ -1,7 +1,7 @@ global_settings { assumed_gamma 1.0 - ambient_light rgb <0.48, 0.47, 0.48> + ambient_light rgb <0.48, 0.49, 0.48> max_trace_level 15 } @@ -11,7 +11,7 @@ global_settings { #include "stones.inc" #include "woods.inc" -#declare Rng1 = seed(1789); +#declare Rng1 = seed(1957); #declare foo = rand(Rng1); #declare Rng2 = seed(now*24*60*60); #declare bar = rand(Rng2); @@ -152,7 +152,7 @@ finish { #declare Ground_Texture = texture { pigment { rgb <0.31, 0.33, 0.24> } -normal { dents 0.22 scale 1.6} +normal { dents 0.22 scale 1.666} finish { ambient 0 specular 0.3 metallic roughness 0.18 reflection { 0.4 metallic } diff --git a/groundbase.inc b/groundbase.inc index 70ded91..d5d60a4 100644 --- a/groundbase.inc +++ b/groundbase.inc @@ -86,7 +86,7 @@ translate y*H_sol #declare GroundBase_a = object { /* - C'est quoi ce truc ? + le soubassement de l'abribus */ union { #local Dx = 1.5; @@ -111,8 +111,8 @@ texture { T_Grnt7 rotate 49 scale 0.333 } #declare GroudBase_coin = object { merge { - cylinder { 0, y*0.5, 0.10 } - sphere { 0, 0.10 scale <1, 0.25, 1> translate y*0.5 } + cylinder { 0, y*0.5, 0.12 } + sphere { 0, 0.12 scale <1, 0.25, 1> translate y*0.5 } } } @@ -127,7 +127,7 @@ union { object { GroudBase_coin translate <-Sz, Hc, Sz> } object { GroudBase_coin translate < Sz, Hc, Sz> } } -texture { T_Grnt27 rotate 9 scale 0.32 } +texture { T_Grnt27 rotate 9 scale 0.302 } #undef Sz #undef Hc } diff --git a/hexacone.inc b/hexacone.inc index ed30147..105b19d 100644 --- a/hexacone.inc +++ b/hexacone.inc @@ -36,10 +36,11 @@ union { cylinder {-z, z, 0.11 } } // XXX not very tested - #local Rt2 = 0.009; - torus { .25, .005 } - torus { .25, Rt2 rotate x*90 } - torus { .25, Rt2 rotate z*90 } + #local Rt1 = 0.290; + #local Rt2 = 0.006; + torus { Rt1, Rt2 scale <1, 4, 1> } + torus { Rt1, Rt2 scale <1, 4, 1> rotate x*90 } + torus { Rt1, Rt2 scale <1, 4, 1> rotate z*90 } // clignotement de la lumiere \o/ #local kR = 0.065; diff --git a/hexastar.inc b/hexastar.inc index e69de29..b7e5077 100644 --- a/hexastar.inc +++ b/hexastar.inc @@ -0,0 +1,9 @@ +/* + * H E X A S T A R + * + */ + +/* ------------------------------------------------------------ */ +/* ------------------------------------------------------------ */ +/* ------------------------------------------------------------ */ + diff --git a/xperiment.inc b/xperiment.inc index 3286af7..11ac458 100644 --- a/xperiment.inc +++ b/xperiment.inc @@ -75,10 +75,13 @@ object { // #debug concat(" Arche, val = ", str(Val, 6, 4), "\n") merge { #local Ha = 2; + #local D2 = Val * 1.414; // mettre une base de la colonne - cylinder { <-1, 0, 0>, <-1, 0.20, 0> Val*1.49 } - cylinder { < 1, 0, 0>, < 1, 0.20, 0> Val*1.41 } - sphere { < 1, 0.20, 0> Val*1.41 } + cylinder { <-1, 0, 0>, <-1, 0.20, 0> D2 } + cylinder { < 1, 0, 0>, < 1, 0.20, 0> D2 } + sphere { 0, D2 scale <1, 0.5, 1> translate <-1, 0.20, 0> } + sphere { 0, D2 scale <1, 0.5, 1> translate < 1, 0.20, 0> } + // les deux futs de l'arche cylinder { <-1, 0, 0>, <-1, Ha, 0>, Val } cylinder { < 1, 0, 0>, < 1, Ha, 0>, Val } #if (rand(Rng1) < 0.50) @@ -134,7 +137,7 @@ union { #macro Cahute_0 () difference { - #local KX = 0.55; + #local KX = 0.52; #local KH = 1.80 + rand(Rng1) ; // #debug concat(" Cahute_0, KH = ", str(KH, 6, 4), "\n") #local KZ = KX + (0.24*rand(Rng1)); @@ -150,12 +153,9 @@ difference { #local R = rand(Rng1); // #debug concat("Random = ", str(R, 6, 4), "\n") - #if ( R < 0.19 ) - texture { T_Planete_A } - #elseif ( R < 0.56 ) - texture { T_Beton_1 } - #else - texture { T_Beton_2 } + #if ( R < 0.19 ) texture { T_Planete_A } + #elseif ( R < 0.56 ) texture { T_Beton_1 } + #else texture { T_Beton_2 } #end // if rotate y * (277 * rand(Rng1))