[Gzz-commits] gzz/gfx demo/xupdf.py librenderables/renderable...

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/09/18 09:06:25

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

Log message:
        Anisotropic PDF zoom

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/xupdf.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.49&tr2=1.50&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/xupdf.py
diff -c gzz/gfx/demo/xupdf.py:1.10 gzz/gfx/demo/xupdf.py:1.11
*** gzz/gfx/demo/xupdf.py:1.10  Wed Sep 18 08:26:24 2002
--- gzz/gfx/demo/xupdf.py       Wed Sep 18 09:06:25 2002
***************
*** 139,145 ****
            cs1 = vs.coords.affineCoordsys(0, key+"_"+str(i), 10,
                    curx, ycoord, h/ph, 0, 0, h/ph)
            pq = GZZGL.createFisheyePaperQuad(
!               papers[i][0], 0, 0, papers[i][1], papers[i][2], 21, 21, 1)
            vs.map.put(pq, cs1, cs2)
        curx += 1.02 * h/ph * papers[i][1]
  
--- 139,145 ----
            cs1 = vs.coords.affineCoordsys(0, key+"_"+str(i), 10,
                    curx, ycoord, h/ph, 0, 0, h/ph)
            pq = GZZGL.createFisheyePaperQuad(
!               papers[i][0], 0, 0, papers[i][1], papers[i][2], 21, 21, 3)
            vs.map.put(pq, cs1, cs2)
        curx += 1.02 * h/ph * papers[i][1]
  
***************
*** 183,189 ****
                        (self.ctrx+1.5*self.rad, self.ctry), self.nadir)
        print "Context"
        cs2 = vs.coords.affineCoordsys(0, "2", -3, 
!               screensize[0]/2, 0.9 * screensize[1]/2, 50, 0,0,50)
  
        placepapers(vs, cs2, globalpap, "foo", 
                screensize[0]/2, 0.9 * screensize[1]/2, 
--- 183,189 ----
                        (self.ctrx+1.5*self.rad, self.ctry), self.nadir)
        print "Context"
        cs2 = vs.coords.affineCoordsys(0, "2", -3, 
!               screensize[0]/2, 0.9 * screensize[1]/2, 50/3, 0,0,50/3)
  
        placepapers(vs, cs2, globalpap, "foo", 
                screensize[0]/2, 0.9 * screensize[1]/2, 
Index: gzz/gfx/librenderables/renderables.py
diff -c gzz/gfx/librenderables/renderables.py:1.49 
gzz/gfx/librenderables/renderables.py:1.50
*** gzz/gfx/librenderables/renderables.py:1.49  Wed Sep 18 08:26:24 2002
--- gzz/gfx/librenderables/renderables.py       Wed Sep 18 09:06:25 2002
***************
*** 464,469 ****
--- 464,480 ----
                          m += v.z * atan(r) / r;
                      }
                      break;
+ 
+                 case 3:
+                     // Anistropic PDF zoom
+                     {
+                         v.x += v.z * atan(v.x);
+                         if (r2 > 0) {
+                             float r = sqrt(r2);
+                             v.y *= 1 + v.z * atan(r) / r;
+                          }
+                         return v;
+                     }
                      
                  }