diff --git a/Makefile b/Makefile index 0e93d8f..bacf559 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,9 @@ MOYEN=+w1280 +h1024 GRAND=+w1600 +h1200 PETIT=+w800 +h600 -DIMS=$(MOYEN) +DIMS=$(PETIT) OPTS = +a +q9 -d -LOWR = -a +q5 -d POVRAY=povray @@ -22,10 +21,11 @@ all: loco.png parking.png corail.png train.png essai.png \ ridelles.png rotonde.png grue.png \ citerne.png -GLOBDEPS=${INCS}/train.inc plancher.inc ${INCS}/poteaux.inc \ - ${INCS}/rails.inc ${INCS}/grue.inc \ +GLOBDEPS=${INCS}/train.inc ${INCS}/poteaux.inc \ + ${INCS}/rails.inc ${INCS}/grue.inc ${INCS}/ridelles.inc \ + ${INCS}/citerne.inc \ ${INCS}/constantes.inc \ - contexte.inc + contexte.inc monde.inc #-------------------------------------------------------- diff --git a/benne.pov b/benne.pov index cad9962..fb066e9 100644 --- a/benne.pov +++ b/benne.pov @@ -25,24 +25,7 @@ object { Wagon_Benne translate y*2 } /*------------------------------------------------------------------*/ -#include "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 - } +#include "monde.inc" camera { diff --git a/electric.pov b/electric.pov index 147e62b..7ea1913 100644 --- a/electric.pov +++ b/electric.pov @@ -6,27 +6,16 @@ #version 3.7; -#include "colors.inc" -#include "metals.inc" - global_settings { - ambient_light Gray15 assumed_gamma 1.0 /* pour povray 3.7 */ } +#include "colors.inc" +#include "metals.inc" + /*------------------------------------------------------------------*/ -background { color Gray40 } - -plane { - y, 0 - pigment - { - hexagon Gray55, rgb<0.55, 0.65, 0.30>, Gray75 - scale 20 - } - finish { reflection 0.42 } - } +#include "monde.inc" #include "incs/rails.inc" #include "incs/train.inc" @@ -42,7 +31,6 @@ union camera { - spherical right x*image_width/image_height location <11, 11.1, -54> look_at <0, 8, -10> diff --git a/incs/citerne.inc b/incs/citerne.inc index ac64c36..f794005 100644 --- a/incs/citerne.inc +++ b/incs/citerne.inc @@ -3,7 +3,7 @@ * Une citerne de St Chinian */ //----------------------------------------------------------------- -#declare Diam_Citerne = 4.5; +#declare Diam_Citerne = 4.6; #declare Epp_Cerclage = 0.233; #declare Diam_Cerclage = (Diam_Citerne+Epp_Cerclage); #declare Larg_Cerclage = 0.6; @@ -40,7 +40,7 @@ union { } } scale <1, 0.882, 1> -translate y*10.5 +translate y*10.7 texture { pigment { color rgb <0.96, 0.25, 0.2> } finish { phong 0.6 } diff --git a/incs/ridelles.inc b/incs/ridelles.inc index a5f0413..bf7ef58 100644 --- a/incs/ridelles.inc +++ b/incs/ridelles.inc @@ -7,12 +7,12 @@ #declare Ridelle_Cote = object { union { - cylinder { <0, 4.5, -11>, <0, 4.5, 11>, 0.5 } - box { <-.5, 4, -11>, <.5, 4.5, 11> } + cylinder { <0, 4.5, -11>, <0, 4.5, 11>, 0.25 } + box { <-.25, 4, -11>, <.25, 4.5, 11> } #declare foo=0; #while (foo<6) - box { <-.4, 0, foo*4-10-.3>, <.4, 4, foo*4-10+.3> } - #declare foo=foo+1; + box { <-.4, 0, foo*4-10-.2>, <.4, 4, foo*4-10+.2> } + #declare foo=foo+0.5; #end } texture { @@ -22,9 +22,11 @@ texture { translate y*5.75 } +/* avant et arriere */ + #declare Ridelle_Bout = object { -box { <-4, 6.2, -0.3>, <4, 9.7, 0.3> } +box { <-4, 6.2, -0.1>, <4, 9.7, 0.1> } texture { pigment { color MediumWood } finish { roughness .73 } diff --git a/incs/train.inc b/incs/train.inc index 8639f5d..fc435cc 100644 --- a/incs/train.inc +++ b/incs/train.inc @@ -12,7 +12,7 @@ difference { union { cylinder { <-1, 0, 0>, <1, 0, 0>, 4 } - cylinder { <-1, 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 } diff --git a/monde.inc b/monde.inc index d8d65b2..939789a 100644 --- a/monde.inc +++ b/monde.inc @@ -12,7 +12,7 @@ plane { } rotate x*90 translate <-0.5, 0, -0.5> - scale <30, 1, 30> + scale <50, 1, 50> } } @@ -22,16 +22,15 @@ sky_sphere { gradient y color_map { - [0 color Khaki] - [0.1 color Gray20 ] - [0.4 color Orange] - [0.5 color Blue] - [.97 color LightBlue] - [1 color Khaki] + [0 color Khaki ] + [0.2 color Gray20 ] + [0.5 color Blue ] + [0.87 color LightBlue ] + [1 color Khaki ] } } rotate 50 - scale 0.5 + scale 0.05 translate -1 } diff --git a/parking.pov b/parking.pov index 378dc1b..eba0468 100644 --- a/parking.pov +++ b/parking.pov @@ -30,14 +30,14 @@ sky_sphere { color_map { [0 color Black] - [0.33 color <0.7, 0.3, 0.5> ] - [0.44 color <0.7, 0.3, 0.1> ] + [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.42 + turbulence 0.92 } - scale .042 + scale 0.82 rotate 42 } @@ -96,10 +96,10 @@ union { camera { - location <94, 24, -170> + location <44, 4, -110> right image_width/image_height*x - look_at <10, 0, 0> - angle 42 + look_at <10, 1.9, 0> + angle 62 } light_source { <150, 78, -250> color Gray20 } diff --git a/ridelles.pov b/ridelles.pov index 8f77a72..7f48658 100644 --- a/ridelles.pov +++ b/ridelles.pov @@ -30,14 +30,13 @@ object { Wagon_Ridelles translate <0, 2, 0> } camera { - spherical - location <100, 35, -90> + location <40, 15, -50> right x*image_width/image_height look_at <0, 5, 0> - angle 20 + angle 42 } -light_source { <20, 70, -200> color White } -light_source { <-20, 170, -150> color White } +light_source { <200, 70, -200> color Gray50 } +light_source { <-200, 170, -150> color White } /*------------------------------------------------------------------*/ diff --git a/wagons.pov b/wagons.pov index e11eec7..7eefda8 100644 --- a/wagons.pov +++ b/wagons.pov @@ -18,8 +18,7 @@ global_settings { assumed_gamma 1.0 } /*------------------------------------------------------------------*/ -#include "plancher.inc" -object { Plancher_0 scale <.5, 1, .5> } +#include "monde.inc" /*------------------------------------------------------------------*/ @@ -33,19 +32,19 @@ object { Wagon_Citerne rotate y*50 translate x*16 } #include "incs/poteaux.inc" object { Poteau_0 } -object { Poteau_1 translate -z*9.34567 } +object { Poteau_1 translate -z*12 } /*------------------------------------------------------------------*/ camera { - location <12, 20, -50> + location <12, 10, -50> right image_width/image_height*x look_at <0, 0, 0> angle 42 } -light_source { <-50, 120, -330> color White } +light_source { <-50, 120, -330> color Gray50 } light_source { <190, 498, -250> color White } light_source { <160, 99, -250> color Yellow }