[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py modules/pp...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/04/16 06:42:53

Modified files:
        org/fenfire/demo: buoyoing.py 
        org/fenfire/modules/pp: PPCanvasNode.java SinglePaper.java 
        org/fenfire/view: SpatialPlane.java 

Log message:
        twids

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasNode.java.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/SinglePaper.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SpatialPlane.java.diff?tr1=1.18&tr2=1.19&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.14 
fenfire/org/fenfire/demo/buoyoing.py:1.15
--- fenfire/org/fenfire/demo/buoyoing.py:1.14   Wed Apr 16 05:47:13 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Wed Apr 16 06:42:52 2003
@@ -229,7 +229,7 @@
 
 #mainNodeType = (scrollblockLinker.xulinkPageSpanNodeType, None, pagespans[0])
 # mainNodeType = (adaptor.nodes[0], None, ff.swamp.Nodes.get(paper))
-mainNodeType = (adaptor, None, ff.swamp.Nodes.get(paperA))
+mainNodeType = (adaptor, None, ff.swamp.Nodes.get(note1))
 
 class Scene(vob.buoy.buoymanager.RealBuoyManager):
     def __init__(self):
Index: fenfire/org/fenfire/modules/pp/PPCanvasNode.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.19 
fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.20
--- fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.19       Wed Apr 16 
04:45:58 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasNode.java    Wed Apr 16 06:42:53 2003
@@ -17,7 +17,7 @@
 
 
 public class PPCanvasNode implements NodeBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.19 2003/04/16 
08:45:58 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.20 2003/04/16 
10:42:53 mudyc Exp $";  
     public static boolean dbg = true;
     private static void p(String s) { if (dbg) pa(s); }
     private static void pa(String s) { System.out.println("PPCanvasNode::"+s); 
}
@@ -83,6 +83,8 @@
      */
     public int renderBuoy(VobScene vs, int into, Object node, Object content,
                   Object cachedSize){
+       pa("renderBuoy: "+ node);
+
        int[] pan = getCoords(node);
         float [] bs = new float[2];
        nodeview.getSize(node, bs);
@@ -99,7 +101,7 @@
            
            SinglePaper.i(fen, node, win, nodeview)
                .render(vs, into, c2fCS, c2fCSInv, null);
-
+           
        } else {
            int zo = (int)(buoyZoom * 100000);
            int geometry = vs.orthoBoxCS(into, "FocusGeometry",0, zo,0, 1,1, 
pan[0], pan[1]);  
Index: fenfire/org/fenfire/modules/pp/SinglePaper.java
diff -u fenfire/org/fenfire/modules/pp/SinglePaper.java:1.9 
fenfire/org/fenfire/modules/pp/SinglePaper.java:1.10
--- fenfire/org/fenfire/modules/pp/SinglePaper.java:1.9 Wed Apr 16 03:46:47 2003
+++ fenfire/org/fenfire/modules/pp/SinglePaper.java     Wed Apr 16 06:42:53 2003
@@ -17,9 +17,10 @@
  * the background and the vobs inside the plane.
  */
 public class SinglePaper {
-private static final String rcsid = "$Id: SinglePaper.java,v 1.9 2003/04/16 
07:46:47 tjl Exp $";  
-    public static boolean dbg = false;
-    private static void pa(String s) { System.out.println("SinglePaper:"+s); }
+private static final String rcsid = "$Id: SinglePaper.java,v 1.10 2003/04/16 
10:42:53 mudyc Exp $";  
+    public static boolean dbg = true;
+    private static void p(String s) { if (dbg) pa(s); }
+    private static void pa(String s) { System.out.println("SinglePaper::"+s); }
 
     // Singleton  <sigh> why do I do everything with singleton?
     // Even I hate globals..
@@ -101,6 +102,8 @@
                    final int inversePanZoom,
                    NodePlacementHook hook) 
     {
+       p("render paper: "+node);
+
        final NodePlacementHook hook_final = hook;
 
        // don't want to move this away from here..
@@ -110,8 +113,8 @@
        final GLVobCoorder_Gen glc = (GLVobCoorder_Gen)vs.coords;
        float[] sqs = new float[2];
        glc.getSqSize(frameCS, sqs);
-       if (sqs[1] < 5) return;
-       if (dbg) pa("Sqs frame: "+sqs[0]+" "+sqs[1]);
+       p("Sqs frame: "+sqs[0]+" "+sqs[1]);
+       //if (sqs[1] < 5) return;
 
        // CS from center of frameCS to screen
        int framecenterCS = vs.translateCS(frameCS, "FCTR", sqs[0]/2, sqs[1]/2);
Index: fenfire/org/fenfire/view/SpatialPlane.java
diff -u fenfire/org/fenfire/view/SpatialPlane.java:1.18 
fenfire/org/fenfire/view/SpatialPlane.java:1.19
--- fenfire/org/fenfire/view/SpatialPlane.java:1.18     Wed Apr 16 01:59:23 2003
+++ fenfire/org/fenfire/view/SpatialPlane.java  Wed Apr 16 06:42:53 2003
@@ -25,7 +25,7 @@
  */
 
 public class SpatialPlane {
-public static final String rcsid = "$Id: SpatialPlane.java,v 1.18 2003/04/16 
05:59:23 mudyc Exp $";
+public static final String rcsid = "$Id: SpatialPlane.java,v 1.19 2003/04/16 
10:42:53 mudyc Exp $";
     public static boolean dbg = false;
     private static void p(String s) { pa(s); }
     private static void pa(String s) { System.out.println("SpatialPlane::"+s); 
}
@@ -117,6 +117,8 @@
                       Object node, int cullCS, 
                       Fen fen, NodePlacementHook hook, NodeView nodeview) 
     {
+       p("render GL, node: "+ node);
+
        if (frame == null) {
            frame = GLRen.createCallListBoxCoorded(
                "PushAttrib ENABLE_BIT\n" +