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

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/11/15 03:05:01

Modified files:
        gfx/demo       : irregu4.py 

Log message:
        numpad keys move the paper

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

Patches:
Index: gzz/gfx/demo/irregu4.py
diff -u gzz/gfx/demo/irregu4.py:1.13 gzz/gfx/demo/irregu4.py:1.14
--- gzz/gfx/demo/irregu4.py:1.13        Thu Nov 14 08:30:23 2002
+++ gzz/gfx/demo/irregu4.py     Fri Nov 15 03:05:01 2002
@@ -6,7 +6,7 @@
 
 seed = 200
 pap = ThePaperMill().getPaper(seed)
-paperquad = GLRen.createPaperQuad(pap, -2, -2, 2, 2, 0)
+paperquad = GLRen.createPaperQuad(pap, -4, -4, 4, 4, 0)
 
 textures = [ ("sawnoise",
               "bias,0.5,scale,0.15,freq,1,df,2,scale2,0.25,freq2,10,df2,.5"),
@@ -52,7 +52,9 @@
         self.y1 = 0
         self.xs = 1
         self.ys = 1
-        self.scale = 1
+        self.x0 = 0
+        self.y0 = 0
+        self.scale = 150
         self.shape = 0
         self.texslicing = 0
         self.flags = 255
@@ -254,10 +256,16 @@
             TexEnv TEXTURE_ENV TEXTURE_ENV_MODE ADD
             Enable ALPHA_TEST
             AlphaFunc GEQUAL 1.0
+            #MatrixMode TEXTURE
+            #LoadMatrix 2 0 0 0  0 1 0 0  0 0 1 0  0 0 0 1
+            #MatrixMode MODELVIEW
             """ % texINTENSITY.getTexId() 
 
+        c1 = ""
         slice = SLICE_1D + (1 - (self.flags >> 6 & 1)) * SLICE_2D;
         if slice & SLICE_2D:
+            c1 = "1 1 1 0  0 0 0 0"
+            slice += Y_SECCOLOR
             stdcode += combinercode("""
             SecondaryColorEXT .5 .5 .5
             
@@ -305,7 +313,7 @@
         self.outer = GLRen.createIrregularEdge(shape,
             texscale, linewidth, refsize, scale_pow,
             border0, border1, texslicing,
-            "0 0 0 1 0 0 0 0", "",
+            "0 0 0 1 0 0 0 0", c1,
             0, 0,
             slice + Y_COLOR + SHIFTS, stdcode + """
             BlendFunc ZERO ZERO
@@ -320,7 +328,7 @@
         self.inner = GLRen.createIrregularEdge(shape,
             texscale, linewidth, refsize, scale_pow,
             border0, border1, texslicing,
-            ("0 0 0 0 0 0 0 0", "1 1 1 1 0 0 0 0")[self.flags >> 1 & 1], "",
+            ("0 0 0 0 0 0 0 0", "1 1 1 1 0 0 0 0")[self.flags >> 1 & 1], c1,
             0, 0,
             slice + Y_COLOR + (self.flags >> 4 & 1) * INSIDE, stdcode, 1.0)
 
@@ -357,11 +365,13 @@
 
        vs.matcher.add(cs2, "2")
 
-        cs1 = vs.coords.affineCoordsys(0, 10, 600, 450,
-                                       self.scale * 150,
+        cs1 = vs.coords.affineCoordsys(0, 10,
+                                       512 + self.scale * self.x0,
+                                       384 + self.scale * self.y0,
+                                       self.scale * 1,
                                        self.scale * 0,
                                        self.scale * 0,
-                                       self.scale * 150)
+                                       self.scale * 1)
 
         cspap = vs.coords.affineCoordsys(0, 0, 0, 0, 1, 0, 0, 1)
         vs.matcher.add(cspap, "pap")
@@ -403,14 +413,14 @@
             self.y1 -= .2 * sin(self.a1)
         elif k == "Left": self.a1 -= .1
         elif k == "Right": self.a1 += .1
-        elif k == "KP_Up": self.y1 -= .2
-        elif k == "KP_Down": self.y1 += .2
-        elif k == "KP_Left": self.x1 -= .2
-        elif k == "KP_Right": self.x1 += .2
-        elif k == "KP_Prior": self.x1 += .14; self.y1 -= .14
-        elif k == "KP_Next": self.x1 += .14; self.y1 += .14
-        elif k == "KP_Home": self.x1 -= .14; self.y1 -= .14
-        elif k == "KP_End": self.x1 -= .14; self.y1 += .14
+        elif k == "KP_Up": self.y1 -= .2; self.y0 += .2
+        elif k == "KP_Down": self.y1 += .2; self.y0 -= .2
+        elif k == "KP_Left": self.x1 -= .2; self.x0 += .2
+        elif k == "KP_Right": self.x1 += .2; self.x0 -= .2
+        elif k == "KP_Prior": self.x1 += .14; self.y1 -= .14; self.x0 -= .14; 
self.y0 += .14;
+        elif k == "KP_Next": self.x1 += .14; self.y1 += .14; self.x0 -= .14; 
self.y0 -= .14;
+        elif k == "KP_Home": self.x1 -= .14; self.y1 -= .14; self.x0 += .14; 
self.y0 += .14;
+        elif k == "KP_End": self.x1 -= .14; self.y1 += .14; self.x0 += .14; 
self.y0 -= .14;
         elif k == "Prior":
             self.texslicing -= .125
             print self.texslicing
@@ -423,8 +433,8 @@
         elif k == "X": self.xs -= .1
         elif k == "y": self.ys += .1
         elif k == "Y": self.ys -= .1
-        elif k == "+": self.scale += .1
-        elif k == "-": self.scale -= .1
+        elif k == "+": self.scale *= 1.2
+        elif k == "-": self.scale *= 1.2
         elif "1" <= k <= "9":
             self.flags ^= 1 << int(k) - 1
             self.initcode()