premier wagon nettoyé

incs/constantes.inc

@@ -20,13 +20,23 @@
 
 #declare RND = seed(42);
 
+#declare FADE_DIST = 2.0;
+#declare FADE_POWA = 2.0;
+
 /* ------------------------------------------------------------ */
 /* 	il nous faut quelques textures 'standards'		*/
 
 #declare Orange_Corail = texture
 {
 pigment { color Orange }
-normal  { dents 0.22 scale 0.42 }
+normal  { dents 0.42 scale 0.042 }
+finish	{ phong 0.5 }
+}
+
+#declare Jaune_Corail = texture
+{
+pigment { color Yellow }
+normal  { dents 0.32 scale 0.242 }
 finish	{ phong 0.5 }
 }
 
@@ -36,7 +46,6 @@ finish	{ phong 0.5 }
 	pigment { color Green }
 	normal { bumps 0.22 scale 0.42 }
 	finish  { phong 0.5 }
-
 }
 
 #declare Rouge_Train_1 = texture
@@ -50,7 +59,7 @@ finish	{ phong 0.5 }
 #declare Texture_Roues = texture
 {
 	pigment { color LightSteelBlue }
-	finish { phong 0.5 }
+	finish { specular 0.5 }
 }
 
 #declare Texture_Chassis = texture

incs/corail.inc

