more frobnicate again

.gitignore

@@ -1,4 +1,10 @@
 
 *.png
-*.pov-state
+tmp/*.png 
+*.gif
 
+*.pov-state
+tmp/*.pov-state
+
+MANIFEST
+tarball

Makefile

@@ -1,16 +1,16 @@
 #--------------------------------------------------------
 
-MOYEN=+w1280 +h1024
+MOYEN = +w1280 +h1024
-GRAND=+w1600 +h1200
+GRAND = +w1600 +h1200
-PETIT=+w800 +h600
+PETIT = +w800 +h600
 DIMS=$(PETIT)
 
 OPTS = +a +q9 -d
 
-POVRAY=povray
+POVRAY = povray
 
 # nouveau mars 2021
-INCS = incs/
+INCS = incs
 
 # CJPEGOPT=-quality 88 -progressive -dct float -targa
 CJPEGOPT = -progressive -dct float -quality 88
@@ -19,18 +19,26 @@ PNGOPT = -interlace -compression 9 -text png.txt
 all:	loco.png parking.png corail.png train.png essai.png	\
 	inside.png benne.png electric.png truc.png wagons.png	\
 	ridelles.png rotonde.png grue.png 			\
-	citerne.png
+	citerne.png voiture.png gare.png
 
 GLOBDEPS=${INCS}/train.inc ${INCS}/poteaux.inc			\
+	${INCS}/electric.inc ${INCS}/voiture.inc		\
 	${INCS}/rails.inc ${INCS}/grue.inc ${INCS}/ridelles.inc	\
-	${INCS}/citerne.inc					\
+	${INCS}/instruments.inc					\
-	${INCS}/constantes.inc					\
+	${INCS}/citerne.inc ${INCS}/benne.inc			\
+	${INCS}/constantes.inc ${INCS}/locomotive.inc		\
+	${INCS}/enseigne.inc					\
+	picz/plancher.png picz/cadran.png			\
 	contexte.inc monde.inc
 
 #--------------------------------------------------------
 
 essai.png:	essai.pov Makefile $(GLOBDEPS)
-	$(POVRAY) +Iessai +Oessai $(DIMS) $(OPTS)
+	$(POVRAY) +Iessai  $(DIMS) $(OPTS)
+
+foo.gif:	Makefile essai.png voiture.png
+	convert -delay 20 	 			\
+		voiture.png essai.png foo.gif
 
 #-----------------------------------------------------------------------
 #
@@ -40,31 +48,28 @@ essai.png:	essai.pov Makefile $(GLOBDEPS)
 rotonde.png: rotonde.pov Makefile $(GLOBDEPS)
 	$(POVRAY) +Irotonde  $(DIMS) $(OPTS) +v 
 
-#-----------------------------------------------------------------------
-
 parking.png: parking.pov Makefile $(GLOBDEPS)
 	$(POVRAY) +Iparking  $(DIMS) $(OPTS) +v 
 
+wagons.png: wagons.pov $(GLOBDEPS) Makefile
+	$(POVRAY) +Iwagons  $(DIMS) $(OPTS) +v
+
+gare.png:	gare.pov $(GLOBDEPS) Makefile
+	$(POVRAY) +Igare  $(DIMS) $(OPTS) +v 
+
+#-----------------------------------------------------------------------
+
 loco.png:	loco.pov ${GLOBDEPS} Makefile 
 	$(POVRAY) +Iloco  $(DIMS) $(OPTS) +v 
 
-train.png:	train.pov ${DEPS} Makefile 
+train.png:	train.pov ${GLOBDEPS} Makefile 
 	$(POVRAY) +Itrain  $(DIMS) $(OPTS) +v 
 
-
 corail.png:	corail.pov  Makefile $(GLOBDEPS)
 	$(POVRAY) +Icorail  $(DIMS) $(OPTS) +v 
 
-
-gare.tga:	gare.pov gare.inc plancher.tga plancher.inc		\
-		enseigne.inc Makefile
-	$(POVRAY) +Igare +FT $(DIMS) $(OPTS) +v 
-
 #-----------------------------------------------------------------------
 
-wagons.png: wagons.pov $(GLOBDEPS) Makefile
-	$(POVRAY) +Iwagons  $(DIMS) $(OPTS) +v
-
 inside.png: inside.pov $(GLOBDEPS) Makefile
 	$(POVRAY) +Iinside  $(DIMS) $(OPTS) +v
 
@@ -89,12 +94,12 @@ grue.png: grue.pov $(GLOBDEPS) Makefile
 #--------------------------------------------------------
 #	les trucs en travaux
 
-tmp/voiture.tga:	voiture.inc voiture.pov $(GLOBDEPS)
+voiture.png:	voiture.pov $(GLOBDEPS) Makefile
-	$(POVRAY) +Ivoiture +FT +Otmp/ $(DIMS) $(OPTS) +v
+	$(POVRAY) +Ivoiture  $(DIMS) $(OPTS) +v
 
 #--------------------------------------------------------
 
-SRCFILES = *.inc *.pov *.txt Makefile *.sh
+SRCFILES = *.inc incs/*.inc *.pov *.txt Makefile tools/*.sh
 
 lines:
 	wc $(SRCFILES) | sort -n
@@ -103,7 +108,7 @@ tarball:   $(SRCFILES)
 	ls $^ > MANIFEST ;                              \
 	( cd .. ;                                       \
 	tar zcvf jouets-tth.tar.gz                   \
-	        `sed 's/^/Jouets\//' Jouets/MANIFEST` )
+	        `sed 's/^/PovJouets\//' PovJouets/MANIFEST` )
 	date >> tarball
 
 #--------------------------------------------------------

benne.pov

@@ -5,10 +5,7 @@
 */
 
 #version 3.7;
