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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/18 23:24:31

Modified files:
        .              : TODO 
        gfx/demo       : xupdf.py 

Log message:
        Priorities, done

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.114&tr2=1.115&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/xupdf.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.114 gzz/TODO:1.115
*** gzz/TODO:1.114      Wed Sep 18 21:20:04 2002
--- gzz/TODO    Wed Sep 18 23:24:31 2002
***************
*** 42,47 ****
--- 42,54 ----
        - UML and APIs of ImageCache
        - implementation of ImageCache
      jvk:
+       - think about using render-to-texture to speed up papers.
+         We now control the repeating units; rendering one such 
+         unit to a relatively high-resolution texture would enable 
+         us to use only one pass; rendering it would be quick 
+         on the GPU. This way we wouldn't have to worry about 
+         number of passes as much. However, this brings 
+         caching problems.
        - think about the second row of 
          Documentation/Presentations/General2002/script.html
          How could we easiest show the basis textures and 
***************
*** 51,63 ****
            - zoom to make them reasonable-sized
            - ability to change randomly the texgen basis 
              as well as dot product (separate keys)
-       - think about using render-to-texture to speed up papers.
-         We now control the repeating units; rendering one such 
-         unit to a relatively high-resolution texture would enable 
-         us to use only one pass; rendering it would be quick 
-         on the GPU. This way we wouldn't have to worry about 
-         number of passes as much. However, this brings 
-         caching problems.
        - Add a mode to libpaper for non-repeating textures. 
          This is needed for perheportaali client with 
          the infinite papers, where the repeating
--- 58,63 ----
***************
*** 87,95 ****
          papertest.py and others.
      tjl:
        - distorted multi-page PDF view with xu links
-           - placepapers always evenly
-           - exponential scale, exponential magnification in fisheye
-               --> far, far better interpolation
            - use real coordinates when moving to / from buoy, 
              i.e. buoy coords
            - show right page of buoy
--- 87,92 ----
***************
*** 101,117 ****
            - buoy edges? more magnification?
            - mouse clicks on buoys to work
  
-           - use libpaper for backgrounds !!! !!! !!!
-               - for tomorrow, only one pass (speed!!!) in the ones
-                 really used for the papers.
- 
            - limit mousing area to the real area of the paper.
  
            - entry / link making bindings
- 
-           - better distortion 
- 
            - multiple instances of same pdf / text visible? --> keys?
  
        - script the demo, determine in detail all features
          required.
--- 98,108 ----
            - buoy edges? more magnification?
            - mouse clicks on buoys to work
  
            - limit mousing area to the real area of the paper.
  
            - entry / link making bindings
            - multiple instances of same pdf / text visible? --> keys?
+           - better distortion 
  
        - script the demo, determine in detail all features
          required.
Index: gzz/gfx/demo/xupdf.py
diff -c gzz/gfx/demo/xupdf.py:1.16 gzz/gfx/demo/xupdf.py:1.17
*** gzz/gfx/demo/xupdf.py:1.16  Wed Sep 18 23:11:15 2002
--- gzz/gfx/demo/xupdf.py       Wed Sep 18 23:24:31 2002
***************
*** 6,12 ****
  screensize = (1024, 768) # assuming XGA projector.
  screenctr = (0.9 * screensize[0]/2, screensize[1]/2)
  
! AbstractUpdateManager.defaultAnimationTime = 1000
  AbstractUpdateManager.fractCalc = AbstractUpdateManager.LinearCalculator()
  
  from gzz.gfx.gl import GZZGL,GLSpans,Paper
--- 6,12 ----
  screensize = (1024, 768) # assuming XGA projector.
  screenctr = (0.9 * screensize[0]/2, screensize[1]/2)
  
! AbstractUpdateManager.defaultAnimationTime = 3000
  AbstractUpdateManager.fractCalc = AbstractUpdateManager.LinearCalculator()
  
  from gzz.gfx.gl import GZZGL,GLSpans,Paper
