[Gzz-commits] gzz/gzz/modules/pp PPView2.java

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/01/13 03:33:53

Modified files:
        gzz/modules/pp : PPView2.java 

Log message:
        nadir fix

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.58&tr2=1.59&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.58 
gzz/gzz/modules/pp/PPView2.java:1.59
--- gzz/gzz/modules/pp/PPView2.java:1.58        Mon Jan 13 03:01:17 2003
+++ gzz/gzz/modules/pp/PPView2.java     Mon Jan 13 03:33:53 2003
@@ -36,7 +36,7 @@
 import java.util.*;
 
 public class PPView2 implements View {
-public static final String rcsid = "$Id: PPView2.java,v 1.58 2003/01/13 
08:01:17 mudyc Exp $";
+public static final String rcsid = "$Id: PPView2.java,v 1.59 2003/01/13 
08:33:53 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
@@ -158,7 +158,9 @@
     public void addInterp(Object key, Object o) { interps.put(key, o); }
     public void clearInterps() { interps.clear(); }
 
+    /* Coordsys */
     private int MAIN_CS = -1;
+    private int NADIR_PT = -1;
     
 
     Vob black = GLCache.getCallList("Color 0 0 0\n");
@@ -302,19 +304,13 @@
                } 
                count *= 0.5;
            }
-           actr = vs.translateCS(actr, "SHIFT_"+count, 0, count * 1.8f);
+           actr = vs.translateCS(actr, "SHIFT_"+connectedFrom, 0, count * 
1.8f);
 
            int buoycs = floater.buoyCoordsys(actr, key);
 
-           // Nadir CS
-           final int nadir_point_cs;
-           nadir_point_cs =  vs.orthoBoxCS(0, "nadir_point"+c, 0, 
-                                          leftPanelRealWidth + 0.5f*mainWidth,
-                                          mainHeight*2.0f,
-                                          1, 1, 2, 2);
            final int nadir_buoy = 
-               ((GLVobCoorder)vs.coords).nadirOrigin(buoycs, nadir_point_cs);
-           vs.matcher.add(nadir_buoy, "NADIR"+c.toString() );
+               ((GLVobCoorder)vs.coords).nadirOrigin(buoycs, NADIR_PT);
+           vs.matcher.add(nadir_buoy, "NADIR"+connectedFrom.toString() );
 
            final int frameCS = vs.orthoBoxCS(nadir_buoy, "frame", 0, 
                    -buoyVPWidth/2, -buoyVPHeight/2, 1, 1, 
@@ -366,8 +362,6 @@
     }
 
     TextStyle style = GraphicsAPI.getInstance().getTextStyle("Sans", 0, 20);
-    //CellView cellview = new ImageCell(new TextCellContentView(style));
-    //CellView cellview = new ImageCell(new LinebrokenCellContentView(style));
     CellView cellview = new ImageCell(new PPCellView(style,
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"));
 
@@ -380,6 +374,11 @@
            "LineWidth 2\nColor 0 0 0\nEnable TEXTURE_2D");
 
     public void render(VobScene vs, int intoCS, ViewContext context) {
+       // Nadir CS
+       NADIR_PT =  vs.orthoBoxCS(0, "nadir_point", 0, 
+                                 leftPanelRealWidth + 0.5f*mainWidth,
+                                 mainHeight*2.0f,
+                                 1, 1, 2, 2);
        ev_handler.cleanCallers();
 
        buoy_vc.setCellView(cellview);