-global_settings { assumed_gamma 1.0 }
+#include	"contexte.inc"
-
-#include	"colors.inc"
-#include	"metals.inc"
 
 /*------------------------------------------------------------------*/
 
@@ -29,10 +26,10 @@ object { Wagon_Benne translate y*2 }
 
 camera
 	{
-	location	<35.5, 13, 20>
+	location	<35.5, 23, 40>
 	right		image_width/image_height*x
 	look_at		<0, 6, 0>
-	angle		51
+	angle		ANGLE_CAM
 	}
 
 light_source { <90, 131, 190> color White }

citerne.pov

@@ -1,16 +1,9 @@
 /*
-
+ *	une citerne pour transporter le pinard
 */
 
 #version 3.7;
-
+#include	"contexte.inc"
-#include	"colors.inc"
-#include	"metals.inc"
-
-global_settings {
-        ambient_light   Gray15
-        assumed_gamma   1.0             /* pour povray 3.7 */
-        }
 
 /*------------------------------------------------------------------*/
 
@@ -24,30 +17,14 @@ object { Wagon_Citerne translate y*2 }
 
 /*------------------------------------------------------------------*/
 
-#include	"plancher.inc"
+#include	"monde.inc"
-object { Plancher_0 scale <.5, 1, .5> }
-
-sky_sphere {
-	pigment
-		{
-		gradient	x
-		color_map
-			{
-			[0 color Green]
-			[0.33 color Gray30 ]
-			[1 color Blue]
-			}
-		}
-	scale	0.5
-	translate -1
-	}
 
 camera
 	{
-	location	<36, 13, -11>
+	location	<46, 13, -41>
 	right		image_width/image_height*x
 	look_at		<0, 5.8, 0>
-	angle		61
+	angle		ANGLE_CAM
 	}
 
 light_source { <290, 131, -190> color White }

contexte.inc

@@ -2,4 +2,32 @@
  *		contexte.inc
  */
 
+global_settings { assumed_gamma 1.0 }
 
+/*------------------------------------------------------------------*/
+/*
+ *		essential system includes
+ */
+#include	"colors.inc"
+#include	"metals.inc"
+#include	"textures.inc"
+
+/*------------------------------------------------------------------*/
+
+#declare	ANGLE_CAM = 33;
+
+/*------------------------------------------------------------------*/
+/*
+ *		outils de mise au point (smart tools)
+ */
+#declare Repere = object
+{
+#local	DA = 5;
+#local	DB = DA * 5;
+union	{
+	cylinder { <-DA, 0, 0>, <100, 0, 0>, 0.1 pigment { color Red } }
+	cylinder { <0, -DA, 0>, <0, 100, 0>, 0.1 pigment { color Green } }
+	cylinder { <0, 0, -DA>, <0, 0, 100>, 0.1 pigment { color Blue } }
+	}
+}
+/*------------------------------------------------------------------*/

corail.pov

@@ -6,39 +6,11 @@
  */
 
 #version 3.7;
-global_settings { assumed_gamma 1.0 }
+#include	"contexte.inc"
-
-#include	"colors.inc"
-#include	"metals.inc"
-#include	"textures.inc"
 
 /*------------------------------------------------------------------*/
-plane	{
-	y, 0
-	pigment
-		{
-		brick Gray35, rgb<0.50, 0.40, 0.20>
-		rotate z*90
-		}
-	}
 
-sky_sphere {
+#include	"monde.inc"
-	pigment
-		{
-		gradient	y
-		color_map
-			{
-			[0 color Khaki]
-			[0.2 color <0   ,  .1, .2>]
-			[0.5 color <0.2 , 0,    0>]
-			[0.6 color <0   ,  .2, .1>]
-			[1 color Khaki]
-			}
-		turbulence 2.5
-		}
-	rotate 50
-	scale	2
-	}
 
 #include	"incs/train.inc"
 #include	"incs/rails.inc"
@@ -67,10 +39,10 @@ union
 
 camera
 	{
-	location	<18, 10, -45>
+	location	<38, 10, -45>
 	right		image_width/image_height*x
-	look_at		<0, 6, 0>
+	look_at		<0, 7, 0>
-	angle		62
+	angle		ANGLE_CAM
 	}
 
 light_source { <550, 725, -900> color Gray60 }

electric.pov

@@ -5,13 +5,8 @@
  */
 
 #version 3.7;
+#include	"contexte.inc"
 
