Compare commits

..

No commits in common. "75b1b9f741a2c0646334f0dcb593e3f29eebfc0d" and "29bed43554743ce16b2bcdb730b878fe990efa5a" have entirely different histories.

10 changed files with 14 additions and 43 deletions

View File

@ -14,7 +14,7 @@
#include "hexabenz.inc" #include "hexabenz.inc"
#include "hexawood.inc" #include "hexawood.inc"
#include "trident.inc" #include "trident.inc"
#include "xperiment.inc"
#include "dynamic.inc" #include "dynamic.inc"
// --------------------------------------------------------- // ---------------------------------------------------------
@ -27,8 +27,6 @@
// --------------------------------------------------------- // ---------------------------------------------------------
// ---------------------------------------------------------
object { Repere scale 10 translate y*7 } object { Repere scale 10 translate y*7 }
object { Le_Decor } object { Le_Decor }

View File

@ -31,7 +31,7 @@ object { Le_Decor }
#declare AV = 0.06; #declare AV = 0.06;
#declare LatX = R_circ * 0.98 * cos(CK + AV); #declare LatX = R_circ * 0.98 * cos(CK + AV);
#declare LatY = 3; #declare LatY = 3;
#declare LatZ = R_circ * 0.97 * sin(CK + AV); #declare LatZ = R_circ * 0.99 * sin(CK + AV);
camera { camera {
location <CamX, CamY, CamZ> location <CamX, CamY, CamZ>

View File

@ -3,27 +3,10 @@
#include "gadgets.inc" #include "gadgets.inc"
// =======================================================
// on va tenter de placer un truc qui bouge
// sur le rail circulaire
#local CK = NormClock * 5.750; // radians
#declare Xpos = R_circular * sin(CK);
#declare Zpos = R_circular * cos(CK);
#declare AR = degrees(CK);
object {
Wagonnet_0 (4)
rotate y*AR
translate <Xpos, 1.25, Zpos>
}
// //
object { Les_Bibelots rotate y*clock translate UnderHoles[2] } object { Les_Bibelots rotate y*clock translate UnderHoles[2] }
object { Les_Machins rotate -y*clock translate UnderHoles[3] } object { Les_Machins rotate -y*clock translate UnderHoles[3] }
/// =======================================================
/* /*
* un hexabenz sur une base exterieure * un hexabenz sur une base exterieure
*/ */

View File

@ -104,15 +104,6 @@ union {
} }
// ======================================================= // =======================================================
#declare Des_Choses = object
{
union {
object { Chose () translate -<-1.7, 0, 0.8> }
object { Chose () translate -< 1.5, 0, 1.2> rotate -y*clock }
}
}
// =======================================================
#declare Gyros = object #declare Gyros = object
{ {
// #debug " Les gyros !!!\n" // #debug " Les gyros !!!\n"
@ -148,7 +139,7 @@ object { Gyros }
object { HexaWood rotate -y*(clock*0.38) translate y } object { HexaWood rotate -y*(clock*0.38) translate y }
#break #break
#case (3) #case (3)
object { Des_Choses } object { Chose () translate y*0.34 rotate -y*clock }
#break #break
#case (4) #case (4)
object { HexaBenz () scale 2 translate 2.7*y rotate -y*clock } object { HexaBenz () scale 2 translate 2.7*y rotate -y*clock }

View File

@ -17,9 +17,9 @@ merge {
cylinder { 0, y/6, 0.33 } cylinder { 0, y/6, 0.33 }
#local R = rand(Rng1); #local R = rand(Rng1);
#if ( R < 0.52) #if ( R < 0.52)
texture { T_Beton_1 } texture { T_WIP_alert }
#else #else
texture { T_Beton_2 } texture { M_Texture }
#end #end
} }
#end // macro #end // macro
@ -45,7 +45,7 @@ merge {
#if (rand(Rng1) < 0.52) #if (rand(Rng1) < 0.52)
texture { tPlasticOrange } texture { tPlasticOrange }
#else #else
texture { tPlasticGreen } texture { Ruby_Glass }
#end // if #end // if
scale <0.62, 0.5, 0.61> scale <0.62, 0.5, 0.61>

View File

@ -11,7 +11,7 @@ global_settings {
#include "stones.inc" #include "stones.inc"
#include "woods.inc" #include "woods.inc"
#declare Rng1 = seed(999); #declare Rng1 = seed(1234);
#declare foo = rand(Rng1); #declare foo = rand(Rng1);
#declare Rng2 = seed(now*24*60*60); #declare Rng2 = seed(now*24*60*60);
#declare bar = rand(Rng2); #declare bar = rand(Rng2);

View File

@ -148,7 +148,7 @@ union {
translate Dz + y*H_base } translate Dz + y*H_base }
#undef Dz #undef Dz
} }
translate y*(H_sol+H_base) // XXX Why ? translate y*(H_sol+H_base)
} }
/* ======================================================= */ /* ======================================================= */

