last commits before xmas

Makefile

@@ -1,11 +1,11 @@
 #--------------------------------------------------------
 
-MOYEN = +w1280 +h1024
-GRAND = +w1600 +h1200
 PETIT = +w800 +h600
-DIMS=$(PETIT)
+MOYEN = +w1152 +h900
+GRAND = +w1600 +h1200
+DIMS=$(MOYEN)
 
-OPTS = +a +q9 -d
+OPTS = +a0.01 +q9 -d
 
 POVRAY = povray
 
@@ -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}/instruments.inc	${INCS}/corail.inc		\
 	${INCS}/citerne.inc ${INCS}/benne.inc			\
 	${INCS}/constantes.inc ${INCS}/locomotive.inc		\
 	${INCS}/enseigne.inc					\

benne.pov

@@ -26,7 +26,7 @@ object { Wagon_Benne translate y*2 }
 
 camera
 	{
-	location	<35.5, 23, 40>
+	location	<35.5, 21, 40>
 	right		image_width/image_height*x
 	look_at		<0, 6, 0>
 	angle		ANGLE_CAM

contexte.inc

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

corail.pov

@@ -41,11 +41,11 @@ camera
 	{
 	location	<38, 10, -45>
 	right		image_width/image_height*x
-	look_at		<0, 7, 0>
+	look_at		<-5.3, 7, 0>
 	angle		ANGLE_CAM
 	}
 
-light_source { <550, 725, -900> color Gray60 }
+// light_source { <550, 725, -900> color Gray60 }
 light_source { <600, 700, -850> color Gray50 }
 
 

essai.pov

@@ -13,16 +13,17 @@
 #include        "incs/grue.inc"
 
 // object { Boogie }
-object { Grande_Roue }
+// object { Grande_Roue }
-
+#include        "incs/enseigne.inc"
+object { Enseigne_Corail_texte }
 camera {
-	location	<5.5, 15, 20>
+	location	<17.5, 3, 10>
 	right		image_width/image_height*x
-	look_at		<0, 3, 0>
+	look_at		<0, 0, 0>
 	angle		ANGLE_CAM
 	}
 
-object { Repere }
+object { Repere scale 0.5 }
 
 light_source { <90, 131, 190> color White }
 light_source { <90, 111, 250> color White }

incs/constantes.inc

@@ -18,7 +18,10 @@
 /*  generateur de nombres pseudo-aleatoires.  
     mais comment le 'seeder' de fac,on differente a chaque run ? */
 
-#declare RND = seed(42);
+#declare RND = seed(1664);
+
+#declare FADE_DIST = 2.0;
+#declare FADE_POWA = 2.0;
 
 /* ------------------------------------------------------------ */
 /* 	il nous faut quelques textures 'standards'		*/
@@ -26,23 +29,29 @@
 #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 }
+finish	{ phong 0.4 }
+}
+
+#declare Jaune_Corail = texture
+{
+pigment { color Yellow }
+normal  { dents 0.32 scale 0.242 }
+finish	{ phong 0.4 }
 }
 
 #declare Vert_Train_1 = texture
 {
-// pour la benne
+/* pour la benne */
-	pigment { color Green }
+	pigment { color rgb <0.22, 0.77, 0.11> }
-	normal { bumps 0.22 scale 0.42 }
+	normal { bumps 0.17 rotate <10, 0, 10> scale 0.31 }
 	finish  { phong 0.5 }
-
 }
 
 #declare Rouge_Train_1 = texture
 {
 // pour la citerne
-	pigment { color rgb <0.96, 0.25, 0.2> }
+	pigment { color rgb <0.93, 0.25, 0.2> }
 	normal { bumps 0.33 scale 0.42 }
 	finish  { phong 0.5 }
 }
@@ -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	{
+texture	{ Jaune_Corail }
-	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 }
@@ -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;
+union	{
-#local diametre = 1.2;
+	object { Citerne_Corail   translate -x* Etc	}
-union
+	object { Citerne_Corail   translate  x* Etc	}
-	{
-	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 }
 
@@ -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 }

incs/electric.inc

@@ -60,7 +60,7 @@ texture {
 
 // -------------------------------------------------------------------
 
-#declare Haut_Pento = 15;
+#declare Haut_Pento = 18;
 
 #declare Base_Panto_0 = object
 {

incs/enseigne.inc

@@ -1,10 +1,11 @@
-/*
- *	see 'gare.inc' for usage
- */
 
 #include  "chars.inc"
 
-#declare Enseigne = object
+/* ===========================================================*/
+/*
+ *	see 'gare.inc' for usage
+ */
+#declare Enseigne_Hello = object
 {
 union
     {
@@ -22,5 +23,33 @@ union
     }
 texture { PinkAlabaster scale 3 }
 }
+/* ===========================================================*/
+#declare Enseigne_Corail_plaque = object
+{
+box { <-0.8, -0.01, -3.5>, <0.8, 0.01, 3.5> }
+pigment { color Blue }
+rotate z*90
+}
+/* ----------------------------------------------------------- */
+#declare Enseigne_Corail_texte = object
+{
+text { ttf "data/tintin_talking.ttf" ,
+	"Bourtoulots Express", 0.06, 0.0
+	pigment{ White }
+	} 
+translate -3.6*x
+rotate -90 * y
+translate <0.03, -0.19, 0.00>
+}
+/* ----------------------------------------------------------- */
+#declare Enseigne_Corail_texte = object
+{
+union	{
+	object { Enseigne_Corail_plaque }
+	object { Enseigne_Corail_texte }
+	}
+}
+/* ===========================================================*/
+/* ===========================================================*/
 
-/* (c) Oulala */
+/* (c) Oulala 2025 */

incs/gare.inc

@@ -43,7 +43,7 @@ union
 	{
 	object { Corps_Gare }
 	object { Quai_Gare }
-	object { Enseigne scale 15 translate <0, 460, -210>  }
+	object { Enseigne_Hello scale 15 translate <0, 460, -210>  }
 	}
 }
 

incs/train.inc

@@ -21,7 +21,7 @@ difference {
 
 	#declare foo = 0;
 	#while (foo < 360)
-		#local R = 2.2;
+		#local R = 2.35;
 		#declare xx = sin(radians(foo))*R;
 		#declare yy = cos(radians(foo))*R;
 

inside.pov

@@ -17,7 +17,7 @@
 
 object { Wagon_Corail }
 camera	{
-	location	<-1.6, 10, -19>
+	location	<-1.6, 12, -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 }
 

train.pov

@@ -69,12 +69,12 @@ camera
 	{
 	location	<260, 38, 25>
 	right		image_width/image_height*x
-	look_at		<0, 3, -10>
+	look_at		<0, 3, 12>
 	angle		ANGLE_CAM
 	}
 
-light_source { <150, 98, -150> color Orange }
+light_source { <150,  98, -150> color Orange }
-light_source { <170, 88, -170> color Yellow }
+light_source { <170, 128, -170> color Yellow }
 
 // light_source { <100, 100, 50> color White }
 

wagons.pov

@@ -40,8 +40,8 @@ camera
 	angle		ANGLE_CAM
 	}
 
-light_source { <-50, 120, -330> color Gray50 }
+// light_source { <-50, 120, -330> color Gray50 }
-light_source { <190, 498, -250> color White }
+// light_source { <190, 498, -250> color White }
 light_source { <160, 99, -450> color Yellow }
 
 /*------------------------------------------------------------------*/