diff --git a/pr/sol/GNUmakefile b/pr/sol/GNUmakefile index 3f65abe..53942f4 100644 --- a/pr/sol/GNUmakefile +++ b/pr/sol/GNUmakefile @@ -3,51 +3,49 @@ include GNUmakevars all: \ - sol-im-leerraum.ppm \ - raumhafen.ppm \ - people.ppm \ - test-mittelstueck.ppm \ - test-sz.ppm \ - test-sol.ppm \ - test-mensch.ppm \ - exodus.ppm \ - sol-ortho.ppm + test-sz.png \ + sol-im-leerraum.png \ + raumhafen.png \ + people.png \ + test-mittelstueck.png \ + test-sol.png \ + test-mensch.png \ + exodus.png \ + sol-ortho.png -%.jpg: %.ppm +%.jpg: %.png cjpeg $< > $@ -%.ppm: %.pov - $(POVRAY) +L$(POVINC) +V -I$< +FP +%.png: %.pov + $(POVRAY) +L$(POVINC) +V -I$< +FN %.pov: make% $< > $@ -test-sz.ppm: test-sz.pov sz.pov ynkelonium_texture.pov Triebwerk.pov +test-sz.png: test-sz.pov sz.pov ynkelonium_texture.pov Triebwerk.pov -test-mittelstueck.ppm: test-mittelstueck.pov mittelstueck.pov \ +test-mittelstueck.png: test-mittelstueck.pov mittelstueck.pov \ ynkelonium_texture.pov Triebwerk.pov -test-sol.ppm: test-sol.pov sol.pov sz.pov mittelstueck.pov \ +test-sol.png: test-sol.pov sol.pov sz.pov mittelstueck.pov \ ynkelonium_texture.pov Triebwerk.pov -test-mensch.ppm: test-mensch.pov mensch.pov +test-mensch.png: test-mensch.pov mensch.pov -exodus.ppm: exodus.pov sol.pov sz.pov mittelstueck.pov \ +exodus.png: exodus.pov sol.pov sz.pov mittelstueck.pov \ ynkelonium_texture.pov Triebwerk.pov mensch.pov ringwulst.pov $(POVRAY) +L$(POVINC) +V -I$< +FP +W600 +H800 -raumhafen.ppm: raumhafen.pov +raumhafen.png: raumhafen.pov $(POVRAY) +L$(POVINC) +V -I$< +FP +W600 +H800 -sol-im-leerraum.ppm: sol-im-leerraum.pov sol.pov sz.pov mittelstueck.pov \ +sol-im-leerraum.png: sol-im-leerraum.pov sol.pov sz.pov mittelstueck.pov \ ynkelonium_texture.pov Triebwerk.pov ringwulst.pov $(POVRAY) +L$(POVINC) +V -I$< +FP -sol-ortho.ppm: sol-ortho.pov sol.pov sz.pov mittelstueck.pov \ +sol-ortho.png: sol-ortho.pov sol.pov sz.pov mittelstueck.pov \ ynkelonium_texture.pov Triebwerk.pov ringwulst.pov -%.gif: %.ppm - ppmquant 256 $< | ppmtogif > $@ diff --git a/pr/sol/sz.pov b/pr/sol/sz.pov index 03fa817..11f939c 100644 --- a/pr/sol/sz.pov +++ b/pr/sol/sz.pov @@ -133,24 +133,77 @@ union { #declare i = 15; #while (i < 360) - cone { - <0, 0, 0>, 100 - <0, 10, 0>, 100 - translate <0, -1260, 0> - rotate <45, 0, 0> - rotate <0, i, 0> - texture { - pigment { color rgb <0.7, 0.5, 0.7> } - finish { - ambient 0.2 - diffuse 0.35 - specular 0.55 - roughness 0.1 - reflection 0.25 - brilliance 1.0 + #ifdef (Landestuetzen_ausgefahren) + #local j = 0; + #while (j < 3) + #local Rl = 1250*sqrt(0.5); + #local Yo = (1270 - Rl) * (3-j)/3 - 1270; + #local Zo = (1100 - Rl) * j/3 + Rl; + #local Yu = (1270 - Rl) * (2-j)/3 - 1270; + #local Zu = (1100 - Rl) * (j+1)/3 + Rl; + #debug concat ("\nlandestuetze: (", + str(Yo, 0, 0), ", ", str(Zo, 0, 0), ") - (", + str(Yu, 0, 0), ", ", str(Zu, 0, 0), ")") + #local Rl = 50 - 10 * j; + cone { + <0, Yo, Zo>, Rl + <0, Yu, Zu>, Rl + rotate <0, i, 0> + texture { + Ynkelonium_Texture + } + } + #local j = j + 1; + #end + union { + intersection { + sphere { + <0, 10, 0>, 50 + } + cylinder { + <0, 10, 0> + <0, 60, 0> + 50 + } + } + cone { + <0, 0, 0>, 100 + <0, 10, 0>, 100 + } + texture { + pigment { color rgb <0.7, 0.5, 0.7> } + finish { + ambient 0.2 + diffuse 0.35 + specular 0.55 + roughness 0.1 + reflection 0.25 + brilliance 1.0 + } + } + translate <0, -1280, 1100> + rotate <0, i, 0> + } + #else + cone { + <0, 0, 0>, 100 + <0, 10, 0>, 100 + translate <0, -1260, 0> + rotate <45, 0, 0> + rotate <0, i, 0> + texture { + pigment { color rgb <0.7, 0.5, 0.7> } + finish { + ambient 0.2 + diffuse 0.35 + specular 0.55 + roughness 0.1 + reflection 0.25 + brilliance 1.0 + } } } - } + #end #declare i = i + 30; #end } diff --git a/pr/sol/test-sz.pov b/pr/sol/test-sz.pov index e464b88..93c5efc 100644 --- a/pr/sol/test-sz.pov +++ b/pr/sol/test-sz.pov @@ -25,16 +25,19 @@ camera { #ifdef (Camera_Totale) camera { - location <4650, 1700, 0> + angle 40 + location <8000, 1300, 0> look_at <1250, 1300, 0> } #end +#declare Landestuetzen_ausgefahren = 1; + #include "sz.pov" object { SZ - translate <0, 1300, 0> + translate <0, 1280, 0> }