diff --git a/Makefile b/Makefile index 7bdd389..3080454 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ DIMS = -W1600 -H1200 POVOPT = +q9 +A0.05 -WT2 Declare=NbFrames=450 -d POVDEP = contexte.inc hexacone.inc hexabenz.inc \ - hexastar.inc all.inc \ + all.inc hexastar.inc \ globals.inc hexawood.inc datas/hf.png \ dynamic.inc trident.inc groundbase.inc \ gadgets.inc xperiment.inc @@ -20,7 +20,7 @@ PNG: essai.png scene.png topview.png passage.png \ hexacone.png remote.png survol.png cutoff.png \ carto.png hexawood.png bubblecut.png \ circular.png panoramic.png splined.png \ - trident.png approche.png + trident.png approche.png hexastar.png echo "make PNG ck=$(CK) done" >> WS/log approche.png: approche.pov Makefile $(POVDEP) @@ -41,7 +41,7 @@ cutoff.png: cutoff.pov Makefile $(POVDEP) bubblecut.png: bubblecut.pov Makefile $(POVDEP) povray $(POVOPT) $(DIMS) -K$(CK) -i$< -o$@ -essai.png: essai.pov Makefile $(POVDEP) +essai.png: essai.pov Makefile $(POVDEP) hexastar.inc povray $(POVOPT) $(DIMS) -K$(CK) -i$< -o$@ noise.png: essai.png Makefile convert -verbose -noise 45x3 $< $@ @@ -55,6 +55,9 @@ hexacone.png: hexacone.pov Makefile $(POVDEP) hexawood.png: hexawood.pov Makefile $(POVDEP) povray $(POVOPT) $(DIMS) +K$(CK) -i$< -o$@ +hexastar.png: hexastar.pov Makefile $(POVDEP) + povray $(POVOPT) $(DIMS) +K$(CK) -i$< -o$@ + passage.png: passage.pov Makefile $(POVDEP) povray $(POVOPT) $(DIMS) -K$(CK) -i$< -o$@ diff --git a/all.inc b/all.inc index c388f3b..978acd7 100644 --- a/all.inc +++ b/all.inc @@ -12,6 +12,7 @@ #include "hexabenz.inc" #include "hexawood.inc" #include "trident.inc" +#include "hexastar.inc" // les machins avec des bugs // #include "hexastar.inc" @@ -23,6 +24,8 @@ #include "contexte.inc" // les machins qui bougent -#include "dynamic.inc" +#if ( ! NO_DYNAMIC ) + #include "dynamic.inc" +#end #debug "+++++++++++++++++++++++++++ FIN ALL\n" diff --git a/approche.pov b/approche.pov index d147d85..330bfbb 100644 --- a/approche.pov +++ b/approche.pov @@ -8,6 +8,7 @@ #include "globals.inc" +#declare NO_DYNAMIC = 0; #include "all.inc" object { Le_Decor } @@ -16,7 +17,7 @@ object { Le_Decor } #declare LocX = 0; #declare LocY = 3.6 - NormClock; -#declare LocZ = -210 + (120 * NormClock); +#declare LocZ = -220 + (120 * NormClock); #declare LocCam = ; #declare LatCam = <0, 1.2, 0>; diff --git a/bubblecut.pov b/bubblecut.pov index c29072a..30871fa 100644 --- a/bubblecut.pov +++ b/bubblecut.pov @@ -7,6 +7,7 @@ #include "globals.inc" +#declare NO_DYNAMIC = 1; #include "all.inc" // ======================================================= @@ -31,7 +32,7 @@ sphere { Position, 0.020 translate y*TY + POS_Cutoff texture { T_WIP_alert } } */ -/* this one is for debugging */ +/* those are for for debugging */ // object { OpenBox (1, 0.05) translate y*TY + POS_Cutoff } // object { Repere translate y*2.8 + POS_Cutoff } diff --git a/carto.pov b/carto.pov index ba137a8..ccaabf2 100644 --- a/carto.pov +++ b/carto.pov @@ -9,6 +9,7 @@ #include "globals.inc" +#declare NO_DYNAMIC = 0; #include "all.inc" // --------------------------------------------------------- diff --git a/circular.pov b/circular.pov index a6bf9e3..9d2b8b8 100644 --- a/circular.pov +++ b/circular.pov @@ -7,6 +7,7 @@ #include "globals.inc" +#declare NO_DYNAMIC = 0; #include "all.inc" // ======================================================= diff --git a/contexte.inc b/contexte.inc index f7286e4..f961afe 100644 --- a/contexte.inc +++ b/contexte.inc @@ -19,12 +19,16 @@ #declare RedB_1_X = -24; #declare RedB_1_Z = 8; -#declare RedB_2_X = 39; -#declare RedB_2_Z = -14; +#declare RedB_2_X = 36; +#declare RedB_2_Z = -21; + +#declare RedB_3_X = 42; +#declare RedB_3_Z = -5; #declare Pos_RedB_0 = ; #declare Pos_RedB_1 = ; #declare Pos_RedB_2 = ; +#declare Pos_RedB_3 = ; #macro RoundBase_0 ( T ) difference { @@ -364,25 +368,28 @@ union { translate } object { RoundBase_0 (T_Planete_B) translate } + object { RoundBase_0 (T_Planete_A) + translate } + // object { Les_Lumieres } object { QuadriLight } object { Les_GyroPhares () } object { Les_HexaPoles } object { Horloge rotate y*27 translate < 3, 0, -30> } object { Les_Choses } - object { Les_Arches (1.9) rotate y*152 translate <-34, 0, -26> } + object { Les_Arches (1.9) rotate y*132 translate <-34, 0, -26> } - object { Les_Cahutes () rotate y*90 translate <24, 0, -10> } + object { Les_Cahutes () translate <2, 0, -40> } /* les trucs dans le Y négatif */ - object { Trois_Arches (1.4) scale 2.7 translate <0, 0, -121> } + object { Trois_Arches (1.4) scale 2.7 translate <0, 0, -131> } 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 { OpenBox(1.5, 0.06) translate <-19, 1.52, -104> } + object { OpenBox(1.5, 0.06) translate <-19, 1.52, -144> } #for (Foo, 0, 5) - object { Les_Cahutes () translate <29, 0, -(77+Foo*9)> } + object { Les_Cahutes () translate <29, 0, -(77+Foo*11)> } #end // for } } diff --git a/cutoff.pov b/cutoff.pov index 8da7552..72560e3 100644 --- a/cutoff.pov +++ b/cutoff.pov @@ -7,6 +7,7 @@ #include "globals.inc" +#declare NO_DYNAMIC = 0; #include "all.inc" // ======================================================= diff --git a/dynamic.inc b/dynamic.inc index c65c732..f5f03e6 100644 --- a/dynamic.inc +++ b/dynamic.inc @@ -22,7 +22,7 @@ object { #end rotate y*degrees(CK) - translate + translate translate <-30, 0, 0> } @@ -56,7 +56,7 @@ object { Les_Machins rotate -y*clock translate UnderHoles[3] } { #local K = 1.39; union { - object { HexaBenz () rotate y*90 translate <-K, 1.79, 0> } + object { HexaBenz () rotate y*90 translate <-K, 1.83, 0> } object { HexaBenz () translate < K, 1.66, 0> } } } @@ -88,6 +88,13 @@ object { BiTrident translate Pos_RedB_2 + (y*2) } +/* l'hexastar est une nouvelle venue du 4 janvier 2026 */ +// elle est ici présentée sur son estrade. +object { HexaStar rotate z*5 + rotate y*(670*sin(NormClock)) + translate Pos_RedB_3 + (y*2) + } + /* * on fait passer un hexatruc dans le ciel */ diff --git a/escadrille.pov b/escadrille.pov index e7844ad..2ad4d63 100644 --- a/escadrille.pov +++ b/escadrille.pov @@ -8,6 +8,7 @@ #include "globals.inc" +#declare NO_DYNAMIC = 0; #include "all.inc" // ======================================================= @@ -32,9 +33,13 @@ #if ( (abs(posX)>Limit) & (abs(posZ)>Limit) ) // position #local Y_mean = Y_mean + posY; #local Y_count = Y_count + 1; - #if (rand(Rng1) < 0.555) + #local R = rand(Rng1); + #if (Rng1 < 0.30) object { HexaCone () rotate translate } + #elseif (R < 0.60) + object { HexaStar () rotate + translate } #else object { HexaBenz () rotate translate } @@ -50,10 +55,10 @@ object { Le_Decor } // object { Repere scale 5 translate y } #local CamX = -8.7 + ( 6.9 * Cos_01(NormClock)); -#local CamY = 0.42 + (17.06 * Cos_01(NormClock)); +#local CamY = 0.42 + (17.36 * Cos_01(NormClock)); #local CamZ = 122 - (21.9 * Cos_01(NormClock)); -#local LatY = (Y_mean / Y_count) - NormClock; +#local LatY = (Y_mean / Y_count) - (0.5*NormClock); #debug concat("Lat Y ", str(LatY, 7, 3),"\n") camera { diff --git a/essai.pov b/essai.pov index 89d0391..5fff944 100644 --- a/essai.pov +++ b/essai.pov @@ -12,7 +12,6 @@ // ======================================================= // nouveau du dernier jour 2025 -#include "hexastar.inc" #declare Une_HexaStar = object { @@ -286,7 +285,7 @@ object { Gyros } object { Le_ConeStack () translate y*0.20 } #break #case (3) - object { HorlogeDouble /* rotate -y*(5*clock) */ } + object { HorlogeDouble rotate -y*(5*clock) } object { Repere translate y*1 } #break #case (4) @@ -299,7 +298,7 @@ object { Gyros } object { Les_Boules translate y*0.8 } #break #case (6) - object { Une_HexaStar rotate y*(clock) } + object { Une_HexaStar /* rotate y*(clock) */ } #break #case (7) #local Pos = <0.5-NormClock, 0, 0>; diff --git a/hexabenz.pov b/hexabenz.pov index 0cdbaa7..ae32c26 100644 --- a/hexabenz.pov +++ b/hexabenz.pov @@ -6,6 +6,7 @@ #include "globals.inc" +#declare NO_DYNAMIC = 0; #include "all.inc" // ======================================================= diff --git a/hexacone.pov b/hexacone.pov index ee1e6cf..e811c33 100644 --- a/hexacone.pov +++ b/hexacone.pov @@ -6,6 +6,7 @@ #include "globals.inc" +#declare NO_DYNAMIC = 0; #include "all.inc" object { Le_Decor } diff --git a/hexastar.inc b/hexastar.inc index 38400b0..264d634 100644 --- a/hexastar.inc +++ b/hexastar.inc @@ -8,44 +8,47 @@ /* ============================================================ */ /* Un des six éléments de base */ -#declare HS_element_a = object -{ -union { - cone { <-4, 0, 0>, 0.05, <-1, 0, 0>, 1.00 } - cone { < 4, 0, 0>, 0.05, < 1, 0, 0>, 1.00 } +#declare HS_radius = 0.496; + +#macro HS_element_a () +union { + #local R_a = 0.18; + #local Small = 0.00001; + cone { <-1.5, 0, 0>, Small, <-0.6, 0, 0>, R_a } + sphere { 0, R_a scale <0.3, 1, 1> translate <-0.6, 0, 0> } + cone { < 1.5, 0, 0>, Small, < 0.6, 0, 0>, R_a } + sphere { 0, R_a scale <0.3, 1, 1> translate < 0.6, 0, 0> } + #local R = rand(Rng1); + #if ( R < 0.50 ) texture { GoldDark } + #else texture { T_Gold_3C } + #end } -} +#end // macro /* ------------------------------------------------------------ */ -#declare HS_element_b = object +/* + * element central + */ +#declare HS_element_central = object { -difference { - cylinder { <-1, 0, 0>, <1, 0, 0>, 0.70 } - box { 0, <1, 1, 1> } - } -} -/* ------------------------------------------------------------ */ -#declare HS_element = object -{ -union { - object { HS_element_a texture { GoldDark } } - object { HS_element_b texture { G_Texture } } - } +torus { HS_radius, 0.019 scale <1, 15.92, 1> rotate z*90 } +texture { Gold_Nugget } } + /* ============================================================ */ /* On regroupe les six élements */ #declare HS_les_elements = object { union { #for (Foo, 0, 360, 60) - #local E = 0.31; - #local Tx = E * sin(radians(Foo)); + #local E = HS_radius; #local Ty = E * cos(radians(Foo)); + #local Tz = E * sin(radians(Foo)); object { - HS_element - rotate -z*foo - translate + HS_element_a () + translate <0, Ty, Tz> } - #end // end for + #end // end for + object { HS_element_central } } } /* ============================================================ */ @@ -54,4 +57,6 @@ union { { object { HS_les_elements } } +// #debug "++++++++++ hexastar loaded !\n" + /* ============================================================ */ diff --git a/hexastar.pov b/hexastar.pov new file mode 100644 index 0000000..286637f --- /dev/null +++ b/hexastar.pov @@ -0,0 +1,33 @@ +/* + * H E X A C O N E - HE X A S T A R + * nouveau du 3 janvier 2026 + */ + +#version 3.7; + +#include "globals.inc" + +#declare NO_DYNAMIC = 0; +#include "all.inc" + +// ======================================================= + +object { Le_Decor } + +#declare CK = 2.03 - (NormClock * 2.72); +#declare DX_cam = 6.1 * cos(CK); +#declare DZ_cam = 5.2 * sin(CK); +#declare Loc_cam = + Pos_RedB_3; + +camera { + location Loc_cam + look_at Pos_RedB_3 + <0, 1.95+NormClock, 0> + right + + /* quand j'aurais la bonne machine... */ + // focal_point <0.37, 0.0, 0> + // aperture 0.046 + // blur_samples 30 + angle 70 - 7 * Cos_01(NormClock) + } + diff --git a/hexawood.pov b/hexawood.pov index c3386b7..e029820 100644 --- a/hexawood.pov +++ b/hexawood.pov @@ -8,6 +8,7 @@ #include "globals.inc" +#declare NO_DYNAMIC = 0; #include "all.inc" // ======================================================= @@ -24,6 +25,6 @@ camera { location LOC look_at LAT right - angle 16 + 2.51*NormClock + angle 16 + 2.71*NormClock } diff --git a/orbite.pov b/orbite.pov index 568c339..93741f9 100644 --- a/orbite.pov +++ b/orbite.pov @@ -6,6 +6,7 @@ #include "globals.inc" +#declare NO_DYNAMIC = 1; #include "all.inc" // ======================================================= @@ -66,6 +67,13 @@ object { HexaCone () rotate y*CK*99.22 translate } +#declare PosX = RO * sin(CK+3.12); +#declare PosY = 0; +#declare PosZ = RO * cos(CK+3.23); +object { HexaStar () + rotate y*CK*99.22 translate + } + object { Planete rotate (-clock*0.21)*y } light_source { <23, 6, 15>, rgb <0.77, 0.79, 0.80> } diff --git a/panoramic.pov b/panoramic.pov index 5308556..cca0405 100644 --- a/panoramic.pov +++ b/panoramic.pov @@ -7,6 +7,7 @@ #include "globals.inc" +#declare NO_DYNAMIC = 0; #include "all.inc" // ======================================================= diff --git a/passage.pov b/passage.pov index f3f3df0..a9ed0f2 100644 --- a/passage.pov +++ b/passage.pov @@ -7,6 +7,7 @@ #include "globals.inc" +#declare NO_DYNAMIC = 0; #include "all.inc" #declare PosX = 3.95; diff --git a/remote.pov b/remote.pov index a66ad3c..2b8bb33 100644 --- a/remote.pov +++ b/remote.pov @@ -7,6 +7,7 @@ #include "globals.inc" +#declare NO_DYNAMIC = 0; #include "all.inc" #declare A = <-SzSol, 16, -8>; diff --git a/scene.pov b/scene.pov index 3fb29a7..d3f8b34 100644 --- a/scene.pov +++ b/scene.pov @@ -7,6 +7,7 @@ #include "globals.inc" +#declare NO_DYNAMIC = 0; #include "all.inc" // --------------------------------------------------------- diff --git a/splined.pov b/splined.pov index d4182e4..483e757 100644 --- a/splined.pov +++ b/splined.pov @@ -9,6 +9,7 @@ #include "globals.inc" +#declare NO_DYNAMIC = 0; #include "all.inc" object { Le_Decor } @@ -73,10 +74,12 @@ union { finish { ambient 0.15 diffuse 0.65 phong 0.4 } } +#if (0) #fopen KP "WS/spline.log" append -#write (KP, clock, " / ", NbFrames, " -> ") -#write (KP, NormClock, " ", K1, " ", K2, " = ", V1, " ", V2, "\n") +#write (KP, clock, " ", NbFrames, " ") +#write (KP, NormClock, " ", K1, " ", K2, " ", V1, " ", V2, "\n") #fclose KP +#end } // ======================================================= diff --git a/survol.pov b/survol.pov index 5d05006..acd001a 100644 --- a/survol.pov +++ b/survol.pov @@ -7,6 +7,7 @@ #include "globals.inc" +#declare NO_DYNAMIC = 0; #include "all.inc" object { Le_Decor } @@ -15,20 +16,20 @@ object { Le_Decor } // ======================================================= #declare Debut = <-3, 89, 188> ; -#declare Fin = < 2, 91, -15> ; -#declare Pos = sqrt(NormClock+0.02); +#declare Fin = < 2, 91, -25> ; +#declare Pos = sqrt(NormClock); #declare PosCam = Interpolate(Debut, Fin, Pos); #declare LatX = 0.414 * sin(NormClock*6.1); -#declare LatZ = -9 + (NormClock+11); -#declare LatCam = PosCam + ; -// -object { Repere scale 2 translate LatCam } +#declare LatZ = -(150 + (7*NormClock)); +#declare LatCam = PosCam + ; + +// object { Repere scale 40 translate LatCam + y*5 } camera { location PosCam - look_at 0 + look_at LatCam right - angle 80 + angle 72 } diff --git a/tools/mkseqs.sh b/tools/mkseqs.sh index 72c3a8b..97b87c9 100755 --- a/tools/mkseqs.sh +++ b/tools/mkseqs.sh @@ -1,5 +1,8 @@ #!/bin/bash +source tools/config.sh +source tools/fonctions.sh + for foo in $* do @@ -9,7 +12,10 @@ do tools/build-gif89a.sh $foo else echo "+++ Beurking on $foo" | tee -a WS/log + sleep 10 fi + visual_sleep "next render is comming" 30 + done diff --git a/topview.pov b/topview.pov index 05f47ce..61944a8 100644 --- a/topview.pov +++ b/topview.pov @@ -7,6 +7,7 @@ #include "globals.inc" +#declare NO_DYNAMIC = 0; #include "all.inc" diff --git a/trident.pov b/trident.pov index 94cc7fa..198f4bc 100644 --- a/trident.pov +++ b/trident.pov @@ -6,6 +6,7 @@ #include "globals.inc" +#declare NO_DYNAMIC = 0; #include "all.inc" // ======================================================= diff --git a/xperiment.inc b/xperiment.inc index 1863b44..0132d8e 100644 --- a/xperiment.inc +++ b/xperiment.inc @@ -16,7 +16,7 @@ union { 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 { HexaStar translate <-EX*2, 0, -EZ*2> } object { HexaCone () translate < EX*2, -0.2, -EZ*2> } } }