diff --git a/contexte.inc b/contexte.inc index d9fdaa9..331d797 100644 --- a/contexte.inc +++ b/contexte.inc @@ -397,8 +397,8 @@ union { #end // for /* --------- les trucs dans le Y positif */ - object { OpenBox(1.6, 0.11) translate <0, 2.58, 112> } - object { OpenBox(1.6, 0.11) rotate y*45 translate <0, 4.7, 166> } + object { OpenBox(1.6, 0.11) translate <-3, 3.58, 112> } + object { OpenBox(1.6, 0.11) rotate y*45 translate <3, 6.7, 166> } } } diff --git a/dynamic.inc b/dynamic.inc index 1c1ae44..70a70ef 100644 --- a/dynamic.inc +++ b/dynamic.inc @@ -147,12 +147,12 @@ object { HexaBenz () /* * passage d'un hexawood près de la base */ -#declare A = <-25, 0.4, (SzSol/2)+4>; -#declare B = < 29, 0.5, (SzSol/2)+1>; +#declare A = <-25, 0.4, (SzSol/2)+5>; +#declare B = < 29, 0.5, (SzSol/2)+2>; #declare P = Interpolate(A, B, NormClock); #local K = NormClock*31; #local R = 16.64 * cos(K); -#local H = 0.52 * pow(sin(K), 3); +#local H = 0.50 * pow(sin(K), 3); #declare P_hexawood = P + <0, 0.26+H, 0>; // #debug "+++++++++++++ P_hexawood defined\n" diff --git a/essai.pov b/essai.pov index 32ff1f2..80a14f5 100644 --- a/essai.pov +++ b/essai.pov @@ -308,7 +308,7 @@ union { // ------------------------------------------------------ ## -#declare Selector = mod(int(clock/60)+20, 8); +#declare Selector = mod(int(clock/80)+20, 8); #debug concat("Selector = ", str(Selector, 6, 0), "\n") #declare AngleCam = 17 - 3*Cos_01(NormClock); diff --git a/gadgets.inc b/gadgets.inc index a8bdf29..4f17bd0 100644 --- a/gadgets.inc +++ b/gadgets.inc @@ -118,7 +118,7 @@ prism { #if (rand(Rng1) < 0.5) texture { T_Beton_1 } #else texture { T_Beton_2 } #end // if - scale 0.666 // WTF ? + scale 0.621 // WTF ? /* Pourquoi ce scale ? * parce que la spline est 'hardcoded' quelques * lignes plus haut, et qu'il y a des méthodes @@ -215,7 +215,7 @@ sphere { #macro Un_Machin () union { #for (Y, 1, 8, 1) - object { Bubble() translate y*Y*0.11 } + object { Bubble() translate y*Y*0.111 } #end } #end diff --git a/globals.inc b/globals.inc index e9557d1..02f7739 100644 --- a/globals.inc +++ b/globals.inc @@ -48,8 +48,9 @@ global_settings { #declare T_WIP_color = texture { -pigment { color Cyan*NormClock } -finish { phong 0.23 ambient 0.50 } +#local V = (sin(clock*0.122) / 2) + 0.5; +pigment { color Cyan * V } +finish { phong 0.23 ambient 0.30 } } #declare T_WIP_alert = texture diff --git a/groundbase.inc b/groundbase.inc index 51072ad..bf89ab4 100644 --- a/groundbase.inc +++ b/groundbase.inc @@ -47,13 +47,13 @@ texture { T_Beton_2 } text { ttf "datas/ComicMono-Bold.ttf" Texte 0.1, 0 // texture { T_WIP_alert } - texture { T_WIP_bluewave scale 0.65 } + texture { T_WIP_bluewave rotate x*clock scale 0.75 } } } #declare Cabane_Compteur = object { union { - object { Compteur scale 0.55 + object { Compteur scale 0.666 translate <-0.46, 0.22, 0.32> } object { Cabane_Base_2 } } diff --git a/hexastar.inc b/hexastar.inc index ef0da0a..903af6a 100644 --- a/hexastar.inc +++ b/hexastar.inc @@ -31,10 +31,11 @@ union { { union { torus { HS_radius*0.73, 0.0180 } - #local L = 0.0032; - cylinder { -y*L, y*L, 0.059 } - sphere { 0, 0.059 translate -y*L } - sphere { 0, 0.059 translate y*L } + #local L = 0.0028; + #local R = 0.0597; + cylinder { -y*L, y*L, R } + sphere { 0, R translate -y*L } + sphere { 0, R translate y*L } } scale <1, 25.10, 1> rotate z*90 @@ -54,9 +55,10 @@ union { cone { < 0.44, 0, 0>, Small, < 0.88, 0, 0>, R_a } sphere { 0, R_a scale <0.7, 1, 1> translate <0.88, 0, 0> } #local R = rand(Rng1); - #if ( R < 0.45 ) texture { C_Texture } - #elseif ( R < 0.80 ) texture { Aluminum } - #else texture { T_Gold_3C } + #if ( R < 0.35 ) texture { C_Texture } + #elseif ( R < 0.50 ) texture { M_Texture } + #elseif ( R < 0.80 ) texture { Aluminum } + #else texture { T_Gold_3C } #end } #end // macro diff --git a/hexastar.pov b/hexastar.pov index f37cfe0..85b0217 100644 --- a/hexastar.pov +++ b/hexastar.pov @@ -28,6 +28,6 @@ camera { // focal_point <0.37, 0.0, 0> // aperture 0.046 // blur_samples 30 - angle 70 - 9 * Cos_01(NormClock) + angle 70 - 11 * Cos_01(NormClock) } diff --git a/hexawood.inc b/hexawood.inc index 926242f..02dbf0a 100644 --- a/hexawood.inc +++ b/hexawood.inc @@ -84,7 +84,7 @@ merge { #local RP = 0.040; sphere { 0, RP scale <1, 0.84, 1> translate 0.35*y } cylinder { 0, 0.35*y, RP } - sphere { 0, 0.09 scale <1, 0.29, 1> } + sphere { 0, 0.09 scale <1, 0.26, 1> } } #local R = rand(Rng1); #if ( R < 0.3 ) texture { Tinny_Brass } @@ -109,7 +109,7 @@ union { } /* ------------------------------------------------------------ */ -#declare HW_Anneau0 = object +#declare HW_Anneau_0 = object { merge { torus { Hc_rad*0.31, 0.0666 scale <1, 0.55, 1> } @@ -121,9 +121,35 @@ merge { #end // FOR } texture { GoldDark } -rotate y * (1337 * NormClock) +} + +#declare HW_Anneau_1 = object +{ +merge { + #for (Foo, 0, 359, 60) + #local DX = Hc_rad*0.35 * sin(radians(Foo+30)); + #local DZ = Hc_rad*0.35 * cos(radians(Foo+30)); + merge { + cylinder { 0, 0.05*y, 0.006 } + cone { 0.05*y, 0.006, 0.08*y, 0.012 } + translate + } + #end + } +#local R = rand(Rng1); +texture { T_WIP_color } +} + +#declare HW_Anneau = object +{ +union { + object { HW_Anneau_0 } + object { HW_Anneau_1 } + } +rotate y * (1664 * NormClock) translate y*0.32 } + /* ------------------------------------------------------------ */ #declare HexaWood = object { @@ -134,7 +160,7 @@ union { light_source { 0.20*y rgb <0, 0.20, 0.99> } #end object { HW_Cones () translate y*0.15 } - object { HW_Anneau0 } + object { HW_Anneau } } } diff --git a/hexawood.pov b/hexawood.pov index e029820..2bf70ec 100644 --- a/hexawood.pov +++ b/hexawood.pov @@ -25,6 +25,6 @@ camera { location LOC look_at LAT right - angle 16 + 2.71*NormClock + angle 18 + 2.71*NormClock } diff --git a/orbite.pov b/orbite.pov index 6f45770..cc74d58 100644 --- a/orbite.pov +++ b/orbite.pov @@ -10,7 +10,7 @@ #include "all.inc" // ======================================================= -#declare R_planete = 1.45; +#declare R_planete = 1.85; #declare Croute = object { @@ -51,7 +51,7 @@ union { } // ======================================================= -#local RO = 4.15; +#local RO = 4.95; #local CK = NormClock * 13.37; #declare PosX = RO * sin(CK); @@ -74,12 +74,12 @@ 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> } +object { Planete rotate (-clock*0.31)*y } +light_source { <23, 8, 15>, rgb <0.77, 0.79, 0.80> } // ------------------------------------------------------------- camera { - location <3+NormClock, -1.0+(7.777*NormClock), 8.59> + location <8+NormClock, -1.0+(8.6*NormClock), 11.59> look_at <0.0, 0.0, 0> right #if (0) @@ -87,6 +87,6 @@ camera { aperture 0.046 blur_samples 30 #end - angle 55 + angle 57 } diff --git a/panoramic.pov b/panoramic.pov index ccad480..f47add2 100644 --- a/panoramic.pov +++ b/panoramic.pov @@ -16,7 +16,7 @@ object { Le_Decor } // ======================================================= -#declare CK = 1.8 + (2.72 * Cos_01(NormClock)); +#declare CK = 1.97 + (2.72 * Cos_01(NormClock)); #declare CamX = 1.72; #declare CamY = 7 + (4*Cos_01(NormClock)); diff --git a/remote.pov b/remote.pov index 6825250..dd38921 100644 --- a/remote.pov +++ b/remote.pov @@ -33,7 +33,7 @@ object { Le_Decor } // object { Repere scale 3 translate } -#local DistCam = 390; +#local DistCam = 430 + (12 * NormClock); #local CK = -1.101 - (0.051 * NormClock); #declare CamX = DistCam * sin(CK); #declare CamY = 28; diff --git a/survol.pov b/survol.pov index 0b914a1..5f5294d 100644 --- a/survol.pov +++ b/survol.pov @@ -15,8 +15,8 @@ object { Le_Decor } // XXX instrumenter la caméra serait un GROS plus !!! // ======================================================= -#declare Debut = <-4, 89, 284> ; -#declare Fin = < 5, 91, -6> ; +#declare Debut = <-14, 89, 284> ; +#declare Fin = < 19, 81, -3> ; #declare Pos = sqrt(NormClock); #declare PosCam = Interpolate(Debut, Fin, Pos); diff --git a/topview.pov b/topview.pov index 1b86b39..64d8f22 100644 --- a/topview.pov +++ b/topview.pov @@ -35,7 +35,7 @@ object { HexaWood translate P } object { Le_Decor } -#declare CamY = 36 - (10.05 * Cos_01(NormClock)); +#declare CamY = 36 - (10.01 * Cos_01(NormClock)); #declare LatY = -4 + ( 2.12 * NormClock); camera { diff --git a/xperiment.inc b/xperiment.inc index 583d3cd..31883c7 100644 --- a/xperiment.inc +++ b/xperiment.inc @@ -45,7 +45,7 @@ object { /* le corps */ merge { #local L2 = Longueur / 2; - #local R = 0.27; + #local R = 0.29; cylinder { , <-L2, 0, 0>, R } sphere { <0, 0, 0>, R scale <3, 1, 1> @@ -63,9 +63,9 @@ object { scale <2.5, 1, 1> translate x*L2*0.75 } #local R = rand(Rng1); - #if (R < 0.333) texture { T_Brass_2C } - #elseif (R < 0.25) texture { GoldDark } - #elseif (R < 0.50) texture { T_Chrome_5A } + #if (R < 0.27) texture { T_Brass_2C } + #elseif (R < 0.56) texture { GoldDark } + #elseif (R < 0.70) texture { T_Chrome_5A } #else texture { T_Gold_3C } #end }