Changeset 665

Timestamp:

08/19/03 21:33:25 (5 years ago)

Author:

sholloway

Message:

*** empty log message ***

Files:

• trunk/RBRapier/RBRapier/Formats/Attic/SVG.old/Renderers/RapierObjects.py (modified) (2 diffs)
• trunk/RBRapier/RBRapier/Formats/SVG/RapierRenderItems.py (modified) (20 diffs)
• trunk/RBRapier/RBRapier/Formats/SVG/SVGSkin/SVGItems/PathBuilder.py (modified) (1 diff)
• trunk/RBRapier/RBRapier/Tools/Geometry/Curves.py (modified) (1 diff)
• trunk/RBRapier/RBRapier/Tools/Geometry/gluPolygonTesselation.py (modified) (1 diff)
• trunk/RBRapier/RBRapier/Tools/Transformations2d.py (modified) (1 diff)

trunk/RBRapier/RBRapier/Formats/Attic/SVG.old/Renderers/RapierObjects.py

@@ -187 +187 @@
-
-class RapierPathFactory(Abstract.AbstractPathFactory):
-64
+32
-    pos = (0,0)
-    controlpoint = None
@@ -298 +298 @@
-    def ellipticarc_rel(self, rx, ry, xrotation, largeArcFlag, sweepFlag, x, y): 
-        dx, dy = self.pos
-_rel(rx, ry, xrotation, largeArcFlag, sweepf
+(rx, ry, xrotation, largeArcFlag, sweepF
-    def ellipticarc(self, rx, ry, xrotation, largeArcFlag, sweepFlag, x, y): 
-
-
-
+
+
+
+
+
+
+
+
+
-
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

trunk/RBRapier/RBRapier/Formats/SVG/RapierRenderItems.py

@@ -24 +24 @@
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+from __future__ import generators
-from OpenGL import GL
+import Polygon as PolygonModule
-import Numeric
-
-from RBRapier.Tools import Transformations2d
-from RBRapier.Tools.Geometry import Curves
-glu
+PolygonTesselator as _
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -42 +44 @@
-
-class Style(object):
-
-{}
+, **kwstyle
+kwstyle
-        map(self._style.update, styles)
-
@@ -49 +51 @@
-        result = self.__class__()
-        result._style = self._style.copy()
+        return result
-
-    def __iadd__(self, other):
@@ -81 +84 @@
-        result = self.__class__()
-        result.collection = self.collection[:]
+        return result
-
-    def translate(self, x=0.0, y=0.0): 
@@ -105 +109 @@
-        self.Add(Transformations2d.Matrix([[xx, xy, xh], [yx, yy, yh], [hx, hy, hh]]))
-
+    def asArray3x3(self):
+        try: 
+            return self._cached_matrix
+        except AttributeError:
+            matrix = Transformations2d.Composite.asArray3x3(self)
+            self._cached_matrix = matrix
+            return matrix
+
-    def AddSVGTransforms(self, transforms):
-        def AddTransforms(name, *args):
@@ -119 +131 @@
-    fromSVGTransforms = classmethod(fromSVGTransforms)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-class PathConnector(object):
-    pos = (0,0)
-    controlpoint = None
-64
+32
-
-    command_table = {
@@ -153 +176 @@
-    def AddSVGPath(self, path):
-        def AddPathElement(commandidx, *args):
-name
+commandidx
-            transformfn = getattr(self, name, None)
-            if transformfn is not None:
@@ -164 +187 @@
-        return result
-    fromSVGPath = classmethod(fromSVGPath)
+
+    def GetContours(self):
+        return [map(tuple, contour) for contour in filter(None, self.pathlist)]
-
-    def move_rel(self, x, y): 
@@ -238 +264 @@
-    def ellipticarc_rel(self, rx, ry, xrotation, largeArcFlag, sweepFlag, x, y): 
-        dx, dy = self.pos
-f
+F
-    def ellipticarc(self, rx, ry, xrotation, largeArcFlag, sweepFlag, x, y): 
-
+
+
+
-        self.pathlist[-1].extend(list(ellipse))
-        self._savepos((x,y))
@@ -261 +289 @@
-
-class GLGeometry(object):
+    points = ()
+    colors = ()
+
+    def __init__(self, points=None, singlecolor=None, colors=None):
+        if points is not None:
+            self.SetPoints(points)
+
+        if singlecolor is not None:
+            assert colors is None
+            self.SetSingleColor(singlecolor)
+        elif colors is not None:
+            assert singlecolor is None
+            self.SetColors(colors)
+
-    def SetPoints(self, points, transform=None):
-        points = Numeric.asarray(points, _NumericType)
-        if transform is not None:
-            # add the homogeneous coordinate
-            points = Numeric.concatenate((points, Numeric.ones((len(points), 1), _NumericType)), 1)
-            points = Numeric.transpose(Numeric.dot(transform.asArray3x3(), Numeric.transpose(points)))
-            points = result[:,:-1] # trim the homogenous coordinate -- assumes that they are all still 1.
-        self.points = points
-
@@ -276 +312 @@
-    def SetColors(self, colors):
-        self.colors = Numeric.asarray(colors, _NumericType)
+    
+    def Commit(self):
+        raise NotImplementedError
-
-class GLStroke(GLGeometry):
-    def AddLines(self, indexes):
+        self.Add(GL.GL_LINES, indexes)
+
+    def AddLineStrip(self, indexes):
+        self.Add(GL.GL_LINE_STRIP, indexes)
+
+    def AddLineLoop(self, indexes):
+        self.Add(GL.GL_LINE_LOOP, indexes)
+
+    def Add(self, glmode, indexes):
-        pass
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        pass
-
-
-
-
-
-
-
+
+
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -301 +358 @@
-
-    transform = None
+    default_transform = Transform()
-    style = None
+    default_style = Style(stroke=(0,0,0))
-
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -307 +366 @@
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
+
+
-        pass
-        #style, transform = self._GetStyleAndTransform(style, transform)
-
-    #~ SVG Settings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -331 +390 @@
-    def _GetStyleAndTransform(self, style=None, transform=None):
-        if style is None:
-
+
+
+
+
-        elif self.style is not None:
-            style += self.style
-        if transform is None:
-
+
+
+
+
-        elif self.transform is not None:
-            transform *= self.transform
@@ -345 +410 @@
-    children = ()
-
-, transform
+=None, transform=None
-        style, transform = self._GetStyleAndTransform(style, transform)
-        for child in self.children:
-
+
+
-
-    def SetChildren(self, children):
@@ -373 +439 @@
-    def Compile(self, style, transform):
-        style, transform = self._GetStyleAndTransform(style, transform)
-
-
-
+
+
+
+
+
+
+
-
-    #~ SVG Settings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -385 +455 @@
-
-class Rect(RenderItem):
+    def Compile(self, style, transform):
+        style, transform = self._GetStyleAndTransform(style, transform)
+        x,y = self.position
+        w,h = self.dimensions
+
+        # TODO: compute rounded rectangles
+        points = [(x,y), (x+w, y), (x+w, y+h), (x, y+h)]
+        points = transform.TransformPoints(points)
+
+        fillcolor = style.GetFillColor()
+        if fillcolor is not None:
+            fill = GLFill(points, fillcolor)
+            fill.AddTriangleStrip(range(4))
+            yield fill
+
+        strokecolor = style.GetStrokeColor()
+        if strokecolor is not None:
+            stroke = GLStroke(points, strokecolor)
+            stroke.AddLineLoop(range(4))
+            yield stroke
+
-    #~ SVG Settings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
@@ -400 +491 @@
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class Polyline(RenderItem):
-    #~ SVG Settings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    def SetPoints(self, points):
-        self.points = points
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class Polygon(Polyline):
-    pass # Note: what the heck is the difference anyway?
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class Ellipse(RenderItem):
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    #~ SVG Settings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
@@ -434 +530 @@
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+class Polyline(RenderItem):
+    def Compile(self, style, transform):
+        style, transform = self._GetStyleAndTransform(style, transform)
+
+        fillcolor = style.GetFillColor()
+        if fillcolor is not None and len(self.points) >= 3:
+            fillpoints = self.points
+            if fillpoints[0] != fillpoints[-1]:
+                # close the polyline so we can fill it
+                fillpoints = fillpoints + fillpoints[0:1]
+
+            glmodedatalist = SVGTesselator([fillpoints]).results
+            for glmode, fillpoints in glmodedatalist:
+                fillpoints = transform.TransformPoints(fillpoints)
+                fill = GLFill(fillpoints, fillcolor)
+                fill.Add(glmode, range(len(fillpoints)))
+                yield fill
+
+        strokecolor = style.GetStrokeColor()
+        if strokecolor is not None:
+            points = transform.TransformPoints(self.points)
+            stroke = GLStroke(points, strokecolor)
+            stroke.AddLineStrip(range(len(points)))
+            yield stroke
+
+    #~ SVG Settings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    def SetPoints(self, points):
+        self.points = points
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class Polygon(Polyline):
+    def Compile(self, style, transform):
+        style, transform = self._GetStyleAndTransform(style, transform)
+
+        fillcolor = style.GetFillColor()
+        if fillcolor is not None:
+            glmodedatalist = SVGTesselator([self.points]).results
+            for glmode, fillpoints in glmodedatalist:
+                fillpoints = transform.TransformPoints(fillpoints)
+                fill = GLFill(fillpoints, fillcolor)
+                fill.Add(glmode, range(len(fillpoints)))
+                yield fill
+
+        strokecolor = style.GetStrokeColor()
+        if strokecolor is not None:
+            glmodedatalist = []
+            glmodedatalist = SVGTesselator([self.points], boundary=True).results
+            for glmode, strokepoints in glmodedatalist:
+                strokepoints = transform.TransformPoints(strokepoints)
+                stroke = GLStroke(strokepoints, strokecolor)
+                stroke.Add(glmode, range(len(strokepoints)))
+                yield stroke
+
+    def SetPoints(self, points):
+        if points[0] != points[-1]:
+            self.points = points + [points[0]]
+        else:
+            self.points = points
+        assert len(self.points) >= 3
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
-class Path(RenderItem):
+    def Compile(self, style, transform):
+        style, transform = self._GetStyleAndTransform(style, transform)
+
+        path = PathConnector.fromSVGPath(self.path)
+
+        fillcolor = style.GetFillColor()
+        if fillcolor is not None:
+            # make contour list
+            contourlist = []
+            for contour in path.GetContours():
+                if len(contour) <= 2:
+                    continue
+                if contour[0] != contour[-1]:
+                    # close the contour so we can fill it
+                    contour += contour[0:1]
+                contourlist.append(contour)
+
+            if contourlist:
+                poly = PolygonModule.Polygon()
+                map(poly.addContour, contourlist)
+                poly.triStrip()
+
+                #glmodedatalist = [] #SVGTesselator(contourlist).results
+                #for glmode, fillpoints in glmodedatalist:
+                #    fillpoints = transform.TransformPoints(fillpoints)
+                #    fill = GLFill(fillpoints, fillcolor)
+                #    fill.Add(glmode, range(len(fillpoints)))
+                #    yield fill
+
+        strokecolor = style.GetStrokeColor()
+        if strokecolor is not None:
+            for contour in path.GetContours():
+                points = transform.TransformPoints(contour)
+                stroke = GLStroke(points, strokecolor)
+                stroke.AddLineStrip(range(len(points)))
+                yield stroke
+
-    #~ SVG Settings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
@@ -473 +670 @@
-        'line': Line,
-        'rect': Rect,
-
+#
-        'path': Path,
-        'polyline': Polyline,

trunk/RBRapier/RBRapier/Formats/SVG/SVGSkin/SVGItems/PathBuilder.py

@@ -150 +150 @@
-
-    def RestoreToEx(self, onbegin=lambda xformcmd:None, onadd=lambda name, *args:None, onend=lambda xformcmd:None):
-transform
+path
-        for args in self.path:
-            onadd(*args)
-transform
+path
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

trunk/RBRapier/RBRapier/Tools/Geometry/Curves.py

@@ -178 +178 @@
-
-        tmp = rx2*y2 + ry2*x2
-
-
-
+
+
+
+
+
+
+
-
-        if xrotation:

trunk/RBRapier/RBRapier/Tools/Geometry/gluPolygonTesselation.py

@@ -152 +152 @@
-        GL.glEnd()
-
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class PolygonTesselator(gluPolygonTesselator):
+    def tessellate(self, *args, **kw):
+        self.results = []
+        gluPolygonTesselator.tessellate(self, *args, **kw)
+        return self.results
+
+    def _OnBegin(self, mode):
+        self.mode = mode
+        self.vertexdata = []
+    def _OnVertex(self, vertexdata):
+        self.vertexdata.append(vertexdata)
+    def _OnEnd(self):
+        self.results.append((self.mode, self.vertexdata))
+        del self.mode, self.vertexdata
+

trunk/RBRapier/RBRapier/Tools/Transformations2d.py

@@ -128 +128 @@
-    def asArray3x3(self):
-        """Returns the transformation in 3x3 Numeric array form"""
-
-
-
-
+
+
+
+
+
+
+
+
-
-    def Inverse(self):