Changeset 349

Timestamp:

11/01/02 14:02:17 (6 years ago)

Author:

sholloway

Message:

*** empty log message ***

Files:

• trunk/RBRapier/RBRapier/Formats/Wavefront/MeshedObject.py (modified) (6 diffs)
• trunk/RBRapier/RBRapier/Renderer/Geometry/ArrayTraversal.py (modified) (2 diffs)
• trunk/RBRapier/demo/Wavefront/scene.py (modified) (2 diffs)

trunk/RBRapier/RBRapier/Formats/Wavefront/MeshedObject.py

@@ -93 +93 @@
-
-    GeoObjectFactory = GeoObject
+    IndexedTraversal = ArrayTraversal.IndexedCollectionTraversal
-
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -162 +163 @@
-            else:
-                mesh = MeshFactory()
+                bTODOPrinted = 0
-                for FaceTraversal in Group.Faces:
+                    if not bTODOPrinted and len(FaceTraversal) > 4: 
+                        print "TODO: teselate faces of more than 4 vertices"
+                        print
+                        bTODOPrinted = 1
-                    v0,v1 = FaceTraversal[:2]
-                    for v2 in FaceTraversal[2:]:
@@ -189 +195 @@
-            listdata = Group.Traversals.get('list')
-            if listdata:
-ArrayTraversal.IndexedCollection
+self.Indexed
-
-            fandatacollection = Group.Traversals.get('fan')
-            if fandatacollection:
-ArrayTraversal.IndexedCollection
+self.Indexed
-
-            stripdatacollection = Group.Traversals.get('strip')
-            if stripdatacollection:
-ArrayTraversal.IndexedCollection
+self.Indexed
-
-    def OptimizeTraversals(self, level):
@@ -206 +212 @@
-            if listdata:
-                optimizer.Visit(listdata)
-ArrayTraversal.IndexedCollection
+self.Indexed
-            elif listdata is not None:
-                del Group.Traversals['list']
@@ -214 +220 @@
-                for fandata in fandatacollection:
-                    optimizer.Visit(fandata)
-ArrayTraversal.IndexedCollection
+self.Indexed
-            elif fandatacollection is not None:
-                del Group.Traversals['fan']
@@ -222 +228 @@
-                for stripdata in stripdatacollection:
-                    optimizer.Visit(stripdata)
-ArrayTraversal.IndexedCollection
+self.Indexed
-            elif stripdatacollection is not None:
-                del Group.Traversals['strip']

trunk/RBRapier/RBRapier/Renderer/Geometry/ArrayTraversal.py

@@ -26 +26 @@
-from OpenGL import GL
-import Numeric
+from Foundation.AspectOriented import Aspect
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -88 +89 @@
-
-    def Execute(self, context):
+        primitive = self.primitive
-        for data in self.datacollection:
+            self._glDrawElements(primitive, data)
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class ColoredIndexedCollectionTraversal(IndexedCollectionTraversal):
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    #~ Constants / Variables / Etc. 
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    colors = []
+
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    #~ Public Methods 
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    def __init__(self, primitive, datacollection, format=None):
+        IndexedCollectionTraversal.__init__(self, primitive, datacollection, format)
+        self.GenerateColors()
+
+    def GenerateColors(self):
+        import random
+        self.colors = [(.3 + .7*random.random(), .3 + .7*random.random(), .3 + .7*random.random()) for x in self.datacollection]
+
+    def Execute(self, context):
+        for color, data in zip(self.colors, self.datacollection):
+            GL.glColor3f(*color)
-            self._glDrawElements(self.primitive, data)
-
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class ColoredIndexedCollectionAspect(Aspect.Aspect, ColoredIndexedCollectionTraversal):
+    pass

trunk/RBRapier/demo/Wavefront/scene.py

@@ -59 +59 @@
-        self.Sequence.AddElement(self.Viewport, -2)
-
-
-
-
+
+
-
-        GL.glEnable(GL.GL_LIGHTING)
@@ -68 +67 @@
-
-        #for each in self.Sequence.Elements: print each
+
+    def WavefrontOBJ(self, name, *args, **kw):
+        builder = MeshedObject.MeshedObjectBuilder()
+        GeoObj = builder.Build(open(name, 'r'), *args, **kw)
+        self.Sequence.AddElement(GeoObj)
+        return GeoObj
-
-    def Render(self, subject, canvas):