diff --git a/.gitignore b/.gitignore index 6d5dd58..c1d481b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.png tmp/*.png +*.gif *.pov-state tmp/*.pov-state diff --git a/Makefile b/Makefile index 37438e3..120d3d1 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ #-------------------------------------------------------- -MOYEN=+w1280 +h1024 -GRAND=+w1600 +h1200 -PETIT=+w800 +h600 +MOYEN = +w1280 +h1024 +GRAND = +w1600 +h1200 +PETIT = +w800 +h600 DIMS=$(PETIT) -OPTS = +a0.01 +q9 -d +OPTS = +a +q9 -d -POVRAY=povray +POVRAY = povray # nouveau mars 2021 INCS = incs @@ -26,12 +26,17 @@ GLOBDEPS=${INCS}/train.inc ${INCS}/poteaux.inc \ ${INCS}/rails.inc ${INCS}/grue.inc ${INCS}/ridelles.inc \ ${INCS}/citerne.inc ${INCS}/benne.inc \ ${INCS}/constantes.inc ${INCS}/locomotive.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 #----------------------------------------------------------------------- # @@ -41,29 +46,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 ${GLOBDEPS} Makefile $(POVRAY) +Itrain $(DIMS) $(OPTS) +v - corail.png: corail.pov Makefile $(GLOBDEPS) $(POVRAY) +Icorail $(DIMS) $(OPTS) +v -gare.png: gare.pov $(GLOBDEPS) Makefile - $(POVRAY) +Igare $(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 diff --git a/benne.pov b/benne.pov index f7e8b89..354edec 100644 --- a/benne.pov +++ b/benne.pov @@ -5,7 +5,6 @@ */ #version 3.7; -global_settings { assumed_gamma 1.0 } #include "contexte.inc" #include "colors.inc" @@ -30,7 +29,7 @@ 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 ANGLE_CAM diff --git a/citerne.pov b/citerne.pov index 6e2098a..5427ef4 100644 --- a/citerne.pov +++ b/citerne.pov @@ -8,11 +8,6 @@ #include "colors.inc" #include "metals.inc" -global_settings { - ambient_light Gray15 - assumed_gamma 1.0 /* pour povray 3.7 */ - } - /*------------------------------------------------------------------*/ #include "incs/train.inc" @@ -29,7 +24,7 @@ object { Wagon_Citerne translate y*2 } camera { - location <36, 13, -11> + location <36, 13, -31> right image_width/image_height*x look_at <0, 5.8, 0> angle ANGLE_CAM diff --git a/contexte.inc b/contexte.inc index 9c72bac..3cb2140 100644 --- a/contexte.inc +++ b/contexte.inc @@ -2,4 +2,6 @@ * contexte.inc */ -#declare ANGLE_CAM = 42; +global_settings { assumed_gamma 1.0 } + +#declare ANGLE_CAM = 33; diff --git a/corail.pov b/corail.pov index dd5f1bf..d7b27c0 100644 --- a/corail.pov +++ b/corail.pov @@ -6,7 +6,6 @@ */ #version 3.7; -global_settings { assumed_gamma 1.0 } #include "contexte.inc" #include "colors.inc" @@ -44,7 +43,7 @@ union camera { - location <18, 10, -45> + location <28, 10, -45> right image_width/image_height*x look_at <0, 6, 0> angle ANGLE_CAM diff --git a/electric.pov b/electric.pov index dcb4a03..eb24278 100644 --- a/electric.pov +++ b/electric.pov @@ -5,9 +5,6 @@ */ #version 3.7; -global_settings { - assumed_gamma 1.0 /* pour povray 3.7 */ - } #include "contexte.inc" #include "colors.inc" @@ -32,8 +29,8 @@ union camera { right x*image_width/image_height - location <19, 11.1, -44> - look_at <0, 8, -10> + location <39, 11.1, -44> + look_at <0, 8, 0> angle ANGLE_CAM } diff --git a/essai.pov b/essai.pov index d0468db..967a345 100644 --- a/essai.pov +++ b/essai.pov @@ -3,7 +3,6 @@ */ #version 3.7; -global_settings { assumed_gamma 1.0 } #include "contexte.inc" #include "colors.inc" @@ -17,9 +16,9 @@ global_settings { assumed_gamma 1.0 } object { Boogie } camera { - location <19.5, 8, 9> + location <24.5, 15, 22> right image_width/image_height*x - look_at <0, 0, 0> + look_at <0, 2, 0> angle ANGLE_CAM } diff --git a/gare.pov b/gare.pov index c340e8e..f8d203a 100644 --- a/gare.pov +++ b/gare.pov @@ -7,9 +7,6 @@ */ #version 3.7; -global_settings { - assumed_gamma 1.0 /* pour povray 3.7 */ - } #include "contexte.inc" #include "colors.inc" diff --git a/grue.pov b/grue.pov index d0f562d..185b3ad 100644 --- a/grue.pov +++ b/grue.pov @@ -1,10 +1,9 @@ /* - * + * un gros chantier, vraiment gros (cTMr) */ #version 3.7; -global_settings { assumed_gamma 1.0 } #include "contexte.inc" #include "colors.inc" @@ -13,31 +12,7 @@ global_settings { assumed_gamma 1.0 } /*------------------------------------------------------------------*/ -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 "monde.inc" #include "incs/train.inc" #include "incs/rails.inc" diff --git a/incs/poteaux.inc b/incs/poteaux.inc index cc99540..e85344c 100644 --- a/incs/poteaux.inc +++ b/incs/poteaux.inc @@ -6,6 +6,8 @@ #include "woods.inc" +// ----------------------------------------------------------------- + #declare Poteau_0 = object { union @@ -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 } - cylinder { <-2, 19, 0>, <2, 19, 0>, 0.20 } + cone { <0, 20, 0>, 0.64, <0, 21, 0>, 0.21 } + cylinder { <-4, 19, 0>, <4, 19, 0>, 0.20 } } texture { T_Wood12 rotate x*90 scale 3 } } diff --git a/incs/train.inc b/incs/train.inc index 1850cf3..98f17fc 100644 --- a/incs/train.inc +++ b/incs/train.inc @@ -7,19 +7,22 @@ * */ +//----------------------------------------------------------------- + #declare Corps_Grande_Roue = object { difference { union { cylinder { <-1, 0, 0>, <1, 0, 0>, 4 } - cylinder { <-0.5, 0, 0>, <0, 0, 0>, 4.3 } + cylinder { <-0.5, 0, 0>, <-0.3, 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; - #declare yy = cos(radians(foo))*2.0; + #local R = 2.2; + #declare xx = sin(radians(foo))*R; + #declare yy = cos(radians(foo))*R; cylinder { <-2, xx, yy>, <2, xx, yy>, 0.56 } @@ -27,16 +30,19 @@ difference { #end } translate y*4 -pigment { color LightSteelBlue } -finish { phong 0.7 } +texture { + 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>, <1, 0, 0>, 3 } cylinder { <-1, 0, 0>, <0, 0, 0>, 3.3 } } cylinder { <-1.4, 0, 0> <-0.6, 0, 0>, 1.7 } @@ -52,9 +58,11 @@ difference { #declare foo = foo + 36; #end } -translate y*3 -pigment { color LightSteelBlue } -finish { phong 0.7 } +translate y*3 /* why ??? */ +texture { + pigment { color LightSteelBlue } + finish { phong 0.6 } + } } #declare Moyeu = object @@ -118,11 +126,11 @@ texture { #declare Chassis_Boogie = object { union { - box { <-3.85, 0, -3>, <3.85, 2, 3> } - cylinder { <0, 1, 0>, <0, 4, 0>, 2 } + box { <-3.85, 0, -3>, <3.85, 1.6, 3> } + cylinder { <0, 1, 0>, <0, 4, 0>, 1.5 } } translate y*2 -pigment { color Blue } +pigment { color Gray30 } } #declare Boogie = object @@ -133,7 +141,7 @@ union object { Petite_Roue scale <-1, 1, 1> translate <-5.5, 0, -3.5> } object { Petite_Roue translate < 5.5, 0, -3.5> } object { Petite_Roue scale <-1, 1, 1> translate <-5.5, 0, 3.5> } - object { Petite_Roue translate < 5.5, 0, 3.5> } + // object { Petite_Roue translate < 5.5, 0, 3.5> } } } diff --git a/inside.pov b/inside.pov index a877356..4ab5f08 100644 --- a/inside.pov +++ b/inside.pov @@ -6,7 +6,6 @@ */ #version 3.7; -global_settings { assumed_gamma 1.0 } #include "contexte.inc" #include "colors.inc" diff --git a/loco.pov b/loco.pov index 5fc87d5..29e533d 100644 --- a/loco.pov +++ b/loco.pov @@ -6,10 +6,6 @@ #version 3.7; #include "contexte.inc" -global_settings { - assumed_gamma 1.0 /* pour povray 3.7 */ - } - #include "colors.inc" #include "metals.inc" @@ -41,7 +37,7 @@ 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 ANGLE_CAM diff --git a/monde.inc b/monde.inc index 05d4a1b..53c92ce 100644 --- a/monde.inc +++ b/monde.inc @@ -12,7 +12,7 @@ plane { } rotate x*90 translate <-0.5, 0, -0.5> - scale <50, 1, 50> + scale <150, 1, 150> } } diff --git a/omg-fuckingworld.txt b/omg-fuckingworld.txt index e69de29..29ea075 100644 --- a/omg-fuckingworld.txt +++ b/omg-fuckingworld.txt @@ -0,0 +1,7 @@ +TODO +==== + +[ ] Rendre le Makefile pilotable depuis le shell ? + +[ ] Tester le module à partir d'un .INI de Povray + diff --git a/parking.pov b/parking.pov index 4531212..327546a 100644 --- a/parking.pov +++ b/parking.pov @@ -1,11 +1,10 @@ /* - * + * 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" diff --git a/ridelles.pov b/ridelles.pov index c2adbe8..3da556b 100644 --- a/ridelles.pov +++ b/ridelles.pov @@ -5,11 +5,6 @@ #include "metals.inc" #include "textures.inc" -global_settings { - assumed_gamma 1.0 /* pour povray 3.7 */ - } - - /*------------------------------------------------------------------*/ #include "monde.inc" @@ -36,7 +31,7 @@ camera angle ANGLE_CAM } -light_source { <200, 70, -200> color Gray50 } -light_source { <-200, 170, -150> color White } +light_source { < 200, 70, -200> color Gray50 } +light_source { <-200, 170, -150> color White } /*------------------------------------------------------------------*/ diff --git a/rotonde.pov b/rotonde.pov index 6088cfa..e152b1d 100644 --- a/rotonde.pov +++ b/rotonde.pov @@ -1,14 +1,12 @@ #version 3.7; -global_settings { assumed_gamma 1.0 } #include "contexte.inc" #include "colors.inc" #include "metals.inc" #include "textures.inc" - /*------------------------------------------------------------------*/ #include "incs/poteaux.inc" object { Poteau_1 } @@ -21,12 +19,11 @@ object { Un_Rail_Droit translate z*-100} /*------------------------------------------------------------------*/ - 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 ANGLE_CAM } diff --git a/train.pov b/train.pov index 0dc6b59..6738a3e 100644 --- a/train.pov +++ b/train.pov @@ -1,4 +1,3 @@ - /* * * pour plus de details: @@ -7,7 +6,6 @@ */ #version 3.7; -global_settings { assumed_gamma 1.0 } #include "contexte.inc" #include "colors.inc" @@ -18,9 +16,8 @@ global_settings { assumed_gamma 1.0 } #include "monde.inc" - - - +#include "incs/train.inc" +#include "incs/electric.inc" #include "incs/rails.inc" #include "incs/train.inc" #include "incs/benne.inc" @@ -29,17 +26,29 @@ global_settings { assumed_gamma 1.0 } #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 } + } +} + +union + { + object { Trois_rails } object { Locomotive_Vapeur translate <0, 2, -56> } object { Wagon_Citerne translate <0, 2, -25> } object { Wagon_Benne translate <0, 2, 2> } object { Wagon_Corail translate <0, 2, 39> } object { Wagon_Ridelles translate <0, 2, 78> } + + #local XS = 60; + object { Trois_rails translate x*XS } + object { Locomotive_Electric translate } + } #include "incs/poteaux.inc" @@ -54,7 +63,7 @@ union camera { - location <130, 18, 15> + location <260, 38, 25> right image_width/image_height*x look_at <0, 3, 10> angle ANGLE_CAM diff --git a/truc.pov b/truc.pov index 481842a..18752be 100644 --- a/truc.pov +++ b/truc.pov @@ -3,7 +3,6 @@ */ #version 3.7; -global_settings { assumed_gamma 1.0 } #include "contexte.inc" #include "colors.inc" diff --git a/voiture.pov b/voiture.pov index d4896b6..1b587f9 100644 --- a/voiture.pov +++ b/voiture.pov @@ -1,10 +1,7 @@ /* - un fichier de test. + quelques elements des voitures */ #version 3.7; -global_settings { - assumed_gamma 1.0 /* pour povray 3.7 */ - } #include "contexte.inc" #include "colors.inc" @@ -19,16 +16,16 @@ global_settings { object { Boogie } camera { - location <15.5, 8, 9> - look_at <0, 0, 0> - angle 42 + location <25.5, 15, 22> + look_at <0, 2, 0> + angle ANGLE_CAM } cylinder { <-100, 0, 0>, <100, 0, 0>, 0.1 pigment { color Red } } 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 } +light_source { <90, 131, 190> color Cyan } +light_source { <90, 111, 250> color Magenta } /*------------------------------------------------------------------*/ diff --git a/wagons.pov b/wagons.pov index 9d7d499..4ea57e4 100644 --- a/wagons.pov +++ b/wagons.pov @@ -10,7 +10,6 @@ */ #version 3.7; -global_settings { assumed_gamma 1.0 } #include "contexte.inc" #include "colors.inc" @@ -39,14 +38,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 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 } /*------------------------------------------------------------------*/