wipi wip wip

Makefile

@@ -3,58 +3,49 @@
 MOYEN=+w1280 +h1024
 GRAND=+w1600 +h1200
 PETIT=+w800 +h600
-DIMS=$(PETIT)
+DIMS=$(MOYEN)
 
-OPTS=+a +q9 -d
+OPTS = +a +q9 -d
-LOWR=-a +q5 -d
+LOWR = -a +q5 -d
 
 POVRAY=povray
 
-# nouveau mars 2001
+# nouveau mars 2021
 INCS = incs/
 
 # CJPEGOPT=-quality 88 -progressive -dct float -targa
 CJPEGOPT = -progressive -dct float -quality 88
 PNGOPT = -interlace -compression 9 -text png.txt
 
-all:	loco.png parking.png corail.png train.png \
+all:	loco.png parking.png corail.png train.png essai.png	\
-	inside.png benne.png electric.png truc.png wagons.png \
+	inside.png benne.png electric.png truc.png wagons.png	\
-	ridelles.png rotonde.png grue.png t1.jpg t2.jpg t3.jpg	\
+	ridelles.png rotonde.png grue.png 			\
 	citerne.png
-	echo "on a fait les images" >> log.toto
 
-targa:	tmp/ridelles.tga tmp/electric.tga tmp/citerne.tga	\
+GLOBDEPS=${INCS}/train.inc plancher.inc ${INCS}/poteaux.inc 	\
-	tmp/corail.tga tmp/voiture.tga	
+	${INCS}/rails.inc ${INCS}/grue.inc			\
-	echo "on a fait les targas" >> log.toto
+	${INCS}/constantes.inc					\
-
+	contexte.inc
-GLOBDEPS=${INCS}/train.inc ${INCS}/plancher.inc ${INCS}/poteaux.inc 	\
-	${INCS}/rails.inc ${INCS}/grue.inc				\
-	${INCS}/constantes.inc
 
 #--------------------------------------------------------
 
-
 essai.png:	essai.pov Makefile $(GLOBDEPS)
 	$(POVRAY) +Iessai +Oessai $(DIMS) $(OPTS)
 
-
 #-----------------------------------------------------------------------
 #
 #	le grand garage de tout les wagons
 #
 
-tmp/rotonde.tga:	rotonde.pov rotonde.inc 
+rotonde.png: rotonde.pov Makefile $(GLOBDEPS)
-	$(POVRAY) +Irotonde +FT +Otmp/ $(DIMS) $(OPTS) +v 
+	$(POVRAY) +Irotonde  $(DIMS) $(OPTS) +v 
-
-rotonde.jpg:	tmp/rotonde.tga            
-	cjpeg $(CJPEGOPT) tmp/rotonde.tga >  rotonde.jpg
 
 #-----------------------------------------------------------------------
 
 parking.png: parking.pov Makefile $(GLOBDEPS)
 	$(POVRAY) +Iparking  $(DIMS) $(OPTS) +v 
 
-loco.png:	loco.pov ${DEPS} Makefile 
+loco.png:	loco.pov ${GLOBDEPS} Makefile 
 	$(POVRAY) +Iloco  $(DIMS) $(OPTS) +v 
 
 train.png:	train.pov ${DEPS} Makefile 
@@ -71,12 +62,8 @@ gare.tga:	gare.pov gare.inc plancher.tga plancher.inc		\
 
 #-----------------------------------------------------------------------
 
-tmp/wagons.tga:	wagons.pov plancher.inc ridelles.inc	\
+wagons.png: wagons.pov $(GLOBDEPS) Makefile
-		train.inc poteaux.inc Makefile
+	$(POVRAY) +Iwagons  $(DIMS) $(OPTS) +v
-	$(POVRAY) +Iwagons +ft +Otmp/ $(DIMS) $(OPTS) +v 
-
-wagons.jpg:	tmp/wagons.tga 
-	cjpeg $(CJPEGOPT) tmp/wagons.tga > wagons.jpg
 
 inside.png: inside.pov $(GLOBDEPS) Makefile
 	$(POVRAY) +Iinside  $(DIMS) $(OPTS) +v
