From 048148967b33401eb414b5205d17198fd3f13894 Mon Sep 17 00:00:00 2001 From: Tonton Th Date: Fri, 31 Oct 2025 14:14:07 +0100 Subject: [PATCH] a lot of cosmetic changes --- dynamic.inc | 16 +++++++++++++--- escadrille.pov | 15 +++++++-------- gadgets.inc | 4 ++-- globals.inc | 2 +- groundbase.inc | 2 +- hexabenz.inc | 2 +- hexawood.inc | 6 +++--- panoramic.pov | 6 +++--- splined.pov | 15 ++++++++------- 9 files changed, 39 insertions(+), 29 deletions(-) diff --git a/dynamic.inc b/dynamic.inc index 445b1e7..1f77530 100644 --- a/dynamic.inc +++ b/dynamic.inc @@ -20,6 +20,10 @@ union { } object { BiBenz rotate -y*(clock*0.21) translate Pos_RedB_0 } +/* + * deux hexacones se tournent autour + * XXX peut-être les faire bouger un peu plus ? + */ #declare BiCone = object { #local K = 1.27; @@ -38,6 +42,11 @@ object { BiCone rotate -y*(Cos_010(NormClock)*55.38) translate Pos_RedB_1 } #declare P = Interpolate(A, B, NormClock); object { HexaCone () rotate y*((12*NormClock)+80) translate P } +/* XXX + * un "machin" se déplace sur le rail circulaire + * XXX */ + + /* * le vaisseau "trident" passe a travers les @@ -92,16 +101,17 @@ object { HexaWood rotate z*R translate P_hexawood } /* * survol par un trident */ -#declare A = < 2, 49, -20>; -#declare B = <-3, 37, 22>; +#declare A = < 2, 47, -20>; +#declare B = <-3, 35, 22>; #declare P = Interpolate(A, B, NormClock); object { Trident_A () rotate y*(clock*2.7) rotate z*80 rotate <2, 94, 0> translate P } - +/* ----------------------------------- */ #debug "dynamic is loaded\n" +/* ----------------------------------- */ diff --git a/escadrille.pov b/escadrille.pov index 761e581..7920039 100644 --- a/escadrille.pov +++ b/escadrille.pov @@ -31,8 +31,8 @@ // #debug concat("X ", str(posX,7,3), " Z ", str(posZ,7,3), "\n") // #debug concat("position Z ", str(posZ,7,3),"\n") - #if ( (abs(posX)>1.3) & (abs(posZ)>1.3) ) - + #declare Limit = 1.450; + #if ( (abs(posX)>Limit) & (abs(posZ)>Limit) ) // position #if (rand(Rng1) < 0.555) object { HexaCone () rotate translate } @@ -43,9 +43,8 @@ // #debug "\n" - - #end // if pos... - #end // loop IDX + #end // if position... + #end // loop idX #end // loop idZ // ======================================================= @@ -54,9 +53,9 @@ object { Le_Decor } // object { Repere scale 5 translate y } -#local CamX = -8.7 + ( 6.9 * Cos_01(NormClock)); -#local CamY = 0.42 + (27.89 * Cos_01(NormClock)); -#local CamZ = 16.86 + (14.9 * Cos_01(NormClock)); +#local CamX = -8.7 + ( 6.9 * Cos_01(NormClock)); +#local CamY = 0.42 + (29.06 * Cos_01(NormClock)); +#local CamZ = 122 - (18.9 * Cos_01(NormClock)); camera { location diff --git a/gadgets.inc b/gadgets.inc index ba3b4ff..5c0d299 100644 --- a/gadgets.inc +++ b/gadgets.inc @@ -19,7 +19,7 @@ merge { #if ( R < 0.52) texture { T_WIP_alert } #else - texture { WIP_color } + texture { M_Texture } #end } #end // macro @@ -150,7 +150,7 @@ union { #declare OpenBox = object { union { - #local R = 0.010; + #local R = 0.021; /* les verticales */ cylinder { <-1, -1, -1>, <-1, 1, -1>, R } cylinder { < 1, -1, -1>, < 1, 1, -1>, R } diff --git a/globals.inc b/globals.inc index c016d3f..607751d 100644 --- a/globals.inc +++ b/globals.inc @@ -137,7 +137,7 @@ finish { pigment { rgb <0.0, 0.0, 1.0> } finish { ambient 0.33 } } #declare Y_Texture = texture { - pigment { rgb <0.8, 0.8, 0> } finish { ambient 0.33 } } + pigment { rgb <0.8, 0.8, 0.0> } finish { ambient 0.33 } } #declare M_Texture = texture { pigment { rgb <0.8, 0.0, 0.8> } finish { ambient 0.33 } } #declare C_Texture = texture { diff --git a/groundbase.inc b/groundbase.inc index aa40053..7911856 100644 --- a/groundbase.inc +++ b/groundbase.inc @@ -112,7 +112,7 @@ texture { T_Grnt7 rotate 49 scale 0.333 } { merge { cylinder { 0, y*0.5, 0.10 } - sphere { 0, 0.10 scale <1, 0.23, 1> translate y*0.5 } + sphere { 0, 0.10 scale <1, 0.25, 1> translate y*0.5 } } } diff --git a/hexabenz.inc b/hexabenz.inc index b3a26ed..f009212 100644 --- a/hexabenz.inc +++ b/hexabenz.inc @@ -56,7 +56,7 @@ union { translate } #end // end for - #local SBAC = 0.290; + #local SBAC = 0.300; object { Benz_attache_cones (SBAC) translate -z*0.175 } object { Benz_attache_cones (SBAC) translate z*0.202 } } diff --git a/hexawood.inc b/hexawood.inc index 85230d6..2cc741d 100644 --- a/hexawood.inc +++ b/hexawood.inc @@ -82,11 +82,11 @@ merge { } #local R = rand(Rng1); #if ( R < 0.3 ) - texture { Tinny_Brass } + texture { Tinny_Brass } #elseif ( R < 0.8 ) - texture { New_Penny } + texture { New_Penny } #else - texture { tPlasticGreen } + texture { T_Brass_2C } #end // if #end // macro diff --git a/panoramic.pov b/panoramic.pov index b1ecc64..ad21db4 100644 --- a/panoramic.pov +++ b/panoramic.pov @@ -17,13 +17,13 @@ // ======================================================= object { Le_Decor } -#debug "ACTION !!!\n" #include "dynamic.inc" // ======================================================= #declare CK = 2.79 * Cos_01(NormClock); +#declare CamX = 1.22; #declare CamY = 7 + (4*Cos_01(NormClock)); #declare LatX = 20 * cos(CK*1.08); @@ -33,7 +33,7 @@ object { Le_Decor } camera { // orthographic - location <0, CamY, 0> + location look_at - angle 75 + angle 71 + (NormClock * 10) } diff --git a/splined.pov b/splined.pov index 2947168..d4089fd 100644 --- a/splined.pov +++ b/splined.pov @@ -39,8 +39,8 @@ object { Le_Decor } #declare ViewSpline = object { union { - #for (CK, 0.00, 1.00, 0.0025) - sphere { <0,0,0>, 0.030 + #for (CK, 0.00, 1.00, 0.0024) + sphere { <0,0,0>, 0.028 texture{ pigment {color rgb <0.20, 0.14, 0.14> } finish {ambient 0.15 diffuse 0.85 phong 0.6 } @@ -64,17 +64,17 @@ union { #declare P2 = <1, -1.3, 0.1> + (0.95 * Scaler * Spline_1(V2)); sphere { 0, 0.06 - pigment { color Blue } + texture { B_Texture } translate P1 } sphere { 0, 0.06 - pigment { color Red } + texture { R_Texture } translate P2 } cylinder { P1, P2, 0.017 - pigment { color Green } + texture { G_Texture } } finish { ambient 0.15 diffuse 0.65 phong 0.4 } } @@ -87,7 +87,7 @@ union { // ======================================================= -#declare Flag = (mod(clock,90) < 45); +#declare Flag = (mod(clock+33,120) < 40); #if ( Flag ) object { AllTheSpline scale 10 translate y*2 } @@ -96,6 +96,7 @@ union { #debug " FLAG IS NO\n" #end +/* P1 and P2 are computed in AllTheSpline object */ #local P1B = (P1 * 10) + <0, 2, 0>; #local P2B = (P2 * 10) + <0, 2, 0>; #if ( Flag ) @@ -105,7 +106,7 @@ union { #declare Ang_cam = 105; #else #declare Loc_cam = P1B; - #declare Lat_cam = P2B; + #declare Lat_cam = P2B * 0.85; #declare Ang_cam = 52; #end