Replace union with Merge CornellBox

monkstone · monkstone · commit 1cd6eef8a13e · 2011-09-29T06:53:17.000+01:00
diff --git a/raytracing/BasicScene.py b/raytracing/BasicScene.py
@@ -0,0 +1,52 @@
+"""
+cornell_box.py
+Author: Martin Prout September 2011, based on an original cornell.pov by Kari Kivisalo
+This O0 Cornell Box, uses 'raw' writing for more complicated PovRAY elements
+such as the non point light source, with a SubPatch.
+The povwriter module, a modified recipe (http://code.activestate.com/recipes/205451/ (r1)) 
+is the normal interface between python and PovRAY.
+"""
+
+from povwriter import *
+
+
+
+class BasicScene(object):
+    """
+    Basic external scene
+    Note the use of tuples to group scalar values for vector type
+    """
+    def __init__(self,  name,  size):
+        self.scene = POVFile(name,  size, "colors.inc",  "skies.inc")
+        self.cam = Camera(location = (0, 2, -3), look_at = (0, 1, 2))
+        self.sky = SkySphere("S_Cloud3")
+        self.ground = Plane((0.0, 1.0, 0.0), 0.0,
+                        Texture(
+                                Pigment(color = "NeonBlue"),  
+                                Finish(reflection = 0.15)
+                                )
+                            )
+        self.light = LightSource( (2, 4, -3), color = "White")
+        
+    def foreground(self):
+        for i in xrange(4):
+            self.scene.write(Sphere( ((i * 0.5), 0.25 + (i * 0.5), 2), 0.25, 
+                Texture(
+                        Pigment(
+                                color = "Yellow")
+                                )
+                            )
+                        )
+            
+        
+        
+    def background(self):    
+        self.scene.write(self.cam,  self.sky,  self.light,  self.ground)
+        
+def main():   
+    scene = BasicScene("basic_scene.pov",  (800, 600))    
+    scene.background()
+    scene.foreground()
+    
+if __name__ == "__main__":
+    main()
diff --git a/raytracing/basic_scene.jpg b/raytracing/basic_scene.jpg
diff --git a/raytracing/basic_scene.pov b/raytracing/basic_scene.pov
@@ -5,7 +5,9 @@
 // For PovRAY Version: 3.7 (includes radiosity)
 // Date: September 2011
 // Auth: Martin Prout 
-// +width 800 +height 600 for basic_scene example
+
+// width 800 height 600
+
 #version 3.7;
 global_settings{
     assumed_gamma 1.0
@@ -56,28 +58,51 @@ plane
     }
 }
 
-triangle
+sphere
+{
+    <0.0, 0.25, 2>, 0.25
+    texture
+    {
+        pigment
+        {
+            color Yellow
+        }
+    }
+}
+
+sphere
 {
-    <0, 1, 2>, <1, 0, 1>, <0, 0, 0>
+    <0.5, 0.75, 2>, 0.25
     texture
     {
         pigment
         {
-            color Red
+            color Yellow
+        }
+    }
+}
+
+sphere
+{
+    <1.0, 1.25, 2>, 0.25
+    texture
+    {
+        pigment
+        {
+            color Yellow
         }
     }
 }
 
-box
+sphere
 {
-    <0, 1, 2>, <1, 0, 1>
+    <1.5, 1.75, 2>, 0.25
     texture
     {
         pigment
         {
             color Yellow
         }
     }
-    rotate <0, 10, 0>
 }
 
diff --git a/raytracing/cornell_box.jpg b/raytracing/cornell_box.jpg
diff --git a/raytracing/cornell_box.pov b/raytracing/cornell_box.pov
@@ -5,7 +5,9 @@
 // For PovRAY Version: 3.7 (includes radiosity)
 // Date: September 2011
 // Auth: Martin Prout 
