[Gzz-commits] gzz ./TODO gfx/demo/xupdf.py gfx/libutil/effect...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/27 05:48:17

Modified files:
        .              : TODO 
        gfx/demo       : xupdf.py 
        gfx/libutil    : effects.py 
        gzz/vob        : AffineVobCoorder.java OrthoCoorder.java 
                         VobCoorder.java 

Log message:
        Moving in distorted paper ok again

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.154&tr2=1.155&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/xupdf.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libutil/effects.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/AffineVobCoorder.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/OrthoCoorder.java.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/VobCoorder.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.154 gzz/TODO:1.155
*** gzz/TODO:1.154      Fri Sep 27 05:11:11 2002
--- gzz/TODO    Fri Sep 27 05:48:16 2002
***************
*** 53,66 ****
            - *1: use nonlinearity() !!!
      tjl:
        - distorted multi-page PDF view with xu links
!           - texture performance, look at imagecache
!               - need to create lower-resolution versions since
!                 BASE_LEVEL doesn't quite suffice
!                   - basic code is there, think about this further
!                     when we have a larger structure where this is a problem.
            - entry / link making bindings
            - saving
-           - text
            - larger startup structure
            - clean up the xupdf.py file
            - buoy edges, distorted (dep. on *1)
--- 53,61 ----
            - *1: use nonlinearity() !!!
      tjl:
        - distorted multi-page PDF view with xu links
!           - text
            - entry / link making bindings
            - saving
            - larger startup structure
            - clean up the xupdf.py file
            - buoy edges, distorted (dep. on *1)
***************
*** 104,109 ****
--- 99,109 ----
      tjl:
        + implementation of frame rate counter magic Vob
        - distorted multi-page PDF view with xu links
+           - texture performance, look at imagecache
+               - need to create lower-resolution versions since
+                 BASE_LEVEL doesn't quite suffice
+                   - basic code is there, think about this further
+                     when we have a larger structure where this is a problem.
            - mouse clicks on buoys to work
            - better distortion
                - better function
Index: gzz/gfx/demo/xupdf.py
diff -c gzz/gfx/demo/xupdf.py:1.22 gzz/gfx/demo/xupdf.py:1.23
*** gzz/gfx/demo/xupdf.py:1.22  Fri Sep 27 02:34:53 2002
--- gzz/gfx/demo/xupdf.py       Fri Sep 27 05:48:17 2002
***************
*** 376,382 ****
      def mouse(self, ev):
        global globalx, globaly
        if ev.getID() == ev.MOUSE_CLICKED:
!           scale = globalpap[0][1][2] / screensize[1]
            globalx += (ev.getX() - screensize[0]/2) * scale
            # self.y -= ev.getY() - screensize[1]/2
            globaly = ev.getY() * scale
--- 376,382 ----
      def mouse(self, ev):
        global globalx, globaly
        if ev.getID() == ev.MOUSE_CLICKED:
!           scale = 1.0 / screensize[1]
            globalx += (ev.getX() - screensize[0]/2) * scale
            # self.y -= ev.getY() - screensize[1]/2
            globaly = ev.getY() * scale
***************
*** 390,398 ****
        cs1 = bf.addCentralBuoy(globalcursor.getId())
        # cs1_zoom = vs.coords.affineCoordsys(cs1, 0, 0, 0, 
        #     100, 0, 0, 100)
!       cs1_zoom= vs.coords.distort(cs1, 0, 0, 1, 1, 500, 100)
        vs.matcher.add(cs1_zoom, globalcursor.getId()+"__bulg") 
!       placepapers(vs, cs1_zoom, globalpap, globalcursor.getId())
                    
  
  currentScene = XuPDFScene_PDFZoom()
--- 390,401 ----
        cs1 = bf.addCentralBuoy(globalcursor.getId())
        # cs1_zoom = vs.coords.affineCoordsys(cs1, 0, 0, 0, 
        #     100, 0, 0, 100)
!       eye = 0.5
!       cs1_zoom= vs.coords.distort(cs1, 0, 0, eye, eye, 700, 20)
        vs.matcher.add(cs1_zoom, globalcursor.getId()+"__bulg") 
!       cs1_trans = vs.coords.translateXY(cs1_zoom, -globalx, -globaly)
!       vs.matcher.add(cs1_trans, globalcursor.getId()+"__trans") 
!       placepapers(vs, cs1_trans, globalpap, globalcursor.getId())
                    
  
  currentScene = XuPDFScene_PDFZoom()
Index: gzz/gfx/libutil/effects.py
diff -c gzz/gfx/libutil/effects.py:1.6 gzz/gfx/libutil/effects.py:1.7
*** gzz/gfx/libutil/effects.py:1.6      Fri Sep 27 02:34:53 2002
--- gzz/gfx/libutil/effects.py  Fri Sep 27 05:48:17 2002
***************
*** 95,104 ****
        size = 1
        vs = self.vs
        cs = vs.coords.affineCoordsys(0, 100, b[0], b[1], size, 0, 0, size)
