[Gzz-commits] gzz/gfx demo/paperbasis.py librenderables/rende...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/11/26 04:30:44

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

Log message:
        adjustscale

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/paperbasis.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.153&tr2=1.154&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/paperbasis.py
diff -u gzz/gfx/demo/paperbasis.py:1.18 gzz/gfx/demo/paperbasis.py:1.19
--- gzz/gfx/demo/paperbasis.py:1.18     Tue Nov 26 04:23:38 2002
+++ gzz/gfx/demo/paperbasis.py  Tue Nov 26 04:30:44 2002
@@ -129,6 +129,7 @@
     """ % locals()
 
     return GLRen.createBasisPaperQuad(pap, 0, 0, 1, 1,
+                                   2.8,
                                       constcode + texcodes[tex0comb],
                                       constcode + texcodes[tex1comb],
                                       constcode + texcodes[isectcomb])
Index: gzz/gfx/librenderables/renderables.py
diff -u gzz/gfx/librenderables/renderables.py:1.153 
gzz/gfx/librenderables/renderables.py:1.154
--- gzz/gfx/librenderables/renderables.py:1.153 Mon Nov 25 11:03:38 2002
+++ gzz/gfx/librenderables/renderables.py       Tue Nov 26 04:30:44 2002
@@ -1007,9 +1007,10 @@
 {
     "Type" : "2",
     "Name": "BasisPaperQuad",
-    "Data": "Paper::Paper* paper; CallGLCode tex0code, tex1code, isectcode; 
float x0, y0, x1, y1;",
+    "Data": "Paper::Paper* paper; CallGLCode tex0code, tex1code, isectcode; 
float x0, y0, x1, y1; float paperScale; ",
     "Params" : """
            Paper paper, float x0, float y0, float x1, float y1,
+           float paperScale,
             UTF8String tex0, UTF8String tex1, UTF8String isect
        """,
     "ParamCode" : """
@@ -1018,6 +1019,7 @@
             this->y0 = y0;
             this->x1 = x1;
             this->y1 = y1;
+            this->paperScale = paperScale;
             tex0code = CallGLCode(tex0.c_str());
             tex1code = CallGLCode(tex1.c_str());
             isectcode = CallGLCode(isect.c_str());
@@ -1046,9 +1048,11 @@
                glBegin(GL_QUADS);
                 for (int i = 0; i < 4; i++) {
                     ZPt v = coords1.transform(p[i]);
-                    glMultiTexCoord2fARB(0, p[i].x, p[i].y);
+                    glMultiTexCoord2fARB(0, paperScale * p[i].x, 
+                                           paperScale * p[i].y);
                     q = cs2inv.transform(v);
-                    glMultiTexCoord2fARB(1, q.x, q.y);
+                    glMultiTexCoord2fARB(1, paperScale * q.x, 
+                                           paperScale * q.y);
                     coords1.vertex(p[i]);
                 }
                 glEnd();
@@ -1065,9 +1069,11 @@
                glBegin(GL_QUADS);
                 for (int i = 0; i < 4; i++) {
                     ZPt v = coords2.transform(p[i]);
-                    glMultiTexCoord2fARB(1, p[i].x, p[i].y);
+                    glMultiTexCoord2fARB(1, paperScale * p[i].x, 
+                                           paperScale * p[i].y);
                     q = cs1inv.transform(v);
-                    glMultiTexCoord2fARB(0, q.x, q.y);
+                    glMultiTexCoord2fARB(0, paperScale * q.x, 
+                                           paperScale * q.y);
                     coords2.vertex(p[i]);
                 }
                 glEnd();
@@ -1084,9 +1090,11 @@
                glBegin(GL_QUADS);
                 for (int i = 0; i < 4; i++) {
                     ZPt v = coords2.transform(p[i]);
-                    glMultiTexCoord2fARB(1, p[i].x, p[i].y);
+                    glMultiTexCoord2fARB(1, paperScale * p[i].x, 
+                                           paperScale * p[i].y);
                     q = cs1inv.transform(v);
-                    glMultiTexCoord2fARB(0, q.x, q.y);
+                    glMultiTexCoord2fARB(0, paperScale * q.x, 
+                                           paperScale * q.y);
                     coords2.vertex(p[i]);
                 }
                 glEnd();