Changeset 370

Timestamp:

11/12/02 15:40:59 (6 years ago)

Author:

sholloway

Message:

*** empty log message ***

Files:

• trunk/RBRapier/RBRapier/Formats/Wavefront/MeshedObject.py (modified) (1 diff)
• trunk/RBRapier/RBRapier/Tools/Geometry/Analysis/TriangleLister.py (modified) (1 diff)
• trunk/RBRapier/RBRapier/Tools/Geometry/Analysis/TriangleStripifier.py (modified) (1 diff)
• trunk/RBRapier/demo/Lightwave/scene.py (modified) (4 diffs)
• trunk/RBRapier/demo/Wavefront/scene.py (modified) (3 diffs)

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

@@ -168 +168 @@
-                    for each in FaceTraversal:
-                        face = mesh.AddFace(*each)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def SimpleTraversals(self):

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

@@ -25 +25 @@
-
-class TriangleLister(object):
-
+=None
-        result = []
-        if TaskProgress:

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

@@ -424 +424 @@
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
+=None
-        selector = self.Selector
-        bCleanFaces = getattr(mesh, 'CleanFaces', 0)

trunk/RBRapier/demo/Lightwave/scene.py

@@ -37 +37 @@
-from RBRapier.Renderer.Appearance import Lighting
-
-from RBRapier.Formats.Lightwave import MeshedObject
-from RBRapier.Formats import GeoObject
-from RBRapier.Renderer.Geometry import ArrayTraversal
+
+from RBRapier.Formats.Lightwave import MeshedObject
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -57 +58 @@
-        self.ClearColor = Buffers.ClearColor((0.,0.,0.,0.))
-        self.Sequence.AddSetupElement(self.ClearColor.Execute)
-
-        self.ClearDepth = Buffers.ClearDepth(1.)
-        self.Sequence.AddSetupElement(self.ClearDepth.Execute)
-
-        self.DepthTest = FragmentTests.DepthTest()
-        self.Sequence.AddSetupElement(self.DepthTest.Select)
-
-
-
-
+
+
-        self.Culling = PolygonRasterization.FaceCulling()
-        self.Sequence.AddSetupElement(self.Culling.Select)
@@ -72 +69 @@
-        self.Lighting = Lighting.LightingModel()
-        self.Sequence.AddElement(self.Lighting.Select)
-
-        self.Lights = []
-        self.Lights.append(Lighting.Light(0))
@@ -127 +123 @@
-
-    def StripColoredLigthwaveLWO(self, name, *args, **kw):
+        GL.glEnable(GL.GL_COLOR_MATERIAL)
-        builder = MeshedObject.MeshedObjectBuilder()
-        builder.GeoObjectFactory = GeoObject.DefaultGeoObject

trunk/RBRapier/demo/Wavefront/scene.py

@@ -32 +32 @@
-from RBRapier.Renderer.Environment import FragmentTests
-from RBRapier.Renderer.View import Viewport
+from RBRapier.Renderer.View import Transformations
+from RBRapier.Renderer.View import TransformationSettings
+from RBRapier.Renderer.Appearance import PolygonRasterization
+from RBRapier.Renderer.Appearance import Lighting
+
+from RBRapier.Formats import GeoObject
+from RBRapier.Renderer.Geometry import ArrayTraversal
-
-from RBRapier.Formats.Wavefront import MeshedObject
@@ -55 +62 @@
-        self.DepthTest = FragmentTests.DepthTest()
-        self.Sequence.AddElement(self.DepthTest.Select, -1)
+        #self.Normalization = TransformationSettings.Normalization()
+        #self.Sequence.AddSetupElement(self.Normalization.Select)
+        self.Culling = PolygonRasterization.FaceCulling()
+        self.Sequence.AddSetupElement(self.Culling.Select)
+
+        self.Lighting = Lighting.LightingModel()
+        self.Sequence.AddElement(self.Lighting.Select)
+        self.Lights = []
+        self.Lights.append(Lighting.Light(0))
+        self.Lights[0].Specular = 0., 0., 1.
+        self.Lights[0].Diffuse = .3, .3, .4
+        self.Lights.append(Lighting.Light(1))
+        self.Lights[1].Specular = 1., 0., 0.
+        self.Lights[1].Diffuse = .4, .3, .3
+        self.Lights.append(Lighting.SpotLight(2, SpotCutoff=30., SpotExponent=0.))
+        self.Lights[2].Position = (0., -5, 0., 1.)
+        self.Lights[2].SpotDirection = (0., 1., 0., 0.)
+
+        #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-        self.Viewport = Viewport.Viewport()
-, -2
+.Execute
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        #self.GeoObj = self.WavefrontOBJ('data/x29.obj', 1, 3)
-        #self.GeoObj = self.WavefrontOBJ('data/porsche.obj', 1, 3)
-        #self.GeoObj = self.WavefrontOBJ('data/cessna.obj', 1, 3)
-
-
-
-
+
-        GL.glEnable(GL.GL_COLOR_MATERIAL)
-
-        #for each in self.Sequence.Elements: print each
-
-    def StripeColoredWavefrontOBJ(self, name, *args, **kw):
-        builder = MeshedObject.MeshedObjectBuilder()
-from RBRapier.Renderer.Geometry import ArrayTraversal
+builder.GeoObjectFactory = GeoObject.DefaultGeoObject
-        builder.IndexedTraversal = ArrayTraversal.ColoredIndexedCollectionTraversal
-        GeoObj = builder.Build(open(name, 'r'), *args, **kw)
@@ -82 +133 @@
-    def WavefrontOBJ(self, name, *args, **kw):
-        builder = MeshedObject.MeshedObjectBuilder()
+        builder.GeoObjectFactory = GeoObject.DefaultGeoObject
-        GeoObj = builder.Build(open(name, 'r'), *args, **kw)
-        self.Sequence.AddElement(GeoObj)
-        return GeoObj
-
+    Animate = 1
-    def Render(self, subject, canvas):
+        # Recalculate the viewport
-        self.Viewport.SetRectangle(canvas.GetClientRect().asTuple())
-
-
-
-
-
-
-
-
+
+
-        self.Sequence.Execute(None)
+        # Animation
+        if self.Animate:
+            self.ModelView.Rotate.Angle += self.ModelView.Rotate.AngleDelta
+            self.LightXForm.Rotate.Angle += self.LightXForm.Rotate.AngleDelta