Makefile

@@ -24,7 +24,7 @@ all:	loco.png parking.png corail.png train.png essai.png	\
 GLOBDEPS=${INCS}/train.inc ${INCS}/poteaux.inc			\
 	${INCS}/electric.inc ${INCS}/voiture.inc		\
 	${INCS}/rails.inc ${INCS}/grue.inc ${INCS}/ridelles.inc	\
-	${INCS}/instruments.inc	${INCS}/corail.inc		\
+	${INCS}/instruments.inc					\
 	${INCS}/citerne.inc ${INCS}/benne.inc			\
 	${INCS}/constantes.inc ${INCS}/locomotive.inc		\
 	${INCS}/enseigne.inc					\

contexte.inc

@@ -5,7 +5,6 @@
 global_settings {
 	assumed_gamma 1.0
 	ambient_light rgb <0.18, 0.14, 0.17>
-	max_trace_level 17
 	}
 
 /*------------------------------------------------------------------*/
@@ -18,7 +17,7 @@ global_settings {
 
 /*------------------------------------------------------------------*/
 
-#declare	ANGLE_CAM = 42;
+#declare	ANGLE_CAM = 33;
 
 //---------------------------------------
 /*

incs/constantes.inc

@@ -20,23 +20,13 @@
 
 #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.42 scale 0.042 }
+normal  { dents 0.22 scale 0.42 }
-finish	{ phong 0.5 }
-}
-
-#declare Jaune_Corail = texture
-{
-pigment { color Yellow }
-normal  { dents 0.32 scale 0.242 }
 finish	{ phong 0.5 }
 }
 
@@ -46,6 +36,7 @@ finish	{ phong 0.5 }
 	pigment { color Green }
 	normal { bumps 0.22 scale 0.42 }
 	finish  { phong 0.5 }
+
 }
 
 #declare Rouge_Train_1 = texture
@@ -59,7 +50,7 @@ finish	{ phong 0.5 }
 #declare Texture_Roues = texture
 {
 	pigment { color LightSteelBlue }
-	finish { specular 0.5 }
+	finish { phong 0.5 }
 }
 
 #declare Texture_Chassis = texture

incs/corail.inc

@@ -6,17 +6,22 @@
 
 #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	{ Jaune_Corail }
+texture	{
+	pigment { color Yellow }
+	finish	{ phong 0.5 }
+	}
 }
 
 #declare Base_Corail = object
 {
-union	{
+union
+	{
 	object { Chassis_Corail }
 	object { Boogie	translate z*-13.8 }
 	object { Boogie	translate z* 13.8 }
@@ -31,18 +36,21 @@ 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> }
 
@@ -65,12 +73,14 @@ 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 }
 	}
@@ -79,33 +89,28 @@ 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
 {
-union	{
+#local posX = 4.8;
-	object { Citerne_Corail   translate -x* Etc	}
+#local diametre = 1.2;
-	object { Citerne_Corail   translate  x* Etc	}
+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 }
 	}
+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 }
 
@@ -128,13 +133,15 @@ 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 }
@@ -143,7 +150,8 @@ texture {
 
 #declare Siege_Corail = object
 {
-union	{
+union
+	{
 	object { Armature_Siege_Corail }
 	object { Coussins_Siege_Corail }
 	}
@@ -155,25 +163,27 @@ union	{
 //
 #declare Ampoule_Corail = object
 {
-sphere { <0, 0, 0> 0.17 pigment { color White } }
+sphere { <0, 0, 0> 0.2 pigment { color Gray90 } }
 }
 
 //	------------------------------------------
 
 #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.85
+			translate y*13.8
 			}
 
 		#declare foo = foo + 1;
@@ -184,7 +194,8 @@ union	{
 
 #declare Interieur_Corail = object
 {
-union	{
+union
+	{
 	#declare foo = -4;
 	#while (foo <= 4)
 		#declare px = foo * 4.16;
@@ -194,12 +205,14 @@ union	{
 	}
 }
 //	------------------------------------------
+
 /*
  *		MAIS CETTE RAMPE EST COMPLETEMENT FAUSSE !!!
  */
 #declare Rampe = object
 {
-union	{
+union
+	{
 	#declare foo = -2;
 	#while (foo <= 2)
 		#declare px = foo * 6.97;
@@ -221,11 +234,12 @@ union	{
 
 #declare Wagon_Corail = object
 {
-union	{
+union
+	{
 	object { Base_Corail }
 	object { Cabine_Corail }
 	object { Toit_Corail }
-	object { Tuyaux_Corail translate y*4.16 }
+	object { Tuyaux_Corail }
 	object { Interieur_Corail }
 	object { Lumieres_Corail }
 	// object { Rampe }

inside.pov

@@ -17,7 +17,7 @@
 
 object { Wagon_Corail }
 camera	{
-	location	<-1.6, 12, -19>
+	location	<-1.6, 10, -19>
 	right		image_width/image_height*x
 	look_at		<1, 4, 10>
 	angle		80
@@ -26,7 +26,7 @@ camera	{
 /*------------------------------------------------------------------*/
 
 
-// light_source { <180, 125, -180> color White }
+light_source { <180, 125, -180> color White }
 //light_source { <170, 100, -180> color White }
 //light_source { <120, 11, -185> color White }