[Gzz-commits] gzz ./TODO gzz/gfx/gl/GL.java gzz/gfx/gl/Paper....

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/12/04 04:47:09

Modified files:
        .              : TODO 
        gzz/gfx/gl     : GL.java Paper.java 
Added files:
        gzz/gfx/gl     : GLDeletable.java 

Log message:
        Fix paper deletion

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.433&tr2=1.434&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLDeletable.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GL.java.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/Paper.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.433 gzz/TODO:1.434
--- gzz/TODO:1.433      Tue Dec  3 10:00:45 2002
+++ gzz/TODO    Wed Dec  4 04:47:08 2002
@@ -1,11 +1,17 @@
 ------------------------------------------------
-RELEASES
-Things that have to be done before a given release will be made.
+Explanation: TODO and project management, rolled into one.
+Based on releases, but individual timetables also.
+For each person, a list of tasks in order of execution,
+unless [BLOCKED: ...] present.
+
+Note that you are allowed to negotiate with each other
+and swap tasks!
+
 Symbols:
        - foo                     "Foo *MUST* be ready for release"
        + foo                     "Foo would be nice for release but
                                    can be bumped to next"
-       [GI03], etc.              "Needed for the [...] publication"
+       [GI03], etc.              "Needed for the [...] publication/thing"
 
 
 [[[ alpha2, alpha3 not released, internal milestones. ]]]
@@ -28,7 +34,7 @@
                - puzzle view
                - soft shadows of irregus- ?!?!?! Need algorithm...
                        - only very approximate needed
-    tuukkah + vegai:
+    vegai:
        - "make committable": remove CLASSES and all object files,
          compile normal and GL and test both normal and GL;
          if either fails any test not marked failing, fail HARD.
@@ -40,6 +46,9 @@
          file is not zero-length though. Proper framework:
          get pdf and ps file size.
            - sane exception if ../mstmpimg isn't found
+       - genimages: allow using different formats for generated images.
+         Specifically, need to be able to use gzipped S3TC files; 
+         should be a LOT faster to load.
        - web page update: CVS link is broken
     tuukkah:
        - release engineering 
@@ -55,24 +64,28 @@
     tjl:        
        - return ANKOS to Agora [ blocked by: waiting for trip to agora ]
        - fix memleak in making movies
+           - memleak test format
+       - go through most important GL demos and redo the interfaces
+       - fillet demo
+           - fix last two screens
+           - add new libfillet code
+       - demo movie of fillets
        - demo movie of irregu general stuff
        - demo movie of xupdf
-       - irregu:
-               - !!! borders for paperquads
-                 Perhaps should add "ZVec CoordSys::grad(const ZPt)"
-                 or directional derivative for determining 
-                 the width of a nonlinearly scaled border
-               + polygon puzzle view
        - better graphics for xupdf and pp
            - fillets without the original object
                - normal direction as data
                - dicing only when needed
                - fill with fading color
            - soft shadows
-       - fillet demo
-           - fix last two screens
-           - add new libfillet code
-       - go through most important GL demos and redo the interfaces
+       - irregu:
+               - !!! borders for paperquads
+                 Perhaps should add "ZVec CoordSys::grad(const ZPt)"
+                 or directional derivative for determining 
+                 the width of a nonlinearly scaled border
+                   - need to think about how to generalize...
+                     linestyle objects for npr scaling?
+               + polygon puzzle view
     anybody:
        - implement PEG 1021 for AWT
        - a really comprehensive web page of screenshots, animations
@@ -509,8 +522,6 @@
 -------------------------------------------
 PUBLICATIONS (approximate planned time order)
 
-tjl, jvk: paper paper
-tjl, jvk: irregularframe 
 benja, tjl: article about urn-5 to First Monday
 tjl, jvk, marke: paper generalizing fillets to Information Visualization
 tjl, ?: nadir, buoys --> HT03? Basically, the 2002 general demo
Index: gzz/gzz/gfx/gl/GL.java
diff -u gzz/gzz/gfx/gl/GL.java:1.23 gzz/gzz/gfx/gl/GL.java:1.24
--- gzz/gzz/gfx/gl/GL.java:1.23 Tue Dec  3 14:14:12 2002
+++ gzz/gzz/gfx/gl/GL.java      Wed Dec  4 04:47:09 2002
@@ -117,17 +117,26 @@
     static public void freeQueue() {
        synchronized(queue) {
            for(Iterator i = queue.iterator(); i.hasNext(); ) {
-               JavaObject obj = ((JavaObject)i.next());
-               obj.deleteObj();
-               obj.id = 0;
+               GLDeletable obj = ((GLDeletable)i.next());
+               obj.deleteObject();
            }
            queue.clear();
        }
     }
 
+    /** To be called from d.finalize(): set this object's
+     * deleteObject() to be called in GL thread.
+     */
+    static public void addDeletable(GLDeletable d) {
+       synchronized(queue) {
+           queue.add(d);
+       }
+    }
+
     /** The Java proxy for a C++ object.
      */
-    static public abstract class JavaObject extends gzz.vob.Vob {
+    static public abstract class JavaObject extends gzz.vob.Vob 
+           implements GLDeletable {
        private int id = 0;
        JavaObject(int id) { super(); this.id = id; }
        /** During garbage collection: destroy the C++ object associated with 
this object.
@@ -137,18 +146,17 @@
            // Would like to
            //          deleteObj();
            // but can't due to thread problems.
-           if(id != 0) 
-               synchronized(queue) {
-                   queue.add(this);
-               }
+           if(id != 0) addDeletable(this);
        }
        public void render(java.awt.Graphics g, 
                            boolean fast,
                            RenderInfo info1,
                            RenderInfo info2
                            )  { }
-       /** Delete the C++ object associated with this proxy.
-        */
+       public void deleteObject() {
+           deleteObj();
+           id = 0;
+       }
        protected abstract void deleteObj();
        /** Get the C++ integer id associated with this object.
         */
Index: gzz/gzz/gfx/gl/Paper.java
diff -u gzz/gzz/gfx/gl/Paper.java:1.6 gzz/gzz/gfx/gl/Paper.java:1.7
--- gzz/gzz/gfx/gl/Paper.java:1.6       Wed Oct 23 15:50:17 2002
+++ gzz/gzz/gfx/gl/Paper.java   Wed Dec  4 04:47:09 2002
@@ -25,7 +25,7 @@
 
 /** The interface to the paper library.
  */
-public class Paper {
+public class Paper implements GLDeletable {
     public static boolean dbg = true;
     private static void p(String s) { if(dbg) System.out.println(s); }
     private static void pa(String s) { System.err.println(s); }
@@ -75,7 +75,11 @@
     }
 
     public void finalize() {
+       if(c_id != 0) GL.addDeletable(this);
+    }
+    public void deleteObject() {
        impl_delete(c_id);
+       c_id = 0;
     }
 
     int getId() { return c_id; }