-global_settings {
-        assumed_gamma   1.0             /* pour povray 3.7 */
-        }
-
-#include	"colors.inc"
-#include	"metals.inc"
 
 /*------------------------------------------------------------------*/
 
@@ -32,13 +27,13 @@ union
 camera
 	{
 	right		x*image_width/image_height
-	location	<11, 11.1, -54>
+	location	<39, 11.1, -44>
-	look_at		<0, 8, -10>
+	look_at		<0, 8, 0>
-	angle		38
+	angle		ANGLE_CAM
 	}
 
-light_source { <7, 8, -54> color Gray80 }
+light_source { <17, 8, -54> color Gray80 }
-light_source { <150, 130, -150> color Green }
+// light_source { <150, 130, -150> color Green }
 light_source { <270, 130, 250> color Gray50 }
 
 /*------------------------------------------------------------------*/

essai.pov

@@ -1,11 +1,10 @@
 /*
-	un fichier de test.
+	essai.pov -- un fichier de test.
 */
 
 #version 3.7;
-global_settings { assumed_gamma 1.0 }
+#include	"contexte.inc"
 
-#include	"colors.inc"
 #include	"metals.inc"
 
 #include 	"incs/train.inc"
@@ -13,18 +12,17 @@ global_settings { assumed_gamma 1.0 }
 #include 	"incs/benne.inc"
 #include        "incs/grue.inc"
 
-object { Boogie }
+// object { Boogie }
+object { Grande_Roue }
 
 camera {
-	location	<15.5, 8, 9>
+	location	<5.5, 15, 20>
 	right		image_width/image_height*x
-	look_at		<0, 0, 0>
+	look_at		<0, 3, 0>
-	angle		51
+	angle		ANGLE_CAM
 	}
 
-cylinder { <-100, 0, 0>, <100, 0, 0>, 0.1 pigment { color Red } }
+object { Repere }
-cylinder { <0, -100, 0>, <0, 100, 0>, 0.1 pigment { color Green } }
-cylinder { <0, 0, -100>, <0, 0, 100>, 0.1 pigment { color Blue } }
 
 light_source { <90, 131, 190> color White }
 light_source { <90, 111, 250> color White }

gare.pov

@@ -0,0 +1,32 @@
+
+/*
+ *			UN TRAIN SANS GARE ?
+ *				NON !
+ *
+ *
+ */
+
+#version 3.7;
+#include	"contexte.inc"
+
+/*------------------------------------------------------------------*/
+// #include 	"incs/plancher.inc"
+
+#include	"incs/decor.inc"
+#include	"incs/gare.inc"
+#include	"incs/rails.inc"
+
+object { Gare	}
+
+/*------------------------------------------------------------------*/
+
+camera
+	{
+	location	<320, 490, -1400>
+	look_at		<0, 460, 0>
+	}
+
+light_source { <1650, 878, -850> color White }
+light_source { <930, 598, -1350> color Yellow }
+
+/*------------------------------------------------------------------*/

grue.pov

@@ -1,42 +1,14 @@
 
 /*
- *
+ *	un gros chantier, vraiment gros (cTMr)
  */
 
 #version 3.7;
-global_settings { assumed_gamma 1.0 }
+#include	"contexte.inc"
-
-#include	"colors.inc"
-#include	"metals.inc"
-#include	"textures.inc"
 
 /*------------------------------------------------------------------*/
 
-plane	{
+#include	"monde.inc"
-	y, 0
-	pigment
-		{
-		brick Gray50, rgb<0.10, 0.60, 0.30>
-		rotate z*90
-		scale 3
-		}
-	}
-
-sky_sphere {
-	pigment
-		{
-		gradient	y
-		color_map
-			{
-			[0.2 color <0, .1, .2>]
-			[0.6 color <0, .3, .1>]
-			[0.9 color <0, .2, .3>]
-			}
-		turbulence 29
-		}
-	rotate 40
-	scale	1.5
-	}
 
 #include	"incs/train.inc"
 #include	"incs/rails.inc"

incs/benne.inc

