diff --git a/.gitignore b/.gitignore index 3e34327..dc87e68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.png +*.pov-state diff --git a/Makefile b/Makefile index 24c2644..972e382 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ targa: tmp/ridelles.tga tmp/electric.tga tmp/citerne.tga \ echo "on a fait les targas" >> log.toto GLOBDEPS=${INCS}/train.inc ${INCS}/plancher.inc ${INCS}/poteaux.inc \ - ${INCS}/rails.inc \ + ${INCS}/rails.inc ${INCS}/grue.inc \ ${INCS}/constantes.inc #-------------------------------------------------------- @@ -81,12 +81,8 @@ wagons.jpg: tmp/wagons.tga inside.png: inside.pov $(GLOBDEPS) Makefile $(POVRAY) +Iinside $(DIMS) $(OPTS) +v -tmp/benne.tga: train.inc benne.pov constantes.inc rails.inc \ - benne.inc Makefile - $(POVRAY) +Ibenne +Otmp/benne +FT $(DIMS) $(OPTS) +v - -benne.jpg: tmp/benne.tga - cjpeg $(CJPEGOPT) tmp/benne.tga > benne.jpg +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 @@ -94,17 +90,11 @@ citerne.jpg: tmp/citerne.tga cjpeg $(CJPEGOPT) tmp/citerne.tga > citerne.jpg -tmp/electric.tga: electric.pov electric.inc train.inc rails.inc \ - instruments.inc Makefile - $(POVRAY) +Ielectric +FT +Otmp/electric $(DIMS) $(OPTS) +v -electric.jpg: tmp/electric.tga - cjpeg $(CJPEGOPT) tmp/electric.tga > electric.jpg +electric.png: electric.pov $(GLOBDEPS) Makefile + $(POVRAY) +Ielectric $(DIMS) $(OPTS) +v -truc.tga: truc.pov train.inc poteaux.inc \ - decor.inc voiture.inc constantes.inc \ - enseigne.inc electric.inc corail.inc \ - grue.inc instruments.inc galerie.inc - $(POVRAY) +Itruc +FT $(DIMS) $(LOWR) -v +truc.png: truc.pov $(GLOBDEPS) Makefile + $(POVRAY) +Itruc $(DIMS) $(OPTS) +v tmp/ridelles.tga: ridelles.pov ridelles.inc $(GLOBDEPS) @@ -128,7 +118,7 @@ tmp/voiture.tga: voiture.inc voiture.pov $(GLOBDEPS) #-------------------------------------------------------- -SRCFILES=*.inc *.pov *.txt Makefile *.sh +SRCFILES = *.inc *.pov *.txt Makefile *.sh lines: wc $(SRCFILES) | sort -n diff --git a/benne.pov b/benne.pov new file mode 100644 index 0000000..5423200 --- /dev/null +++ b/benne.pov @@ -0,0 +1,57 @@ +/* + + un fichier de test. + poser le wagon benne sur les rails. +*/ + +#version 3.7; +global_settings { assumed_gamma 1.0 } + +#include "colors.inc" +#include "metals.inc" + +/*------------------------------------------------------------------*/ + +#include "incs/train.inc" +#include "incs/rails.inc" +#include "incs/benne.inc" +#include "incs/decor.inc" + +object { Balise_0 translate x*95 } + +object { Un_Rail_Droit } + +object { Wagon_Benne translate y*2 } + +/*------------------------------------------------------------------*/ + +#include "incs/plancher.inc" +object { Plancher_0 scale <.5, 1, .5> } + +sky_sphere { + pigment + { + gradient y + color_map + { + [0 color Green] + [0.33 color Gray50 ] + [1 color Blue] + } + } + scale 0.33333333 + rotate <10, 0, 10> + translate -1 + } + +camera + { + location <35.5, 13, 20> + look_at <0, 6, 0> + angle 51 + } + +light_source { <90, 131, 190> color White } +light_source { <90, 111, 250> color White } + +/*------------------------------------------------------------------*/ diff --git a/contexte.inc b/contexte.inc new file mode 100644 index 0000000..e69de29 diff --git a/electric.pov b/electric.pov new file mode 100644 index 0000000..055d560 --- /dev/null +++ b/electric.pov @@ -0,0 +1,57 @@ +/* + * + * pour plus de details: oulala@chez.com + * + */ + +#version 3.7; + +#include "colors.inc" +#include "metals.inc" + +global_settings { + ambient_light Gray15 + assumed_gamma 1.0 /* pour povray 3.7 */ + } + +/*------------------------------------------------------------------*/ + +background { color Gray40 } + +plane { + y, 0 + pigment + { + hexagon Gray55, rgb<0.55, 0.65, 0.30>, Gray75 + scale 20 + } + finish { reflection 0.42 } + } + +#include "incs/rails.inc" +#include "incs/train.inc" +#include "incs/electric.inc" + +union + { + object { Un_Rail_Droit } + object { Locomotive_Electric translate y*2 } + } + +/*------------------------------------------------------------------*/ + +camera + { + spherical + right x*image_width/image_height + right x*image_width/image_height + location <11, 11.1, -54> + look_at <0, 8, -10> + angle 38 + } + +light_source { <7, 8, -54> color Gray80 } +light_source { <150, 130, -150> color Green } +light_source { <270, 130, 250> color Gray50 } + +/*------------------------------------------------------------------*/ diff --git a/essai.pov b/essai.pov index 5c11086..34a3083 100644 --- a/essai.pov +++ b/essai.pov @@ -2,6 +2,9 @@ un fichier de test. */ +#version 3.7; +global_settings { assumed_gamma 1.0 } + #include "colors.inc" #include "metals.inc" diff --git a/incs/grue.inc b/incs/grue.inc index 93915d4..7c67274 100644 --- a/incs/grue.inc +++ b/incs/grue.inc @@ -146,15 +146,11 @@ translate y*2.0 /* pour la poser sur la plate forme */ // ------------------------------------------ #declare Corps_Grue = object { -union - { - union - { - object { Pivot_Grue rotate y*42 } - object { Cabine_Grue } - object { Fleche } - } - } +union { + object { Pivot_Grue rotate y*42 } + object { Cabine_Grue } + object { Fleche } + } translate y*7.0 } // ------------------------------------------ diff --git a/inside.pov b/inside.pov new file mode 100644 index 0000000..e1579a7 --- /dev/null +++ b/inside.pov @@ -0,0 +1,57 @@ + +/* + * fichier de test pour l'interieur du wagon Corail. + * pour plus de details: oulala@chez.com + * + */ + +#version 3.7; +global_settings { assumed_gamma 1.0 } + +#include "colors.inc" +#include "metals.inc" + +/*------------------------------------------------------------------*/ + +sky_sphere { + 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" + +object { Wagon_Corail } +camera { + location <-1.6, 10, -19> + look_at <1, 4, 10> + angle 80 + } + +/*------------------------------------------------------------------*/ + + +light_source { <180, 125, -180> color White } +//light_source { <170, 100, -180> color White } +//light_source { <120, 11, -185> color White } + +/*------------------------------------------------------------------*/ diff --git a/loco.pov b/loco.pov index 04969f2..d05dece 100644 --- a/loco.pov +++ b/loco.pov @@ -3,6 +3,8 @@ * */ +#version 3.7; + #include "colors.inc" #include "metals.inc" diff --git a/parking.pov b/parking.pov index 271e86b..f085275 100644 --- a/parking.pov +++ b/parking.pov @@ -4,6 +4,9 @@ * */ +#version 3.7; +global_settings { assumed_gamma 1.0 } + #include "colors.inc" #include "metals.inc" diff --git a/picz/plancher.png b/picz/plancher.png index 36c99c1..5bd9bc9 100644 Binary files a/picz/plancher.png and b/picz/plancher.png differ diff --git a/truc.pov b/truc.pov new file mode 100644 index 0000000..e8c3bfb --- /dev/null +++ b/truc.pov @@ -0,0 +1,47 @@ +/* + * Go Fuck Yourself, Jean-Luc M ! + */ + +#version 3.7; +global_settings { assumed_gamma 1.0 } + +#include "colors.inc" +#include "metals.inc" +#include "textures.inc" + +/*------------------------------------------------------------------*/ + +/* +#include "galerie.inc" +object { galerie(8, 14.2, 0.5, 0.175) pigment { color Yellow } } +*/ + +#include "incs/train.inc" +#include "incs/corail.inc" +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> + look_at <0, 9, 0> + angle 42 + } + +light_source { <-50, 17, -50> color White } +light_source { <-20, 70, 50> color White } + +/*------------------------------------------------------------------*/