[Gzz-commits] fenfire/org/fenfire/view PaperView2D.java pages...

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Benja Fallenstein <address@hidden>      03/04/24 16:52:24

Modified files:
        org/fenfire/view: PaperView2D.java pagespanlayout.test 
        org/fenfire/view/buoy: MainNode2D.java 

Log message:
        scale PaperView2D by factor 200 to make the appereance reasonable :-)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PaperView2D.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/pagespanlayout.test.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/MainNode2D.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/PaperView2D.java
diff -u fenfire/org/fenfire/view/PaperView2D.java:1.2 
fenfire/org/fenfire/view/PaperView2D.java:1.3
--- fenfire/org/fenfire/view/PaperView2D.java:1.2       Thu Apr 24 16:31:32 2003
+++ fenfire/org/fenfire/view/PaperView2D.java   Thu Apr 24 16:52:23 2003
@@ -30,6 +30,7 @@
 
     public GraphicsAPI.RenderingSurface optWin;
 
+    private float[] tmp = new float[2];
     public void render(VobScene vs, 
                Object plane,
                int matchingParent,
@@ -44,7 +45,12 @@
 
        org.nongnu.libvob.Vob v = GLRen.createEasyPaperQuad(
                    p, dicefactor, flags);
-       vs.put(v, box2screen, box2paper);
+       
+       vs.coords.getSqSize(box2paper, tmp);
+       int magnified = vs.coords.orthoBox(box2paper, 0, 0, 0,
+                                          1/200f, 1/200f,
+                                          tmp[0], tmp[1]);
+       vs.put(v, box2screen, magnified);
 
        if(child != null)
            child.render(vs, plane, matchingParent,
Index: fenfire/org/fenfire/view/buoy/MainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/MainNode2D.java:1.4 
fenfire/org/fenfire/view/buoy/MainNode2D.java:1.5
--- fenfire/org/fenfire/view/buoy/MainNode2D.java:1.4   Thu Apr 24 16:38:41 2003
+++ fenfire/org/fenfire/view/buoy/MainNode2D.java       Thu Apr 24 16:52:24 2003
@@ -70,7 +70,7 @@
        float w = tmp[0], h = tmp[1];
        int box2paper = 
            vs.coords.orthoBox(0, 0, panX-w/2, panY-h/2, 
-                              zoom, zoom, w, h);
+                              1/zoom, 1/zoom, w, h);
        view.render(vs, plane, into, into, box2paper);
     }
     public void keystroke(String s) {
Index: fenfire/org/fenfire/view/pagespanlayout.test
diff -u fenfire/org/fenfire/view/pagespanlayout.test:1.6 
fenfire/org/fenfire/view/pagespanlayout.test:1.7
--- fenfire/org/fenfire/view/pagespanlayout.test:1.6    Thu Apr 24 14:01:56 2003
+++ fenfire/org/fenfire/view/pagespanlayout.test        Thu Apr 24 16:52:23 2003
@@ -99,8 +99,8 @@
 
     l = fenfire.view.PageSpanLayout(enfMaker.makeEnfilade(sc.getCurrent()))
 
-    assertApprox(.1, l.w, 2 * 595)
-    assertApprox(.1, l.h, 842)
+    assertApprox(.1, l.getWidth(), 2 * 595)
+    assertApprox(.1, l.getHeight(), 842)
 
 def testSimply():
     """Test that the view renders something