@@ -94,7 +94,7 @@ texture {
 union
 	{
 	object { Base_Courte }
-	object { Petite_Benne translate y*0.5 }
+	object { Petite_Benne translate y*0.55 }
 	object { Support_Benne translate z*-11 }
 	object { Support_Benne translate z* 11 }
 	object { Piston_Benne }

incs/electric.inc

@@ -8,16 +8,16 @@
 
 #declare Base_Loco_Electric = object
 {
-union
+#local DYR = 3;
-	{
+union  {
-	object { Petite_Roue scale <-1, 1, 1>	translate <-5.5, 0, -12> }
+	object { Petite_Roue scale <-1, 1, 1>	translate <-5.5, DYR, -12> }
-	object { Petite_Roue 			translate < 5.5, 0, -12> }
+	object { Petite_Roue 			translate < 5.5, DYR, -12> }
-	object { Petite_Roue scale <-1, 1, 1>	translate <-5.5, 0,  -5> }
+	object { Petite_Roue scale <-1, 1, 1>	translate <-5.5, DYR,  -5> }
-	object { Petite_Roue 			translate < 5.5, 0,  -5> }
+	object { Petite_Roue 			translate < 5.5, DYR,  -5> }
-	object { Petite_Roue scale <-1, 1, 1>	translate <-5.5, 0,   5> }
+	object { Petite_Roue scale <-1, 1, 1>	translate <-5.5, DYR,   5> }
-	object { Petite_Roue 			translate < 5.5, 0,   5> }
+	object { Petite_Roue 			translate < 5.5, DYR,   5> }
-	object { Petite_Roue scale <-1, 1, 1>	translate <-5.5, 0,  12> }
+	object { Petite_Roue scale <-1, 1, 1>	translate <-5.5, DYR,  12> }
-	object { Petite_Roue 			translate < 5.5, 0,  12> }
+	object { Petite_Roue 			translate < 5.5, DYR,  12> }
 	}
 }
 

incs/enseigne.inc

@@ -1,5 +1,6 @@
 /*
-*/
+ *	see 'gare.inc' for usage
+ */
 
 #include  "chars.inc"
 
@@ -7,46 +8,17 @@
 {
 union
     {
-    object {
+    object { char_H translate x*-27.5 }
-	char_H
+    object { char_E translate x*-22.5 }
-	translate x*-27.5
+    object { char_L translate x*-17.5 }
-	}
+    object { char_L translate x*-12.5 }
-    object {
+    object { char_O translate x*-7.5 }
-	char_E
+
-	translate x*-22.5
+    object { char_W translate x*2.5 }
-	}
+    object { char_O translate x*7.5 }
-    object {
+    object { char_R translate x*12.5 }
-	char_L
+    object { char_L translate x*17.5 }
-	translate x*-17.5
+    object { char_D translate x*22.5 }
-	}
-    object {
-	char_L
-	translate x*-12.5
-	}
-    object {
-	char_O
-	translate x*-7.5
-	}
-    object {
-	char_W
-	translate x*2.5
-	}
-    object {
-	char_O
-	translate x*7.5
-	}
-    object {
-	char_R
-	translate x*12.5
-	}
-    object {
-	char_L
-	translate x*17.5
-	}
-    object {
-	char_D
-	translate x*22.5
-	}
     }
 texture { PinkAlabaster scale 3 }
 }

incs/gare.inc

@@ -33,9 +33,9 @@ pigment { color White }
 finish { phong 0.4 }
 }
 
-#include "decor.inc"
+#include "incs/enseigne.inc"
-#include "enseigne.inc"
+
-#include "rails.inc"
+
 
 #declare Gare = object
 {

incs/instruments.inc

@@ -12,7 +12,7 @@
 
 #ifdef (Jouets_Instruments)
 	// on fait quedalle
-	#debug "instruments deja inclus\r\n"
+	#warning "*** instruments deja inclus ***\r\n"
 #else
 	#declare Jouets_Instruments = version;
 

incs/locomotive.inc

@@ -10,17 +10,19 @@
 
 #declare Base_Loco_Vapeur = object
 {
+#local HGR = 4;
+#local HPR = 3;
 union
 	{
 	object { Chassis_Long }
-	object { Petite_Roue scale <-1, 1, 1>	translate <-5.5, 0, -13> }
+	object { Petite_Roue scale <-1, 1, 1>	translate <-5.5, HPR, -13> }
-	object { Petite_Roue 			translate < 5.5, 0, -13> }
+	object { Petite_Roue 			translate < 5.5, HPR, -13> }
-	object { Grande_Roue scale <-1, 1, 1>	translate <-5.5, 0,  -5> }
+	object { Grande_Roue scale <-1, 1, 1>	translate <-5.5, HGR,  -5> }
-	object { Grande_Roue 			translate < 5.5, 0,  -5> }
+	object { Grande_Roue 			translate < 5.5, HGR,  -5> }
-	object { Grande_Roue scale <-1, 1, 1>	translate <-5.5, 0,   5> }
+	object { Grande_Roue scale <-1, 1, 1>	translate <-5.5, HGR,   5> }
-	object { Grande_Roue 			translate < 5.5, 0,   5> }
+	object { Grande_Roue 			translate < 5.5, HGR,   5> }
-	object { Petite_Roue scale <-1, 1, 1>	translate <-5.5, 0,  13> }
+	object { Petite_Roue scale <-1, 1, 1>	translate <-5.5, HPR,  13> }
-	object { Petite_Roue 			translate < 5.5, 0,  13> }
+	object { Petite_Roue 			translate < 5.5, HPR,  13> }
 	}
 }
 
@@ -43,8 +45,10 @@ union	{
 	sphere		{ < 3.3, -2.75, -16.5>, .6 }
 	sphere		{ < 3.3, -2.75, -1>, .6 }
 	}
-pigment { color Gray60 }
+texture	{
-finish		{ phong 0.5 }
+	pigment 	{ color Gray60 }
+	finish		{ phong 0.5 }
+	}
 translate y*10
 }
 
@@ -59,7 +63,7 @@ difference {
 	cylinder { <0, 3, -8>, <0, 6.2, -8>, .95 }
 	}
 texture	{
-	pigment		{ color Gray40 }
+	pigment		{ color Gray30 }
 	finish		{ phong 0.65 }
 	}
 translate y*10

incs/poteaux.inc

@@ -6,6 +6,8 @@
 
 #include   "woods.inc"
 
+// -----------------------------------------------------------------
+
 #declare Poteau_0 = object
 {
 union
@@ -22,8 +24,8 @@ texture { New_Penny scale 0.3 }
 {
 union
 	{
-	box { <-1, 0, -1>, <-0.08, 1.6, 1> }
+	box { <-1, 0, -1>, <-0.08, 1.6, 1.5> }
-	box { <0.08, 0, -1>, <1, 1.6, 1> }
+	box { <0.08, 0, -1.5>, <1, 1.6, 1> }
 	}
 texture
 	{
@@ -37,8 +39,8 @@ texture
 union
 	{
 	cylinder { <0, 0, 0>, <0, 20, 0>, 0.42 }
-	cone 	{ <0, 20, 0>, 0.64, <0, 23, 0>, 0.21 }
+	cone 	{ <0, 20, 0>, 0.64, <0, 21, 0>, 0.21 }
-	cylinder { <-2, 19, 0>, <2, 19, 0>, 0.20 }
+	cylinder { <-4, 19, 0>, <4, 19, 0>, 0.20 }
 	}
 texture	{ T_Wood12 rotate x*90 scale 3 }
 }

incs/train.inc

@@ -1,62 +1,75 @@
 /*
- *		un petit train 
+ *		des éléments du petit train 
- *		--------------
+ *		---------------------------
- *
- *	pas la peine de chercher la benne ici, elle est partie
- *	dans son fichier 'benne.inc'.
  *
  */
 
+//-----------------------------------------------------------------
+#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,   0, 0>, <0.8, 0, 0>, 4 }
-		cylinder { <-0.5, 0, 0>, <0, 0, 0>, 4.3 }
+		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)
-		#declare xx = sin(radians(foo))*2.0;
+		#local R = 2.2;
-		#declare yy = cos(radians(foo))*2.0;
+		#declare xx = sin(radians(foo))*R;
+		#declare yy = cos(radians(foo))*R;
 
 		cylinder { <-2, xx, yy>, <2, xx, yy>, 0.56 }
 
-		#declare foo = foo + 45;
+		#declare foo = foo + 36;
 	#end
 	}
-translate y*4
+texture	{ Texture_Roues }
-pigment { color LightSteelBlue }
-finish { phong 0.7 }
 }
 
+//-----------------------------------------------------------------
 
 #declare Corps_Petite_Roue = object
 {
 difference {
 	union {
-		cylinder { < 0, 0, 0>, <1, 0, 0>, 3 }
+		cylinder { < 0, 0, 0>, <0.8, 0, 0>, 3 }
-		cylinder { <-1, 0, 0>, <0, 0, 0>, 3.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 xx = sin(radians(foo))*2.29;
-		#declare yy = cos(radians(foo))*2.31;
+		#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
+texture	{ Texture_Roues }
-pigment { color LightSteelBlue }
-finish { phong 0.7 }
 }
 
+//-----------------------------------------------------------------
+
 #declare Moyeu = object
 {
 union {
@@ -69,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> }
 	}
 }
 
@@ -81,7 +96,7 @@ union {
 {
 union {
 	object { Corps_Grande_Roue }
-	object { Moyeu translate <0.95, 4, 0> }
+	object { Moyeu translate <0.95, 0, 0> }
 	}
 }
 
@@ -94,10 +109,7 @@ union	{
 	box	{ <-3.6, 0.7, -12.5>, <3.6, 1.3, 12.5> }
 	}
 translate y*4.1
-texture	{
+texture { Texture_Chassis }
-	pigment { color Yellow }
-	finish { phong 0.6 ambient 0.4 }
-	}
 }
 
 #declare Chassis_Long = object
@@ -107,10 +119,7 @@ union	{
 	box	{ <-4, 0.5, -16>, <4, 1.5, 16> }
 	}
 translate y*4.1
-texture	{
+texture { Texture_Chassis }
-	pigment { color Yellow }
-	finish { phong 0.6  ambient 0.4 }
-	}
 }
 
 //-----------------------------------------------------------------
@@ -118,22 +127,23 @@ texture	{
 #declare Chassis_Boogie = object
 {
 union	{
-	box	{ <-3.85, 0, -3>, <3.85, 2, 3> }
+	box	{ <-3.85, 0, -3>, <3.85, 1.6, 3> }
-	cylinder { <0, 1, 0>, <0, 4, 0>, 2 }
+	cylinder { <0, 1, 0>, <0, 4, 0>, 1.5 }
 	}
 translate y*2
-pigment { color Blue }
+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 scale <-1, 1, 1>	translate <-5.5, HR, -3.5> }
-	object { Petite_Roue translate < 5.5, 0, -3.5> }
+	object { Petite_Roue			translate < 5.5, HR, -3.5> }
-	object { Petite_Roue scale <-1, 1, 1> 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, 0,  3.5> }
+	object { Petite_Roue			translate < 5.5, HR,  3.5> }
 	}
 }
 
@@ -141,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 scale <-1, 1, 1>	translate <-5.5, HR, -8> }
-	object { Grande_Roue			translate < 5.5, 0, -8> }
+	object { Grande_Roue			translate < 5.5, HR, -8> }
-	object { Grande_Roue scale <-1, 1, 1>	translate <-5.5, 0,  8> }
+	object { Grande_Roue scale <-1, 1, 1>	translate <-5.5, HR,  8> }
-	object { Grande_Roue			translate < 5.5, 0,  8> }
+	object { Grande_Roue			translate < 5.5, HR,  8> }
 	}
 }
 	

