[Gzz-commits] gzz/gfx/demo fpfont.py

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/01/24 08:54:47

Modified files:
        gfx/demo       : fpfont.py 

Log message:
        Separate paper and quad

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/fpfont.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/fpfont.py
diff -u gzz/gfx/demo/fpfont.py:1.3 gzz/gfx/demo/fpfont.py:1.4
--- gzz/gfx/demo/fpfont.py:1.3  Fri Jan 24 08:53:04 2003
+++ gzz/gfx/demo/fpfont.py      Fri Jan 24 08:54:47 2003
@@ -50,18 +50,17 @@
        self.key = KeyPresses(self,
            SlideLin("x", 0, 30, "x coord", "Left", "Right"),
            SlideLin("y", 0, 30, "x coord", "Up", "Down"),
+           SlideLin("xg", 0, 30, "x coord", "j", "l"),
+           SlideLin("yg", 0, 30, "x coord", "i", ","),
        )
 
     def scene(self, vs):
        putnoc(vs, background((.5,.5,.5)))
 
-        cs1 = vs.coords.affineCoordsys(0, 0, self.x, self.y, 
+        csg = vs.coords.affineCoordsys(0, 0, self.xg, self.yg, 
            1000, 0, 0, 1000)
        vs.matcher.add(cs1, "1")
-
-        vs.map.put(getDList("""
-        BindProgramARB FRAGMENT_PROGRAM_ARB %s
-       Enable FRAGMENT_PROGRAM_ARB
+       vs.map.put(getDList("""
 
         ActiveTexture TEXTURE0
         TexGen S TEXTURE_GEN_MODE OBJECT_LINEAR
@@ -105,7 +104,15 @@
 
         ActiveTexture TEXTURE0
 
-       MultiTexCoord TEXTURE5 2 -1 0 0
+       """), csg)
+
+        cs1 = vs.coords.affineCoordsys(0, 0, self.x, self.y, 
+           1000, 0, 0, 1000)
+       vs.matcher.add(cs1, "1")
+
+        vs.map.put(getDList("""
+        BindProgramARB FRAGMENT_PROGRAM_ARB %s
+       Enable FRAGMENT_PROGRAM_ARB
         
        BindTexture TEXTURE_2D %s
        TexParameter TEXTURE_2D TEXTURE_MIN_FILTER LINEAR_MIPMAP_LINEAR
@@ -114,8 +121,10 @@
        Enable TEXTURE_2D
         Color 1 1 1
         Begin QUAD_STRIP
+       MultiTexCoord TEXTURE5 2 -1 0 0
         Vertex 0 0
         Vertex 0 1
+       MultiTexCoord TEXTURE5 1 0 0 0
         Vertex 1 0
         Vertex 1 1
         End
@@ -124,5 +133,6 @@
 
 
 currentScene = Scene()
+