[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz ./TODO gfx/demo/mipzip.py gzz/client/Abstra...
|
From: |
Tuomas J. Lukka |
|
Subject: |
[Gzz-commits] gzz ./TODO gfx/demo/mipzip.py gzz/client/Abstra... |
|
Date: |
Sat, 18 Jan 2003 10:18:21 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 03/01/18 10:18:21
Modified files:
. : TODO
gfx/demo : mipzip.py
gzz/client : AbstractUpdateManager.java
gzz/gfx/gl : MipzipLoader.java
gzz/util : Background.java
Log message:
Mipziploader seems to be working, rudimentarily\!\!
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.522&tr2=1.523&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/mipzip.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/AbstractUpdateManager.java.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/MipzipLoader.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/util/Background.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.522 gzz/TODO:1.523
--- gzz/TODO:1.522 Sat Jan 18 08:30:58 2003
+++ gzz/TODO Sat Jan 18 10:18:20 2003
@@ -252,8 +252,6 @@
colors (not "not" tests but test that the
color really is right)
tjl:
- - X11 ConnectionNumber and select and pipe for lower latency
- and interruptibility of event wait.
- mipzip test program
- xupdf: distorted multi-page PDF view with xu links
- use mipzips
Index: gzz/gfx/demo/mipzip.py
diff -u gzz/gfx/demo/mipzip.py:1.4 gzz/gfx/demo/mipzip.py:1.5
--- gzz/gfx/demo/mipzip.py:1.4 Sat Jan 18 08:30:58 2003
+++ gzz/gfx/demo/mipzip.py Sat Jan 18 10:18:21 2003
@@ -15,10 +15,10 @@
class Scene:
def __init__(self):
- self.mem = MemoryPartitioner(4 * 1024 * 1024)
+ self.mem = MemoryPartitioner(32 * 1024 * 1024)
self.files = []
self.tex = []
- for f in glob.glob("../mstmpimg/*.mipzip")[0:5]:
+ for f in glob.glob("../mstmpimg/*.mipzip"):
ml = MipzipLoader(File(f))
# ml.loadToBaseLevelSynch(0)
mc = MipzipMemoryConsumer(self.mem, ml)
@@ -44,12 +44,13 @@
TexCoord %(x1)s %(y0)s
Vertex 1 0
End
- """ % { "x0" : .25, "y0" : .25, "x1": .5, "y1":.5 })
+ """ % { "x0" : .25, "y0" : .25, "x1": .3, "y1":.3 })
def scene(self, vs):
vs.map.put(background((.3,.7,.8)))
AbstractUpdateManager.setNoAnimation()
- w = vs.size.width / self.nrows
h = vs.size.height / self.nrows
+ w = h
+ print "S"
# print "Sc:",len(self.files)
for x in range(0, self.nrows):
for y in range(0, self.nrows):
@@ -71,6 +72,7 @@
self.x = ev.getX()
self.y = ev.getY()
print self.x, self.y
+ AbstractUpdateManager.chg()
def key(self, key):
return
Index: gzz/gzz/client/AbstractUpdateManager.java
diff -u gzz/gzz/client/AbstractUpdateManager.java:1.31
gzz/gzz/client/AbstractUpdateManager.java:1.32
--- gzz/gzz/client/AbstractUpdateManager.java:1.31 Sat Jan 18 09:53:08 2003
+++ gzz/gzz/client/AbstractUpdateManager.java Sat Jan 18 10:18:21 2003
@@ -41,7 +41,7 @@
*/
public abstract class AbstractUpdateManager implements Runnable {
-public static final String rcsid = "$Id: AbstractUpdateManager.java,v 1.31
2003/01/18 14:53:08 tjl Exp $";
+public static final String rcsid = "$Id: AbstractUpdateManager.java,v 1.32
2003/01/18 15:18:21 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
@@ -350,6 +350,8 @@
r.run();
if(dbg) pa("Updmanager idle: finished run "+r);
return true;
+ } else {
+ if(dbg) pa("Updmanager No idle tasks");
}
return false;
}
@@ -398,6 +400,7 @@
// Wait for next event
if(dbg) pa("Updmanager: WAIT FOR EVENT!!!");
handleEvents(true);
+ if(dbg) pa("Updmanager: FINISHED WAITING FOR EVENT!!!");
}
// Thread.yield(); // Again, try to let the evena thread have
control.
synchronized(ordering) {
Index: gzz/gzz/gfx/gl/MipzipLoader.java
diff -u gzz/gzz/gfx/gl/MipzipLoader.java:1.9
gzz/gzz/gfx/gl/MipzipLoader.java:1.10
--- gzz/gzz/gfx/gl/MipzipLoader.java:1.9 Sat Jan 18 08:30:58 2003
+++ gzz/gzz/gfx/gl/MipzipLoader.java Sat Jan 18 10:18:21 2003
@@ -201,7 +201,7 @@
Background bg, float priority) {
if(dbg) pa("MipzipLoader "+this+" goal "+level+
" now at "+currentBaseLevel);
- if(level != goalBaseLevel) {
+ if(level != goalBaseLevel || level != currentBaseLevel) {
this.goalBaseLevel = level;
this.bg = bg;
this.priority = priority;
@@ -309,6 +309,8 @@
* @return Memory, in bytes
*/
public int getMemory(int level) {
+ if(level < 0) level = 0;
+ if(level > levels.length-1) level = levels.length-1;
int bytesForLevel = levels[level].size.width *
levels[level].size.height * bitsPerTexel / 8;
int totalBytes = (bytesForLevel * 4) / 3;
return totalBytes;
Index: gzz/gzz/util/Background.java
diff -u gzz/gzz/util/Background.java:1.4 gzz/gzz/util/Background.java:1.5
--- gzz/gzz/util/Background.java:1.4 Mon Jan 13 01:48:50 2003
+++ gzz/gzz/util/Background.java Sat Jan 18 10:18:21 2003
@@ -71,16 +71,17 @@
public void run() {
try {
while(true) {
+ Runnable r;
synchronized(queue) {
- Runnable r = (Runnable)queue.getAndRemoveLowest();
+ r = (Runnable)queue.getAndRemoveLowest();
if(r == null) {
queue.wait();
continue;
}
- if(dbg) pa("BG: Going to run "+r);
- r.run();
- if(dbg) pa("BG: Did run "+r);
}
+ if(dbg) pa("BG: Going to run "+r);
+ r.run();
+ if(dbg) pa("BG: Did run "+r);
}
} catch(InterruptedException e) {
pa("BG INTERRUPTED");