[Gzz-commits] gzz/gzz/vob/vobs ColoredSectorVob.java ColoredS...

[Asko Soukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Asko Soukka <address@hidden>    03/03/13 13:10:43

Modified files:
        gzz/vob/vobs   : ColoredSectorVob.java 
                         ColoredSquareSectorVob.java OvalBgVob.java 
                         RectBgVob.java 

Log message:
        borderColor

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/ColoredSectorVob.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/ColoredSquareSectorVob.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/OvalBgVob.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/RectBgVob.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: gzz/gzz/vob/vobs/ColoredSectorVob.java
diff -u gzz/gzz/vob/vobs/ColoredSectorVob.java:1.10 
gzz/gzz/vob/vobs/ColoredSectorVob.java:1.11
--- gzz/gzz/vob/vobs/ColoredSectorVob.java:1.10 Thu Mar 13 11:40:33 2003
+++ gzz/gzz/vob/vobs/ColoredSectorVob.java      Thu Mar 13 13:10:41 2003
@@ -43,7 +43,7 @@
  * surrounded by a sector of the current foreground color.
  */
 public class ColoredSectorVob extends OvalBgVob {
-public static final String rcsid = "$Id: ColoredSectorVob.java,v 1.10 
2003/03/13 16:40:33 humppake Exp $";
+public static final String rcsid = "$Id: ColoredSectorVob.java,v 1.11 
2003/03/13 18:10:41 humppake Exp $";
     public static boolean dbg = false;
     private static final void p(String s) { if(dbg) System.out.println(s); }
 
@@ -77,7 +77,8 @@
        }
 
        if(drawBorder) {
-            g.setColor(info1.getMixedFgColor());
+           if (borderColor == null) g.setColor(info1.getMixedFgColor());
+           else g.setColor(borderColor);
            g.drawArc(mx, my, mw, mh, start, sector);
            if (sector < 360) {
                float a = (float)((Math.PI / 180f) * (360f-(start)));
Index: gzz/gzz/vob/vobs/ColoredSquareSectorVob.java
diff -u gzz/gzz/vob/vobs/ColoredSquareSectorVob.java:1.8 
gzz/gzz/vob/vobs/ColoredSquareSectorVob.java:1.9
--- gzz/gzz/vob/vobs/ColoredSquareSectorVob.java:1.8    Thu Mar 13 11:40:34 2003
+++ gzz/gzz/vob/vobs/ColoredSquareSectorVob.java        Thu Mar 13 13:10:41 2003
@@ -42,7 +42,7 @@
  * drawn as sectors.
  */
 public class ColoredSquareSectorVob extends ColoredSectorVob {
-public static final String rcsid = "$Id: ColoredSquareSectorVob.java,v 1.8 
2003/03/13 16:40:34 humppake Exp $";
+public static final String rcsid = "$Id: ColoredSquareSectorVob.java,v 1.9 
2003/03/13 18:10:41 humppake Exp $";
     public static boolean dbg = false;
     private static final void p(String s) { if(dbg) System.out.println(s); }
 
@@ -81,7 +81,8 @@
        }
 
        if(drawBorder) {
-            g.setColor(info1.getMixedFgColor());
+           if (borderColor == null) g.setColor(info1.getMixedFgColor());
+           else g.setColor(borderColor);
            g.drawRect(mx, my, mw-1, mh-1);
            if(mh >= 14) {
                g.drawRect(mx+1, my+1, mw-3, mh-3);
@@ -127,8 +128,11 @@
     
     protected String glBorderString() {
        String glString = "";
+       String glBorderColorString = "0 0 0";
+       if (borderColor != null)
+           glBorderColorString = ColorUtil.colorGLString(borderColor);
        glString += (
-                    "Color 0 0 0 1\n"+
+                    "Color "+glBorderColorString+" 1\n"+
                     "Begin LINE_STRIP\n"+
                     "Vertex 1 1\n"+
                     "Vertex 1 0\n"+
Index: gzz/gzz/vob/vobs/OvalBgVob.java
diff -u gzz/gzz/vob/vobs/OvalBgVob.java:1.11 
gzz/gzz/vob/vobs/OvalBgVob.java:1.12
--- gzz/gzz/vob/vobs/OvalBgVob.java:1.11        Thu Mar 13 11:40:34 2003
+++ gzz/gzz/vob/vobs/OvalBgVob.java     Thu Mar 13 13:10:42 2003
@@ -43,7 +43,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.11 2003/03/13 
16:40:34 humppake Exp $";
+public static final String rcsid = "$Id: OvalBgVob.java,v 1.12 2003/03/13 
18:10:42 humppake Exp $";
     public static boolean dbg = false;
     private static final void p(String s) { if(dbg) System.out.println(s); }
 
@@ -56,6 +56,9 @@
     /** Border drawing flag */
     protected final boolean drawBorder;
 
+    /** Border color */
+    protected final Color borderColor;
+
     static protected float [][] circleGL = new float[360][2];
     static protected boolean circleGLReady = false;
     static protected void prepareCircleGL(float r) {
@@ -80,18 +83,20 @@
     protected int step;
 
     /** Constructor shorthands */
-    public OvalBgVob() { this(Color.white, true); }
-    public OvalBgVob(Color bgColor) { this(bgColor, true); }
-    public OvalBgVob(Color bgColor, boolean drawBorder) {
-       this(bgColor, drawBorder, 90, 360, 10);
+    public OvalBgVob() { this(Color.white, true, null); }
+    public OvalBgVob(Color bgColor) { this(bgColor, true, null); }
+    public OvalBgVob(Color bgColor, boolean drawBorder) { this(bgColor, 
drawBorder, null); }
+    public OvalBgVob(Color bgColor, boolean drawBorder, Color borderColor) {
+       this(bgColor, drawBorder, borderColor, 90, 360, 10);
     }
     public OvalBgVob(int start, int sector, int step) {
-       this(Color.white, true, start, sector, step);
+       this(Color.white, true, null, start, sector, step);
     }
   
     /** Constructor for OvalBgVob.
      * @param bgColor Background color.
      * @param drawBorder Border drawing flag.
+     * @param borderColor Border color. If null, default fgColor is used.
      * @param start Start angle of the sector. 0 degree is at clock three.
      *              90 degrees is at clock twelve.
      * @param sector The angle of the sector to be drawn. Max 360 degrees. 
@@ -100,11 +105,12 @@
      *             resolution is 360 vertexes. XXX this will be removed
      *             after DiceableMesh renderable works.
      */
-    public OvalBgVob(Color bgColor, boolean drawBorder, 
+    public OvalBgVob(Color bgColor, boolean drawBorder, Color borderColor,
                     int start, int sector, int step) {
        super();
        this.bgColor = bgColor;
        this.drawBorder = drawBorder;
+       this.borderColor = borderColor;
        this.start = Math.abs(start);
        this.sector = Math.abs(sector);
        this.step = Math.abs(step);
@@ -174,7 +180,8 @@
        }
        
        if(drawBorder) {
-            g.setColor(info1.getMixedFgColor());
+           if (borderColor == null) g.setColor(info1.getMixedFgColor());
+           else g.setColor(borderColor);
            g.drawOval(mx, my, mw, mh);
            if(mh >= 14) {
                /** Heavier border for greter Vobs */
@@ -242,8 +249,11 @@
 
     protected String glBorderString() {
        String glString = "";
+       String glBorderColorString = "0 0 0";
+       if (borderColor != null)
+           glBorderColorString = ColorUtil.colorGLString(borderColor);
        glString += (
-                    "Color 0 0 0 1\n" +
+                    "Color "+glBorderColorString+" 1\n" +
                     "Begin LINE_LOOP\n");
        if (sector < 360) glString += ("Vertex 0.5 0.5\n");
        for (int i=0;i<sector;i+=step) {
Index: gzz/gzz/vob/vobs/RectBgVob.java
diff -u gzz/gzz/vob/vobs/RectBgVob.java:1.9 gzz/gzz/vob/vobs/RectBgVob.java:1.10
--- gzz/gzz/vob/vobs/RectBgVob.java:1.9 Thu Mar 13 11:40:34 2003
+++ gzz/gzz/vob/vobs/RectBgVob.java     Thu Mar 13 13:10:42 2003
@@ -42,7 +42,7 @@
  * surrounded by a rectangle of the current foreground color.
  */
 public class RectBgVob extends Vob {
-public static final String rcsid = "$Id: RectBgVob.java,v 1.9 2003/03/13 
16:40:34 humppake Exp $";
+public static final String rcsid = "$Id: RectBgVob.java,v 1.10 2003/03/13 
18:10:42 humppake Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
@@ -55,18 +55,24 @@
     /** Border drawing flag */
     protected final boolean drawBorder;
 
+    /** Border color */
+    protected final Color borderColor;
+
     /** Constructor shorthands */
-    public RectBgVob() { this(Color.white, true); }
-    public RectBgVob(Color bgColor) { this(bgColor, true); }
+    public RectBgVob() { this(Color.white, true, null); }
+    public RectBgVob(Color bgColor) { this(bgColor, true, null); }
+    public RectBgVob(Color bgColor, boolean drawBorder) { this(bgColor, 
drawBorder, null); }
   
     /** Construct RectBgVob.
      * @param bgColor Background color.
      * @param drawBorder Border drawing flag.
+     * @param borderColor Border color. If null, default fgColor is used.
      */
-    public RectBgVob(Color bgColor, boolean drawBorder) {
+    public RectBgVob(Color bgColor, boolean drawBorder, Color borderColor) {
        super();
        this.bgColor = bgColor;
        this.drawBorder = drawBorder;
+       this.borderColor = borderColor;
     }
 
     static Rectangle rect = new Rectangle();
@@ -99,7 +105,8 @@
        }
 
        if(drawBorder) {
-            g.setColor(info1.getMixedFgColor());
+           if (borderColor == null) g.setColor(info1.getMixedFgColor());
+           else g.setColor(borderColor);
            g.drawRect(mx, my, mw-1, mh-1);
            if(mh >= 14) {
                g.drawRect(mx+1, my+1, mw-3, mh-3);
@@ -139,13 +146,17 @@
                    "End\n");
            }
 
+           String glBorderColorString = "0 0 0";
+           if (borderColor != null)
+               glBorderColorString = ColorUtil.colorGLString(borderColor);
+
            glList = GLRen.createCallListBoxCoorded(
                "PushAttrib CURRENT_BIT ENABLE_BIT\n"+
                 "Disable TEXTURE_2D\n"+
 
                bgcall +
 
-               "Color 0 0 0 1\n"+
+               "Color "+glBorderColorString+" 1\n"+
                "Begin LINE_STRIP\n"+
                "Vertex 1 1\n"+
                "Vertex 1 0\n"+