[Gzz-commits] gzz gzz/gfx/gl/GLSpanner.java gzz/gfx/gl/PageSp...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/01/28 13:42:11

Modified files:
        gzz/gfx/gl     : GLSpanner.java PageSpanPaper.java 
Added files:
        doc            : SpanCellViews.rst 
        doc/pegboard/spancellviews--tjl: peg.rst 
        gzz/view       : PageSpanCellView.java 
        test/gzz/view  : pagespancellview.test 

Log message:
        Refactoring spancellview out of xupdf

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/SpanCellViews.rst?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/spancellviews--tjl/peg.rst?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLSpanner.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/PageSpanPaper.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/PageSpanCellView.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/view/pagespancellview.test?rev=1.1

Patches:
Index: gzz/gzz/gfx/gl/GLSpanner.java
diff -u gzz/gzz/gfx/gl/GLSpanner.java:1.9 gzz/gzz/gfx/gl/GLSpanner.java:1.10
--- gzz/gzz/gfx/gl/GLSpanner.java:1.9   Mon Jan 27 12:26:04 2003
+++ gzz/gzz/gfx/gl/GLSpanner.java       Tue Jan 28 13:42:11 2003
@@ -45,9 +45,9 @@
        private MipzipMemoryConsumer consumer;
 
        /** The width and height of the real page inside
-        * the texture.
+        * the texture, in *TEXTURE* coordinates.
         */
-       float x1, y1;
+       public final float x1, y1;
 
        /** The width and height in pagespan units of the real page.
         */
@@ -106,7 +106,7 @@
     public static class SpanRect {
        public final SpanPage page;
 
-       /** The coordinates of this rectangle.
+       /** The *TEXTURE* coordinates of this rectangle.
         */
        public final float x0, y0, x1, y1;
 
@@ -177,4 +177,6 @@
        }
        return r;
     }
+
+
 }
Index: gzz/gzz/gfx/gl/PageSpanPaper.java
diff -u gzz/gzz/gfx/gl/PageSpanPaper.java:1.4 
gzz/gzz/gfx/gl/PageSpanPaper.java:1.5
--- gzz/gzz/gfx/gl/PageSpanPaper.java:1.4       Mon Jan 27 14:39:40 2003
+++ gzz/gzz/gfx/gl/PageSpanPaper.java   Tue Jan 28 13:42:11 2003
@@ -12,6 +12,15 @@
      */
     public final float w, h;
 
+    /** Return the paper X coordinate for the given full page span coordinate.
+     */
+    public float getX(float fullPageX) {
+       return p.getX(fullPageX);
+    }
+    public float getY(float fullPageY) {
+       return p.getY(fullPageY);
+    }
+
     Object identity;
     GLSpanner.SpanPage p;