View File

@ -13,7 +13,6 @@
#include "hexabenz.inc" #include "hexabenz.inc"
#include "hexawood.inc" #include "hexawood.inc"
#include "trident.inc" #include "trident.inc"
#include "xperiment.inc"
// ======================================================= // =======================================================
object { Le_Decor } object { Le_Decor }

View File

@ -36,7 +36,7 @@ object { Le_Decor }
// object { Repere scale 3 translate <SzSol, 2, SzSol> } // object { Repere scale 3 translate <SzSol, 2, SzSol> }
#local DistCam = 299; #local DistCam = 299;
#local CK = -1.101 + (0.201 * NormClock); #local CK = -0.101 + (0.201 * NormClock);
#declare CamX = DistCam * sin(CK); #declare CamX = DistCam * sin(CK);
#declare CamY = 28; #declare CamY = 28;
#declare CamZ = DistCam * cos(CK); #declare CamZ = DistCam * cos(CK);

View File

@ -21,7 +21,7 @@ object { Le_Decor }
// ======================================================= // =======================================================
#declare Spline_1 = #declare Spline_1 =
spline { spline {
cubic_spline natural_spline
-0.2, <-2, 1.0, -2>, // control point -0.2, <-2, 1.0, -2>, // control point
0.0, < 0, 1.3, -2>, // start point 0.0, < 0, 1.3, -2>, // start point
@ -39,8 +39,8 @@ object { Le_Decor }
#declare ViewSpline = object #declare ViewSpline = object
{ {
union { union {
#for (CK, 0.00, 1.00, 0.0017) #for (CK, 0.00, 1.00, 0.0024)
sphere { <0,0,0>, 0.022 sphere { <0,0,0>, 0.028
texture{ texture{
pigment {color rgb <0.20, 0.14, 0.14> } pigment {color rgb <0.20, 0.14, 0.14> }
finish {ambient 0.15 diffuse 0.85 phong 0.6 } finish {ambient 0.15 diffuse 0.85 phong 0.6 }
@ -98,7 +98,7 @@ union {
/* P1 and P2 are computed in AllTheSpline object */ /* P1 and P2 are computed in AllTheSpline object */
#local P1B = (P1 * 10) + <0, 2, 0>; #local P1B = (P1 * 10) + <0, 2, 0>;
#local P2B = (P2 * 8) + <0, 2, 0>; #local P2B = (P2 * 10) + <0, 2, 0>;
#if ( Flag ) #if ( Flag )
#declare Loc_cam = <87-(12*NormClock), 29-NormClock, 4-(9*exp(NormClock))>; #declare Loc_cam = <87-(12*NormClock), 29-NormClock, 4-(9*exp(NormClock))>;
#declare Lat_tmp = Interpolate(P1, P2, 0.50); #declare Lat_tmp = Interpolate(P1, P2, 0.50);
@ -106,7 +106,7 @@ union {
#declare Ang_cam = 105; #declare Ang_cam = 105;
#else #else
#declare Loc_cam = P1B; #declare Loc_cam = P1B;
#declare Lat_cam = P2B; // XXX * 0.85; #declare Lat_cam = P2B * 0.85;
#declare Ang_cam = 52; #declare Ang_cam = 52;
#end #end