more frobnicate again

incs/train.inc

@@ -1,23 +1,34 @@
 /*
- *		un petit train 
- *		--------------
- *
- *	pas la peine de chercher la benne ici, elle est partie
- *	dans son fichier 'benne.inc'.
+ *		des éléments du petit train 
+ *		---------------------------
  *
  */
 
+//-----------------------------------------------------------------
+#declare Texture_Roues = texture
+{
+	pigment { color LightSteelBlue }
+	finish { phong 0.7 }
+}
+
+#declare Texture_Chassis = texture
+{
+	pigment { color Yellow }
+	finish { phong 0.6 ambient 0.4 }
+}
+
 //-----------------------------------------------------------------
 
 #declare Corps_Grande_Roue = object
 {
 difference {
 	union {
-		cylinder { <-1, 0, 0>, <1, 0, 0>, 4 }
-		cylinder { <-0.5, 0, 0>, <-0.3, 0, 0>, 4.3 }
+		cylinder { < 0,   0, 0>, <0.8, 0, 0>, 4 }
+		cylinder { <-0.5, 0, 0>, <0,   0, 0>, 4.3 }
 		}
 	cylinder { <-1.2, 0, 0> <-0.6, 0, 0>, 2.8 }
 	cylinder { < 1.2, 0, 0> < 0.6, 0, 0>, 3.2 }
+
 	#declare foo = 0;
 	#while (foo < 360)
 		#local R = 2.2;
@@ -29,11 +40,7 @@ difference {
 		#declare foo = foo + 36;
 	#end
 	}
-translate y*4
-texture	{
-	pigment { color LightSteelBlue }
-	finish { phong 0.7 }
-	}
+texture	{ Texture_Roues }
 }
 
 //-----------------------------------------------------------------
@@ -42,29 +49,27 @@ texture	{
 {
 difference {
 	union {
-		// cylinder { < 0, 0, 0>, <1, 0, 0>, 3 }
-		cylinder { <-1, 0, 0>, <0, 0, 0>, 3.3 }
+		cylinder { < 0, 0, 0>, <0.8, 0, 0>, 3 }
+		cylinder { <-0.5, 0, 0>, <0, 0, 0>, 3.35 }
 		}
 	cylinder { <-1.4, 0, 0> <-0.6, 0, 0>, 1.7 }
 	cylinder { < 1.4, 0, 0> < 0.6, 0, 0>, 1.7 }
 
 	#declare foo = 0;
 	#while (foo < 360)
-		#declare xx = sin(radians(foo))*2.31;
-		#declare yy = cos(radians(foo))*2.31;
+		#declare xx = sin(radians(foo))*2.29;
+		#declare yy = cos(radians(foo))*2.29;
 
-		sphere { <1.1, xx, yy>, 0.42 }
+		sphere { <1.1, xx, yy>, 0.44 }
 
 		#declare foo = foo + 36;
 	#end
 	}
-translate y*3				/* why ??? */
-texture {
-	pigment { color LightSteelBlue }
-	finish { phong 0.6 }
-	}
+texture	{ Texture_Roues }
 }
 
+//-----------------------------------------------------------------
+
 #declare Moyeu = object
 {
 union {
@@ -77,11 +82,13 @@ union {
 texture { T_Chrome_2C }
 }
 
+//-----------------------------------------------------------------
+
 #declare Petite_Roue = object
 {
 union {
 	object { Corps_Petite_Roue }
-	object { Moyeu translate <0.95, 3, 0> }
+	object { Moyeu translate <0.95, 0, 0> }
 	}
 }
 
@@ -89,7 +96,7 @@ union {
 {
 union {
 	object { Corps_Grande_Roue }
-	object { Moyeu translate <0.95, 4, 0> }
+	object { Moyeu translate <0.95, 0, 0> }
 	}
 }
 
@@ -102,10 +109,7 @@ union	{
 	box	{ <-3.6, 0.7, -12.5>, <3.6, 1.3, 12.5> }
 	}
 translate y*4.1
-texture	{
-	pigment { color Yellow }
-	finish { phong 0.6 ambient 0.4 }
-	}
+texture { Texture_Chassis }
 }
 
 #declare Chassis_Long = object
@@ -115,10 +119,7 @@ union	{
 	box	{ <-4, 0.5, -16>, <4, 1.5, 16> }
 	}
 translate y*4.1
-texture	{
-	pigment { color Yellow }
-	finish { phong 0.6  ambient 0.4 }
-	}
+texture { Texture_Chassis }
 }
 
 //-----------------------------------------------------------------
@@ -135,13 +136,14 @@ pigment { color Gray30 }
 
 #declare Boogie = object
 {
+#local HR = 3;
 union
 	{
 	object { Chassis_Boogie }
-	object { Petite_Roue scale <-1, 1, 1> translate <-5.5, 0, -3.5> }
-	object { Petite_Roue translate < 5.5, 0, -3.5> }
-	object { Petite_Roue scale <-1, 1, 1> translate <-5.5, 0,  3.5> }
-	// object { Petite_Roue translate < 5.5, 0,  3.5> }
+	object { Petite_Roue scale <-1, 1, 1>	translate <-5.5, HR, -3.5> }
+	object { Petite_Roue			translate < 5.5, HR, -3.5> }
+	object { Petite_Roue scale <-1, 1, 1>	translate <-5.5, HR,  3.5> }
+	object { Petite_Roue			translate < 5.5, HR,  3.5> }
 	}
 }
 
@@ -149,13 +151,13 @@ union
 
 #declare Base_Courte = object
 {
-union
-	{
+#local HR = 4;
+union	{
 	object { Chassis_Court }
-	object { Grande_Roue scale <-1, 1, 1>	translate <-5.5, 0, -8> }
-	object { Grande_Roue			translate < 5.5, 0, -8> }
-	object { Grande_Roue scale <-1, 1, 1>	translate <-5.5, 0,  8> }
-	object { Grande_Roue			translate < 5.5, 0,  8> }
+	object { Grande_Roue scale <-1, 1, 1>	translate <-5.5, HR, -8> }
+	object { Grande_Roue			translate < 5.5, HR, -8> }
+	object { Grande_Roue scale <-1, 1, 1>	translate <-5.5, HR,  8> }
+	object { Grande_Roue			translate < 5.5, HR,  8> }
 	}
 }