[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz gfx/demo/mipzip.py gzz/gfx/gl/MipzipLoader....
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] gzz gfx/demo/mipzip.py gzz/gfx/gl/MipzipLoader.... |
Date: |
Sat, 18 Jan 2003 15:49:09 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 03/01/18 15:49:09
Modified files:
gfx/demo : mipzip.py
gzz/gfx/gl : MipzipLoader.java
Log message:
Not using 0x0 teximages decreases the problem -- ?
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/mipzip.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/MipzipLoader.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/mipzip.py
diff -u gzz/gfx/demo/mipzip.py:1.6 gzz/gfx/demo/mipzip.py:1.7
--- gzz/gfx/demo/mipzip.py:1.6 Sat Jan 18 15:24:25 2003
+++ gzz/gfx/demo/mipzip.py Sat Jan 18 15:49:09 2003
@@ -25,9 +25,10 @@
self.files.append(mc)
self.tex.append(getDListNocoords("""
BindTexture TEXTURE_2D %s
- TexParameter TEXTURE_2D TEXTURE_MIN_FILTER LINEAR_MIPMAP_LINEAR
- TexParameter TEXTURE_2D TEXTURE_MAG_FILTER LINEAR
""" % mc.getTexture(0, 0).getTexId()))
+# TexParameter TEXTURE_2D TEXTURE_MIN_FILTER LINEAR_MIPMAP_LINEAR
+# TexParameter TEXTURE_2D TEXTURE_MAG_FILTER LINEAR
+# """ % mc.getTexture(0, 0).getTexId()))
self.nrows = int(math.sqrt(len(self.files))) + 1
self.x = 512
self.y = 384
Index: gzz/gzz/gfx/gl/MipzipLoader.java
diff -u gzz/gzz/gfx/gl/MipzipLoader.java:1.11
gzz/gzz/gfx/gl/MipzipLoader.java:1.12
--- gzz/gzz/gfx/gl/MipzipLoader.java:1.11 Sat Jan 18 15:24:26 2003
+++ gzz/gzz/gfx/gl/MipzipLoader.java Sat Jan 18 15:49:09 2003
@@ -144,7 +144,7 @@
switch(state) {
case STATE_INTEXTURE:
tex.loadNull2D(level, texFormat,
- 0, 0, 0, "RGB", "FLOAT");
+ 1, 2, 0, "RGB", "FLOAT");
case STATE_DATALOADED:
loadedData = null;
}
@@ -200,6 +200,8 @@
*/
synchronized public void setGoalBaseLevel(int level,
Background bg, float priority) {
+ if(level < 0) level = 0;
+ if(level >= levels.length-1) level = levels.length-1;
if(level != goalBaseLevel || level != currentBaseLevel) {
if(dbg) pa("MipzipLoader "+this+" goal "+level+
" now at "+currentBaseLevel);