[Gzz-commits] libvob include/vob/vobs/Trivial.hxx org/nongnu/...

[Asko Soukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Asko Soukka <address@hidden>    03/03/26 08:36:35

Modified files:
        include/vob/vobs: Trivial.hxx 
        org/nongnu/libvob/gl: GLRen.java 
        org/nongnu/libvob/vobs: SimpleConnection.java 
        test           : __init__$py.class 
        test/tools     : __init__$py.class 

Log message:
        LineConnector fix

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/vobs/Trivial.hxx.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/gl/GLRen.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/vobs/SimpleConnection.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/__init__$py.class.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/tools/__init__$py.class.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: libvob/include/vob/vobs/Trivial.hxx
diff -u libvob/include/vob/vobs/Trivial.hxx:1.10 
libvob/include/vob/vobs/Trivial.hxx:1.11
--- libvob/include/vob/vobs/Trivial.hxx:1.10    Tue Mar 11 06:24:28 2003
+++ libvob/include/vob/vobs/Trivial.hxx Wed Mar 26 08:36:35 2003
@@ -45,13 +45,19 @@
 struct LineConnector {
     enum { NTrans = 2 };
 
+    float px0, py0, px1, py1;
+
     template<class F> void params(F &f) {
+       f(px0, py0, px1, py1);
     }
 
     template<class T> void render(const T &t0, const T &t1) const {
+        Pt box0 = t0.getSqSize();
+        Pt box1 = t1.getSqSize();
+
        glBegin(GL_LINES);
-           t0.vertex(ZPt(0,0,0));
-           t1.vertex(ZPt(0,0,0));
+           t0.vertex(ZPt(box0.x*px0,box0.y*py0,0));
+           t1.vertex(ZPt(box1.x*px1,box1.y*py1,0));
        glEnd();
     }
 };
Index: libvob/org/nongnu/libvob/gl/GLRen.java
diff -u libvob/org/nongnu/libvob/gl/GLRen.java:1.6 
libvob/org/nongnu/libvob/gl/GLRen.java:1.7
--- libvob/org/nongnu/libvob/gl/GLRen.java:1.6  Mon Mar 17 07:48:19 2003
+++ libvob/org/nongnu/libvob/gl/GLRen.java      Wed Mar 26 08:36:35 2003
@@ -51,13 +51,13 @@
 
 static public class LineConnector extends GL.Renderable2JavaObject  { private 
LineConnector(int i) { super(i); }
 }
-static public LineConnector createLineConnector() { 
+static public LineConnector createLineConnector(float p0, float p1, float p2, 
float p3) { 
 LineConnector _ = new LineConnector(
-implcreateLineConnector());
+implcreateLineConnector(p0, p1, p2, p3));
 
  return _; }
 
-static private native int implcreateLineConnector() ; 
+static private native int implcreateLineConnector(float p0, float p1, float 
p2, float p3) ; 
 static public class CallList extends GL.Renderable0JavaObject  { private 
CallList(int i) { super(i); }
 GL.DisplayList p0;
 }
Index: libvob/org/nongnu/libvob/vobs/SimpleConnection.java
diff -u libvob/org/nongnu/libvob/vobs/SimpleConnection.java:1.2 
libvob/org/nongnu/libvob/vobs/SimpleConnection.java:1.3
--- libvob/org/nongnu/libvob/vobs/SimpleConnection.java:1.2     Wed Mar 26 
07:39:26 2003
+++ libvob/org/nongnu/libvob/vobs/SimpleConnection.java Wed Mar 26 08:36:35 2003
@@ -35,7 +35,7 @@
  */
 
 public class SimpleConnection extends Vob {
-public static final String rcsid = "$Id: SimpleConnection.java,v 1.2 
2003/03/26 12:39:26 humppake Exp $";
+public static final String rcsid = "$Id: SimpleConnection.java,v 1.3 
2003/03/26 13:36:35 humppake Exp $";
 
     float x0, y0, x1, y1;
     Color color;
@@ -79,17 +79,7 @@
     Vob line;
 
     public int putGL(VobScene vs, int coordsys1, int coordsys2) {
-       /** Current line connector don't support colors or
-           mounting coordinates.
-       if(line == null && color != null)
-           line = GLRen.createLineConnector(x0, y0, x1, y1, 1, 1,
-                                            color.getRed()/255f,
-                                            color.getGreen()/255f,
-                                            color.getBlue()/255f,
-                                            1);
-       else line = GLRen.createLineConnector(x0, y0, x1, y1, 1, 1,
-       -1, -1, -1, -1);*/
-       if(line == null) line = GLRen.createLineConnector();
+       if(line == null) line = GLRen.createLineConnector(x0, y0, x1, y1);
        vs.map.put(line, coordsys1, coordsys2);
        return 0;
     }
Index: libvob/test/__init__$py.class
Index: libvob/test/tools/__init__$py.class