[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/30 09:29:29

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

Log message:
        Fix offset texture bugs and don't clamp the undistorted shape texture 
(__GL_NV25_EMULATE doesn't seem to support clamping properly)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/irregu4.py.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.158&tr2=1.159&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/irregu4.py
diff -u gzz/gfx/demo/irregu4.py:1.26 gzz/gfx/demo/irregu4.py:1.27
--- gzz/gfx/demo/irregu4.py:1.26        Sat Nov 30 08:10:23 2002
+++ gzz/gfx/demo/irregu4.py     Sat Nov 30 09:29:29 2002
@@ -73,7 +73,7 @@
             offsetprog = "OFFSET_TEXTURE_2D_NV"
         
         texHILO = getCachedTexture(
-            [128, 128, 0, 1, internal, format, "irregu",
+            [128, 128, 0, 2, internal, format, "irregu",
              [ "texture", textures[0][0],
                "params", textures[0][1],
                "ripple_scale", str(ripple_scale),
@@ -88,8 +88,8 @@
             TexImage2D TEXTURE_2D 0 ALPHA 4 4 0 ALPHA 0 0 0 0 0 1 1 0 0 1 1 0 
0 0 0 0
             TexParameter TEXTURE_2D TEXTURE_BASE_LEVEL 0
             TexParameter TEXTURE_2D TEXTURE_MAX_LEVEL 0
-            TexParameter TEXTURE_2D TEXTURE_WRAP_S CLAMP
-            TexParameter TEXTURE_2D TEXTURE_WRAP_T CLAMP
+            TexParameter TEXTURE_2D TEXTURE_WRAP_S REPEAT
+            TexParameter TEXTURE_2D TEXTURE_WRAP_T REPEAT
             TexParameter TEXTURE_2D TEXTURE_MIN_FILTER NEAREST
             TexParameter TEXTURE_2D TEXTURE_MAG_FILTER NEAREST
             BindTexture TEXTURE_2D 0
@@ -652,7 +652,7 @@
 
 class StillMotionScene:
     def __init__(self):
-        self.scale = 512
+        self.scale = 700
         self.x0, self.y0 = -.35, -.65
         self.x1, self.y1 = .35, .65
         self.xs, self.ys = .6,.4
@@ -756,8 +756,8 @@
         putnoc(vs, background((1.0,1.0,1.0)))
     
         cs1 = vs.coords.affineCoordsys(0, 10,
-                                       600 + self.scale * self.x0,
-                                       450 + self.scale * self.y0,
+                                       512 + self.scale * self.x0,
+                                       384 + self.scale * self.y0,
                                        self.scale * 1,
                                        self.scale * 0,
                                        self.scale * 0,
@@ -783,7 +783,7 @@
     saveanim.saveframe(filename, w)
 
 def makeScreenshots():
-    w.setLocation(0,0,1200,900)
+    w.setLocation(0,0,1024,768)
     ps = StillMotionScene()
     r(ps, "shots/motion.png")
 
Index: gzz/gfx/librenderables/renderables.py
diff -u gzz/gfx/librenderables/renderables.py:1.158 
gzz/gfx/librenderables/renderables.py:1.159
--- gzz/gfx/librenderables/renderables.py:1.158 Sat Nov 30 08:10:23 2002
+++ gzz/gfx/librenderables/renderables.py       Sat Nov 30 09:29:29 2002
@@ -1621,10 +1621,9 @@
             float xw = (coords2.transform(ZPt(1,0,0)) - 
coords2.transform(ZPt(0,0,0))).length();
             float yw = (coords2.transform(ZPt(0,1,0)) - 
coords2.transform(ZPt(0,0,0))).length();
             
-            float s = border1 - border0;
-            float sx = .25 * s / xw;
-            float sy = .25 * s / yw;
-            float mat[4] = { sx, 0, 0, sy };
+            float s = .5 * (border1 - border0);
+            float sx = s / xw;
+            float sy = s / yw;
             ZPt vert[] = {
               ZPt(+1 + sx, -1 - sy, 0),
               ZPt(+1 + sx, +1 + sy, 0),
@@ -1633,6 +1632,7 @@
             };
             GLERR;
             glActiveTexture(GL_TEXTURE1);
+            float mat[4] = { .25 * sx, 0, 0, .25 * sy };
             glTexEnvfv(GL_TEXTURE_SHADER_NV, GL_OFFSET_TEXTURE_MATRIX_NV, mat);
             GLERR;
             glActiveTexture(GL_TEXTURE0);
@@ -1647,7 +1647,7 @@
                         case 0: glTranslatef(-linewidth, 0, 0); break;
                         case 1: glTranslatef(+linewidth, 0, 0); break;
                         case 2: glTranslatef(0, -linewidth, 0); break;
-                        case 3: glTranslatef(0, -linewidth, 0); break;
+                        case 3: glTranslatef(0, +linewidth, 0); break;
                     }
                 }
                 glBegin(GL_QUADS);