[Gzz-commits] gzz/gfx demo/irregu4.py librenderables/renderab...

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/11/21 07:07:13

Modified files:
        gfx/demo       : irregu4.py 
        gfx/librenderables: renderables.py 

Log message:
        Add wireframe

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/irregu4.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.149&tr2=1.150&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/irregu4.py
diff -u gzz/gfx/demo/irregu4.py:1.20 gzz/gfx/demo/irregu4.py:1.21
--- gzz/gfx/demo/irregu4.py:1.20        Thu Nov 21 06:15:00 2002
+++ gzz/gfx/demo/irregu4.py     Thu Nov 21 07:07:09 2002
@@ -327,6 +327,20 @@
             Enable BLEND
             """, 1.0)
 
+        self.wireframe = GLRen.createIrregularEdge(
+            shape,
+            texscale, linewidth, refsize, scale_pow,
+            border0, border1, texslicing, "", "",
+            0, 0,
+            slice + (self.flags >> 4 & 1) * INSIDE, """
+            PushAttrib ENABLE_BIT POLYGON_BIT
+            PolygonMode FRONT_AND_BACK LINE
+            Disable TEXTURE_2D
+            Disable ALPHA_TEST
+            Disable DEPTH_TEST
+            Color 0 0 0
+            """, 1.0)
+                                                   
         self.shadow = GLRen.createIrregularEdge(shape,
             texscale, linewidth, refsize, scale_pow,
             border0, border1, texslicing,
@@ -421,8 +435,6 @@
         cspap = vs.coords.affineCoordsys(0, 0, 0, 0, 1, 0, 0, 1)
         vs.matcher.add(cspap, "pap")
                                          
-
-
         if self.flags & 128:
             vs.map.put(self.shadow, cs1shadow, cs2)
 
@@ -441,6 +453,9 @@
                 
                 vs.map.put(self.stencil_teardown)
 
+        if self.flags >> 8 & 1:
+            vs.map.put(self.wireframe, cs1, cs2)
+            
 
         print "1: ADD TEXTURE", self.flags >> 0& 1
         print "2: ADD COLOR", self.flags >> 1 & 1
@@ -450,6 +465,7 @@
         print "6: STENCIL", self.flags >> 5 & 1
         print "7: 2ND TEXCOORDS (inv)", self.flags >> 6 & 1
         print "8: SHADOW", self.flags >> 7 & 1
+        print "9: WIREFRAME", self.flags >> 8 & 1
 
     def key(self, k):
         if 0: pass
Index: gzz/gfx/librenderables/renderables.py
diff -u gzz/gfx/librenderables/renderables.py:1.149 
gzz/gfx/librenderables/renderables.py:1.150
--- gzz/gfx/librenderables/renderables.py:1.149 Thu Nov 21 03:36:55 2002
+++ gzz/gfx/librenderables/renderables.py       Thu Nov 21 07:07:13 2002
@@ -1442,11 +1442,10 @@
             break;
         case 7: {
             n = 4;
-            float t = 1/sqrt(2);
-            vert[0] = coords2.transform(ZPt(+t, -t, 0));
-            vert[1] = coords2.transform(ZPt(+t, +t, 0));
-            vert[2] = coords2.transform(ZPt(-t, +t, 0));
-            vert[3] = coords2.transform(ZPt(-t, -t, 0));
+            vert[0] = coords2.transform(ZPt(+1, -1, 0));
+            vert[1] = coords2.transform(ZPt(+1, +1, 0));
+            vert[2] = coords2.transform(ZPt(-1, +1, 0));
+            vert[3] = coords2.transform(ZPt(-1, -1, 0));
             }
             break;
         case 8: