[Gzz-commits] libvob/org/nongnu/libvob vobs/OvalBgVob.java vo...

[Asko Soukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Asko Soukka <address@hidden>    03/03/26 07:39:26

Modified files:
        org/nongnu/libvob/vobs: OvalBgVob.java SimpleConnection.java 
Added files:
        org/nongnu/libvob/gl: Stencil.java 

Log message:
        loom GL 'runs'

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/gl/Stencil.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/vobs/OvalBgVob.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/vobs/SimpleConnection.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/vobs/OvalBgVob.java
diff -u libvob/org/nongnu/libvob/vobs/OvalBgVob.java:1.1 
libvob/org/nongnu/libvob/vobs/OvalBgVob.java:1.2
--- libvob/org/nongnu/libvob/vobs/OvalBgVob.java:1.1    Sun Mar 16 10:46:22 2003
+++ libvob/org/nongnu/libvob/vobs/OvalBgVob.java        Wed Mar 26 07:39:26 2003
@@ -42,7 +42,7 @@
  * surrounded by a circle of the current foreground color.
  */
 public class OvalBgVob extends Vob {
-public static final String rcsid = "$Id: OvalBgVob.java,v 1.1 2003/03/16 
15:46:22 benja Exp $";
+public static final String rcsid = "$Id: OvalBgVob.java,v 1.2 2003/03/26 
12:39:26 humppake Exp $";
     public static boolean dbg = false;
     private static final void p(String s) { if(dbg) System.out.println(s); }
 
@@ -228,10 +228,8 @@
                "PopAttrib\n"
                );
        }
-
-       throw new Error("Cannot render OvalBgVob in GL yet!");
        
-       /*gzz.gfx.gl.Stencil.drawStenciled(
+       org.nongnu.libvob.gl.Stencil.drawStenciled(
           vs,
           new Runnable() { public void run() {
               vs.map.put(glStencil, coordsys1);
@@ -245,7 +243,7 @@
           );
 
        if(drawBorder) vs.map.put(glBorder, coordsys1);
-       return 0;*/
+       return 0;
     }
 
     protected String glBorderString() {
Index: libvob/org/nongnu/libvob/vobs/SimpleConnection.java
diff -u libvob/org/nongnu/libvob/vobs/SimpleConnection.java:1.1 
libvob/org/nongnu/libvob/vobs/SimpleConnection.java:1.2
--- libvob/org/nongnu/libvob/vobs/SimpleConnection.java:1.1     Sun Mar 16 
11:01:13 2003
+++ libvob/org/nongnu/libvob/vobs/SimpleConnection.java Wed Mar 26 07:39:26 2003
@@ -35,7 +35,7 @@
  */
 
 public class SimpleConnection extends Vob {
-public static final String rcsid = "$Id: SimpleConnection.java,v 1.1 
2003/03/16 16:01:13 benja Exp $";
+public static final String rcsid = "$Id: SimpleConnection.java,v 1.2 
2003/03/26 12:39:26 humppake Exp $";
 
     float x0, y0, x1, y1;
     Color color;
@@ -79,8 +79,8 @@
     Vob line;
 
     public int putGL(VobScene vs, int coordsys1, int coordsys2) {
-       throw new Error("SimpleConnection doesn't work in GL yet");
-       /**
+       /** 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,
@@ -88,10 +88,10 @@
                                             color.getBlue()/255f,
                                             1);
        else line = GLRen.createLineConnector(x0, y0, x1, y1, 1, 1,
-                                             -1, -1, -1, -1);
+       -1, -1, -1, -1);*/
+       if(line == null) line = GLRen.createLineConnector();
        vs.map.put(line, coordsys1, coordsys2);
        return 0;
-       **/
     }
 }