diff --git a/Makefile b/Makefile index 239bae3..0e93d8f 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ MOYEN=+w1280 +h1024 GRAND=+w1600 +h1200 PETIT=+w800 +h600 -DIMS=$(GRAND) +DIMS=$(MOYEN) OPTS = +a +q9 -d LOWR = -a +q5 -d @@ -17,14 +17,15 @@ INCS = incs/ CJPEGOPT = -progressive -dct float -quality 88 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 \ +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 GLOBDEPS=${INCS}/train.inc plancher.inc ${INCS}/poteaux.inc \ - ${INCS}/rails.inc ${INCS}/grue.inc \ - ${INCS}/constantes.inc + ${INCS}/rails.inc ${INCS}/grue.inc \ + ${INCS}/constantes.inc \ + contexte.inc #-------------------------------------------------------- diff --git a/benne.pov b/benne.pov index 749a080..cad9962 100644 --- a/benne.pov +++ b/benne.pov @@ -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 } diff --git a/citerne.pov b/citerne.pov index 644898e..7bda01b 100644 --- a/citerne.pov +++ b/citerne.pov @@ -45,6 +45,7 @@ sky_sphere { camera { location <36, 13, -11> + right image_width/image_height*x look_at <0, 5.8, 0> angle 61 } diff --git a/contexte.inc b/contexte.inc index e69de29..1c64559 100644 --- a/contexte.inc +++ b/contexte.inc @@ -0,0 +1,5 @@ +/* + * contexte.inc + */ + + diff --git a/corail.pov b/corail.pov index 134892d..cf336ab 100644 --- a/corail.pov +++ b/corail.pov @@ -68,6 +68,7 @@ union camera { location <18, 10, -45> + right image_width/image_height*x look_at <0, 6, 0> angle 62 } diff --git a/electric.pov b/electric.pov index 055d560..147e62b 100644 --- a/electric.pov +++ b/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 diff --git a/essai.pov b/essai.pov index 34a3083..f39edda 100644 --- a/essai.pov +++ b/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 } } diff --git a/grue.pov b/grue.pov index d51e647..a609dd1 100644 --- a/grue.pov +++ b/grue.pov @@ -58,6 +58,7 @@ union camera { location <42, 12, 25> + right image_width/image_height*x look_at <0, 6, 3> angle 42 } diff --git a/incs/train.inc b/incs/train.inc index ac1095d..8639f5d 100644 --- a/incs/train.inc +++ b/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 diff --git a/inside.pov b/inside.pov index e1579a7..6b7a9ca 100644 --- a/inside.pov +++ b/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 } diff --git a/loco.pov b/loco.pov index d05dece..10c9918 100644 --- a/loco.pov +++ b/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 } diff --git a/parking.pov b/parking.pov index f085275..378dc1b 100644 --- a/parking.pov +++ b/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 } diff --git a/rotonde.pov b/rotonde.pov index b7640ec..39a0136 100644 --- a/rotonde.pov +++ b/rotonde.pov @@ -33,6 +33,7 @@ plane { camera { location <0, 70, 180> + right image_width/image_height*x look_at <0, 0, 0> angle 50 } diff --git a/train.pov b/train.pov index 37d33a0..59aaec8 100644 --- a/train.pov +++ b/train.pov @@ -68,6 +68,7 @@ union camera { location <130, 18, 15> + right image_width/image_height*x look_at <0, 3, 10> angle 70 } diff --git a/truc.pov b/truc.pov index e8c3bfb..00919d9 100644 --- a/truc.pov +++ b/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 } diff --git a/wagons.pov b/wagons.pov index 3cf9356..e11eec7 100644 --- a/wagons.pov +++ b/wagons.pov @@ -40,6 +40,7 @@ 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 }