teatime or beer ?

This commit is contained in:
le vieux 2021-03-15 17:29:35 +01:00
parent c53aa92319
commit 395d648c9d
23 changed files with 97 additions and 122 deletions

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
*.png *.png
tmp/*.png tmp/*.png
*.gif
*.pov-state *.pov-state
tmp/*.pov-state tmp/*.pov-state

View File

@ -1,13 +1,13 @@
#-------------------------------------------------------- #--------------------------------------------------------
MOYEN=+w1280 +h1024 MOYEN = +w1280 +h1024
GRAND=+w1600 +h1200 GRAND = +w1600 +h1200
PETIT=+w800 +h600 PETIT = +w800 +h600
DIMS=$(PETIT) DIMS=$(PETIT)
OPTS = +a0.01 +q9 -d OPTS = +a +q9 -d
POVRAY=povray POVRAY = povray
# nouveau mars 2021 # nouveau mars 2021
INCS = incs INCS = incs
@ -26,12 +26,17 @@ GLOBDEPS=${INCS}/train.inc ${INCS}/poteaux.inc \
${INCS}/rails.inc ${INCS}/grue.inc ${INCS}/ridelles.inc \ ${INCS}/rails.inc ${INCS}/grue.inc ${INCS}/ridelles.inc \
${INCS}/citerne.inc ${INCS}/benne.inc \ ${INCS}/citerne.inc ${INCS}/benne.inc \
${INCS}/constantes.inc ${INCS}/locomotive.inc \ ${INCS}/constantes.inc ${INCS}/locomotive.inc \
picz/plancher.png picz/cadran.png \
contexte.inc monde.inc contexte.inc monde.inc
#-------------------------------------------------------- #--------------------------------------------------------
essai.png: essai.pov Makefile $(GLOBDEPS) 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) rotonde.png: rotonde.pov Makefile $(GLOBDEPS)
$(POVRAY) +Irotonde $(DIMS) $(OPTS) +v $(POVRAY) +Irotonde $(DIMS) $(OPTS) +v
#-----------------------------------------------------------------------
parking.png: parking.pov Makefile $(GLOBDEPS) parking.png: parking.pov Makefile $(GLOBDEPS)
$(POVRAY) +Iparking $(DIMS) $(OPTS) +v $(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 loco.png: loco.pov ${GLOBDEPS} Makefile
$(POVRAY) +Iloco $(DIMS) $(OPTS) +v $(POVRAY) +Iloco $(DIMS) $(OPTS) +v
train.png: train.pov ${GLOBDEPS} Makefile train.png: train.pov ${GLOBDEPS} Makefile
$(POVRAY) +Itrain $(DIMS) $(OPTS) +v $(POVRAY) +Itrain $(DIMS) $(OPTS) +v
corail.png: corail.pov Makefile $(GLOBDEPS) corail.png: corail.pov Makefile $(GLOBDEPS)
$(POVRAY) +Icorail $(DIMS) $(OPTS) +v $(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 inside.png: inside.pov $(GLOBDEPS) Makefile
$(POVRAY) +Iinside $(DIMS) $(OPTS) +v $(POVRAY) +Iinside $(DIMS) $(OPTS) +v

View File

@ -5,7 +5,6 @@
*/ */
#version 3.7; #version 3.7;
global_settings { assumed_gamma 1.0 }
#include "contexte.inc" #include "contexte.inc"
#include "colors.inc" #include "colors.inc"
@ -30,7 +29,7 @@ object { Wagon_Benne translate y*2 }
camera camera
{ {
location <35.5, 13, 20> location <35.5, 23, 40>
right image_width/image_height*x right image_width/image_height*x
look_at <0, 6, 0> look_at <0, 6, 0>
angle ANGLE_CAM angle ANGLE_CAM

View File

@ -8,11 +8,6 @@
#include "colors.inc" #include "colors.inc"
#include "metals.inc" #include "metals.inc"
global_settings {
ambient_light Gray15
assumed_gamma 1.0 /* pour povray 3.7 */
}
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
#include "incs/train.inc" #include "incs/train.inc"
@ -29,7 +24,7 @@ object { Wagon_Citerne translate y*2 }
camera camera
{ {
location <36, 13, -11> location <36, 13, -31>
right image_width/image_height*x right image_width/image_height*x
look_at <0, 5.8, 0> look_at <0, 5.8, 0>
angle ANGLE_CAM angle ANGLE_CAM

View File

@ -2,4 +2,6 @@
* contexte.inc * contexte.inc
*/ */
#declare ANGLE_CAM = 42; global_settings { assumed_gamma 1.0 }
#declare ANGLE_CAM = 33;

View File

@ -6,7 +6,6 @@
*/ */
#version 3.7; #version 3.7;
global_settings { assumed_gamma 1.0 }
#include "contexte.inc" #include "contexte.inc"
#include "colors.inc" #include "colors.inc"
@ -44,7 +43,7 @@ union
camera camera
{ {
location <18, 10, -45> location <28, 10, -45>
right image_width/image_height*x right image_width/image_height*x
look_at <0, 6, 0> look_at <0, 6, 0>
angle ANGLE_CAM angle ANGLE_CAM

View File

@ -5,9 +5,6 @@
*/ */
#version 3.7; #version 3.7;
global_settings {
assumed_gamma 1.0 /* pour povray 3.7 */
}
#include "contexte.inc" #include "contexte.inc"
#include "colors.inc" #include "colors.inc"
@ -32,8 +29,8 @@ union
camera camera
{ {
right x*image_width/image_height right x*image_width/image_height
location <19, 11.1, -44> location <39, 11.1, -44>
look_at <0, 8, -10> look_at <0, 8, 0>
angle ANGLE_CAM angle ANGLE_CAM
} }

View File

@ -3,7 +3,6 @@
*/ */
#version 3.7; #version 3.7;
global_settings { assumed_gamma 1.0 }
#include "contexte.inc" #include "contexte.inc"
#include "colors.inc" #include "colors.inc"
@ -17,9 +16,9 @@ global_settings { assumed_gamma 1.0 }
object { Boogie } object { Boogie }
camera { camera {
location <19.5, 8, 9> location <24.5, 15, 22>
right image_width/image_height*x right image_width/image_height*x
look_at <0, 0, 0> look_at <0, 2, 0>
angle ANGLE_CAM angle ANGLE_CAM
} }

View File

@ -7,9 +7,6 @@
*/ */
#version 3.7; #version 3.7;
global_settings {
assumed_gamma 1.0 /* pour povray 3.7 */
}
#include "contexte.inc" #include "contexte.inc"
#include "colors.inc" #include "colors.inc"

View File

@ -1,10 +1,9 @@
/* /*
* * un gros chantier, vraiment gros (cTMr)
*/ */
#version 3.7; #version 3.7;
global_settings { assumed_gamma 1.0 }
#include "contexte.inc" #include "contexte.inc"
#include "colors.inc" #include "colors.inc"
@ -13,31 +12,7 @@ global_settings { assumed_gamma 1.0 }
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
plane { #include "monde.inc"
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/train.inc"
#include "incs/rails.inc" #include "incs/rails.inc"

View File

@ -6,6 +6,8 @@
#include "woods.inc" #include "woods.inc"
// -----------------------------------------------------------------
#declare Poteau_0 = object #declare Poteau_0 = object
{ {
union union
@ -37,8 +39,8 @@ texture
union union
{ {
cylinder { <0, 0, 0>, <0, 20, 0>, 0.42 } cylinder { <0, 0, 0>, <0, 20, 0>, 0.42 }
cone { <0, 20, 0>, 0.64, <0, 23, 0>, 0.21 } cone { <0, 20, 0>, 0.64, <0, 21, 0>, 0.21 }
cylinder { <-2, 19, 0>, <2, 19, 0>, 0.20 } cylinder { <-4, 19, 0>, <4, 19, 0>, 0.20 }
} }
texture { T_Wood12 rotate x*90 scale 3 } texture { T_Wood12 rotate x*90 scale 3 }
} }

View File

@ -7,19 +7,22 @@
* *
*/ */
//-----------------------------------------------------------------
#declare Corps_Grande_Roue = object #declare Corps_Grande_Roue = object
{ {
difference { difference {
union { union {
cylinder { <-1, 0, 0>, <1, 0, 0>, 4 } 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>, 2.8 }
cylinder { < 1.2, 0, 0> < 0.6, 0, 0>, 3.2 } cylinder { < 1.2, 0, 0> < 0.6, 0, 0>, 3.2 }
#declare foo = 0; #declare foo = 0;
#while (foo < 360) #while (foo < 360)
#declare xx = sin(radians(foo))*2.0; #local R = 2.2;
#declare yy = cos(radians(foo))*2.0; #declare xx = sin(radians(foo))*R;
#declare yy = cos(radians(foo))*R;
cylinder { <-2, xx, yy>, <2, xx, yy>, 0.56 } cylinder { <-2, xx, yy>, <2, xx, yy>, 0.56 }
@ -27,16 +30,19 @@ difference {
#end #end
} }
translate y*4 translate y*4
pigment { color LightSteelBlue } texture {
finish { phong 0.7 } pigment { color LightSteelBlue }
finish { phong 0.7 }
}
} }
//-----------------------------------------------------------------
#declare Corps_Petite_Roue = object #declare Corps_Petite_Roue = object
{ {
difference { difference {
union { 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, 0, 0>, <0, 0, 0>, 3.3 }
} }
cylinder { <-1.4, 0, 0> <-0.6, 0, 0>, 1.7 } cylinder { <-1.4, 0, 0> <-0.6, 0, 0>, 1.7 }
@ -52,9 +58,11 @@ difference {
#declare foo = foo + 36; #declare foo = foo + 36;
#end #end
} }
translate y*3 translate y*3 /* why ??? */
pigment { color LightSteelBlue } texture {
finish { phong 0.7 } pigment { color LightSteelBlue }
finish { phong 0.6 }
}
} }
#declare Moyeu = object #declare Moyeu = object
@ -118,11 +126,11 @@ texture {
#declare Chassis_Boogie = object #declare Chassis_Boogie = object
{ {
union { union {
box { <-3.85, 0, -3>, <3.85, 2, 3> } box { <-3.85, 0, -3>, <3.85, 1.6, 3> }
cylinder { <0, 1, 0>, <0, 4, 0>, 2 } cylinder { <0, 1, 0>, <0, 4, 0>, 1.5 }
} }
translate y*2 translate y*2
pigment { color Blue } pigment { color Gray30 }
} }
#declare Boogie = object #declare Boogie = object
@ -133,7 +141,7 @@ union
object { Petite_Roue scale <-1, 1, 1> 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> }
object { Petite_Roue scale <-1, 1, 1> 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> }
} }
} }

View File

@ -6,7 +6,6 @@
*/ */
#version 3.7; #version 3.7;
global_settings { assumed_gamma 1.0 }
#include "contexte.inc" #include "contexte.inc"
#include "colors.inc" #include "colors.inc"

View File

@ -6,10 +6,6 @@
#version 3.7; #version 3.7;
#include "contexte.inc" #include "contexte.inc"
global_settings {
assumed_gamma 1.0 /* pour povray 3.7 */
}
#include "colors.inc" #include "colors.inc"
#include "metals.inc" #include "metals.inc"
@ -41,7 +37,7 @@ union {
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
camera { camera {
location <-42, 17.5, 32> location <-72, 17.5, 32>
right image_width/image_height*x right image_width/image_height*x
look_at <5, 9.7, 18> look_at <5, 9.7, 18>
angle ANGLE_CAM angle ANGLE_CAM

View File

@ -12,7 +12,7 @@ plane {
} }
rotate x*90 rotate x*90
translate <-0.5, 0, -0.5> translate <-0.5, 0, -0.5>
scale <50, 1, 50> scale <150, 1, 150>
} }
} }

View File

@ -0,0 +1,7 @@
TODO
====
[ ] Rendre le Makefile pilotable depuis le shell ?
[ ] Tester le module à partir d'un .INI de Povray

View File

@ -1,11 +1,10 @@
/* /*
* * Les jouets de tTh - 2021
* pour plus de details: oulala@chez.com * pour plus de details: oulala@chez.com
* *
*/ */
#version 3.7; #version 3.7;
global_settings { assumed_gamma 1.0 }
#include "contexte.inc" #include "contexte.inc"
#include "colors.inc" #include "colors.inc"

View File

@ -5,11 +5,6 @@
#include "metals.inc" #include "metals.inc"
#include "textures.inc" #include "textures.inc"
global_settings {
assumed_gamma 1.0 /* pour povray 3.7 */
}
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
#include "monde.inc" #include "monde.inc"
@ -36,7 +31,7 @@ camera
angle ANGLE_CAM angle ANGLE_CAM
} }
light_source { <200, 70, -200> color Gray50 } light_source { < 200, 70, -200> color Gray50 }
light_source { <-200, 170, -150> color White } light_source { <-200, 170, -150> color White }
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/

View File

@ -1,14 +1,12 @@
#version 3.7; #version 3.7;
global_settings { assumed_gamma 1.0 }
#include "contexte.inc" #include "contexte.inc"
#include "colors.inc" #include "colors.inc"
#include "metals.inc" #include "metals.inc"
#include "textures.inc" #include "textures.inc"
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
#include "incs/poteaux.inc" #include "incs/poteaux.inc"
object { Poteau_1 } object { Poteau_1 }
@ -21,12 +19,11 @@ object { Un_Rail_Droit translate z*-100}
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
camera camera
{ {
location <0, 70, 180> location <20, 70, 240>
right image_width/image_height*x right image_width/image_height*x
look_at <0, 0, 0> look_at <0, 24, 0>
angle ANGLE_CAM angle ANGLE_CAM
} }

View File

@ -1,4 +1,3 @@
/* /*
* *
* pour plus de details: * pour plus de details:
@ -7,7 +6,6 @@
*/ */
#version 3.7; #version 3.7;
global_settings { assumed_gamma 1.0 }
#include "contexte.inc" #include "contexte.inc"
#include "colors.inc" #include "colors.inc"
@ -18,9 +16,8 @@ global_settings { assumed_gamma 1.0 }
#include "monde.inc" #include "monde.inc"
#include "incs/train.inc"
#include "incs/electric.inc"
#include "incs/rails.inc" #include "incs/rails.inc"
#include "incs/train.inc" #include "incs/train.inc"
#include "incs/benne.inc" #include "incs/benne.inc"
@ -29,17 +26,29 @@ global_settings { assumed_gamma 1.0 }
#include "incs/corail.inc" #include "incs/corail.inc"
#include "incs/locomotive.inc" #include "incs/locomotive.inc"
union #declare Trois_rails = object
{ {
union {
object { Un_Rail_Droit } object { Un_Rail_Droit }
object { Un_Rail_Droit translate z*-100 } object { Un_Rail_Droit translate z*-100 }
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 { Locomotive_Vapeur translate <0, 2, -56> }
object { Wagon_Citerne translate <0, 2, -25> } object { Wagon_Citerne translate <0, 2, -25> }
object { Wagon_Benne translate <0, 2, 2> } object { Wagon_Benne translate <0, 2, 2> }
object { Wagon_Corail translate <0, 2, 39> } object { Wagon_Corail translate <0, 2, 39> }
object { Wagon_Ridelles translate <0, 2, 78> } object { Wagon_Ridelles translate <0, 2, 78> }
#local XS = 60;
object { Trois_rails translate x*XS }
object { Locomotive_Electric translate <XS, 2, 6> }
} }
#include "incs/poteaux.inc" #include "incs/poteaux.inc"
@ -54,7 +63,7 @@ union
camera camera
{ {
location <130, 18, 15> location <260, 38, 25>
right image_width/image_height*x right image_width/image_height*x
look_at <0, 3, 10> look_at <0, 3, 10>
angle ANGLE_CAM angle ANGLE_CAM

View File

@ -3,7 +3,6 @@
*/ */
#version 3.7; #version 3.7;
global_settings { assumed_gamma 1.0 }
#include "contexte.inc" #include "contexte.inc"
#include "colors.inc" #include "colors.inc"

View File

@ -1,10 +1,7 @@
/* /*
un fichier de test. quelques elements des voitures
*/ */
#version 3.7; #version 3.7;
global_settings {
assumed_gamma 1.0 /* pour povray 3.7 */
}
#include "contexte.inc" #include "contexte.inc"
#include "colors.inc" #include "colors.inc"
@ -19,16 +16,16 @@ global_settings {
object { Boogie } object { Boogie }
camera { camera {
location <15.5, 8, 9> location <25.5, 15, 22>
look_at <0, 0, 0> look_at <0, 2, 0>
angle 42 angle ANGLE_CAM
} }
cylinder { <-100, 0, 0>, <100, 0, 0>, 0.1 pigment { color Red } } 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, -100, 0>, <0, 100, 0>, 0.1 pigment { color Green } }
cylinder { <0, 0, -100>, <0, 0, 100>, 0.1 pigment { color Blue } } cylinder { <0, 0, -100>, <0, 0, 100>, 0.1 pigment { color Blue } }
light_source { <90, 131, 190> color White } light_source { <90, 131, 190> color Cyan }
light_source { <90, 111, 250> color White } light_source { <90, 111, 250> color Magenta }
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/

View File

@ -10,7 +10,6 @@
*/ */
#version 3.7; #version 3.7;
global_settings { assumed_gamma 1.0 }
#include "contexte.inc" #include "contexte.inc"
#include "colors.inc" #include "colors.inc"
@ -39,14 +38,14 @@ object { Poteau_1 translate -z*12 }
camera camera
{ {
location <12, 10, -50> location <14, 10, -80>
right image_width/image_height*x right image_width/image_height*x
look_at <0, 0, 0> look_at <0, 7, 0>
angle ANGLE_CAM angle ANGLE_CAM
} }
light_source { <-50, 120, -330> color Gray50 } light_source { <-50, 120, -330> color Gray50 }
light_source { <190, 498, -250> color White } light_source { <190, 498, -250> color White }
light_source { <160, 99, -250> color Yellow } light_source { <160, 99, -450> color Yellow }
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/