!       vs.matcher.add(cs, str(key)+"_1") 
  
        cs2 = vs.coords.rotateXY(cs, 0)
!       vs.matcher.add(cs2, str(key)+"_2") 
        return cs2
  
        
--- 95,104 ----
        size = 1
        vs = self.vs
        cs = vs.coords.affineCoordsys(0, 100, b[0], b[1], size, 0, 0, size)
!       vs.matcher.add(cs, str(key)+"_buo_1") 
  
        cs2 = vs.coords.rotateXY(cs, 0)
!       vs.matcher.add(cs2, str(key)+"_buoj2") 
        return cs2
  
        
Index: gzz/gzz/vob/AffineVobCoorder.java
diff -c gzz/gzz/vob/AffineVobCoorder.java:1.9 
gzz/gzz/vob/AffineVobCoorder.java:1.10
*** gzz/gzz/vob/AffineVobCoorder.java:1.9       Thu Sep 26 05:09:53 2002
--- gzz/gzz/vob/AffineVobCoorder.java   Fri Sep 27 05:48:17 2002
***************
*** 25,31 ****
  /** A set of coordinate systems for vobs.
   */
  
! public abstract class AffineVobCoorder implements VobCoorder {
      /** Default implementation using affineCoordsys.
       */
      public int coordsys(int into, float depth,
--- 25,31 ----
  /** A set of coordinate systems for vobs.
   */
  
! public abstract class AffineVobCoorder extends VobCoorder {
      /** Default implementation using affineCoordsys.
       */
      public int coordsys(int into, float depth,
Index: gzz/gzz/vob/OrthoCoorder.java
diff -c gzz/gzz/vob/OrthoCoorder.java:1.33 gzz/gzz/vob/OrthoCoorder.java:1.34
*** gzz/gzz/vob/OrthoCoorder.java:1.33  Wed Sep 25 13:56:00 2002
--- gzz/gzz/vob/OrthoCoorder.java       Fri Sep 27 05:48:17 2002
***************
*** 27,34 ****
  /** A set of ortho coordinate systems for vobs.
   */
  
! public class OrthoCoorder implements VobCoorder {
! public static final String rcsid = "$Id: OrthoCoorder.java,v 1.33 2002/09/25 
17:56:00 benja Exp $";
      public static boolean dbg = false;
      private static void p(String s) { if(dbg) pa(s); }
      private static void pa(String s) { System.err.println(s); }
--- 27,34 ----
  /** A set of ortho coordinate systems for vobs.
   */
  
! public class OrthoCoorder extends VobCoorder {
! public static final String rcsid = "$Id: OrthoCoorder.java,v 1.34 2002/09/27 
09:48:17 tjl Exp $";
      public static boolean dbg = false;
      private static void p(String s) { if(dbg) pa(s); }
      private static void pa(String s) { System.err.println(s); }
Index: gzz/gzz/vob/VobCoorder.java
diff -c gzz/gzz/vob/VobCoorder.java:1.13 gzz/gzz/vob/VobCoorder.java:1.14
*** gzz/gzz/vob/VobCoorder.java:1.13    Wed Sep 25 10:45:43 2002
--- gzz/gzz/vob/VobCoorder.java Fri Sep 27 05:48:17 2002
***************
*** 31,37 ****
   * Coordinate systems are recursive; the coordinate system <code>0</code>
   * represents the root coordinate system (i.e., the whole vob scene).
   */
! public interface VobCoorder {
      /** Create a new coordinate system.
       * @param key The key that identifies this coordinate system.
       *                        The key is used for interpolation
--- 31,37 ----
   * Coordinate systems are recursive; the coordinate system <code>0</code>
   * represents the root coordinate system (i.e., the whole vob scene).
   */
! public abstract class VobCoorder {
      /** Create a new coordinate system.
       * @param key The key that identifies this coordinate system.
       *                        The key is used for interpolation
***************
*** 39,53 ****
       *             system into, <code>0</code> for the root
       *             coordinate system.
       */
!     int coordsys(int into, float depth, float x, float y, float w, float h);
  
!     int getCSIndexAt(float x, float y);
  
!     boolean needInterp(VobCoorder interpTo, int[] interpList);
  
!     Vob.RenderInfo getRenderInfo(int csind);
  
!     void dump();
  }
  
  
--- 39,57 ----
       *             system into, <code>0</code> for the root
       *             coordinate system.
       */
!     abstract public int coordsys(int into, float depth, float x, float y, 
float w, float h);
  
!     public int translateXY(int into, float x, float y) {
!       return coordsys(into, 0, x-1, y-1, 2, 2);
!     }
  
!     abstract public int getCSIndexAt(float x, float y);
  
!     abstract public boolean needInterp(VobCoorder interpTo, int[] interpList);
  
!     abstract public Vob.RenderInfo getRenderInfo(int csind);
! 
!     abstract public void dump();
  }