***************
*** 90,95 ****
--- 90,96 ----
      ret = globalscrollblockPapers.get(hashkey, None)
      if ret == None:
        ret = ThePaperMill().getPaper(hashkey)
+       ret.setNPasses(3)
        globalscrollblockPapers[hashkey] = ret
      return ret
  
***************
*** 178,184 ****
      return (papw, pw, ph, papo)
  
  
! def placepapers(vs, cs2, papers, key, x, y, paperx, papery, h, 
onlypages=None):
      # The height in coords
      ph = papers[0][1][2]
      scale = h/ph
--- 179,185 ----
      return (papw, pw, ph, papo)
  
  
! def placepapers(vs, cs2, papers, key, x, y, paperx, papery, h, 
onlypages=None, depth=10):
      # The height in coords
      ph = papers[0][1][2]
      scale = h/ph
***************
*** 191,206 ****
        cs1 = vs.coords.affineCoordsys(0, key+"_p_"+str(i), 10,
                curx, ycoord, scale, 0, 0, scale)
        if onlypages == None or i in onlypages:
            if globalusefancypaper:
                pq = GZZGL.createFisheyePaperQuad(
!                   papers[i][0], 0, 0, papers[i][1][1], papers[i][1][2], 21, 
21, 3)
                vs.map.put(pq, cs1, cs2)
                pq = GZZGL.createFisheyePaperQuad(
!                   papers[i][1][3], 0, 0, papers[i][1][1], papers[i][1][2], 
21, 21, 3)
                vs.map.put(pq, cs1, cs2)
            else:
                pq = GZZGL.createFisheyePaperQuad(
!                   papers[i][1][0], 0, 0, papers[i][1][1], papers[i][1][2], 
21, 21, 3)
                vs.map.put(pq, cs1, cs2)
        curx += 1.02 *  papers[i][1][1] * scale
  
--- 192,208 ----
        cs1 = vs.coords.affineCoordsys(0, key+"_p_"+str(i), 10,
                curx, ycoord, scale, 0, 0, scale)
        if onlypages == None or i in onlypages:
+           grid = 11
            if globalusefancypaper:
                pq = GZZGL.createFisheyePaperQuad(
!                   papers[i][0], 0, 0, papers[i][1][1], papers[i][1][2], grid, 
grid, 3)
                vs.map.put(pq, cs1, cs2)
                pq = GZZGL.createFisheyePaperQuad(
!                   papers[i][1][3], 0, 0, papers[i][1][1], papers[i][1][2], 
grid, grid, 3)
                vs.map.put(pq, cs1, cs2)
            else:
                pq = GZZGL.createFisheyePaperQuad(
!                   papers[i][1][0], 0, 0, papers[i][1][1], papers[i][1][2], 
grid, grid, 3)
                vs.map.put(pq, cs1, cs2)
        curx += 1.02 *  papers[i][1][1] * scale
  
***************
*** 227,238 ****
      def run(self):
        vs = self.vs
        pap = getPDFPapers(space.cellTexter.getEnfilade(self.cell, None))
        cs2 = vs.coords.affineCoordsys(0, self.cell.getId()+"__bulg", 
!           10, 0, 0, 1, 0, 0, 1)
        placepapers(vs, cs2, pap, self.cell.getId(),
            0, 0, 
            0, 0, 
!           100, [0])
        
  
  def addbuoy(vs, anchorX, anchorY, importance, floater, link):
--- 229,241 ----
      def run(self):
        vs = self.vs
        pap = getPDFPapers(space.cellTexter.getEnfilade(self.cell, None))
+       bs = 0.01
        cs2 = vs.coords.affineCoordsys(0, self.cell.getId()+"__bulg", 
!           0.05, 0, 0, bs, 0, 0, bs)
        placepapers(vs, cs2, pap, self.cell.getId(),
            0, 0, 
            0, 0, 
!           100, onlypages=[0], depth=5)
        
  
  def addbuoy(vs, anchorX, anchorY, importance, floater, link):