[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx demo/irregu3.py libcallgl/callgl.cxx
From: |
Janne V. Kujala |
Subject: |
[Gzz-commits] gzz/gfx demo/irregu3.py libcallgl/callgl.cxx |
Date: |
Thu, 17 Oct 2002 12:46:49 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Janne V. Kujala <address@hidden> 02/10/17 12:46:24
Modified files:
gfx/demo : irregu3.py
gfx/libcallgl : callgl.cxx
Log message:
Debug color interpolation
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/irregu3.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcallgl/callgl.cxx.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/irregu3.py
diff -c gzz/gfx/demo/irregu3.py:1.1 gzz/gfx/demo/irregu3.py:1.2
*** gzz/gfx/demo/irregu3.py:1.1 Thu Oct 17 11:27:38 2002
--- gzz/gfx/demo/irregu3.py Thu Oct 17 12:46:24 2002
***************
*** 6,14 ****
"scale", "0.15", "freq", "1", "df", "2",
"scale2", "0.25", "freq2", "10", "df2", ".5"])
-
#tex.shade(16, 16, 0, 4, "RGBA", "RGBA",
! # "geometric", ["type", "7", "bias", "0", "scale", "1"])
--- 6,13 ----
"scale", "0.15", "freq", "1", "df", "2",
"scale2", "0.25", "freq2", "10", "df2", ".5"])
#tex.shade(16, 16, 0, 4, "RGBA", "RGBA",
! # "geometric", ["type", "7", "bias", "-0", "scale", "2"])
***************
*** 24,29 ****
--- 23,34 ----
PushAttrib ENABLE_BIT
BindTexture TEXTURE_2D %(texid)s
+
+ #Debug mountains
+ TexImage2D TEXTURE_2D 0 ALPHA 8 1 0 ALPHA .25 1 .25 .75 .25 .5 .25 .25
+ TexParameter TEXTURE_2D TEXTURE_BASE_LEVEL 0
+ TexParameter TEXTURE_2D TEXTURE_MAX_LEVEL 0
+
Enable TEXTURE_2D
Enable ALPHA_TEST
AlphaFunc GEQUAL %(e)s
Index: gzz/gfx/libcallgl/callgl.cxx
diff -c gzz/gfx/libcallgl/callgl.cxx:1.23 gzz/gfx/libcallgl/callgl.cxx:1.24
*** gzz/gfx/libcallgl/callgl.cxx:1.23 Wed Oct 16 16:58:38 2002
--- gzz/gfx/libcallgl/callgl.cxx Thu Oct 17 12:46:24 2002
***************
*** 211,220 ****
--- 211,222 ----
int w = atoi(v[4].c_str());
int h = atoi(v[5].c_str());
vector<GLfloat> pixels = getfv(v, 8, w * h);
+ /* XXX: need to multiply with the number of components, too
if (pixels.size() != (unsigned)(w * h)) {
cerr << "TexImage2D dimensions " << w << "x" << h << " do not match
the size " << pixels.size() << " of data\n";
return false;
}
+ */
glTexImage2D(getToken(v[1]), atoi(v[2].c_str()), getToken(v[3]),
w, h, atoi(v[6].c_str()), getToken(v[7]),
GL_FLOAT, &pixels[0]);
- [Gzz-commits] gzz/gfx demo/irregu3.py libcallgl/callgl.cxx,
Janne V. Kujala <=