@@ -84,31 +71,20 @@ inside.png: inside.pov $(GLOBDEPS) Makefile
 benne.png: benne.pov $(GLOBDEPS) Makefile
 	$(POVRAY) +Ibenne  $(DIMS) $(OPTS) +v
 
-tmp/citerne.tga: citerne.pov citerne.inc  $(GLOBDEPS)
-	$(POVRAY) +Iciterne +Otmp/citerne +FT $(DIMS) $(OPTS) +v
-citerne.jpg:	tmp/citerne.tga 
-	cjpeg $(CJPEGOPT) tmp/citerne.tga >  citerne.jpg
-
-
 electric.png: electric.pov $(GLOBDEPS) Makefile
 	$(POVRAY) +Ielectric  $(DIMS) $(OPTS) +v
-	
+
+citerne.png: citerne.pov $(GLOBDEPS) Makefile
+	$(POVRAY) +Iciterne  $(DIMS) $(OPTS) +v
+
 truc.png: truc.pov $(GLOBDEPS) Makefile
 	$(POVRAY) +Itruc  $(DIMS) $(OPTS) +v
 
+ridelles.png: ridelles.pov $(GLOBDEPS) Makefile
+	$(POVRAY) +Iridelles  $(DIMS) $(OPTS) +v
 
-tmp/ridelles.tga: ridelles.pov ridelles.inc $(GLOBDEPS)
+grue.png: grue.pov $(GLOBDEPS) Makefile
-	$(POVRAY) +Iridelles +ft +Otmp/ridelles $(DIMS) $(OPTS) +v
+	$(POVRAY) +Igrue  $(DIMS) $(OPTS) +v
-
-ridelles.jpg:	tmp/ridelles.tga
-	cjpeg $(CJPEGOPT) tmp/ridelles.tga >  ridelles.jpg
-
-
-tmp/grue.tga:	grue.pov train.inc grue.inc rails.inc	\
-		poteaux.inc Makefile
-	$(POVRAY) +Igrue +ft +otmp/ $(DIMS) $(OPTS) +v 
-grue.jpg:	tmp/grue.tga 
-	cjpeg $(CJPEGOPT) tmp/grue.tga >  grue.jpg
 
 #--------------------------------------------------------
 #	les trucs en travaux

benne.pov

@@ -25,7 +25,7 @@ object { Wagon_Benne translate y*2 }
 
 /*------------------------------------------------------------------*/
 
