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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/26 04:31:41

Modified files:
        org/fenfire/demo: buoyoing.py 
        org/fenfire/view/buoy: NodeType2D.java PPConnector.java 

Log message:
        Some more debug code

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/NodeType2D.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPConnector.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.27 
fenfire/org/fenfire/demo/buoyoing.py:1.28
--- fenfire/org/fenfire/demo/buoyoing.py:1.27   Fri Apr 25 11:57:07 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Sat Apr 26 04:31:41 2003
@@ -140,7 +140,11 @@
 paperview = ff.view.PaperView2D(vob.putil.demowindow.w, view)
 irregu = ff.view.IrregularViewportView2D(paperview)
 
-# irregu.debugFlags = irregu.DEBUG_CONTENT
+paperviewonly = ff.view.PaperView2D(vob.putil.demowindow.w, None)
+
+ff.view.buoy.NodeType2D.effigy = 0
+
+irregu.debugFlags = irregu.DEBUG_CONTENT | irregu.DEBUG_CHILD
 # irregu.border = 10
 irregu.type = 2
 
@@ -149,7 +153,9 @@
 mainNode = ff.view.buoy.MainNode2D(plane, irregu)
 # mainNode = ff.view.buoy.MainNode2D(plane, paperview)
 
-connector = ff.view.buoy.PPConnector(fen, irregu)
+connector = ff.view.buoy.PPConnector(fen, paperviewonly)
+connector.hackForTesting = 1
+# connector = ff.view.buoy.PPConnector(fen, irregu)
 
 class Scene(vob.buoy.buoymanager.RealBuoyManager):
     def __init__(self):
Index: fenfire/org/fenfire/view/buoy/NodeType2D.java
diff -u fenfire/org/fenfire/view/buoy/NodeType2D.java:1.2 
fenfire/org/fenfire/view/buoy/NodeType2D.java:1.3
--- fenfire/org/fenfire/view/buoy/NodeType2D.java:1.2   Fri Apr 25 10:43:04 2003
+++ fenfire/org/fenfire/view/buoy/NodeType2D.java       Sat Apr 26 04:31:41 2003
@@ -32,6 +32,7 @@
 import org.nongnu.libvob.buoy.*;
 
 import java.awt.Rectangle;
+import java.awt.Color;
 import java.awt.event.MouseEvent;
 
 /** A BuoyViewNodeType showing areas of 2D planes rendered through
@@ -40,6 +41,8 @@
 public class NodeType2D implements BuoyViewNodeType {
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println(s); }
+
+    public static int effigy = 0;
     
     protected View2D view;
 
@@ -60,6 +63,13 @@
 
     public int renderBuoy(VobScene vs, int into, Object linkId,
                          Object anchor, Object cachedSize) {
+       if(effigy != 0) {
+           Vob eff = org.nongnu.libvob.gl.GLRen.createQuad(effigy-1);
+           vs.map.put( eff, into);
+           //vs.map.put(new org.nongnu.libvob.vobs.RectBgVob(
+       //              Color.green, true, Color.black), into);
+           return into;
+       }
        Pair p = (Pair)anchor;
        Object plane = p.first;
        Rectangle rect = (Rectangle)p.second;
@@ -72,12 +82,16 @@
        float scale = w / rect.width;
        if(scale < h / rect.height) scale = h / rect.height;
 
-       int box2paper = vs.coords.orthoBox(0, 0, rect.x, rect.y, 
-                                          scale, scale, 
+///    int box2paper = vs.coords.orthoBox(0, 0, rect.x, rect.y, 
+///                                       1/scale, 1/scale, 
+///                                       w, h);
+       int box2paper = vs.coords.orthoBox(0, 0, 0, 0, 
+                                          1, 1, 
                                           w, h);
        vs.matcher.add(into, box2paper, "BUOYPAP");
 
        view.render(vs, plane, into, into, box2paper);
+
        return vs.coords.translate(into, w/2f, h/2f);
     }
 
Index: fenfire/org/fenfire/view/buoy/PPConnector.java
diff -u fenfire/org/fenfire/view/buoy/PPConnector.java:1.1 
fenfire/org/fenfire/view/buoy/PPConnector.java:1.2
--- fenfire/org/fenfire/view/buoy/PPConnector.java:1.1  Fri Apr 25 09:57:08 2003
+++ fenfire/org/fenfire/view/buoy/PPConnector.java      Sat Apr 26 04:31:41 2003
@@ -16,10 +16,12 @@
 /** Make the kinds of links familiar from PP structure.
  */
 public class PPConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: PPConnector.java,v 1.1 2003/04/25 
13:57:08 benja Exp $";
+public static final String rcsid = "$Id: PPConnector.java,v 1.2 2003/04/26 
08:31:41 tjl Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPLinker:"+s); }
 
+    public static boolean hackForTesting = false;
+
     private Fen fen;
     private View2D view;
     private BuoyViewNodeType nodeType;
@@ -34,7 +36,7 @@
                         BuoyLinkListener l) {
        if(!(mainNode instanceof MainNode2D)) return;
        MainNode2D mn2d = (MainNode2D)mainNode;
-       if(mn2d.getView() != view) return;
+       if(mn2d.getView() != view && !hackForTesting) return;
 
        DefaultVobMatcher m = (DefaultVobMatcher)vs.matcher;
        for(Iterator i=m.getKeys(parentCs).iterator(); i.hasNext();) {