[Gzz-commits] gzz gfx/librenderables/renderables.py gzz/modul...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/02/14 08:41:31

Modified files:
        gfx/librenderables: renderables.py 
        gzz/modules/pp2: PPCanvasCursor.java PPCanvasNode.java 

Log message:
        ugh.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.179&tr2=1.180&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPCanvasCursor.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPCanvasNode.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: gzz/gfx/librenderables/renderables.py
diff -u gzz/gfx/librenderables/renderables.py:1.179 
gzz/gfx/librenderables/renderables.py:1.180
--- gzz/gfx/librenderables/renderables.py:1.179 Fri Feb 14 06:09:32 2003
+++ gzz/gfx/librenderables/renderables.py       Fri Feb 14 08:41:31 2003
@@ -643,6 +643,35 @@
        """
 },
 
+{
+    "Type": "1",
+    "Name": "SquareFrame",
+    "Data": "float width;",
+    "Params": "float width",
+    "ParamCode": """this->width = width;""",
+    "RenderCode": """
+            Pt box = coords1.getSqSize();
+           ZPt p;
+            glPushAttrib(GL_ENABLE_BIT);
+            glDisable(GL_TEXTURE_2D);
+
+            glLineWidth(width);
+            
+           glBegin(GL_LINE_LOOP);
+             p = coords1.transform(ZPt(0,0,0));
+            glVertex3f(p.x, p.y, p.z);
+             p = coords1.transform(ZPt(0,box.y,0));
+            glVertex3f(p.x, p.y, p.z);
+             p = coords1.transform(ZPt(box.x,box.y,0));
+            glVertex3f(p.x, p.y, p.z);
+             p = coords1.transform(ZPt(box.x,0,0));
+            glVertex3f(p.x, p.y, p.z);
+           glEnd();
+
+            glPopAttrib();
+       """
+},
+
 
 {
     "Type": "2",
Index: gzz/gzz/modules/pp2/PPCanvasCursor.java
diff -u gzz/gzz/modules/pp2/PPCanvasCursor.java:1.15 
gzz/gzz/modules/pp2/PPCanvasCursor.java:1.16
--- gzz/gzz/modules/pp2/PPCanvasCursor.java:1.15        Fri Feb 14 06:52:51 2003
+++ gzz/gzz/modules/pp2/PPCanvasCursor.java     Fri Feb 14 08:41:31 2003
@@ -31,9 +31,6 @@
 import gzz.vob.*;
 import gzz.client.*;
 import gzz.gfx.gl.*;
-import gzz.media.*;
-import gzz.media.impl.*;
-import gzz.impl.*;
 
 import java.awt.event.*;
 
@@ -44,7 +41,7 @@
 /** XXX
  */
 public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.15 
2003/02/14 11:52:51 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.16 
2003/02/14 13:41:31 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { 
System.out.println("PPCanvasCursor:"+s); }
 
@@ -140,22 +137,6 @@
        this.hook = hook;
        this.d = d;
        this.window = w;
-
-
-
-       SimpleVStreamTexter sct = (SimpleVStreamTexter)space.getCellTexter();
-       Enfilade1DImpl enf = (Enfilade1DImpl)sct.getEnfilade(c, null);
-       java.util.List enfList= enf.getList();
-       Span1D span = (Span1D) enfList.get(0);
-       CellView cv;
-       if (span instanceof TextSpan)
-           cv = new TextCellContentView();
-       else
-           cv = new PageSpanCellView();
-        float [] bs = new float[3];
-       cv.getSize(c, ((ViewContext)new AbstractViewContext()), bs);
-       panx = -bs[0]/2;
-       pany = -bs[1]/2;
     }
 
 
Index: gzz/gzz/modules/pp2/PPCanvasNode.java
diff -u gzz/gzz/modules/pp2/PPCanvasNode.java:1.15 
gzz/gzz/modules/pp2/PPCanvasNode.java:1.16
--- gzz/gzz/modules/pp2/PPCanvasNode.java:1.15  Wed Feb 12 12:16:50 2003
+++ gzz/gzz/modules/pp2/PPCanvasNode.java       Fri Feb 14 08:41:31 2003
@@ -30,10 +30,14 @@
 import gzz.vob.*;
 import gzz.client.*;
 
+import gzz.media.*;
+import gzz.media.impl.*;
+import gzz.impl.*;
+
 /** XXX
  */
 public class PPCanvasNode implements CellBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.15 2003/02/12 
17:16:50 tjl Exp $";  
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.16 2003/02/14 
13:41:31 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPCanvasNode:"+s); }
 
@@ -93,8 +97,23 @@
                            Object cachedSize) {
        if (dbg) pa("renderBuoyCell:"+c);
 
-       // XXX Pan
        int[] pan = getCoords(c);
+       SimpleVStreamTexter sct = (SimpleVStreamTexter)space.getCellTexter();
+       Enfilade1DImpl enf = (Enfilade1DImpl)sct.getEnfilade(c, null);
+       java.util.List enfList= enf.getList();
+       Span1D span = (Span1D) enfList.get(0);
+       CellView cv;
+       if (span instanceof TextSpan)
+           cv = new TextCellContentView();
+       else
+           cv = new PageSpanCellView();
+        float [] bs = new float[3];
+       cv.getSize(c, ((ViewContext)new AbstractViewContext()), bs);
+
+       pan[0] += bs[0]/2;
+       pan[1] += bs[1]/2;
+
+
        final int c2fCS = 
            vs.coords.ortho(0, 0,  -pan[0]*buoyZoom, -pan[1]*buoyZoom, 
buoyZoom, buoyZoom);
        final int c2fCSInv =