[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/Irreg...

[Benja Fallenstein]

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

Modified files:
        org/fenfire/demo: buoyoing.py 
        org/fenfire/view: IrregularViewportView2D.java PaperView2D.java 
                          SimplePage.java paperview2d.test 
        org/fenfire/view/buoy: BuoyAdaptor.java MainNode2D.java 

Log message:
        work towards using buoyoing with new interfaces

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/IrregularViewportView2D.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PaperView2D.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SimplePage.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/paperview2d.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/BuoyAdaptor.java.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.2&tr2=1.3&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.18 
fenfire/org/fenfire/demo/buoyoing.py:1.19
--- fenfire/org/fenfire/demo/buoyoing.py:1.18   Thu Apr 24 16:10:02 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Thu Apr 24 16:31:32 2003
@@ -34,11 +34,8 @@
     for (k,v) in sys.modules.items():
         print k,"\t",v
 
-import vob
-
 from org import fenfire as ff
 
-from org.nongnu import libvob as vob
 from org.nongnu import alph
 from org.nongnu import storm
 
@@ -47,7 +44,7 @@
 from org.fenfire.index import XuLink
 from org.fenfire.vocab import PP
 
-import vob.buoy
+import vob
 
 ff.util.PageSpanPaper.paperMill = vob.gl.PaperMill.getInstance()
 ff.util.PageSpanPaper.paperMillWindow = vob.putil.demowindow.w
@@ -200,8 +197,10 @@
 textstyle = vob.GraphicsAPI.getInstance().getTextStyle("sans", 0, 24)
 nodeview = ff.view.TextNodeView(fen.txtfunc, textstyle, 24)
 view = ff.view.CanvasView2D(fen, nodeview)
+paperview = ff.view.PaperView2D(vob.putil.demowindow.w, view)
+#irregu = ff.view.IrregularViewportView2D(paperview)
 plane = ff.swamp.Nodes.get(paperA)
-mainNode = ff.view.buoy.MainNode2D(plane, view)
+mainNode = ff.view.buoy.MainNode2D(plane, paperview)
 
 class Scene(vob.buoy.buoymanager.RealBuoyManager):
     def __init__(self):
Index: fenfire/org/fenfire/view/IrregularViewportView2D.java
diff -u fenfire/org/fenfire/view/IrregularViewportView2D.java:1.1 
fenfire/org/fenfire/view/IrregularViewportView2D.java:1.2
--- fenfire/org/fenfire/view/IrregularViewportView2D.java:1.1   Thu Apr 24 
16:01:35 2003
+++ fenfire/org/fenfire/view/IrregularViewportView2D.java       Thu Apr 24 
16:31:32 2003
@@ -15,6 +15,10 @@
 
     public View2D child;
 
+    public IrregularViewportView2D(View2D child) {
+       this.child = child;
+    }
+
     private IrregularFrame irregu;
     private float cw, ch;
 
Index: fenfire/org/fenfire/view/PaperView2D.java
diff -u fenfire/org/fenfire/view/PaperView2D.java:1.1 
fenfire/org/fenfire/view/PaperView2D.java:1.2
--- fenfire/org/fenfire/view/PaperView2D.java:1.1       Thu Apr 24 14:01:56 2003
+++ fenfire/org/fenfire/view/PaperView2D.java   Thu Apr 24 16:31:32 2003
@@ -1,19 +1,34 @@
 // (c) Tuomas J. Lukka
 
 package org.fenfire.view;
-import org.nongnu.libvob.VobScene;
+import org.nongnu.libvob.*;
 import org.nongnu.libvob.gl.*;
 
 /** A paper background for View2D.
  * For the render call, make sure the plane object
  * is the one whose identity (hashCode) is permanent.
+ * <p>
+ * If given another View2D in the constructor,
+ * this other view is rendered on top of the paper.
  */
 public class PaperView2D extends View2D {
     public PaperMill paperMill;
     public float dicefactor = 1;
     public int flags = 0;
 
-    public org.nongnu.libvob.GraphicsAPI.RenderingSurface optWin;
+    protected View2D child;
+    
+    public PaperView2D(GraphicsAPI.RenderingSurface optWin) { 
+       this.optWin = optWin;
+       this.child = null; 
+    }
+    public PaperView2D(GraphicsAPI.RenderingSurface optWin,
+                      View2D child) { 
+       this.optWin = optWin;
+       this.child = child; 
+    }
+
+    public GraphicsAPI.RenderingSurface optWin;
 
     public void render(VobScene vs, 
                Object plane,
@@ -30,6 +45,10 @@
        org.nongnu.libvob.Vob v = GLRen.createEasyPaperQuad(
                    p, dicefactor, flags);
        vs.put(v, box2screen, box2paper);
+
+       if(child != null)
+           child.render(vs, plane, matchingParent,
+                        box2screen, box2paper);
     }
 
 
Index: fenfire/org/fenfire/view/SimplePage.java
diff -u fenfire/org/fenfire/view/SimplePage.java:1.3 
fenfire/org/fenfire/view/SimplePage.java:1.4
--- fenfire/org/fenfire/view/SimplePage.java:1.3        Wed Apr 23 19:40:41 2003
+++ fenfire/org/fenfire/view/SimplePage.java    Thu Apr 24 16:31:32 2003
@@ -53,8 +53,8 @@
     }
     public void getSize(Enfilade1D enf, float[] size) {
        PageSpanLayout l = getPageSpanLayout(enf);
-       size[0] = l.w;
-       size[1] = l.h;
+       size[0] = l.getWidth();
+       size[1] = l.getHeight();
     }
 
 }