@@ -6,22 +6,17 @@
 
 #declare Chassis_Corail = object
 {
-union
-	{
+union	{
 	box	{ <-4, 5.5, -20>, <4, 6.5, 20> }
 	box	{ <-3.5, 3.5, -5>,  <3.5, 5.4, -1> }
 	box	{ <-3.5, 3.5,  5>,  <3.5, 5.4,  1> }
 	}
-texture	{
-	pigment { color Yellow }
-	finish	{ phong 0.5 }
-	}
+texture	{ Jaune_Corail }
 }
 
 #declare Base_Corail = object
 {
-union
-	{
+union	{
 	object { Chassis_Corail }
 	object { Boogie	translate z*-13.8 }
 	object { Boogie	translate z* 13.8 }
@@ -36,21 +31,18 @@ union
 
 #declare Bord_Fenetre = object
 {
-difference
-	{
+difference {
 	box { <-1, -HAUT_FEN, -LARG_FEN>,
 					<1, HAUT_FEN, LARG_FEN> }
 	box { <-2, -HAUT_FEN+E_FEN, -LARG_FEN+E_FEN>,
 					<2, HAUT_FEN-E_FEN, LARG_FEN-E_FEN> }
 	}
-
 texture { T_Chrome_2C }
 }
 
 #declare Cabine_Corail = object
 {
-difference
-	{
+difference {
 	box	{ <-4.5, 6.6, -20>, <4.5, 15, 20> }
 	box	{ <-4, 6.6, -19.5>, <4, 15.1, 19.5> }
 
@@ -73,14 +65,12 @@ texture { Orange_Corail }
 
 #declare Toit_Corail = object
 {
-intersection
-	{
+intersection {
 	box	{ <-4.7, 0, -21>, <4.7, 14, 21> }
 	cylinder { <0, -11, -22>, <0, -11, 22>, 12.5 } 
 	}
 translate y*15
-texture
-	{
+texture {
 	pigment { color Red }
 	finish	{ phong 0.6 }
 	}
@@ -89,28 +79,33 @@ texture
 //
 //	la tuyauterie sur les deux caissons d'en dessous
 //
+#declare Citerne_Corail = object
+{
+#local Ltc = 5.22;
+#local Rtc = 1.12;
+#local Etc = 4.98;
+
+merge	{
+	cylinder { -Ltc*z, Ltc*z, Rtc }
+	sphere   { -Ltc*z,        Rtc }
+	sphere   {  Ltc*z,        Rtc }
+	}
+scale <1, 1, 0.707>
+texture { T_Chrome_4C }
+}
 #declare Tuyaux_Corail = object
 {
-#local posX = 4.8;
-#local diametre = 1.2;
-union
-	{
-	cylinder { <-4.7, 4.5, -5>, <-4.7, 4.5, 5>, diametre }
-	sphere   { <-4.7, 4.5, -5>, diametre }
-	sphere   { <-4.7, 4.5,  5>, diametre }
-	cylinder { < 4.7, 4.5, -5>, < 4.7, 4.5, 5>, diametre }
-	sphere   { < 4.7, 4.5, -5>, diametre }
-	sphere   { < 4.7, 4.5,  5>, diametre }
+union	{
+	object { Citerne_Corail   translate -x* Etc	}
+	object { Citerne_Corail   translate  x* Etc	}
 	}
-texture { T_Chrome_4C }
 }
 
 //	------------------------------------------
 
 #declare Armature_Siege_Corail = object
 {
-union
-	{
+union	{
 	cylinder { <-1.3, 0, 0>, <-1.3, 1.50, 0>, 0.2 }
 	cylinder { < 1.3, 0, 0>, < 1.3, 1.50, 0>, 0.2 }
 
@@ -133,15 +128,13 @@ texture { T_Chrome_2C }
 
 #declare Coussins_Siege_Corail = object
 {
-union
-	{
+union	{
 	box { <-2, 1.75, -1>, <2, 1.40, 1> }
 	box { <-2, 1.95,  1>, <2, 3.10, 0.8> }
 	
 	cylinder { <-2, 3.38,  0.9>, <2, 3.38, 0.9>, 0.2 }
 	}
-texture
-	{
+texture {
 	pigment { color Brown }
 	normal  { bumps 0.6 scale 0.42 }
 	finish	{ phong 0.4 diffuse 0.3 }
@@ -150,8 +143,7 @@ texture
 
 #declare Siege_Corail = object
 {
-union
-	{
+union	{
 	object { Armature_Siege_Corail }
 	object { Coussins_Siege_Corail }
 	}
@@ -163,27 +155,25 @@ union
 //
 #declare Ampoule_Corail = object
 {
-sphere { <0, 0, 0> 0.2 pigment { color Gray90 } }
+sphere { <0, 0, 0> 0.17 pigment { color White } }
 }
 
 //	------------------------------------------
 
 #declare Lumieres_Corail = object
 {
-
-union
-	{
+union	{
 	#declare foo = -2;
 	#while (foo <= 2)
 		#declare px = foo * 6.97;
 
-		sphere { <0, 15.3, px> 0.6 pigment { color BakersChoc } }
+		// sphere { <0, 15.3, px> 0.6 pigment { color BakersChoc } }
 
 		light_source {
 			<0, 0, px> color Gray35
 			fade_distance 6 fade_power 1
 			looks_like { Ampoule_Corail }
-			translate y*13.8
+			translate y*13.85
 			}
 
 		#declare foo = foo + 1;
@@ -194,8 +184,7 @@ union
 
 #declare Interieur_Corail = object
 {
-union
-	{
+union	{
 	#declare foo = -4;
 	#while (foo <= 4)
 		#declare px = foo * 4.16;
@@ -205,14 +194,12 @@ union
 	}
 }
 //	------------------------------------------
-
 /*
  *		MAIS CETTE RAMPE EST COMPLETEMENT FAUSSE !!!
  */
 #declare Rampe = object
 {
-union
-	{
+union	{
 	#declare foo = -2;
 	#while (foo <= 2)
 		#declare px = foo * 6.97;
@@ -234,12 +221,11 @@ union
 
 #declare Wagon_Corail = object
 {
-union
-	{
+union	{
 	object { Base_Corail }
 	object { Cabine_Corail }
 	object { Toit_Corail }
-	object { Tuyaux_Corail }
+	object { Tuyaux_Corail translate y*4.16 }
 	object { Interieur_Corail }
 	object { Lumieres_Corail }
 	// object { Rampe }