inside.pov

@@ -6,36 +6,11 @@
  */
 
 #version 3.7;
-global_settings { assumed_gamma 1.0 }
+#include	"contexte.inc"
-
-#include	"colors.inc"
-#include	"metals.inc"
 
 /*------------------------------------------------------------------*/
 
-sky_sphere {
+#include	"monde.inc"
-	pigment
-		{
-		gradient	y
-		color_map
-			{
-			[0 color Gray75]
-			[1 color Blue]
-			}
-		}
-	scale	4
-	translate -1
-	rotate x*60
-	}
-
-plane	{
-	y, 0
-	pigment
-		{
-		brick Gray35, rgb<0.50, 0.40, 0.30>
-		rotate z*90
-		}
-	}
 
 #include	"incs/train.inc"
 #include	"incs/corail.inc"

loco.pov

@@ -4,49 +4,11 @@
  */
 
 #version 3.7;
-
+#include	"contexte.inc"
-#include	"colors.inc"
-#include	"metals.inc"
-
-
-global_settings {
-        ambient_light   <0.18, 0.25, 0.35>
-        assumed_gamma   1.0                     /* pour povray 3.7 */
-        }
-
 
 /*------------------------------------------------------------------*/
-plane	{
-	y, 0
-	pigment	{
-		image_map { png "picz/plancher.png"  }
-		rotate 		x*90
-		translate 	<-0.5, 0, -0.5>
-		scale		<42, 1, 42>
-		}
-	normal {
-		dents	0.3
-		scale	0.3
-		}
-	}
 