-// +width 800 +height 600 for basic_scene example
+
+// width 300 height 300
+
 #version 3.7;
 global_settings{
     assumed_gamma 1.0
@@ -64,7 +66,7 @@ box
     }
 }
 
-union
+merge
 {
     triangle
     {
@@ -104,7 +106,7 @@ union
     }
 }
 
-union
+merge
 {
     triangle
     {
@@ -128,7 +130,7 @@ union
     }
 }
 
-union
+merge
 {
     triangle
     {
@@ -152,7 +154,7 @@ union
     }
 }
 
-union
+merge
 {
     triangle
     {
@@ -208,7 +210,7 @@ union
     }
 }
 
-union
+merge
 {
     triangle
     {
diff --git a/raytracing/cornell_box.py b/raytracing/cornell_box.py
@@ -32,6 +32,7 @@
 class CornellBox(object):
     """
     Cornell box mainly as an object, except for the lights which are bit complicated
+    300 x 300 is the default size, but we need to add the inc files here. 
     """
     def __init__(self):
         self.scene = POVFile("cornell_box.pov",  (300, 300), "colors.inc",  "skies.inc")
@@ -47,7 +48,7 @@ def __init__(self):
         self.skylight = Box ((21.3, 54.87, 33.2),  (34.3, 54.88, 22.7),  'no_shadow', 
                              Pigment(rgb = (1, 1, 1)), Finish(emission = 0.78,  diffuse = 0))
         # Floor, Ceiling, Backwall                             
-        self.cornell_box = Union(
+        self.cornell_box = Merge(
             # Floor
             Triangle((55.28, 0.0, 0.0), (0.0, 0.0, 0.0), (0.0, 0.0, 55.92)),
             Triangle((55.28, 0.0, 0.0), (0.0, 0.0, 55.92), (54.96, 0.0, 55.92)), 
@@ -58,53 +59,52 @@ def __init__(self):
             Triangle((0.0, 54.88, 55.92), (55.60, 54.88, 55.92), (54.96, 0.0, 55.92)), 
             Triangle((0.0, 54.88, 55.92), (54.96, 0.0, 55.92), (0.0, 0.0, 55.92)), 
             Texture(Pigment(rgb = (1,  1,  1)),  Finish(diffuse=0.75,  ambient = 0))
-                       )
+            )
              
         # Right wall
-        self.right_wall = Union (
+        self.right_wall = Merge (
             Triangle((0.0, 54.88, 0.0), (0.0, 54.88, 55.92), (0.0, 0.0, 55.92)), 
             Triangle((0.0, 54.88, 0.0), (0.0, 0.0, 55.92), (0.0, 0.0, 0.0)), 
             Texture(Pigment(rgb = (0.025, 0.236, 0.025)),  Finish(diffuse=0.75,  ambient = 0))
             )
             
         # Left wall
-        self.left_wall = Union (
+        self.left_wall = Merge (
             Triangle((55.28, 0.0, 0.0), (54.96, 0.0, 55.92), (55.60, 54.88, 55.92)), 
             Triangle((55.28, 0.0, 0.0), (55.60, 54.88, 55.92), (55.60, 54.88, 0.0)), 
             Texture(Pigment(rgb = (0.57, 0.025, 0.025)),  Finish(diffuse=0.75,  ambient = 0))
             )
             
      
-        self.short_box = Union (
-        #Short block
-        Triangle((13.00, 16.50, 6.50), (8.20, 16.50, 22.50), (24.00, 16.50, 27.20)), 
-        Triangle((13.00, 16.50, 6.50), (24.00, 16.50, 27.20), (29.00, 16.50, 11.40)), 
-        Triangle((29.00, 0.0, 11.40), (29.00, 16.50, 11.40), (24.00, 16.50, 27.20)), 
-        Triangle((29.00, 0.0, 11.40), (24.00, 16.50, 27.20), (24.00, 0.0, 27.20)), 
-        Triangle((13.00, 0.0, 6.50), (13.00, 16.50, 6.50), (29.00, 16.50, 11.40)), 
-        Triangle((13.00, 0.0, 6.50), (29.00, 16.50, 11.40), (29.00, 0.0, 11.40)), 
-        Triangle((8.20, 0.0, 22.50), (8.20, 16.50, 22.50), (13.00, 16.50, 6.50)), 
-        Triangle((8.20, 0.0, 22.50), (13.00, 16.50, 6.50), (13.00, 0.0, 6.50)), 
-        Triangle((24.00, 0.0, 27.20), (24.00, 16.50, 27.20), (8.20, 16.50, 22.50)), 
-        Triangle((24.00, 0.0, 27.20), (8.20, 16.50, 22.50), (8.20, 0.0, 22.50)), 
-        Texture(Pigment(rgb = (1,  1,  1)),  Finish(diffuse=0.75,  ambient = 0))
-   
-        )  
+        self.short_box = Merge (
+            #Short block
+            Triangle((13.00, 16.50, 6.50), (8.20, 16.50, 22.50), (24.00, 16.50, 27.20)), 
+            Triangle((13.00, 16.50, 6.50), (24.00, 16.50, 27.20), (29.00, 16.50, 11.40)), 
+            Triangle((29.00, 0.0, 11.40), (29.00, 16.50, 11.40), (24.00, 16.50, 27.20)), 
+            Triangle((29.00, 0.0, 11.40), (24.00, 16.50, 27.20), (24.00, 0.0, 27.20)), 
+            Triangle((13.00, 0.0, 6.50), (13.00, 16.50, 6.50), (29.00, 16.50, 11.40)), 
+            Triangle((13.00, 0.0, 6.50), (29.00, 16.50, 11.40), (29.00, 0.0, 11.40)), 
+            Triangle((8.20, 0.0, 22.50), (8.20, 16.50, 22.50), (13.00, 16.50, 6.50)), 
+            Triangle((8.20, 0.0, 22.50), (13.00, 16.50, 6.50), (13.00, 0.0, 6.50)), 
+            Triangle((24.00, 0.0, 27.20), (24.00, 16.50, 27.20), (8.20, 16.50, 22.50)), 
+            Triangle((24.00, 0.0, 27.20), (8.20, 16.50, 22.50), (8.20, 0.0, 22.50)), 
+            Texture(Pigment(rgb = (1,  1,  1)),  Finish(diffuse=0.75,  ambient = 0))   
+            )  
 
-        self.tall_box = Union (
-          #Tall block
-          Triangle((42.30, 33.00, 24.70), (26.50, 33.00, 29.60), (31.40, 33.00, 45.60)), 
-          Triangle((42.30, 33.00, 24.70), (31.40, 33.00, 45.60), (47.20, 33.00, 40.60)), 
-          Triangle((42.30, 0.0, 24.70), (42.30, 33.00, 24.70), (47.20, 33.00, 40.60)), 
-          Triangle((42.30, 0.0, 24.70), (47.20, 33.00, 40.60), (47.20, 0.0, 40.60)), 
-          Triangle((47.20, 0.0, 40.60), (47.20, 33.00, 40.60), (31.40, 33.00, 45.60)), 
-          Triangle((47.20, 0.0, 40.60), (31.40, 33.00, 45.60), (31.40, 0.0, 45.60)), 
-          Triangle((31.40, 0.0, 45.60), (31.40, 33.00, 45.60), (26.50, 33.00, 29.60)), 
-          Triangle((31.40, 0.0, 45.60), (26.50, 33.00, 29.60), (26.50, 0.0, 29.60)), 
-          Triangle((26.50, 0.0, 29.60), (26.50, 33.00, 29.60), (42.30, 33.00, 24.70)), 
-          Triangle((26.50, 0.0, 29.60), (42.30, 33.00, 24.70), (42.30, 0.0, 24.70)), 
-          Texture(Pigment(rgb = (1,  1,  1)),  Finish(diffuse=0.75,  ambient = 0))
-        )
+        self.tall_box = Merge (
+            #Tall block
+            Triangle((42.30, 33.00, 24.70), (26.50, 33.00, 29.60), (31.40, 33.00, 45.60)), 
+            Triangle((42.30, 33.00, 24.70), (31.40, 33.00, 45.60), (47.20, 33.00, 40.60)), 
+            Triangle((42.30, 0.0, 24.70), (42.30, 33.00, 24.70), (47.20, 33.00, 40.60)), 
+            Triangle((42.30, 0.0, 24.70), (47.20, 33.00, 40.60), (47.20, 0.0, 40.60)), 
+            Triangle((47.20, 0.0, 40.60), (47.20, 33.00, 40.60), (31.40, 33.00, 45.60)), 
+            Triangle((47.20, 0.0, 40.60), (31.40, 33.00, 45.60), (31.40, 0.0, 45.60)), 
+            Triangle((31.40, 0.0, 45.60), (31.40, 33.00, 45.60), (26.50, 33.00, 29.60)), 
+            Triangle((31.40, 0.0, 45.60), (26.50, 33.00, 29.60), (26.50, 0.0, 29.60)), 
+            Triangle((26.50, 0.0, 29.60), (26.50, 33.00, 29.60), (42.30, 33.00, 24.70)), 
+            Triangle((26.50, 0.0, 29.60), (42.30, 33.00, 24.70), (42.30, 0.0, 24.70)), 
+            Texture(Pigment(rgb = (1,  1,  1)),  Finish(diffuse=0.75,  ambient = 0))
+          )
                            
         
     def writePovray(self):
@@ -119,7 +119,7 @@ def writePovray(self):
         self.scene.declare(JE)
         self.scene.declare(IE)
         self.scene.write(self.cam, self.skylight,  self.cornell_box,  self.right_wall, self.left_wall,  
-                        self.short_box,  self.tall_box)
+            self.short_box,  self.tall_box)
             
 
 def main():
diff --git a/raytracing/povwriter/BasicScene.py b/raytracing/povwriter/BasicScene.py
@@ -0,0 +1,54 @@
+"""
+cornell_box.py
+Author: Martin Prout September 2011, based on an original cornell.pov by Kari Kivisalo
+This O0 Cornell Box, uses 'raw' writing for more complicated PovRAY elements
+such as the non point light source, with a SubPatch.
+The povwriter module, a modified recipe (http://code.activestate.com/recipes/205451/ (r1)) 
+is the normal interface between python and PovRAY.
+"""
+
+from povwriter import *
+
+
+
+class BasicScene(object):
+    """
+    Basic external scene
+    Note the use of tuples to group scalar values for vector type
+    """
+    def __init__(self,  name,  size):
+        self.scene = POVFile(name,  size, "colors.inc",  "skies.inc")
+        self.cam = Camera(location = (0, 2, -3), look_at = (0, 1, 2))
+        self.sky = SkySphere("S_Cloud3")
+        self.ground = Plane((0.0, 1.0, 0.0), 0.0,
+                        Texture(
+                                Pigment(color = "NeonBlue"),  
+                                Finish(reflection = 0.15)
+                                )
+                            )
+        self.sphere = Sphere( (0, 1, 2), 1, 
+                        Texture(
+                                Pigment(
+                                        color = "Yellow")
+                                        )
+                                    )
+        self.light = LightSource( (2, 4, -3), color = "White")
+        
+    def add_spheres(self):
+        self.spheres = [10]
+        for i in xrange(10):
+            self.spheres[i] = Sphere( (0, i, 2), 1, 
+                Texture(
+                        Pigment(
+                                color = "Yellow")
+                                )
+                            )
+            
+        
+        
+    def write_file(self):    
+        self.scene.write(self.cam,  self.sky,  self.light,  self.ground,  self.spheres)
+        
+def main():   
+    scene = BasicScene("basic_scene.pov",  (800, 600))
+    scene.write()
diff --git a/raytracing/povwriter/povwriter.py b/raytracing/povwriter/povwriter.py
@@ -4,10 +4,11 @@
 """
 __all__ = ['POVFile',  'Vector',  'Sphere',  'Box',  'Triangle', 'Pigment', 
 'Blob', 'Texture', 'Finish', 'Normal', 'Camera', 'LightSource',  'Torus', 
-'Union', 'Intersection', 'Difference',  'SkySphere', 'Mesh', 'Plane']
+'Union', 'Intersection', 'Difference',  'SkySphere', 'Mesh', 'Plane', 
+'Merge',  'Cylinder',  'Cone']
 HEADER1 = """
-// Persistence Of Vision Ray Tracer Scene Description pov_fib
-// pov_fib:    Generated by tracer.py
+// Persistence Of Vision Ray Tracer Scene Description pov_file
+// pov_file:    Generated by tracer.py
 // tracer.py is based on http://code.activestate.com/recipes/205451/ (r1)
 // For PovRAY Version: 3.7 (includes radiosity)
 // Date: September 2011
@@ -28,9 +29,6 @@
 }
 """
 
-
-
-
 class POVFile(object):
     
     """

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@`
`5`	`5`	`// For PovRAY Version: 3.7 (includes radiosity)`
`6`	`6`	`// Date: September 2011`
`7`	`7`	`// Auth: Martin Prout`
`8`		`-// +width 800 +height 600 for basic_scene example`
	`8`	`+`
	`9`	`+// width 800 height 600`
	`10`	`+`
`9`	`11`	`#version 3.7;`
`10`	`12`	`global_settings{`
`11`	`13`	`assumed_gamma 1.0`
`@@ -56,28 +58,51 @@ plane`
`56`	`58`	`}`
`57`	`59`	`}`
`58`	`60`
`59`		`-triangle`
	`61`	`+sphere`
	`62`	`+{`
	`63`	`+ <0.0, 0.25, 2>, 0.25`
	`64`	`+ texture`
	`65`	`+ {`
	`66`	`+ pigment`
	`67`	`+ {`
	`68`	`+ color Yellow`
	`69`	`+ }`
	`70`	`+ }`
	`71`	`+}`
	`72`	`+`
	`73`	`+sphere`
`60`	`74`	`{`
`61`		`- <0, 1, 2>, <1, 0, 1>, <0, 0, 0>`
	`75`	`+ <0.5, 0.75, 2>, 0.25`
`62`	`76`	`texture`
`63`	`77`	`{`
`64`	`78`	`pigment`
`65`	`79`	`{`
`66`		`- color Red`
	`80`	`+ color Yellow`
	`81`	`+ }`
	`82`	`+ }`
	`83`	`+}`
	`84`	`+`
	`85`	`+sphere`
	`86`	`+{`
	`87`	`+ <1.0, 1.25, 2>, 0.25`
	`88`	`+ texture`
	`89`	`+ {`
	`90`	`+ pigment`
	`91`	`+ {`
	`92`	`+ color Yellow`
`67`	`93`	`}`
`68`	`94`	`}`
`69`	`95`	`}`
`70`	`96`
`71`		`-box`
	`97`	`+sphere`
`72`	`98`	`{`
`73`		`- <0, 1, 2>, <1, 0, 1>`
	`99`	`+ <1.5, 1.75, 2>, 0.25`
`74`	`100`	`texture`
`75`	`101`	`{`
`76`	`102`	`pigment`
`77`	`103`	`{`
`78`	`104`	`color Yellow`
`79`	`105`	`}`
`80`	`106`	`}`
`81`		`- rotate <0, 10, 0>`
`82`	`107`	`}`
`83`	`108`