[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx/libpaper papermill.py texcoords.py
|
From: |
Janne V. Kujala |
|
Subject: |
[Gzz-commits] gzz/gfx/libpaper papermill.py texcoords.py |
|
Date: |
Sat, 31 Aug 2002 02:04:44 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Janne V. Kujala <address@hidden> 02/08/31 02:04:44
Modified files:
gfx/libpaper : papermill.py texcoords.py
Log message:
try 3d textures
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/papermill.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/texcoords.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
Patches:
Index: gzz/gfx/libpaper/papermill.py
diff -c gzz/gfx/libpaper/papermill.py:1.15 gzz/gfx/libpaper/papermill.py:1.16
*** gzz/gfx/libpaper/papermill.py:1.15 Sat Aug 31 01:42:32 2002
--- gzz/gfx/libpaper/papermill.py Sat Aug 31 02:04:44 2002
***************
*** 24,33 ****
("D2", "R2", 1),
],
[
! ("T2", "R2"),
! ("T2", "R2"),
! ("T2", "R2"),
! ("T2", "R2"),
],
]
--- 24,33 ----
("D2", "R2", 1),
],
[
! ("T3", "R3"),
! ("T3", "R3"),
! ("T3", "R3"),
! ("T3", "R3"),
],
]
***************
*** 41,46 ****
--- 41,47 ----
shaderOps = {
"T2" : "TEXTURE_2D",
+ "T3" : "TEXTURE_3D",
"D" : "DOT_PRODUCT_NV",
"D2" : "DOT_PRODUCT_TEXTURE_2D_NV",
"O" : "OFFSET_TEXTURE_2D_NV",
***************
*** 48,53 ****
--- 49,55 ----
shaderTargets = {
"T2" : "TEXTURE_2D",
+ "T3" : "TEXTURE_3D",
"D": None,
"D2": "TEXTURE_2D",
"O": "TEXTURE_2D",
***************
*** 55,63 ****
shaderTexgenTypes = {
"T2" : "A",
"D" : "C",
"D2" : "C",
! "O": "A",
}
dbg = 0
--- 57,66 ----
shaderTexgenTypes = {
"T2" : "A",
+ "T3" : "A3",
"D" : "C",
"D2" : "C",
! "O" : "A",
}
dbg = 0
***************
*** 113,119 ****
the register combiners.
"""
return [i for i in range(0,len(self.st))
! if self.st[i][1] == "R2"]
class DebugCombinerPass:
--- 116,122 ----
the register combiners.
"""
return [i for i in range(0,len(self.st))
! if self.st[i][1] in ("R2", "R3")]
class DebugCombinerPass:
***************
*** 456,461 ****
--- 459,470 ----
"waves", ["abs", "1", "freq0", "1", "freq1", "1"]]),
]
+ rgb3DTextures = [
+ ("rgbw", [128, 128, 128, 3,
+ "RGB", "RGB",
+ "filereader", ["file",
"lava/gfx/data/map3d_F0.01_k0.0325_eps0.015_teps0.5_iter10000.dat", "scale",
"10", "bias", "-1.5" ]]),
+ ]
+
dotTextures = [
("dotprodn", [512, 512, 0, 2,
"SIGNED_HILO_NV", "HILO_NV", # XXX signed
***************
*** 466,478 ****
("dotprodw", [512, 512, 0, 2,
"SIGNED_HILO_NV", "HILO_NV", # XXX signed
"waves", ["abs", "1", "freq0", "2", "freq1",
"3"]]),
! ("dotprodrd", [128, 128, 0, 2,
! "SIGNED_HILO_NV", "HILO_NV", # XXX signed
! "rd1", ["iter", "3000", "F", ".04", "k",
".06"]]),
]
self.textures = {
"R2": [ NamedTexture(name, args) for (name, args) in
rgbTextures ],
"D2": [ NamedTexture(name, args) for (name, args) in
dotTextures ],
}
--- 475,488 ----
("dotprodw", [512, 512, 0, 2,
"SIGNED_HILO_NV", "HILO_NV", # XXX signed
"waves", ["abs", "1", "freq0", "2", "freq1",
"3"]]),
! #("dotprodrd", [128, 128, 0, 2,
! # "SIGNED_HILO_NV", "HILO_NV", # XXX signed
! # "rd1", ["iter", "3000", "F", ".04", "k",
".06"]]),
]
self.textures = {
"R2": [ NamedTexture(name, args) for (name, args) in
rgbTextures ],
+ "R3": [ NamedTexture(name, args) for (name, args) in
rgb3DTextures ],
"D2": [ NamedTexture(name, args) for (name, args) in
dotTextures ],
}
***************
*** 483,489 ****
if emboss:
sh = ShaderPass(embossShaderTypes[0])
else:
! sh = ShaderPass(shaderTypes[1])
types = sh.getTextureTypes()
for i in range(0, len(types)):
--- 493,499 ----
if emboss:
sh = ShaderPass(embossShaderTypes[0])
else:
! sh = ShaderPass(shaderTypes[2])
types = sh.getTextureTypes()
for i in range(0, len(types)):
***************
*** 552,558 ****
if ttyp[i] == "A":
#data = getTexMat(rnd)
! data = TexCoords.get2DTexGenData(rnd)
elif ttyp[i] == "C":
data = [ 0, 0, 0, sca2*rnd.nextGaussian(),
--- 562,570 ----
if ttyp[i] == "A":
#data = getTexMat(rnd)
! data = TexCoords().get2DTexGenData(rnd)
! elif ttyp[i] == "A3":
! data = TexCoords().get3DTexGenData(rnd)
elif ttyp[i] == "C":
data = [ 0, 0, 0, sca2*rnd.nextGaussian(),
***************
*** 562,568 ****
assert 0
if len(data) < 12:
for i in (0,0,0,1): data.append(i)
! if emboss and ttyp[i] == "A":
if eps > 0:
prev = data
else:
--- 574,580 ----
assert 0
if len(data) < 12:
for i in (0,0,0,1): data.append(i)
! if emboss and ttyp[i] in ( "A", "A3" ):
if eps > 0:
prev = data
else:
Index: gzz/gfx/libpaper/texcoords.py
diff -c gzz/gfx/libpaper/texcoords.py:1.5 gzz/gfx/libpaper/texcoords.py:1.6
*** gzz/gfx/libpaper/texcoords.py:1.5 Sat Aug 31 02:02:00 2002
--- gzz/gfx/libpaper/texcoords.py Sat Aug 31 02:04:44 2002
***************
*** 75,81 ****
i = int(stddev * rnd.nextGaussian())
j = int(stddev * rnd.nextGaussian())
k = int(stddev * rnd.nextGaussian())
! if i == j == k == 0: return _create3DPlane(rnd)
# The shift can be anything.
shift = 10 * rnd.nextDouble()
--- 75,81 ----
i = int(stddev * rnd.nextGaussian())
j = int(stddev * rnd.nextGaussian())
k = int(stddev * rnd.nextGaussian())
! if i == j == k == 0: return self._create3DPlane(rnd)
# The shift can be anything.
shift = 10 * rnd.nextDouble()
***************
*** 166,183 ****
for i in range(0,3):
vecs[i][3] += planevec[2][i]
return [
! vectors[0][0],
! vectors[0][1],
! vectors[0][2],
! vectors[0][3],
! vectors[1][0],
! vectors[1][1],
! vectors[1][2],
! vectors[1][3],
! vectors[2][0],
! vectors[2][1],
! vectors[2][2],
! vectors[2][3],
]
def getCorrelatedTexGenData(self, tg, rnd):
--- 166,183 ----
for i in range(0,3):
vecs[i][3] += planevec[2][i]
return [
! vecs[0][0],
! vecs[0][1],
! vecs[0][2],
! vecs[0][3],
! vecs[1][0],
! vecs[1][1],
! vecs[1][2],
! vecs[1][3],
! vecs[2][0],
! vecs[2][1],
! vecs[2][2],
! vecs[2][3],
]
def getCorrelatedTexGenData(self, tg, rnd):