Changeset 364

Timestamp:

11/06/02 17:22:05 (6 years ago)

Author:

sholloway

Message:

*** empty log message ***

Files:

• trunk/RBFoundation/RBFoundation/Aspects/FlyweightGroup.py (added)
• trunk/RBRapier/RBRapier/Formats/Lightwave/MeshedObject.py (modified) (6 diffs)
• trunk/RBRapier/RBRapier/Tools/Geometry/Analysis/TriangleMesh.py (modified) (4 diffs)
• trunk/RBRapier/RBRapier/Tools/Geometry/Synthesis/VertexNormals.py (added)
• trunk/RBRapier/demo/Lightwave/scene.py (modified) (1 diff)

trunk/RBRapier/RBRapier/Formats/Lightwave/MeshedObject.py

@@ -33 +33 @@
-from RBRapier.Tools.Geometry.Analysis import TriangleMesh
-from RBRapier.Tools.Geometry.Analysis import LocalityRemapper
+from RBRapier.Tools.Geometry.Synthesis import VertexNormals
-from RBRapier.Tools.Geometry.ConvexPolygonTesselation import TesselateConvexPolygon
-
@@ -73 +74 @@
-        self.Load(FileInFormat)
-        self.Process(optimizetraversal, optimizemesh)
+
-        result = self.GeoObjectFactory()
-
-        result.SetVertices(self.Vertices)
-        result.SetNormals(self.Normals)
@@ -152 +153 @@
-
-        self.Name = FileInFormat.name
-
-
-
-
+
-        self.SurfaceGroups = obj.Surfaces.values()
-
@@ -168 +166 @@
-
-    def TraverseMesh(self, MeshFactory, TraversalMaker):
-
+
+
+
+
-            if not Group.Faces:
-                Group.Traversals = {}
@@ -176 +177 @@
-                    FaceTraversal = TesselateConvexPolygon(FaceTraversal.IndexList)
-                    for each in FaceTraversal:
+                        each = VNSythesisMgr.VisitTriangle(*each)
-                        face = mesh.AddFace(*each)
-                        if face: 
-                            normal = face.CalculateNormal(self.Vertices.data)
-                            for v in each:
-                                self.Normals.data[v] += normal
-
-                if __debug__: 
@@ -200 +198 @@
-                    Group.Traversals = TraversalMaker(mesh)
-
-
-
+
+
+
-
-    def SimpleTraversals(self):

trunk/RBRapier/RBRapier/Tools/Geometry/Analysis/TriangleMesh.py

@@ -25 +25 @@
-
-import weakref
-RBRapier.Tools.Vector import Vector3
+Foundation.AspectOriented.FlyweightGroup import FlyweightGroupObject
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#~ Definitions 
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class FlyweightGroupObject(object):
-    def ClassFlyweightGroup(klass, name, **kw):
-        return type(name, (klass,), kw)
-    ClassFlyweightGroup = classmethod(ClassFlyweightGroup)
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
@@ -103 +96 @@
-            raise KeyError, "Expected one vertex, but found none! (%r, %r, %r)" % (self.v, (pv0, pv1), result)
-
-    def CalculateNormal(self, VertexList, KeepNormal=0):
-        vectors = [Vector3(VertexList[v]) for v in self.v]
-        e01 = (vectors[1] - vectors[0]).Normalize()
-        e02 = (vectors[2] - vectors[0]).Normalize()
-        normal = e01.Cross3(e02)
-        normal = normal.asarray()
-        if KeepNormal: self.normal = normal
-        return normal
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
@@ -150 +134 @@
-    def __init__(self, FaceClass=Face):
-        FaceClassName = '%s&%s'%(self.__class__.__name__, FaceClass.__name__)
- 
+
-        self.Faces = []
-
@@ -247 +231 @@
-    print "Testing..."
-    import doctest
-
+Triangle
-    doctest.testmod(_testmod)
-    print "Test complete."

trunk/RBRapier/demo/Lightwave/scene.py

@@ -94 +94 @@
-        GL.glMatrixMode(GL.GL_PROJECTION)
-        GL.glLoadIdentity()
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        GL.glMatrixMode(GL.GL_MODELVIEW)
-        GL.glRotatef(1., 0, 1, 0)