gzz-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gzz-commits] gzz gfx/demo/pagespan.py gfx/jni/GzzGL-jni.cxx ...


From: Tuomas J. Lukka
Subject: [Gzz-commits] gzz gfx/demo/pagespan.py gfx/jni/GzzGL-jni.cxx ...
Date: Tue, 17 Sep 2002 02:52:34 -0400

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

Modified files:
        gfx/demo       : pagespan.py 
        gfx/jni        : GzzGL-jni.cxx 
        gzz/gfx/gl     : GLSpans.java 
        gzz/media/impl : PageImageScroll.java 

Log message:
        Vary zoom; we really need the 144 resolution to get clear text

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/pagespan.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/jni/GzzGL-jni.cxx.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLSpans.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/media/impl/PageImageScroll.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/pagespan.py
diff -c gzz/gfx/demo/pagespan.py:1.1 gzz/gfx/demo/pagespan.py:1.2
*** gzz/gfx/demo/pagespan.py:1.1        Tue Sep 17 02:47:00 2002
--- gzz/gfx/demo/pagespan.py    Tue Sep 17 02:52:33 2002
***************
*** 9,22 ****
  
  class PageScene:
      def __init__(self):
!       r = GLSpans.getRect(pages.getCurrent())
        self.q = partialquad(r.x0, r.y0, r.x1, r.y1, texid=r.texId)
      def key(self, key):
!       pass
      def scene(self, vs):
        putnoc(vs, background((0.3,0.5,0.4)))
  
!       vs.put(self.q, "Q", 10, 100, 100, 300, 300)
  
  
  
--- 9,26 ----
  
  class PageScene:
      def __init__(self):
!       r = self.r = GLSpans.getRect(pages.getCurrent())
        self.q = partialquad(r.x0, r.y0, r.x1, r.y1, texid=r.texId)
+       self.xs = [300,600,1000]
      def key(self, key):
!       if key == 'z':
!           rotatelist(self.xs)
      def scene(self, vs):
        putnoc(vs, background((0.3,0.5,0.4)))
  
!       vs.put(self.q, "Q", 10, 100, 100, 
!           self.xs[0], 
!           self.xs[0] * self.r.h / self.r.w)
  
  
  
Index: gzz/gfx/jni/GzzGL-jni.cxx
diff -c gzz/gfx/jni/GzzGL-jni.cxx:1.17 gzz/gfx/jni/GzzGL-jni.cxx:1.18
*** gzz/gfx/jni/GzzGL-jni.cxx:1.17      Tue Sep 17 01:48:39 2002
--- gzz/gfx/jni/GzzGL-jni.cxx   Tue Sep 17 02:52:34 2002
***************
*** 205,211 ****
            new Mosaic::Raster<Mosaic::Format::RGBA>(2048, 2048)
            );
        DBG(dbg) << "Initializing Mosaicbuilder\n";
!     mosaicbuilder = new Mosaic::MosaicBuilder(fact);
        DBG(dbg) << "Returning\n";
  
  
--- 205,211 ----
            new Mosaic::Raster<Mosaic::Format::RGBA>(2048, 2048)
            );
        DBG(dbg) << "Initializing Mosaicbuilder\n";
!       mosaicbuilder = new Mosaic::MosaicBuilder(fact);
        DBG(dbg) << "Returning\n";
  
  
Index: gzz/gzz/gfx/gl/GLSpans.java
diff -c gzz/gzz/gfx/gl/GLSpans.java:1.2 gzz/gzz/gfx/gl/GLSpans.java:1.3
*** gzz/gzz/gfx/gl/GLSpans.java:1.2     Tue Sep 17 02:46:45 2002
--- gzz/gzz/gfx/gl/GLSpans.java Tue Sep 17 02:52:34 2002
***************
*** 12,21 ****
--- 12,25 ----
   */
  public class GLSpans {
      /** A rectangle in a texture.
+      * XXX Make data members final
       */
      static public class Rect {
        public int texId;
        public float x0, y0, x1, y1;
+       /** Width and height in points.
+        */
+       public float w, h;
      };
      static HashMap pages = new HashMap();
  
***************
*** 54,59 ****
--- 58,65 ----
            r.x1 = (float)rect.rect.getTexCoord(0, resmult * (p.x+d.width) / 
rect.w);
            r.y0 = (float)rect.rect.getTexCoord(1, resmult * p.y / rect.h);
            r.y1 = (float)rect.rect.getTexCoord(1, resmult * (p.y+d.height) / 
rect.h);
+           r.w = d.width;
+           r.h = d.height;
  
            pages.put(span, r);
        }
Index: gzz/gzz/media/impl/PageImageScroll.java
diff -c gzz/gzz/media/impl/PageImageScroll.java:1.5 
gzz/gzz/media/impl/PageImageScroll.java:1.6
*** gzz/gzz/media/impl/PageImageScroll.java:1.5 Tue Sep 17 02:08:47 2002
--- gzz/gzz/media/impl/PageImageScroll.java     Tue Sep 17 02:52:34 2002
***************
*** 38,51 ****
  
  public class PageImageScroll
         implements ScrollBlockManager.MediaserverScrollBlock {
! String rcsid = "$Id: PageImageScroll.java,v 1.5 2002/09/17 06:08:47 tjl Exp 
$";
      public static boolean dbg = true;
      final static void p(String s) { if(dbg) System.out.println(s); }
      final static void pa(String s) { System.out.println(s); }
  
      int WIDTH=612; // Letter size fixed, for now, in points, 1/72ths of 
inches..
      int HEIGHT=792;
!     int RESOLUTION=72;
  
      String DIR="mstmpimg/"; // XXX Non-platform-independent!
  
--- 38,51 ----
  
  public class PageImageScroll
         implements ScrollBlockManager.MediaserverScrollBlock {
! String rcsid = "$Id: PageImageScroll.java,v 1.6 2002/09/17 06:52:34 tjl Exp 
$";
      public static boolean dbg = true;
      final static void p(String s) { if(dbg) System.out.println(s); }
      final static void pa(String s) { System.out.println(s); }
  
      int WIDTH=612; // Letter size fixed, for now, in points, 1/72ths of 
inches..
      int HEIGHT=792;
!     int RESOLUTION=144;
  
      String DIR="mstmpimg/"; // XXX Non-platform-independent!
  




reply via email to

[Prev in Thread] Current Thread [Next in Thread]