-sky_sphere {
+#include	"monde.inc"
-	pigment {
-		gradient	y
-		color_map
-			{
-			[0 color Khaki]
-			[0.4 color DarkGreen]
-			[0.5 color Blue]
-			[0.6 color LightBlue]
-			[1 color Khaki]
-			}
-		turbulence 0.42*2
-		}
-	rotate 70
-	scale	0.3123
-	translate -1
-	}
 
 #include	"incs/rails.inc"
 #include	"incs/train.inc"
@@ -72,10 +34,10 @@ union {
 /*------------------------------------------------------------------*/
 
 camera {
-	location	<-42, 17.5, 32>
+	location	<-72, 17.5, 32>
 	right		image_width/image_height*x
 	look_at		<5, 9.7, 18>
-	angle		42
+	angle		ANGLE_CAM
 	}
 
 light_source { <150, 118, -150> color Gray70 }

monde.inc

@@ -4,15 +4,15 @@
  */
 /*------------------------------------------------------------------*/
 
-plane	{
+cylinder {
-	y, 0
+	<0, -0.2, 0>, 0, 400
 	pigment	{
 		image_map {
 			png "picz/plancher.png" interpolate 2
 			}
 		rotate 		x*90
 		translate 	<-0.5, 0, -0.5>
-		scale		<50, 1, 50>
+		scale		<250, 1, 250>
 		}
 	}
 
@@ -24,13 +24,13 @@ sky_sphere {
 			{
 			[0	color Khaki		]
 			[0.2	color Gray20 		]
-			[0.5	color Blue 		]
 			[0.87	color LightBlue		]
 			[1	color Khaki		]
 			}
+		turbulence 0.25
 		}
 	rotate 50
-	scale	0.05
+	scale	0.15
 	translate -1
 	}
 

omg-fuckingworld.txt

@@ -0,0 +1,13 @@
+TODO
+====
+
+[ ]	Rendre le Makefile pilotable depuis le shell
+
+[ ]	Tester le module à partir d'un .INI de Povray
+
+[ ]	Restructurer l'arborescence de la construction
+
+[ ]	Définir un jeu de textures spécifique
+
+[ ]	Préparer le concept de "mise en cadre"
+

parking.pov

@@ -1,45 +1,15 @@
 /*
- *
+ *		Les jouets de tTh - 2021
  *	pour plus de details:		oulala@chez.com
  *
  */
 
 #version 3.7;
-global_settings { assumed_gamma 1.0 }
+#include	"contexte.inc"
-
-#include	"colors.inc"
-#include	"metals.inc"
 
 /*------------------------------------------------------------------*/
 
-disc	{
+#include	"monde.inc"
-	<0, 0, 0>, y, 100
-	pigment
-		{
-		brick Gray45, rgb<0.81, 0.42, 0.40>
-		rotate z*90
-		}
-	scale 2
-	rotate y*12
-	}
-
-sky_sphere {
-	pigment
-		{
-		gradient	y
-		color_map
-			{
-			[0	color Black]
-			[0.33	color <0.6, 0.3, 0.5> ]
-			[0.44   color <0.6, 0.3, 0.1> ]
-			[0.66	color Blue]
-			[1	color Black]
-			}
-		turbulence 0.92
-		}
-	scale	0.82
-	rotate  42
-	}
 
 #include	"incs/train.inc"
 #include	"incs/locomotive.inc"
@@ -99,7 +69,7 @@ camera
 	location	<44, 4, -110>
 	right		image_width/image_height*x
 	look_at		<10, 1.9, 0>
-	angle		62
+	angle		ANGLE_CAM
 	}
 
 light_source { <150, 78, -250> color Gray20 }

