diff --git a/pr/schneller_kreuzer/GNUmakefile b/pr/schneller_kreuzer/GNUmakefile index 3cbdb5b..2937e70 100644 --- a/pr/schneller_kreuzer/GNUmakefile +++ b/pr/schneller_kreuzer/GNUmakefile @@ -55,7 +55,9 @@ test-polgeschuetz.png: test-polgeschuetz.pov polgeschuetz.pov test-schneller_kreuzer.png: test-schneller_kreuzer.pov \ schneller_kreuzer.pov huelle.pov deck_20.pov polgeschuetz.pov \ deck_19.pov ein-mann-jaeger.pov deck_18.pov deck_17.pov \ - deck_16.pov deck_15.pov deck_14.pov deck_13.pov deck_12.pov \ + deck_16.pov deck_15.pov deck_14.pov deck_13.pov \ + feldschirm_projektor.pov \ + deck_12.pov \ deck_11.pov \ speicherbank.pov andruckabsorber.pov \ ringwulst.pov triebwerk.pov \ @@ -86,7 +88,8 @@ test-deck_13.png: test-deck_13.pov \ kabine4.pov \ kraftwerk.pov \ T_bodenbelag.pov \ - zentrale.pov + zentrale.pov \ + feldschirm_projektor.pov \ test-deck_12.png: test-deck_12.pov \ huelle.pov \ diff --git a/pr/schneller_kreuzer/deck_13.pov b/pr/schneller_kreuzer/deck_13.pov index 417208e..174c149 100644 --- a/pr/schneller_kreuzer/deck_13.pov +++ b/pr/schneller_kreuzer/deck_13.pov @@ -4,6 +4,7 @@ #include "kabine4.pov" #include "T_bodenbelag.pov" #include "zentrale.pov" +#include "feldschirm_projektor.pov" #declare Eps=1E-3; @@ -138,104 +139,6 @@ */ } -#declare feldschirm_projektor = - union { - intersection { - union { - difference { - sphere { - <0, 0, 0>, 47.5 - } - sphere { - <0, 0, 0>, 47 - } - } - difference { - sphere { - <0, 0, 0>, 46.5 - } - sphere { - <0, 0, 0>, 46 - } - } - difference { - sphere { - <0, 0, 0>, 45.5 - } - sphere { - <0, 0, 0>, 45 - } - } - texture { pigment { rgb < 0.2, 0.2, 0.4 > } } - } - cone { - <0,0,0>, 0 - <-50, 0, 0>, 5 - scale <1, 0.5, 1> - rotate <0, 0, -17.5> - texture { pigment { rgb < 0.2, 0.2, 0.2 > } } - } - } - #local fsp_r1 = 0.5; - #local fsp_r2 = 0.3; - #local fsp_sa = 3; - cone { - <-43,0,0>, fsp_r2 - <-47, 0, 0>, fsp_r1 - rotate <0, 0, -fsp_sa> - scale <1, 0.5, 1> - rotate <0, 0, -17.5> - texture { pigment { rgb < 1, 0.9, 1 > } } - } - cone { - <-43,0,0>, fsp_r2 - <-47, 0, 0>, fsp_r1 - rotate <0, 0, -fsp_sa> - rotate <120, 0, 0> - scale <1, 0.5, 1> - rotate <0, 0, -17.5> - texture { pigment { rgb < 1, 0.9, 1 > } } - } - cone { - <-43,0,0>, fsp_r2 - <-47, 0, 0>, fsp_r1 - rotate <0, 0, -fsp_sa> - rotate <-120, 0, 0> - scale <1, 0.5, 1> - rotate <0, 0, -17.5> - texture { pigment { rgb < 1, 0.9, 1 > } } - } - sphere { - <-41.5, 15, 0>, 1 - texture { T_Copper_3D } - } - cone { - <-0, 4.8, 0>, 1 - <-0, 0, 0>, 1.5 - matrix < - 1, 0, 0, - 0.5/4.8, 1, 0, - 0, 0, 1, - 0, 0, 0 - > - - translate <-42, 10.2, 0> - texture { pigment { rgb < 1, 0.9, 1 > } } - } - cone { - <-41.5, 12, -3>, 0.5 - <-41.5, 12, +3>, 0.5 - texture { pigment { rgb < 1, 0.8, 1 > } } - } - sphere { - <-41.5, 12, -3>, 0.6 - texture { T_Copper_3D } - } - sphere { - <-41.5, 12, +3>, 0.6 - texture { T_Copper_3D } - } - } #declare deck_13 = union { diff --git a/pr/schneller_kreuzer/feldschirm_projektor.pov b/pr/schneller_kreuzer/feldschirm_projektor.pov new file mode 100644 index 0000000..d286f6c --- /dev/null +++ b/pr/schneller_kreuzer/feldschirm_projektor.pov @@ -0,0 +1,99 @@ +#declare feldschirm_projektor = + union { + intersection { + union { + difference { + sphere { + <0, 0, 0>, 47.5 + } + sphere { + <0, 0, 0>, 47 + } + } + difference { + sphere { + <0, 0, 0>, 46.5 + } + sphere { + <0, 0, 0>, 46 + } + } + difference { + sphere { + <0, 0, 0>, 45.5 + } + sphere { + <0, 0, 0>, 45 + } + } + texture { pigment { rgb < 0.2, 0.2, 0.4 > } } + } + cone { + <0,0,0>, 0 + <-50, 0, 0>, 5 + scale <1, 0.5, 1> + rotate <0, 0, -17.5> + texture { pigment { rgb < 0.2, 0.2, 0.2 > } } + } + } + #local fsp_r1 = 0.5; + #local fsp_r2 = 0.3; + #local fsp_sa = 3; + cone { + <-43,0,0>, fsp_r2 + <-47, 0, 0>, fsp_r1 + rotate <0, 0, -fsp_sa> + scale <1, 0.5, 1> + rotate <0, 0, -17.5> + texture { pigment { rgb < 1, 0.9, 1 > } } + } + cone { + <-43,0,0>, fsp_r2 + <-47, 0, 0>, fsp_r1 + rotate <0, 0, -fsp_sa> + rotate <120, 0, 0> + scale <1, 0.5, 1> + rotate <0, 0, -17.5> + texture { pigment { rgb < 1, 0.9, 1 > } } + } + cone { + <-43,0,0>, fsp_r2 + <-47, 0, 0>, fsp_r1 + rotate <0, 0, -fsp_sa> + rotate <-120, 0, 0> + scale <1, 0.5, 1> + rotate <0, 0, -17.5> + texture { pigment { rgb < 1, 0.9, 1 > } } + } + sphere { + <-41.5, 15, 0>, 1 + texture { T_Copper_3D } + } + cone { + <-0, 4.8, 0>, 1 + <-0, 0, 0>, 1.5 + matrix < + 1, 0, 0, + 0.5/4.8, 1, 0, + 0, 0, 1, + 0, 0, 0 + > + + translate <-42, 10.2, 0> + texture { pigment { rgb < 1, 0.9, 1 > } } + } + cone { + <-41.5, 12, -3>, 0.5 + <-41.5, 12, +3>, 0.5 + texture { pigment { rgb < 1, 0.8, 1 > } } + } + sphere { + <-41.5, 12, -3>, 0.6 + texture { T_Copper_3D } + } + sphere { + <-41.5, 12, +3>, 0.6 + texture { T_Copper_3D } + } + } + diff --git a/pr/schneller_kreuzer/test-deck_13.png b/pr/schneller_kreuzer/test-deck_13.png deleted file mode 100644 index 9402870..0000000 Binary files a/pr/schneller_kreuzer/test-deck_13.png and /dev/null differ