fix some minor issues

1 files changed, 113 insertions, 9 deletions

diff --git a/buch/chapters/110-elliptisch/images/kegelpara.pov b/buch/chapters/110-elliptisch/images/kegelpara.pov
index 5d85eed..13b66cc 100644
--- a/buch/chapters/110-elliptisch/images/kegelpara.pov
+++ b/buch/chapters/110-elliptisch/images/kegelpara.pov
@@ -67,11 +67,11 @@ union {
 }
 #end
 
-arrow(<-2,0,0>,<2,0,0>,0.02,White)
-arrow(<0,-2,0>,<0,2,0>,0.02,White)
-arrow(<0,0,-2>,<0,0,2>,0.02,White)
+arrow(<-2.6,0,0>,<2.5,0,0>,0.02,White)
+arrow(<0,-2,0>,<0,2.3,0>,0.02,White)
+arrow(<0,0,-3.2>,<0,0,3.7>,0.02,White)
 
-#declare epsilon = 0.001;
+#declare epsilon = 0.0001;
 #declare l = 1.5;
 
 #macro Kegel(farbe)
@@ -94,6 +94,54 @@ union {
 }
 #end
 
+#macro Kegelpunkt(xx, phi)
+	< xx, xx * sin(phi), xx * cos(phi) >
+#end
+
+#macro Kegelgitter(farbe, r)
+union {
+	#declare s = 0;
+	#declare smax = 2 * pi;
+	#declare sstep = pi / 6;
+	#while (s < smax - sstep/2)
+		cylinder { Kegelpunkt(l, s), Kegelpunkt(-l, s), r }
+		#declare s = s + sstep;
+	#end
+	#declare phimax = 2 * pi;
+	#declare phisteps = 100;
+	#declare phistep = phimax / phisteps;
+	#declare xxstep = 0.5;
+	#declare xxmax = 2;
+	#declare xx = xxstep;
+	#while (xx < xxmax - xxstep/2)
+		#declare phi = 0;
+		#while (phi < phimax - phistep/2)
+			cylinder {
+				Kegelpunkt(xx, phi),
+				Kegelpunkt(xx, phi + phistep),
+				r
+			}
+			sphere { Kegelpunkt(xx, phi), r }
+			cylinder {
+				Kegelpunkt(-xx, phi),
+				Kegelpunkt(-xx, phi + phistep),
+				r
+			}
+			sphere { Kegelpunkt(-xx, phi), r }
+			#declare phi = phi + phistep;
+		#end
+		#declare xx = xx + xxstep;
+	#end
+	pigment {
+		color farbe
+	}
+	finish {
+		specular 0.9
+		metallic
+	}
+}
+#end
+
 #macro F(w, r)
 	<r * cos(w), r * r/sqrt(2), r * sin(w) >
 #end
@@ -139,6 +187,50 @@ mesh {
 }
 #end
 
+#macro Paraboloidgitter(farbe, gr)
+union {
+	#declare phi = 0;
+	#declare phimax = 2 * pi;
+	#declare phistep = pi / 6;
+
+	#declare rmax = 1.5;
+	#declare rsteps = 100;
+	#declare rstep = rmax / rsteps;
+
+	#while (phi < phimax - phistep/2)
+		#declare r = rstep;
+		#while (r < rmax - rstep/2)
+			cylinder { F(phi, r), F(phi, r + rstep), gr }
+			sphere { F(phi, r), gr }
+			#declare r = r + rstep;
+		#end
+		#declare phi = phi + phistep;
+	#end
+
+	#declare rstep = 0.2;
+	#declare r = rstep;
+
+	#declare phisteps = 100;
+	#declare phistep = phimax / phisteps;
+	#while (r < rmax)
+		#declare phi = 0;
+		#while (phi < phimax - phistep/2)
+			cylinder { F(phi, r), F(phi + phistep, r), gr }
+			sphere { F(phi, r), gr }
+			#declare phi = phi + phistep;
+		#end
+		#declare r = r + rstep;
+	#end
+	pigment {
+		color farbe
+	}
+	finish {
+		specular 0.9
+		metallic
+	}
+}
+#end
+
 #declare a = sqrt(2);
 #macro G(phi,sg)
 	< a*sg*sqrt(cos(2*phi))*cos(phi), a*cos(2*phi), a*sqrt(cos(2*phi))*sin(phi)>
@@ -215,11 +307,23 @@ union {
 }
 #end
 
-#declare kegelfarbe = rgbt<0.2,0.6,0.2,0.2>;
-#declare paraboloidfarbe = rgbt<0.2,0.6,1.0,0.2>;
+#declare kegelfarbe = rgbf<0.2,0.6,0.2,0.2>;
+#declare kegelgitterfarbe = rgb<0.2,0.8,0.2>;
+#declare paraboloidfarbe = rgbf<0.2,0.6,1.0,0.2>;
+#declare paraboloidgitterfarbe = rgb<0.4,1,1>;
+
+//intersection {
+//	union {
+		Paraboloid(paraboloidfarbe)
+		Paraboloidgitter(paraboloidgitterfarbe, 0.004)
+
+		Kegel(kegelfarbe)
+		Kegelgitter(kegelgitterfarbe, 0.004)
+//	}
+//	plane { <0, 0, -1>, 0.6 }
+//}
+
 
-Paraboloid(paraboloidfarbe)
-Kegel(kegelfarbe)
-Lemniskate3D(0.02, Blue)
+Lemniskate3D(0.02, rgb<0.8,0.0,0.8>)
 Lemniskate(0.02, Red)
 Projektion(0.01, Yellow)