[Gzz-commits] fenfire/org/fenfire modules/pp/Pp.java view/Spa...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/04/16 01:59:23

Modified files:
        org/fenfire/modules/pp: Pp.java 
        org/fenfire/view: SpatialPlane.java 

Log message:
        gl links are missing still

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SpatialPlane.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.18 
fenfire/org/fenfire/modules/pp/Pp.java:1.19
--- fenfire/org/fenfire/modules/pp/Pp.java:1.18 Wed Apr 16 01:45:53 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java      Wed Apr 16 01:59:23 2003
@@ -12,6 +12,7 @@
 
 import org.nongnu.libvob.*;
 import org.nongnu.libvob.impl.*;
+import org.nongnu.libvob.impl.gl.*;
 import org.nongnu.libvob.buoy.*;
 import org.nongnu.libvob.vobs.*;
 
@@ -27,8 +28,8 @@
 
 
 public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.18 2003/04/16 05:45:53 
mudyc Exp $";
-    public static final boolean dbg = true;
+public static final String rcsid = "$Id: Pp.java,v 1.19 2003/04/16 05:59:23 
mudyc Exp $";
+    public static final boolean dbg = false;
     protected static void p(String s) { if(dbg) pa(s); }
     protected static void pa(String s) { System.out.println("Pp::"+s); }
 
@@ -228,9 +229,8 @@
 
     public void link(int dir, int anchorCS, BuoyViewNodeType otherNode, 
                     Object linkId, Object otherAnchor) {
-       pa("link!");
+       p("link!");
 
-       OrthoCoorder c = (OrthoCoorder)curVs.coords;
        int anchorUnit = curVs.unitSqCS(anchorCS, "UN");
        int anchorCenter = curVs.translateCS(anchorUnit, "TR55", 0.5f, 0.5f);
        float r = ctrY * 0.9f;
@@ -239,23 +239,27 @@
        float max = (curVs.size.height * focusSizeFactor) / 3;
 
        int buoyCS;
-       if (dir < 0){
-           buoyCS = c.buoyOnCircle(focusCtr, anchorCenter,
-                                   ctrX, ctrY, r, 
-                                   ctrX-r, ctrY, 
-                                   min, max);
+
+       if (GraphicsAPI.getInstance() instanceof GLAPI) {
+           GLVobCoorder c = (GLVobCoorder)curVs.coords;
+           throw new Error("gl link not implemented!");
        } else {
-           buoyCS = c.buoyOnCircle(focusCtr, anchorCenter,
-                                   ctrX, ctrY, r, 
-                                   ctrX+r, ctrY,
-                                   min, max);
+           OrthoCoorder c = (OrthoCoorder)curVs.coords;
+           if (dir < 0){
+               buoyCS = c.buoyOnCircle(focusCtr, anchorCenter,
+                                       ctrX, ctrY, r, 
+                                       ctrX-r, ctrY, 
+                                       min, max);
+           } else {
+               buoyCS = c.buoyOnCircle(focusCtr, anchorCenter,
+                                       ctrX, ctrY, r, 
+                                       ctrX+r, ctrY,
+                                       min, max);
+           }
        }
        buoys.put(""+buoyCS, linkId);
        curVs.matcher.add(buoyCS, linkId);
        curVs.activate(buoyCS);
-
-       float[] fl = new float[3];
-       c.getSqSize(buoyCS, fl);
 
        adaptor.renderBuoy(curVs, buoyCS, linkId, otherAnchor, null);
 
Index: fenfire/org/fenfire/view/SpatialPlane.java
diff -u fenfire/org/fenfire/view/SpatialPlane.java:1.17 
fenfire/org/fenfire/view/SpatialPlane.java:1.18
--- fenfire/org/fenfire/view/SpatialPlane.java:1.17     Wed Apr 16 01:45:53 2003
+++ fenfire/org/fenfire/view/SpatialPlane.java  Wed Apr 16 01:59:23 2003
@@ -25,8 +25,8 @@
  */
 
 public class SpatialPlane {
-public static final String rcsid = "$Id: SpatialPlane.java,v 1.17 2003/04/16 
05:45:53 mudyc Exp $";
-    public static boolean dbg = true;
+public static final String rcsid = "$Id: SpatialPlane.java,v 1.18 2003/04/16 
05:59:23 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); 
}