[Gzz-commits] gzz/gzz client/AbstractUpdateManager.java gfx/g...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/01/14 03:58:17

Modified files:
        gzz/client     : AbstractUpdateManager.java 
        gzz/gfx/gl     : FileSetTextureMemoryConsumer.java 

Log message:
        A little more

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/AbstractUpdateManager.java.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/FileSetTextureMemoryConsumer.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gzz/client/AbstractUpdateManager.java
diff -u gzz/gzz/client/AbstractUpdateManager.java:1.28 
gzz/gzz/client/AbstractUpdateManager.java:1.29
--- gzz/gzz/client/AbstractUpdateManager.java:1.28      Mon Jan 13 01:48:49 2003
+++ gzz/gzz/client/AbstractUpdateManager.java   Tue Jan 14 03:58:17 2003
@@ -41,7 +41,7 @@
  */
 
 public abstract class AbstractUpdateManager implements Runnable {
-public static final String rcsid = "$Id: AbstractUpdateManager.java,v 1.28 
2003/01/13 06:48:49 tjl Exp $";
+public static final String rcsid = "$Id: AbstractUpdateManager.java,v 1.29 
2003/01/14 08:58:17 tjl Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
@@ -319,13 +319,13 @@
      */
     protected abstract boolean handleEvents(boolean waitForEvent);
 
-    private PriorityQueue queue = new PriorityQueue();
+    static private PriorityQueue queue = new PriorityQueue();
 
     /** Run a given task in the main thread at some point
      * in the future.
      * @see gzz.util.Background#addTask
      */
-    public void doWhenIdle(Runnable r, float priority) {
+    public static void doWhenIdle(Runnable r, float priority) {
        synchronized(queue) {
            queue.add(r, priority);
            queue.notifyAll();
Index: gzz/gzz/gfx/gl/FileSetTextureMemoryConsumer.java
diff -u gzz/gzz/gfx/gl/FileSetTextureMemoryConsumer.java:1.1 
gzz/gzz/gfx/gl/FileSetTextureMemoryConsumer.java:1.2
--- gzz/gzz/gfx/gl/FileSetTextureMemoryConsumer.java:1.1        Mon Jan 13 
02:31:35 2003
+++ gzz/gzz/gfx/gl/FileSetTextureMemoryConsumer.java    Tue Jan 14 03:58:17 2003
@@ -2,15 +2,38 @@
 
 package gzz.gfx.gl;
 import gzz.mem.*;
+import gzz.client.*;
 
 /** A memory consumer for a texture which is loaded from a set of files
  * (of different resolutions) at request.
  */
 public abstract class FileSetTextureMemoryConsumer extends 
TextureMemoryConsumer {
 
+    Runnable r_runTexImage = new Runnable() {
+       public void run() { runTexImage(); }
+    };
+    Runnable r_runRequest = new Runnable() {
+       public void run() { runRequest(); }
+    };
+
+    static final int STATE_IDLE = 0,
+                    STATE_REQUESTED = 1,
+                    STATE_TEXIMAGING = 2;
+
     public class File {
        int w, h;
        String name;
+    }
+
+    int state;
+
+    private void runRequest() {
+       state = STATE_TEXIMAGING;
+       // High priority, we're using a lot of memory
+       AbstractUpdateManager.doWhenIdle(r_runRequest, -10); 
+    }
+
+    private void runTexImage() {
     }