plancher.inc

@@ -9,10 +9,7 @@
 plane	{
 	y, 0
 	pigment	{
-		image_map 
+		image_map { png "picz/plancher.png" interpolate 4 }
-			{
-			png "picz/plancher.png" interpolate 4
-			}
 		rotate 		x*90
 		translate 	<-0.5, 0, -0.5>
 		scale		<30, 1, 30>
@@ -25,10 +22,7 @@ plane	{
 plane	{
 	y, 0
 	pigment	{
-		image_map 
+		image_map { png "picz/plancher.png" interpolate 4 }
-			{
-			png "picz/plancher.png" interpolate 4
-			}
 		rotate 		x*90
 		translate 	<-0.5, 0, -0.5>
 		scale		<30, 1, 30>

plop.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-make targa
-make -j 2 all

ridelles.pov

@@ -1,14 +1,5 @@
 #version 3.7;
-
+#include	"contexte.inc"
-#include	"colors.inc"
-#include	"metals.inc"
-#include	"textures.inc"
-
-global_settings {
-        ambient_light   Gray15
-        assumed_gamma   1.0             /* pour povray 3.7 */
-        }
-
 
 /*------------------------------------------------------------------*/
 
@@ -33,10 +24,10 @@ camera
 	location	<40, 15, -50>
  	right     	x*image_width/image_height
 	look_at		<0, 5, 0>
-	angle 		42
+	angle 		ANGLE_CAM
 	}
 
-light_source { <200, 70, -200> color Gray50 }
+light_source { < 200,  70, -200>  color Gray50 }
-light_source { <-200, 170, -150> color White }
+light_source { <-200, 170, -150>  color White }
 
 /*------------------------------------------------------------------*/

rotonde.pov

@@ -1,12 +1,9 @@
-
+/*
+ *		le grand garage des trains
+ */
 
 #version 3.7;
-
+#include	"contexte.inc"
-#include	"colors.inc"
-#include	"metals.inc"
-#include	"textures.inc"
-
-global_settings { ambient_light Yellow }
 
 /*------------------------------------------------------------------*/
 #include   "incs/poteaux.inc"
@@ -20,22 +17,12 @@ object { Un_Rail_Droit translate z*-100}
 
 /*------------------------------------------------------------------*/
 
-plane	{
-	y, 0
-	pigment
-		{
-		checker Gray75, rgb<0.81, 0.86, 0.81>
-		rotate z*90
-		scale 10
-		}
-	}
-
 camera
 	{
-	location	<0, 70, 180>
+	location	<20, 70, 240>
 	right		image_width/image_height*x
-	look_at		<0, 0, 0>
+	look_at		<0, 24, 0>
-	angle		50
+	angle		ANGLE_CAM
 	}
 
 light_source { <142, 500, 500> color White }

tools/mk_anim.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+SPOOL="$HOME/TMP"
+mkdir "$SPOOL"
+
+NBRE=279
+POVOPT=" -w768 -h576 +q9 +a -d "
+SRCFILE="train.pov"
+
+for idx in $(seq 0 $NBRE)
+do
+
+	outfile=$(printf "%s/%04d.png" $SPOOL $idx)
+	horloge=$(echo "$idx / $NBRE" | bc -l)
+
+	printf "%-20s    %.3f\n" $outfile $horloge
+
+	povray -i${SRCFILE} ${POVOPT} -K${horloge} -o${outfile}
+
+done
+
+ffmpeg  -nostdin                                                \
+        -loglevel error                                         \
+        -y -r 30 -f image2 -i $SPOOL/%04d.png                     \
+        -c:v libx264 -pix_fmt yuv420p                           \
+        $SPOOL/foo.mp4

tools/tagpicz.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+printf "==== %s ( %s ) ===\n" $0 $1
+
+VALUE=$(( $RANDOM % 4096 ))
+
+printf "random value = %03xH\n" ${VALUE}
+
+
+

train.pov

@@ -1,58 +1,57 @@
-
 /*
  *
- *	pour plus de details:		oulala@chez.com
+ *	pour plus de details:
+ *		http://la.buvette.org/POV/jouets/
  *
  */
 
-#include	"colors.inc"
+#version 3.7;
-#include	"metals.inc"
+#include	"contexte.inc"
-#include	"textures.inc"
 
 /*------------------------------------------------------------------*/
 
-global_settings { ambient_light Gray10 }
+#include	"monde.inc"
 
-#include "plancher.inc"
-
-object { Plancher_0 rotate y*3 }
-
-#declare DarkKhaki = color red 0.523529 green 0.523529 blue 0.272549;
-sky_sphere {
-	pigment
-		{
-		gradient	y
-		color_map
-			{
-			[0 color DarkKhaki]
-			[0.3 color Blue]
-			[1 color LightBlue]
-			}
-		turbulence 0.8
-		}
-	rotate 55
-	translate -1
-	}
-
-#include	"incs/rails.inc"
 #include	"incs/train.inc"
+#include	"incs/electric.inc"
+#include	"incs/rails.inc"
 #include	"incs/benne.inc"
 #include	"incs/citerne.inc"
 #include	"incs/ridelles.inc"
 #include	"incs/corail.inc"
 #include	"incs/locomotive.inc"
 
-union
+#declare Trois_rails = object
-	{
+{
+union	{
 	object { Un_Rail_Droit }
 	object { Un_Rail_Droit translate z*-100 }
 	object { Un_Rail_Droit translate z* 100 }
+	}
+}
 
-	object { Locomotive_Vapeur	translate <0, 2, -56> }
+#declare Train_Electric = object
-	object { Wagon_Citerne		translate <0, 2, -25> }
+{
-	object { Wagon_Benne		translate <0, 2,   2> }
+union	{
-	object { Wagon_Corail		translate <0, 2,  39> }
+	object { Locomotive_Electric	translate <0, 2, -10> }
-	object { Wagon_Ridelles		translate <0, 2,  78> }
+	object { Wagon_Corail		translate <0, 2,  29> }
+	}
+}
+
+union
+	{
+	object { Trois_rails }
+
+	object { Locomotive_Vapeur	translate <0, 2, -52> }
+	object { Wagon_Citerne		translate <0, 2, -21> }
+	object { Wagon_Benne		translate <0, 2,   6> }
+	object { Wagon_Ridelles		translate <0, 2,  41> }
+
+	#local XS = 60;
+	object { Trois_rails translate x*XS }
+
+	#local DZ = 60 - (clock*33);
+	object { Train_Electric		translate <XS, 0, DZ> }
 	}
 
 #include  "incs/poteaux.inc"
@@ -67,10 +66,10 @@ union
 
 camera
 	{
-	location	<130, 18, 15>
+	location	<260, 38, 25>
 	right		image_width/image_height*x
 	look_at		<0, 3, 10>
-	angle		70
+	angle		ANGLE_CAM
 	}
 
 light_source { <150, 98, -150> color Orange }

truc.pov

@@ -3,11 +3,7 @@
  */
 
 #version 3.7;
-global_settings { assumed_gamma 1.0 }
+#include	"contexte.inc"
-
-#include	"colors.inc"
-#include	"metals.inc"
-#include	"textures.inc"
 
 /*------------------------------------------------------------------*/
 
@@ -22,24 +18,12 @@ object { Bord_Fenetre translate y*7.5 }
 
 /*------------------------------------------------------------------*/
 
-background { color rgb <0.7, 0.7, 0.9999> }
-
-plane	{
-	y, 0
-	pigment
-		{
-		checker Gray75, rgb<0.71, 0.96, 0.81>
-		rotate z*90
-		scale 10
-		}
-	}
-
 camera
 	{
 	location	<-15, 11.333, 35>
 	right		image_width/image_height*x
 	look_at		<0, 9, 0>
-	angle		42
+	angle		ANGLE_CAM
 	}
 
 light_source { <-50, 17, -50> color White }

voiture.pov

@@ -0,0 +1,28 @@
+/*
+	quelques elements des voitures
+*/
+#version 3.7;
+#include	"contexte.inc"
+
+#include	"metals.inc"
+
+#include 	"incs/train.inc"
+#include	"incs/rails.inc"
+#include 	"incs/benne.inc"
+#include        "incs/grue.inc"
+// #include	"decor.inc"
+
+object { Boogie }
+
+camera {
+	location	<25.5, 15, 22>
+	look_at		<0, 2, 0>
+	angle		ANGLE_CAM
+	}
+
+object { Repere }
+
+light_source { <90, 131, 190> color Cyan }
+light_source { <90, 111, 250> color Magenta }
+
+/*------------------------------------------------------------------*/

wagons.pov

@@ -10,11 +10,7 @@
  */
 
 #version 3.7;
-global_settings { assumed_gamma 1.0 }
+#include	"contexte.inc"
-
-#include	"colors.inc"
-#include	"metals.inc"
-#include	"textures.inc"
 
 /*------------------------------------------------------------------*/
 
@@ -38,14 +34,14 @@ object { Poteau_1 translate -z*12 }
 
 camera
 	{
-	location	<12, 10, -50>
+	location	<14, 10, -80>
 	right		image_width/image_height*x
-	look_at		<0, 0, 0>
+	look_at		<0, 7, 0>
-	angle		42
+	angle		ANGLE_CAM
 	}
 
 light_source { <-50, 120, -330> color Gray50 }
 light_source { <190, 498, -250> color White }
-light_source { <160, 99, -250> color Yellow }
+light_source { <160, 99, -450> color Yellow }
 
 /*------------------------------------------------------------------*/