[ff-cvs] libvob/org/nongnu/libvob/vobs ContinuousLineVob...

[Matti Katila]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Matti Katila <address@hidden>   03/08/25 15:56:51

Modified files:
        org/nongnu/libvob/vobs: ContinuousLineVob.java 

Log message:
        fix  color

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/vobs/ContinuousLineVob.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/vobs/ContinuousLineVob.java
diff -u libvob/org/nongnu/libvob/vobs/ContinuousLineVob.java:1.7 
libvob/org/nongnu/libvob/vobs/ContinuousLineVob.java:1.8
--- libvob/org/nongnu/libvob/vobs/ContinuousLineVob.java:1.7    Mon Aug 25 
10:22:22 2003
+++ libvob/org/nongnu/libvob/vobs/ContinuousLineVob.java        Mon Aug 25 
15:56:51 2003
@@ -36,8 +36,8 @@
 /** Continuous line needs x,y,z points in float array.
  */
 public class ContinuousLineVob extends AbstractVob {
-public static final String rcsid = "$Id: ContinuousLineVob.java,v 1.7 
2003/08/25 14:22:22 humppake Exp $";
-    static private void pa(String s) { 
System.out.println("ContinuousLine::"+s); }
+public static final String rcsid = "$Id: ContinuousLineVob.java,v 1.8 
2003/08/25 19:56:51 mudyc Exp $";
+    static private void pa(String s) { 
System.out.println("ContinuousLineVob::"+s); }
     public static boolean dbg = false;
 
     static private GL.Texture tex;
@@ -69,7 +69,7 @@
     static public final int ROUND = 300;
 
     public ContinuousLineVob(float width, float[] points) {
-       this(width, points, false, BEVEL, null);
+       this(width, points, false, BEVEL, java.awt.Color.black);
     }
 
     /** @param points Points in 3D model. One point is x,y and z.
@@ -110,17 +110,15 @@
     public int putGL(VobScene vs, int coordsys1) { 
        if (needInit) loadTex();
 
-       if (color != null){
-           ColorUtil.getRGBColorComponents(color, tmp_floats);
-           vs.put(GLCache.getCallList("Color "+tmp_floats[0]+" 
"+tmp_floats[1]+" "+tmp_floats[2]));
-       }
-
+       vs.map.put(GLCache.getCallList(
+           "PushAttrib ENABLE_BIT \n"+
+            "Color "+ ColorUtil.colorGLString(color)
+           ));
        if (dbg) pa("tex:"+tex+", w:"+width+", jS:"+joinStyle+", 
chain:"+chain+", points"+points);
-
        GLRen.ContinuousLine cl = 
            GLRen.createContinuousLine(tex.getTexId(), width, joinStyle, chain, 
points);
        vs.map.put(cl, coordsys1);
-       if (dbg) pa("draw line..");
+       vs.map.put(GLCache.getCallList("PopAttrib"));
        return  0;
     }
 }