-#include	"incs/plancher.inc"
+#include	"plancher.inc"
 object { Plancher_0 scale <.5, 1, .5> }
 
 sky_sphere {
@@ -47,6 +47,7 @@ sky_sphere {
 camera
 	{
 	location	<35.5, 13, 20>
+	right		image_width/image_height*x
 	look_at		<0, 6, 0>
 	angle		51
 	}

citerne.pov

@@ -0,0 +1,56 @@
+/*
+
+*/
+
+#version 3.7;
+
+#include	"colors.inc"
+#include	"metals.inc"
+
+global_settings {
+        ambient_light   Gray15
+        assumed_gamma   1.0             /* pour povray 3.7 */
+        }
+
+/*------------------------------------------------------------------*/
+
+#include 	"incs/train.inc"
+#include	"incs/rails.inc"
+#include 	"incs/citerne.inc"
+#include	"incs/decor.inc"
+
+object { Un_Rail_Droit }
+object { Wagon_Citerne translate y*2 }
+
+/*------------------------------------------------------------------*/
+
+#include	"plancher.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>
+	right		image_width/image_height*x
+	look_at		<0, 5.8, 0>
+	angle		61
+	}
+
+light_source { <290, 131, -190> color White }
+light_source { <290, 111, -250> color White }
+
+/*------------------------------------------------------------------*/

contexte.inc

@@ -0,0 +1,5 @@
+/*
+ *		contexte.inc
+ */
+
+

corail.pov

@@ -5,6 +5,9 @@
  *
  */
 
+#version 3.7;
+global_settings { assumed_gamma 1.0 }
+
 #include	"colors.inc"
 #include	"metals.inc"
 #include	"textures.inc"
@@ -65,6 +68,7 @@ union
 camera
 	{
 	location	<18, 10, -45>
+	right		image_width/image_height*x
 	look_at		<0, 6, 0>
 	angle		62
 	}

electric.pov

@@ -43,8 +43,7 @@ union
 camera
 	{
 	spherical
- 	right     	x*image_width/image_height
+	right		x*image_width/image_height
- 	right     	x*image_width/image_height
 	location	<11, 11.1, -54>
 	look_at		<0, 8, -10>
 	angle		38

essai.pov

@@ -12,14 +12,14 @@ global_settings { assumed_gamma 1.0 }
 #include	"incs/rails.inc"
 #include 	"incs/benne.inc"
 #include        "incs/grue.inc"
-// #include	"decor.inc"
 
 object { Boogie }
 
 camera {
 	location	<15.5, 8, 9>
+	right		image_width/image_height*x
 	look_at		<0, 0, 0>
-	angle		42
+	angle		51
 	}
 
 cylinder { <-100, 0, 0>, <100, 0, 0>, 0.1 pigment { color Red } }

grue.pov

@@ -0,0 +1,69 @@
+
+/*
+ *
+ */
+
+#version 3.7;
+global_settings { assumed_gamma 1.0 }
+
+#include	"colors.inc"
+#include	"metals.inc"
+#include	"textures.inc"
+
+/*------------------------------------------------------------------*/
+
+plane	{
+	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"
+#include	"incs/grue.inc"
+
+object 
+{
+union
+	{
+	object { Wagon_Grue translate y*2 }
+	object { Un_Rail_Droit }
+	object { Un_Rail_Droit translate z*100 }
+	object { Un_Rail_Droit translate z*200 }
+	}
+}
+
+/*------------------------------------------------------------------*/
+
+camera
+	{
+	location	<42, 12, 25>
+	right		image_width/image_height*x
+	look_at		<0, 6, 3>
+	angle		42
+	}
+
+light_source { <350, 425, -500> color Green }
+light_source { <70, 38, 40> color White }
+
+/*------------------------------------------------------------------*/

incs/train.inc

@@ -49,7 +49,7 @@ difference {
 
 		sphere { <1.1, xx, yy>, 0.42 }
 
-		#declare foo = foo + 45;
+		#declare foo = foo + 36;
 	#end
 	}
 translate y*3

inside.pov

@@ -43,6 +43,7 @@ plane	{
 object { Wagon_Corail }
 camera	{
 	location	<-1.6, 10, -19>
+	right		image_width/image_height*x
 	look_at		<1, 4, 10>
 	angle		80
 	}

loco.pov

@@ -73,6 +73,7 @@ union {
 
 camera {
 	location	<-42, 17.5, 32>
+	right		image_width/image_height*x
 	look_at		<5, 9.7, 18>
 	angle		42
 	}

monde.inc

@@ -16,7 +16,6 @@ plane	{
 		}
 	}
 
-
 sky_sphere {
 	pigment
 		{

parking.pov

@@ -97,6 +97,7 @@ union {
 camera
 	{
 	location	<94, 24, -170>
+	right		image_width/image_height*x
 	look_at		<10, 0, 0>
 	angle		42
 	}

ridelles.pov

@@ -0,0 +1,43 @@
+#version 3.7;
+
+#include	"colors.inc"
+#include	"metals.inc"
+#include	"textures.inc"
+
+global_settings {
+        ambient_light   Gray15
+        assumed_gamma   1.0             /* pour povray 3.7 */
+        }
+
+
+/*------------------------------------------------------------------*/
+
+#include	"monde.inc"
+
+#include	"incs/train.inc"
+#include	"incs/rails.inc"
+
+object { Un_Rail_Droit  }
+object { Un_Rail_Droit  translate z*-100 }
+object { Un_Rail_Droit  translate z* 100 }
+
+#include	"incs/ridelles.inc"
+
+object { Wagon_Ridelles translate <0, 2, 0> }
+
+
+/*------------------------------------------------------------------*/
+
+camera
+	{
+	spherical
+	location	<100, 35, -90>
+ 	right     	x*image_width/image_height
+	look_at		<0, 5, 0>
+	angle 		20
+	}
+
+light_source { <20, 70, -200> color White }
+light_source { <-20, 170, -150> color White }
+
+/*------------------------------------------------------------------*/

rotonde.pov

@@ -0,0 +1,43 @@
+
+
+#version 3.7;
+
+#include	"colors.inc"
+#include	"metals.inc"
+#include	"textures.inc"
+
+global_settings { ambient_light Yellow }
+
+/*------------------------------------------------------------------*/
+#include   "incs/poteaux.inc"
+object { Poteau_1 }
+
+#include   "incs/rotonde.inc"
+object { Rotonde_0 }
+
+#include   "incs/rails.inc"
+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>
+	right		image_width/image_height*x
+	look_at		<0, 0, 0>
+	angle		50
+	}
+
+light_source { <142, 500, 500> color White }
+
+/*------------------------------------------------------------------*/

train.pov

@@ -13,7 +13,7 @@
 
 global_settings { ambient_light Gray10 }
 
-#include "incs/plancher.inc"
+#include "plancher.inc"
 
 object { Plancher_0 rotate y*3 }
 
@@ -68,6 +68,7 @@ union
 camera
 	{
 	location	<130, 18, 15>
+	right		image_width/image_height*x
 	look_at		<0, 3, 10>
 	angle		70
 	}

truc.pov

@@ -37,6 +37,7 @@ plane	{
 camera
 	{
 	location	<-15, 11.333, 35>
+	right		image_width/image_height*x
 	look_at		<0, 9, 0>
 	angle		42
 	}

wagons.pov

@@ -0,0 +1,52 @@
+/*
+ *		tous les petits jouets ensembles
+ *		--------------------------------
+ *
+ *	les dimensions sont en centimetres, et on regardera
+ *	les choses a une hauteur de 40 cm. 
+ *
+ *	pour plus de details:		oulala@chez.com
+ *
+ */
+
+#version 3.7;
+global_settings { assumed_gamma 1.0 }
+
+#include	"colors.inc"
+#include	"metals.inc"
+#include	"textures.inc"
+
+/*------------------------------------------------------------------*/
+
+#include	"plancher.inc"
+object { Plancher_0 scale <.5, 1, .5> }
+
+/*------------------------------------------------------------------*/
+
+#include	"incs/train.inc"
+#include	"incs/citerne.inc"
+#include	"incs/ridelles.inc"
+
+object { Wagon_Ridelles	rotate y*-10 translate x*-14 }
+object { Wagon_Citerne	rotate y*50 translate x*16 }
+
+#include	"incs/poteaux.inc"
+
+object { Poteau_0 }
+object { Poteau_1 translate -z*9.34567 }
+
+/*------------------------------------------------------------------*/
+
+camera
+	{
+	location	<12, 20, -50>
+	right		image_width/image_height*x
+	look_at		<0, 0, 0>
+	angle		42
+	}
+
+light_source { <-50, 120, -330> color White }
+light_source { <190, 498, -250> color White }
+light_source { <160, 99, -250> color Yellow }
+
+/*------------------------------------------------------------------*/