[Gzz-commits] gzz ./TODO gzz/vob/OvalBgVob.java

[Asko Soukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Asko Soukka <address@hidden>    02/10/18 08:46:39

Modified files:
        .              : TODO 
        gzz/vob        : OvalBgVob.java 

Log message:
        OvalBgVob: colored sectors for AWT, stripes still the easiest way in 
OpenGL.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.302&tr2=1.303&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/OvalBgVob.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.302 gzz/TODO:1.303
*** gzz/TODO:1.302      Fri Oct 18 06:10:18 2002
--- gzz/TODO    Fri Oct 18 08:46:39 2002
***************
*** 93,100 ****
            - correct implementation of LollipopCellVobFactor needs
                to change connections' coordsys through Box
        - port Mind* views from 0.6
-             - colored sectors for OvalBgVob, fixing border with AWT,
-             optimizing texture size with OpenGL
            - learn Box and make LollipopCellVobFactory use fixed dimensions
              for ball
         - culling of coordsys: coordsys may, at setparams time,
--- 93,98 ----
Index: gzz/gzz/vob/OvalBgVob.java
diff -c gzz/gzz/vob/OvalBgVob.java:1.2 gzz/gzz/vob/OvalBgVob.java:1.3
*** gzz/gzz/vob/OvalBgVob.java:1.2      Fri Oct 18 02:45:15 2002
--- gzz/gzz/vob/OvalBgVob.java  Fri Oct 18 08:46:39 2002
***************
*** 32,37 ****
--- 32,38 ----
  import java.awt.*;
  import java.awt.event.*;
  import java.util.*;
+ import java.lang.Math;
  import gzz.client.GraphicsAPI;
  
  /** A vob which is a circular background and frame.
***************
*** 40,46 ****
   */
  
  public class OvalBgVob extends Vob {
! public static final String rcsid = "$Id: OvalBgVob.java,v 1.2 2002/10/18 
06:45:15 humppake Exp $";
      public static boolean dbg = false;
      static final void p(String s) { if(dbg) System.out.println(s); }
      static final void pa(String s) { System.out.println(s); }
--- 41,47 ----
   */
  
  public class OvalBgVob extends Vob {
! public static final String rcsid = "$Id: OvalBgVob.java,v 1.3 2002/10/18 
12:46:39 humppake Exp $";
      public static boolean dbg = false;
      static final void p(String s) { if(dbg) System.out.println(s); }
      static final void pa(String s) { System.out.println(s); }
***************
*** 53,62 ****
        if (!texLoaded) {
            String[] texparam = {"type", "8"};
            tex = GL.createTexture(); 
-           /** XXX Should texture's size be relative to vob's physical size?
-            * If so, texture should be reloaded always when greater needed.
-            * Currently texture is loaded only once.
-            */
            tex.shade(128, 128, 0, 1, "ALPHA", "ALPHA", "geometric", texparam);
            texLoaded = true;
        }
--- 54,59 ----
***************
*** 99,116 ****
            g.setColor(bg);
            g.fillOval(mx, my, mw, mh);
        } else {
            for(int i=0; i<nsolids; i++) {
                g.setColor(solids[i]);
!               g.fillOval(mx+(mw*i)/nsolids, my, mw/nsolids, mh);
            }
        }
  
        if(drawBorder) {
              g.setColor(info1.getMixedFgColor());
!           g.drawOval(mx, my, mw-1, mh-1);
!           if(mh >= 14) {
!               g.drawOval(mx+1, my+1, mw-3, mh-3);
!           }
        }
  
        g.setColor(oldfg);
--- 96,112 ----
            g.setColor(bg);
            g.fillOval(mx, my, mw, mh);
        } else {
+           int arc = 360 / nsolids;
            for(int i=0; i<nsolids; i++) {
                g.setColor(solids[i]);
!               g.fillArc(mx, my, mw, mh, -90 + arc * (i-1), arc);
            }
        }
  
        if(drawBorder) {
              g.setColor(info1.getMixedFgColor());
!           if(mh >= 14) g.drawOval(mx-1, my-1, mw+2, mh+2);
!           else g.drawOval(mx, my, mw, mh);
        }
  
        g.setColor(oldfg);
***************
*** 126,131 ****
--- 122,128 ----
            if (!texLoaded) loadTex();
            String bgcall = "";
            if(nsolids > 0) {
+               double arc = (2*Math.PI) / nsolids;
                double w = 1.0 / nsolids;
                for(int i=0; i<nsolids; i++) {
                    double x1 = i*w;
***************
*** 199,205 ****
       * of the array. Mostly useful for checking for nullness.
       */
      public Color[] getSolidColors() { return solids; }
- 
  }
  
  
--- 196,201 ----