diff --git a/all.inc b/all.inc index e69de29..264ab07 100644 --- a/all.inc +++ b/all.inc @@ -0,0 +1,24 @@ +/* + * Tous les includes dans le bon ordre + */ + +#debug "+++++++++++++++++++++++++++ DEBUT ALL\n" + +// tous les petits elements +#include "gadgets.inc" + +// les hexatrucs qui sont OK +#include "hexacone.inc" +#include "hexabenz.inc" +#include "hexawood.inc" +#include "trident.inc" + +// les machins avec des bugs +// #include "hexastar.inc" + +// les constructions en chantier +#include "xperiment.inc" + +#include "contexte.inc" + +#debug "+++++++++++++++++++++++++++ FIN ALL\n" diff --git a/approche.pov b/approche.pov index 0f47538..d147d85 100644 --- a/approche.pov +++ b/approche.pov @@ -8,12 +8,7 @@ #include "globals.inc" -#include "contexte.inc" -#include "hexacone.inc" -#include "hexabenz.inc" -#include "hexawood.inc" -#include "trident.inc" -#include "dynamic.inc" +#include "all.inc" object { Le_Decor } diff --git a/bubblecut.pov b/bubblecut.pov index eca2c7d..c29072a 100644 --- a/bubblecut.pov +++ b/bubblecut.pov @@ -7,13 +7,7 @@ #include "globals.inc" -#include "contexte.inc" -#include "hexacone.inc" -#include "hexabenz.inc" -#include "hexawood.inc" -#include "trident.inc" - -#include "dynamic.inc" +#include "all.inc" // ======================================================= diff --git a/carto.pov b/carto.pov index de07025..ba137a8 100644 --- a/carto.pov +++ b/carto.pov @@ -9,14 +9,9 @@ #include "globals.inc" -#include "contexte.inc" -#include "hexacone.inc" -#include "hexabenz.inc" -#include "hexawood.inc" -#include "trident.inc" -#include "xperiment.inc" -#include "dynamic.inc" +#include "all.inc" +// --------------------------------------------------------- // --------------------------------------------------------- // dessiner une grille diff --git a/circular.pov b/circular.pov index 7216dd9..a6bf9e3 100644 --- a/circular.pov +++ b/circular.pov @@ -7,15 +7,9 @@ #include "globals.inc" -#include "contexte.inc" -#include "gadgets.inc" -#include "hexacone.inc" -#include "hexabenz.inc" -#include "hexawood.inc" -#include "trident.inc" +#include "all.inc" // ======================================================= -#include "dynamic.inc" object { Le_Decor } diff --git a/contexte.inc b/contexte.inc index 3a85802..f7286e4 100644 --- a/contexte.inc +++ b/contexte.inc @@ -6,9 +6,7 @@ /* ======================================================= */ -#include "groundbase.inc" -#include "xperiment.inc" -#include "gadgets.inc" +#debug "+++++++++++++++++++++ debut contexte\n" /* ======================================================= */ /* @@ -210,11 +208,11 @@ blob { /* ======================================================= */ +/* + * on déclare et rempli le tableau avec la place des trous + */ #declare UnderHoles = array[6] -/* - * on rempli le tableau avec la place des trous - */ #for (Idx, 0, 5) #local Angle = (Idx + 0.19) * 1.090; #local Px = sin(Angle) * (SzSol * 0.97); @@ -336,7 +334,7 @@ sky_sphere { color_map { [ 0.2 color Gray20 ] [ 0.4 color rgb <.5, .45, .4> ] - [ 0.7 color Gray40 ] + [ 0.7 color Gray50 ] [ 0.9 color rgb <.5, .5, .45> ] [ 1.0 color Gray20 ] } @@ -356,7 +354,10 @@ sky_sphere { { union { object { Underground } + + #include "groundbase.inc" object { La_GroundBase } + object { RoundBase_0 (T_Beton_1) translate } object { RoundBase_0 (T_Beton_2) @@ -379,9 +380,10 @@ union { object { OpenBox(1.5, 0.06) translate <-19, 1.49, -88> } object { OpenBox(1.5, 0.06) translate <-18, 1.52, -104> } object { OpenBox(1.5, 0.06) translate <-19, 1.52, -134> } - object { Les_Cahutes () translate <29, 0, -79> } - object { Les_Cahutes () translate <31, 0, -91> } - object { Les_Cahutes () translate <20, 0, -104> } + + #for (Foo, 0, 5) + object { Les_Cahutes () translate <29, 0, -(77+Foo*9)> } + #end // for } } /* ------------------------------------------------------------ */ diff --git a/cutoff.pov b/cutoff.pov index 9e129a8..8da7552 100644 --- a/cutoff.pov +++ b/cutoff.pov @@ -7,13 +7,7 @@ #include "globals.inc" -#include "contexte.inc" -#include "hexacone.inc" -#include "hexabenz.inc" -#include "hexawood.inc" -#include "trident.inc" - -#include "dynamic.inc" +#include "all.inc" // ======================================================= diff --git a/dynamic.inc b/dynamic.inc index fe7523a..c65c732 100644 --- a/dynamic.inc +++ b/dynamic.inc @@ -1,12 +1,38 @@ /* */ +// ======================================================= +// rajout d'une patrouille en vol +// 2 janvier 2026 + +#local CK = clock / 150; // en radians +#local RD = 63; // rayon deplacement +#local Xp = RD * sin(CK); +#local Zp = RD * cos(CK); + +object { + #local L2 = 10; + #if (0) + union { + cylinder { <-L2, 0, 0>, , 0.4 } + cylinder { -y*3, y*3, 0.4 } + texture { Y_Texture } + } + #else object { Patrouille rotate 90*y } + #end + + rotate y*degrees(CK) + translate + translate <-30, 0, 0> + } + + // ======================================================= // on va tenter de placer quelques trucs // qui bougent sur le rail circulaire #for (foo, 0, 5) -#local CK = (NormClock+(foo*0.0197)) * 4.02; // radians +#local CK = (NormClock+(foo*0.0204)) * 4.02; // radians #declare Xpos = R_circular * sin(CK); #declare Zpos = R_circular * cos(CK); #declare AR = degrees(CK); @@ -58,7 +84,7 @@ union { } } object { BiTrident - rotate y*(570*Cos_01(NormClock)) + rotate y*(670*Cos_01(NormClock)) translate Pos_RedB_2 + (y*2) } @@ -119,6 +145,8 @@ object { HexaBenz () #local R = 16.64 * cos(K); #local H = 0.52 * pow(sin(K), 3); #declare P_hexawood = P + <0, 0.26+H, 0>; +#debug "+++++++++++++ P_hexawood defined\n" + object { HexaWood rotate z*R translate P_hexawood } /* diff --git a/escadrille.pov b/escadrille.pov index 8846361..8fdef1b 100644 --- a/escadrille.pov +++ b/escadrille.pov @@ -8,12 +8,7 @@ #include "globals.inc" -#include "contexte.inc" -#include "hexacone.inc" -#include "hexabenz.inc" -#include "hexawood.inc" -#include "trident.inc" -#include "xperiment.inc" +#include "all.inc" // ======================================================= diff --git a/essai.pov b/essai.pov index 711fd12..799c6d6 100644 --- a/essai.pov +++ b/essai.pov @@ -7,18 +7,13 @@ #include "globals.inc" -#include "contexte.inc" -#include "gadgets.inc" -#include "hexacone.inc" -#include "hexabenz.inc" -#include "hexawood.inc" -#include "trident.inc" +#include "all.inc" // XXX -#include "xperiment.inc" // XXX // ======================================================= // nouveau du dernier jour 2025 + #include "hexastar.inc" #declare Une_HexaStar = object @@ -27,26 +22,6 @@ object { HexaStar translate y*3 } } // ======================================================= -/* - * new Tue Dec 30 07:39:09 AM UTC 2025 - */ - -#declare Patrouille = object -{ -union { - #local EX = 2.3; - #local EZ = 2.7; - object { Trident_A () rotate x*87 } - object { HexaBenz () translate <-EX, 0, -EZ> } - object { HexaCone () translate < EX, -0.2, -EZ> } - object { HexaBenz () translate <-EX*2, 0, -EZ*2> } - object { HexaCone () translate < EX*2, -0.2, -EZ*2> } - - object { Repere scale 2 translate y*3.4 } - - } -} - // ======================================================= /* * new Thu Dec 18 01:14:19 AM UTC 2025 @@ -268,7 +243,7 @@ object { Gyros } light_source { <-18, 54, -7> - colour Gray40 + colour Gray50 parallel point_at 0 } @@ -282,7 +257,7 @@ object { Gyros } #switch (Selector) #case (0) - object { BasicTextures rotate -y*3*clock) } + object { Des_Choses } #break #case (1) object { Patrouille rotate -y*(clock*0.666) @@ -293,12 +268,12 @@ object { Gyros } object { Le_ConeStack () translate y*0.20 } #break #case (3) - object { Des_Choses } + object { BasicTextures rotate -y*(3*clock) } #break #case (4) object { Trident_A() - scale 2 - rotate <20, 0, 10> translate 2.1*y + scale 1.8 + rotate <20, 0, 10> translate 2.2*y rotate -y*clock } #break #case (5) @@ -333,6 +308,8 @@ plane { #local CamY = CamY * K * 0.61; #local CamZ = CamZ * K; + + camera { location look_at <0, 1.6, 0> diff --git a/globals.inc b/globals.inc index b1d0f1a..2e35e5d 100644 --- a/globals.inc +++ b/globals.inc @@ -148,14 +148,15 @@ finish { } } -/* new: 28 octobre 2025 */ +/* ------------------------------------------------------------ */ +/* new: 28 octobre 2025 */ #declare Ground_Texture = texture { pigment { rgb <0.31, 0.33, 0.24> } normal { dents 0.22 scale 1.666} finish { - ambient 0 specular 0.3 metallic roughness 0.18 - reflection { 0.4 metallic } + ambient 0 specular 0.3 metallic roughness 0.33 + reflection { 0.23 metallic } } } diff --git a/groundbase.inc b/groundbase.inc index ce339cd..3f3314c 100644 --- a/groundbase.inc +++ b/groundbase.inc @@ -112,8 +112,8 @@ texture { T_Grnt7 rotate 49 scale 0.333 } #declare GroudBase_coin = object { merge { - cylinder { 0, y*0.5, 0.12 } - sphere { 0, 0.12 scale <1, 0.25, 1> translate y*0.5 } + cylinder { 0, y*0.5, 0.14 } + sphere { 0, 0.14 scale <1, 0.25, 1> translate y*0.5 } } } diff --git a/hexabenz.pov b/hexabenz.pov index 65dd04b..e0c0fb4 100644 --- a/hexabenz.pov +++ b/hexabenz.pov @@ -6,14 +6,7 @@ #include "globals.inc" -#include "contexte.inc" -#include "hexacone.inc" -#include "hexabenz.inc" -#include "hexawood.inc" -#include "trident.inc" - -#include "dynamic.inc" - +#include "all.inc" // ======================================================= diff --git a/hexacone.pov b/hexacone.pov index c810547..ee1e6cf 100644 --- a/hexacone.pov +++ b/hexacone.pov @@ -6,12 +6,7 @@ #include "globals.inc" -#include "contexte.inc" -#include "hexacone.inc" -#include "hexabenz.inc" -#include "hexawood.inc" -#include "trident.inc" -#include "dynamic.inc" +#include "all.inc" object { Le_Decor } diff --git a/hexawood.pov b/hexawood.pov index 1f03d5d..94e66e9 100644 --- a/hexawood.pov +++ b/hexawood.pov @@ -8,11 +8,7 @@ #include "globals.inc" -#include "contexte.inc" -#include "hexacone.inc" -#include "hexabenz.inc" -#include "hexawood.inc" -#include "trident.inc" +#include "all.inc" #include "dynamic.inc" diff --git a/orbite.pov b/orbite.pov index 5fcfec2..568c339 100644 --- a/orbite.pov +++ b/orbite.pov @@ -6,9 +6,7 @@ #include "globals.inc" -#include "contexte.inc" -#include "hexacone.inc" -#include "hexabenz.inc" +#include "all.inc" // ======================================================= #declare R_planete = 1.45; diff --git a/panoramic.pov b/panoramic.pov index 8356065..5308556 100644 --- a/panoramic.pov +++ b/panoramic.pov @@ -7,18 +7,11 @@ #include "globals.inc" -#include "contexte.inc" -#include "gadgets.inc" -#include "hexacone.inc" -#include "hexabenz.inc" -#include "hexawood.inc" -#include "trident.inc" -#include "xperiment.inc" +#include "all.inc" // ======================================================= -object { Le_Decor } -#include "dynamic.inc" +object { Le_Decor } // ======================================================= diff --git a/passage.pov b/passage.pov index f78eb95..f3f3df0 100644 --- a/passage.pov +++ b/passage.pov @@ -7,15 +7,7 @@ #include "globals.inc" -#include "contexte.inc" -#include "hexacone.inc" -#include "hexabenz.inc" -#include "hexawood.inc" -#include "trident.inc" - -// --------------------------------------- - -#include "dynamic.inc" +#include "all.inc" #declare PosX = 3.95; #declare PosY = 3.80 + (NormClock*0.299); diff --git a/remote.pov b/remote.pov index 1519e42..a66ad3c 100644 --- a/remote.pov +++ b/remote.pov @@ -7,28 +7,24 @@ #include "globals.inc" -#include "contexte.inc" -#include "hexacone.inc" -#include "hexabenz.inc" -#include "hexawood.inc" -#include "trident.inc" +#include "all.inc" #declare A = <-SzSol, 16, -8>; #declare B = ; #declare P = Interpolate(A, B, NormClock); object { HexaCone () rotate y*((6*NormClock)+80) translate P } -#include "dynamic.inc" - object { HexaBenz () rotate y*(clock/9) translate <-9, 3, 7> } // --------------------------------------------------------- // WTF is that ??? XXX +#if (0) #declare A = <-15, -1.9, SzSol>; #declare B = < 23, -0.7, SzSol>; #declare P = Interpolate(A, B, NormClock); object { HexaWood scale 10 translate P } +#end // --------------------------------------------------------- diff --git a/scene.pov b/scene.pov index 2f9cd41..3fb29a7 100644 --- a/scene.pov +++ b/scene.pov @@ -7,13 +7,7 @@ #include "globals.inc" -#include "contexte.inc" -#include "hexacone.inc" -#include "hexabenz.inc" -#include "hexawood.inc" -#include "trident.inc" - -#include "dynamic.inc" +#include "all.inc" // --------------------------------------------------------- diff --git a/splined.pov b/splined.pov index 8ecc256..d4182e4 100644 --- a/splined.pov +++ b/splined.pov @@ -9,39 +9,34 @@ #include "globals.inc" -#include "contexte.inc" -#include "hexacone.inc" -#include "hexabenz.inc" -#include "hexawood.inc" -#include "trident.inc" -#include "dynamic.inc" +#include "all.inc" object { Le_Decor } // ======================================================= #declare Spline_1 = spline { cubic_spline - -0.2, <-2, 1.0, -2>, // control point + -0.2, <-2, 1.0, -3>, // control point - 0.0, < 0, 1.3, -2>, // start point - 0.2, < 2, 1.0, -1>, - 0.4, < 1, 1.5, 0>, - 0.6, < 0, 2.2, 0>, - 0.8, <-1, 0.9, 1>, - 1.0, < 2, 1.0, 2>, // end point + 0.0, <-0.5, 1.3, -2.7>, // start point + 0.2, < 2.0, 1.0, -1.0>, + 0.4, < 1.0, 1.5, 0.0>, + 0.6, < 0.0, 2.2, 0.1>, + 0.8, <-1.1, 1.6, 1.1>, + 1.0, < 2.0, 1.0, 2.0>, // end point 1.2, < 4, 1.0, 2> // control point } -#local Scaler = <2, 1, 3>; +#local Scaler = <2, 1, 3>; // XXX please explain #declare ViewSpline = object { union { - #for (CK, 0.00, 1.00, 0.0017) - sphere { <0,0,0>, 0.022 - texture{ - pigment {color rgb <0.20, 0.14, 0.14> } + #for (CK, 0.00, 1.00, 0.0021) + sphere { <0,0,0>, 0.023 + texture{ + pigment {color rgb <0.20, 0.24, 0.14> } finish {ambient 0.15 diffuse 0.85 phong 0.6 } } translate (Scaler * Spline_1(CK)) @@ -60,7 +55,7 @@ union { union { object { ViewSpline } #declare P1 = Scaler * Spline_1(V1); - #declare P2 = <1, -1.3, 0.1> + (0.95 * Scaler * Spline_1(V2)); + #declare P2 = <1, -1.3, 0.2> + (0.95 * Scaler * Spline_1(V2)); sphere { 0, 0.06 texture { B_Texture } diff --git a/survol.pov b/survol.pov index 3452fa0..5d05006 100644 --- a/survol.pov +++ b/survol.pov @@ -7,19 +7,10 @@ #include "globals.inc" -#include "contexte.inc" -#include "hexacone.inc" -#include "hexabenz.inc" -#include "hexawood.inc" -#include "trident.inc" - -// ======================================================= - -#include "dynamic.inc" +#include "all.inc" object { Le_Decor } -object { Repere scale 2 translate y*2 } // ======================================================= @@ -29,12 +20,15 @@ object { Repere scale 2 translate y*2 } #declare PosCam = Interpolate(Debut, Fin, Pos); #declare LatX = 0.414 * sin(NormClock*6.1); -#declare LatCam = PosCam + ; +#declare LatZ = -9 + (NormClock+11); +#declare LatCam = PosCam + ; +// +object { Repere scale 2 translate LatCam } camera { location PosCam - look_at LatCam + look_at 0 right - angle 50 + angle 80 } diff --git a/topview.pov b/topview.pov index 10405f7..63a4eed 100644 --- a/topview.pov +++ b/topview.pov @@ -7,11 +7,8 @@ #include "globals.inc" -#include "contexte.inc" -#include "hexacone.inc" -#include "hexabenz.inc" -#include "hexawood.inc" -#include "trident.inc" +#include "all.inc" + /* XXX #declare TrX = 1.84 * sqrt(NormClock); @@ -24,7 +21,7 @@ object { HexaCone () rotate y*RrY translate TrH } #include "dynamic.inc" -object { HexaCone () rotate z*9.1 translate <7, 3, -8> } +object { HexaCone () rotate z*9.1 translate <7, 3+NormClock, -8> } object { HexaBenz () translate <-9+NormClock, 2, -6> } /* diff --git a/trident.inc b/trident.inc index f41a48a..e336e00 100644 --- a/trident.inc +++ b/trident.inc @@ -1,3 +1,6 @@ +/* + * H E X A C O N E T R I D E N T + */ #declare Trid_length = 2; @@ -87,6 +90,8 @@ union { } #end // ------------------------------------------------------ +#debug "+++++++++++++++++++++ trident loaded\n" +// ------------------------------------------------------ diff --git a/trident.pov b/trident.pov index a8aae10..4a2c19b 100644 --- a/trident.pov +++ b/trident.pov @@ -6,15 +6,10 @@ #include "globals.inc" -#include "contexte.inc" -#include "hexacone.inc" -#include "hexabenz.inc" -#include "hexawood.inc" -#include "trident.inc" +#include "all.inc" #include "dynamic.inc" - // ======================================================= object { Le_Decor } diff --git a/xperiment.inc b/xperiment.inc index 60227a8..1863b44 100644 --- a/xperiment.inc +++ b/xperiment.inc @@ -4,6 +4,23 @@ * A cosy place for experimental things (2025/10/27) * */ +/* =============================================================== */ +/* + * new Tue Dec 30 07:39:09 AM UTC 2025 + */ +#declare Patrouille = object +{ +union { + #local EX = 2.4; + #local EZ = 2.3; + object { Trident_A () rotate x*87 } + object { HexaBenz () translate <-EX, 0, -EZ> } + object { HexaCone () translate < EX, -0.2, -EZ> } + object { HexaBenz () translate <-EX*2, 0, -EZ*2> } + object { HexaCone () translate < EX*2, -0.2, -EZ*2> } + } +} + /* =============================================================== */ #macro Pointe_Wagonnet_0 () merge { @@ -11,13 +28,13 @@ merge { sphere { 0, 0.06 } #local R = rand(Rng1); #if (R < 0.25) - texture { T_Chrome_1A } + texture { T_Chrome_3A } #elseif (R < 0.50) texture { T_Chrome_2B } #elseif (R < 0.75) texture { T_Chrome_3C } #else - texture { T_Chrome_4D } + texture { T_Chrome_3D } #end // IF } #end // Macro