From f3df71d687b2bf77d6383ab9f6928a714cf14fe4 Mon Sep 17 00:00:00 2001 From: Tonton Th Date: Wed, 27 May 2026 07:23:01 +0200 Subject: [PATCH] nap time ? --- WS/README.md | 3 ++- architecture.inc | 6 +++--- bubblecut.pov | 6 +++--- contexte.inc | 18 ++++++++-------- dynamic.inc | 9 ++++---- essai.pov | 50 ++++++++++++++++++++++++--------------------- gadgets.inc | 20 ++++++++++-------- globals.inc | 2 +- patrouille.pov | 2 +- scene.pov | 2 +- tools/linkfarmer.sh | 2 +- trident.inc | 2 +- xperiment.inc | 8 +++++--- 13 files changed, 70 insertions(+), 60 deletions(-) diff --git a/WS/README.md b/WS/README.md index 8aa91aa..e10ab82 100644 --- a/WS/README.md +++ b/WS/README.md @@ -1,3 +1,4 @@ # Workspace -For intermediates files, and timing log. +This space is for intermediate files, fuzzy garbage, timing log, +and a lot of weird datas. diff --git a/architecture.inc b/architecture.inc index 327cd71..f445ddc 100644 --- a/architecture.inc +++ b/architecture.inc @@ -15,7 +15,7 @@ merge { } #end // =========================================================== -#declare SzC = 0.3; +#declare SzC = 0.333; #macro Base_Col_A () merge { box { <-SzC, 0, -SzC>, } @@ -49,7 +49,7 @@ difference { // ----------------------------------------------------------- #macro Fut_Col_A (H) object { - cylinder { 0, H*y, 0.15 } + cylinder { 0, H*y, SzC * 0.50 } #local R = rand(Rng1); #if (R < 0.43) texture { T_Stone29 } @@ -73,7 +73,7 @@ union { #macro Linteau_A (Lg, Epp) merge { #local L = Lg + 0.42; - #local K = 0.28; + #local K = 0.30; box { <-L, 0, -K>, } cylinder { <0, Epp, -K*0.9>, <0, Epp, K*0.9>, K } #local R = rand(Rng1); diff --git a/bubblecut.pov b/bubblecut.pov index 1ac25d3..d7271df 100644 --- a/bubblecut.pov +++ b/bubblecut.pov @@ -48,13 +48,13 @@ object { Le_Decor } // ======================================================= -#local CamX = -27.4 + (2.29*Cos_01(NormClock)); +#local CamX = -27.4 + (2.39*Cos_01(NormClock)); #local CamY = 1.9 - (0.24*sqrt(NormClock)); -#local CamZ = -0.85 + (2.02*NormClock); +#local CamZ = -0.85 + (2.12*NormClock); camera { location look_at <0, 1.5, 0> + POS_Cutoff right - angle 35 - 5*Cos_01(NormClock) + angle 35 - 5.12*Cos_01(NormClock) } diff --git a/contexte.inc b/contexte.inc index 03120d6..f5618fe 100644 --- a/contexte.inc +++ b/contexte.inc @@ -10,17 +10,17 @@ #declare Les_Jalons = object { union { - #local EC = SzSol + 175; + #local EC = SzSol + 195; /* les coins */ - object { Jalon_0 (0.5, 8, LeGris) translate <-EC, 0, -EC> } - object { Jalon_0 (0.5, 8, LeGris) translate < EC, 0, -EC> } - object { Jalon_0 (0.5, 8, LeGris) translate <-EC, 0, EC> } - object { Jalon_0 (0.5, 8, LeGris) translate < EC, 0, EC> } + object { Jalon_0 (0.5, 18, LeGris) translate <-EC, 0, -EC> } + object { Jalon_0 (0.5, 18, LeGris) translate < EC, 0, -EC> } + object { Jalon_0 (0.5, 18, LeGris) translate <-EC, 0, EC> } + object { Jalon_0 (0.5, 18, LeGris) translate < EC, 0, EC> } /* les milieux des cotés */ - object { Jalon_0 (0.5, 6, LeGris) translate < 0, 0, -EC> } - object { Jalon_0 (0.6, 6, LeGris) translate < 0, 0, EC> } - object { Jalon_0 (0.5, 6, LeGris) translate < EC, 0, 0> } - object { Jalon_0 (0.6, 6, LeGris) translate <-EC, 0, 0> } + object { Jalon_0 (0.5, 6, T_Beton_1) translate < 0, 0, -EC> } + object { Jalon_0 (0.6, 6, T_Beton_1) translate < 0, 0, EC> } + object { Jalon_0 (0.9, 6, T_Beton_2) translate < EC, 0, 0> } + object { Jalon_0 (0.6, 6, T_Beton_1) translate <-EC, 0, 0> } } } /* ======================================================= */ diff --git a/dynamic.inc b/dynamic.inc index bb5db69..d632ee9 100644 --- a/dynamic.inc +++ b/dynamic.inc @@ -7,7 +7,7 @@ object { - #local CK = (clock / 230) - 0.75; // en radians + #local CK = (clock / 210) - 0.75; // en radians #local RD = 63; // rayon deplacement #local Xp = RD * sin(CK); #local Zp = RD * cos(CK); @@ -36,9 +36,10 @@ object { /// ======================================================= /* des trucs autour des trous du sol. */ -// Les_Machins --> 'gadgets.inc' -object { Les_Machins rotate -y*clock translate UnderHoles[2] } -object { Les_Machins rotate y*clock translate UnderHoles[5] } +// Les_Machins dans 'gadgets.inc' + +// object { Les_Machins rotate -y*clock translate UnderHoles[2] } +// object { Les_Machins rotate y*clock translate UnderHoles[5] } // object { Les_HexaBalls rotate y*(clock*2.9) translate UnderHoles[4] } diff --git a/essai.pov b/essai.pov index 031530c..f4f2529 100644 --- a/essai.pov +++ b/essai.pov @@ -41,8 +41,9 @@ union { #local DZ = (E+rand(Rng1)) * cos(A); cone { #local RC = 0.15 + (rand(Rng1) * 0.50); - #local H2 = H + rand(Rng1); - y*(H*(0.01)), 0.15, , 0.001 + #local H1 = H * 0.25; + #local H2 = H + 1.0 + rand(Rng1); + <0, H1, 0>, 0.15, , 0.001 #local Rv = 0.7 + (0.2*rand(Rng1)); #local Gv = 0.4 + (0.5*rand(Rng1)); #local Bv = 0.6 + (0.4*rand(Rng1)); @@ -52,8 +53,14 @@ union { finish { phong 0.51 reflection 0.08 } } } - sphere { 0, 0.45 scale <1, 0.717, 1> texture { T_WIP_color } } #end // for + + union { + #local Rb = 0.42; + sphere { 0, Rb scale <1, 0.717, 1> translate H1*y } + cylinder { 0, (0.01+H1)*y, Rb } + texture { T_WIP_color } + } } #end // macro @@ -66,7 +73,7 @@ union { translate <-4, 0, 0> } object { Anemone_A (1.40+NormClock, 1.50*NormClock) translate < 0, 0, -4> } - object { Anemone_A (1.40+NormClock, 1.50-NormClock) + object { Anemone_A (1.40+NormClock, 1.80-NormClock) translate < 0, 0, 4> } } } @@ -203,13 +210,13 @@ finish { phong 0.25 } #local TZ = 2.95; #local Kro = 32 + (NormClock * 666); union { - object { Obj_BasicTexture texture { R_Texture } + object { Obj_BasicTexture texture { LeGris } rotate y * (rand(Rng1)*Kro) translate } - object { Obj_BasicTexture texture { Texture_du_Vase } + object { Obj_BasicTexture texture { Texture_du_Vase } rotate y * (rand(Rng1)*Kro) translate } - object { Obj_BasicTexture texture { B_Texture } + object { Obj_BasicTexture texture { T_GlowGreen } rotate y * (rand(Rng1)*Kro) translate } @@ -223,7 +230,7 @@ union { rotate y * (rand(Rng1)*Kro) translate <-TX, 0, -TZ> } - object { Repere scale 1.5 translate y*0.5 } + object { Repere scale 1.5 translate y*0.75 } } } @@ -234,8 +241,6 @@ union { Mieux, on garde la chose mais on en dérive le vase */ -// ------------------------------------ - #macro Vase_le_corps_a () intersection { box { <-5, -5, -5>, <5, 0, 5> } @@ -245,10 +250,10 @@ intersection { scale <1, 1.60, 1> } #local R = rand(Rng1); - #if (R < 0.75) + #if (R < 0.65) texture { Texture_du_Vase rotate y*(clock*3) } #else - texture { T_WIP_redwave scale 0.15 + 0.333*rand(Rng1) + texture { T_WIP_redwave scale 0.15 + 0.07*rand(Rng1) rotate <75*rand(Rng1), 75*rand(Rng1), 75*rand(Rng1)> } #end @@ -345,7 +350,7 @@ union { object { Vase () scale 1.4 translate <-2.9, 0, 3.91> } object { Chose () scale 2 translate < 2.9, 0, -4.07> } object { Vase () translate <-4.5, 0, -4> } - object { Repere translate 0.15*y } + object { Repere scale 1.7 translate 0.25*y } } } // ======================================================= @@ -358,9 +363,9 @@ union { #declare Dx = E * sin(radians(I)); #declare Dz = E * cos(radians(I)); #local R = rand(Rng1); - #if (R > 0.76) + #if (R > 0.66) object { GyroPhare () translate } - #elseif (R > 0.45) + #elseif (R > 0.33) object { HexaPole () translate } #else object { HexoFlash (0.14, 1.85 + (0.444*rand(Rng1)) ) @@ -421,13 +426,13 @@ union { object { ProtoTextures } #break #case (3) - object { Blob_Boxed scale 3.159 translate < 0, 2, 0> } - object { Blob_Boxed scale 1.414 translate <-3, 3, 0> } + object { Les_Boules scale 1.727 translate <0, 1, 0> } + object { Blob_Boxed scale 1.414 translate <0, 4, 0> } // object { Repere translate y*1 } #break #case (4) - object { Un_Autre_Cube (0.7) rotate x*clock translate <3, 1.8, 1> } - object { HorlogeDouble scale 2.8 + object { Un_Autre_Cube (0.7) rotate x*clock translate <3, 1.8, 2> } + object { HorlogeDouble scale 2.12 rotate y*(214*NormClock) translate <-3, 0, -2> } #break @@ -440,9 +445,9 @@ plane { // ======================================================= -#local CamX = -2.9 + (1.8*Cos_010(NormClock)); -#local CamY = 0.61 + (0.9*exp(NormClock)); -#local CamZ = -5.777 + (1.3*Cos_01(NormClock)); +#local CamX = -2.9 + (1.9*Cos_010(NormClock)); +#local CamY = 0.61 + (1.1*exp(NormClock)); +#local CamZ = -5.777 + (1.3*Cos_010(NormClock)); #local K = 8.6; #local CamX = CamX * K; @@ -450,7 +455,6 @@ plane { #local CamZ = CamZ * K; camera { - // orthographic location look_at <0, 1.5, 0> diff --git a/gadgets.inc b/gadgets.inc index d1e4ad0..2cb390d 100644 --- a/gadgets.inc +++ b/gadgets.inc @@ -203,19 +203,20 @@ prism { #end // macro // ------------------------------------------------------ ## /* nouveau du 31 mars 2026, aux Bourtoulots - * + * XXX need more fine tuning ! */ #macro HexaPole_abatjour (Quux) union { #local Raj = 0.333; - torus { Raj, 0.013 translate -y*Quux } + torus { Raj, 0.011 translate -y*Quux } #for (Foo, 0, 359, 18) #local DX = Raj * sin(radians(Foo)); #local DZ = Raj * cos(radians(Foo)); cylinder { -y*Quux, y*Quux, 0.009 translate } #end // for torus { Raj, 0.02 translate y*Quux } - rotate y*(clock*0.90*(rand(Rng1)-0.59)) + rotate y*(clock*1.86*(rand(Rng1)-0.52)) + texture { Aluminum } } #end // macro @@ -224,7 +225,7 @@ sphere { 0, 0.080 texture { pigment { color rgb <1, 1, 1> } - finish { emission 0.8 diffuse 0.6 } + finish { emission 0.9 diffuse 0.6 } } } #end // macro @@ -232,18 +233,19 @@ sphere { #macro HexaPole_mat_lampe (Height) union { union { - cylinder { 0, y*Height, 0.061 } + cylinder { 0, y*Height, 0.061 + texture { LeGris }} #local Val = 0.09+(0.09*rand(Rng1)); object { HexaPole_abatjour (Val) translate y*(Height+0.073) } - texture { LeGris } + } #local Pos = y*(Height+0.097); - #if (rand(Rng1) < 0.333) + #if (rand(Rng1) < 0.36) #local Val = 0.25 + 0.5*rand(Rng1); light_source { - Pos rgb <0.86, 0.25+(0.5*rand(Rng1)), 0.99> + Pos rgb <0.86, 0.29+(0.5*rand(Rng1)), 0.99> fade_distance 3.30 fade_power 1.55 looks_like { HexaPole_ampoule (0) } @@ -251,7 +253,7 @@ union { #else sphere { Pos, 0.080 - texture { Y_Texture } + texture { LeGris } } #end // if } diff --git a/globals.inc b/globals.inc index 9ee9b5b..ccb51ec 100644 --- a/globals.inc +++ b/globals.inc @@ -11,7 +11,7 @@ global_settings { #include "stones.inc" #include "woods.inc" -#declare Rng1 = seed(8.6); +#declare Rng1 = seed(3615); #declare foo = rand(Rng1); #declare Rng2 = seed(now*24*60*60); #declare bar = rand(Rng2); diff --git a/patrouille.pov b/patrouille.pov index ead337d..5aac78d 100644 --- a/patrouille.pov +++ b/patrouille.pov @@ -26,7 +26,7 @@ camera { look_at Loc_Patrouille right - angle 13.3333333 + angle 11.11111 } /* =============================================================== */ diff --git a/scene.pov b/scene.pov index 72202e7..0e2a4ce 100644 --- a/scene.pov +++ b/scene.pov @@ -21,7 +21,7 @@ object { Le_Decor } #declare CamX = Dcam * cos(radians(CK+0.9)); #declare CamZ = Dcam * 1.20 * sin(radians(CK)); -#declare LatY = 2.25 + (1.51 * Cos_010(NormClock)); +#declare LatY = 2.20 + (1.21 * Cos_010(NormClock)); camera { location diff --git a/tools/linkfarmer.sh b/tools/linkfarmer.sh index 82684c5..b89ef37 100755 --- a/tools/linkfarmer.sh +++ b/tools/linkfarmer.sh @@ -36,7 +36,7 @@ SRC="frames/$1" local INTER="/dev/shm/tmp-intertitre.png" tools/plot-timing.sh $1 -local NBRE=78 +local NBRE=51 convert "WS/negatif.png" \ -gravity center \ diff --git a/trident.inc b/trident.inc index 2b3cca3..cd8286f 100644 --- a/trident.inc +++ b/trident.inc @@ -57,7 +57,7 @@ merge { #local R = rand(Rng1); #if ( R < 0.333) texture { T_Chrome_1C } #elseif ( R < 0.666) texture { T_Silver_1C } - #else texture { T_WIP_rasta scale 3 } + #else texture { Flashy scale 3 } #end } #undef L diff --git a/xperiment.inc b/xperiment.inc index d28804e..ef3be4f 100644 --- a/xperiment.inc +++ b/xperiment.inc @@ -140,13 +140,14 @@ union { /* nouveau du 7 octobre 2025 */ #macro Une_Boule () sphere { - 0, 0.18 + (rand(Rng1) * 0.06) + 0, 0.15 + (rand(Rng1) * 0.05) + scale <1, 1+(rand(Rng1) * 0.15), 1> #local R = rand(Rng1); #if (R < 0.333) texture { C_Texture } #elseif (R < 0.666) texture { M_Texture } #else texture { Y_Texture } #end - finish { phong 0.7 specular 0.3 } + finish { phong 0.7 specular 0.5 } } #end // macro @@ -157,6 +158,7 @@ sphere { { union { #for (A, 0, 64, 1) + // please explain this formula ! #local CK = (NormClock*55.00) + (A*0.28); object { Une_Boule () #local TX = 3.2 * sin(CK); @@ -164,7 +166,7 @@ union { #local TZ = 3.0 * cos(1-CK); translate } - object { Repere scale 2 } + // object { Repere scale 2 } #end // for } }