From e227f472185bedbb2d5a5619815436a8e451e881 Mon Sep 17 00:00:00 2001
From: hjp <hjp@41646610-1e7d-41f5-9080-4b43bf584971>
Date: Thu, 14 Aug 2008 21:00:40 +0000
Subject: [PATCH] =?UTF-8?q?Ausschnitte=20f=C3=BCr=20Landest=C3=BCtzen.=20K?=
 =?UTF-8?q?raftwerke.=20Weniger=20Treibstofftanks=20(Platz=20f=C3=BCr=20Kr?=
 =?UTF-8?q?aftwerke).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pr/schneller_kreuzer/deck_05.pov | 73 +++++++++++++++++++++++++++-----
 1 file changed, 62 insertions(+), 11 deletions(-)

diff --git a/pr/schneller_kreuzer/deck_05.pov b/pr/schneller_kreuzer/deck_05.pov
index f7a581a..e024736 100644
--- a/pr/schneller_kreuzer/deck_05.pov
+++ b/pr/schneller_kreuzer/deck_05.pov
@@ -1,5 +1,8 @@
 #include "treibstofftank.pov"
 #include "speicherbank.pov"
+#include "kraftwerk.pov"
+
+#local Z = -30;
 
 #declare deck_05 = 
     union {
@@ -19,15 +22,34 @@
 	#end
 	difference {
 	    cone {
-		<0, -29.8, 0> 38.9
-		<0, -30.2, 0> 38.6
+		<0, (Z+0.2), 0> sqrt(pow(49,2)-pow((Z+0.2),2)),
+		<0, (Z-0.2), 0> sqrt(pow(49,2)-pow((Z-0.2),2))
 		texture { T_arkonstahl }
 	    }
 
 	    // Ausschnitt f. Landestützen
-	    // XXX
+	    #local aa = 0;
+	    #while (aa < 360 ) 
+		union {
+		    cone {
+			<20, Z-0.3, 0>, 2
+			<20, Z+0.3, 0>, 2
+		    }
+		    box {
+			<20, Z-0.3, -2>
+			<28, Z+0.3, +2>
+		    }
+		    cone {
+			<28, Z-0.3, 0>, 2
+			<28, Z+0.3, 0>, 2
+		    }
+		    texture { T_arkonstahl }
+		    rotate <0, aa, 0>
+		}
+		#local aa = aa + 30;
+	    #end
 
-	    #ifdef (SCHNITT_1)
+	    #if (SCHNITT_1)
 	    intersection {
 		torus {
 		    23, 23
@@ -41,17 +63,21 @@
 		    rotate <0, -45, 0>
 		}
 		rotate <0, 135, 0>
-		translate <0, 20.0, 0>
+		translate <0, Z, 0>
 	    }
 	    #end
 	}
-        #local rr = 25.5;
-	#while (rr < 40.0) 
+
+	#if (1)
+	// Treibstofftanks
+        #local rr = 30.5;
+	#while (rr < 38.0) 
 	    #local da = degrees(asin(0.5/rr))*2;
+	    #local da = 360 / int(360 / da);
 	    #local aa = 0;
 	    #while (aa <= 360 - da) 
 		#local ss = 1;
-		#ifdef (SCHNITT_1)
+		#if (SCHNITT_1)
 		    #local pp = vrotate(<rr, 0, 0>, <0, aa, 0>);
 		    #if (pp.x < 0 & pp.z < 0) 
 			#local ss = 0;
@@ -60,7 +86,7 @@
 		#if (ss) 
 		    object {
 			treibstofftank
-			translate <rr, -29.8, 0>
+			translate <rr, (Z+0.2), 0>
 			rotate <0, aa, 0>
 		    }
 		#end
@@ -68,12 +94,37 @@
 	    #end
 	    #local rr = rr + 1.0;
 	#end
+	#end
 
+	// Kraftwerke
+        #local rr = 24;
+	#local da = 30;
+	#local aa = da/2;
+	#while (aa <= 360 - da) 
+	    #local ss = 1;
+	    #if (SCHNITT_1)
+		#local pp = vrotate(<rr, 0, 0>, <0, aa, 0>);
+		#if (pp.x < 0 & pp.z < 0) 
+		    #local ss = 0;
+		#end
+	    #end
+	    #if (ss) 
+		object {
+		    turm
+		    translate <rr, (Z+0.2), 0>
+		    rotate <0, aa, 0>
+		}
+	    #end
+	    #local aa = aa + da;
+	#end
+
+
+	// Speicherbänke
 	#local da = 60;
 	#local aa = 0;
 	#while (aa <= 360 - da) 
 	    #local ss = 1;
-	    #ifdef (SCHNITT_1)
+	    #if (SCHNITT_1)
 		#local pp = vrotate(<rr, 0, 0>, <0, aa, 0>);
 		#if (pp.x < 0 & pp.z < 0) 
 		    #local ss = 0;
@@ -82,7 +133,7 @@
 	    #if (ss) 
 		object {
 		    speicherbank
-		    translate <5, -29.8, 0>
+		    translate <5, (Z+0.2), 0>
 		    rotate <0, aa, 0>
 		}
 	    #end