Index: fenfire/org/fenfire/view/buoy/BuoyAdaptor.java
diff -u fenfire/org/fenfire/view/buoy/BuoyAdaptor.java:1.6 
fenfire/org/fenfire/view/buoy/BuoyAdaptor.java:1.7
--- fenfire/org/fenfire/view/buoy/BuoyAdaptor.java:1.6  Tue Apr 15 14:09:18 2003
+++ fenfire/org/fenfire/view/buoy/BuoyAdaptor.java      Thu Apr 24 16:31:32 2003
@@ -76,9 +76,9 @@
        return getNode(node).renderBuoy(vs, into, node, null, cachedSize);
     }
     public BuoyViewMainNode createMainNode(Object linkId, 
-                                          Object anchor, BuoyLinkListener l) {
+                                          Object anchor) {
        Object node = anchor;
-       return getNode(node).createMainNode(node, null, new LinkAdaptor(l));
+       return getNode(node).createMainNode(node, null, null);
     }
 
     /** An adaptor class that calls the nodeLinkers
Index: fenfire/org/fenfire/view/buoy/MainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/MainNode2D.java:1.2 
fenfire/org/fenfire/view/buoy/MainNode2D.java:1.3
--- fenfire/org/fenfire/view/buoy/MainNode2D.java:1.2   Thu Apr 24 15:39:04 2003
+++ fenfire/org/fenfire/view/buoy/MainNode2D.java       Thu Apr 24 16:31:32 2003
@@ -69,7 +69,8 @@
        vs.coords.getSqSize(into, tmp);
        float w = tmp[0], h = tmp[1];
        int box2paper = 
-           vs.coords.ortho(0, 0, panX-w/2, panY-h/2, zoom, zoom);
+           vs.coords.orthoBox(0, 0, panX-w/2, panY-h/2, zoom, zoom, 
+                              w*zoom, h*zoom);
        view.render(vs, plane, into, into, box2paper);
     }
     public void keystroke(String s) {
Index: fenfire/org/fenfire/view/paperview2d.test
diff -u fenfire/org/fenfire/view/paperview2d.test:1.1 
fenfire/org/fenfire/view/paperview2d.test:1.2
--- fenfire/org/fenfire/view/paperview2d.test:1.1       Thu Apr 24 14:01:56 2003
+++ fenfire/org/fenfire/view/paperview2d.test   Thu Apr 24 16:31:32 2003
@@ -12,8 +12,7 @@
     vs = gfx.getvs()
 
     vs.map.put(vob.vobs.SolidBackdropVob(java.awt.Color.black))
-    v2d = fenfire.view.PaperView2D()
-    v2d.optWin = gfx.win
+    v2d = fenfire.view.PaperView2D(gfx.win)
     b2s = vs.orthoCS(0, "A", 0, 100, 100, 100, 100)
     v2d.render(vs, "A", 0, b2s, 0)