[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx/libpaper papermill.py texops_NV2X.py
From: |
Janne V. Kujala |
Subject: |
[Gzz-commits] gzz/gfx/libpaper papermill.py texops_NV2X.py |
Date: |
Tue, 15 Oct 2002 06:46:08 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Janne V. Kujala <address@hidden> 02/10/15 06:46:06
Modified files:
gfx/libpaper : papermill.py texops_NV2X.py
Log message:
Start fixing NV2X code
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/papermill.py.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/texops_NV2X.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: gzz/gfx/libpaper/papermill.py
diff -c gzz/gfx/libpaper/papermill.py:1.48 gzz/gfx/libpaper/papermill.py:1.49
*** gzz/gfx/libpaper/papermill.py:1.48 Tue Oct 15 04:28:36 2002
--- gzz/gfx/libpaper/papermill.py Tue Oct 15 06:46:06 2002
***************
*** 38,44 ****
# We have at least a NV10, possibly better.
# Check the number of general combiners to be sure.
maxcomb = GL.getGLFloat("MAX_GENERAL_COMBINERS_NV")[0]
! if maxcomb < 4:
# use NV10 version
if dbg: print "Using NV10 combiners ",maxcomb
from gfx.libpaper.texcomb_NV1X import TransparentCombinerPass
--- 38,45 ----
# We have at least a NV10, possibly better.
# Check the number of general combiners to be sure.
maxcomb = GL.getGLFloat("MAX_GENERAL_COMBINERS_NV")[0]
! #if maxcomb < 4:
! if 1: #XXX NV20 version is broken
# use NV10 version
if dbg: print "Using NV10 combiners ",maxcomb
from gfx.libpaper.texcomb_NV1X import TransparentCombinerPass
Index: gzz/gfx/libpaper/texops_NV2X.py
diff -c gzz/gfx/libpaper/texops_NV2X.py:1.2 gzz/gfx/libpaper/texops_NV2X.py:1.3
*** gzz/gfx/libpaper/texops_NV2X.py:1.2 Fri Oct 11 07:08:42 2002
--- gzz/gfx/libpaper/texops_NV2X.py Tue Oct 15 06:46:06 2002
***************
*** 87,94 ****
def getTexgenTypes(self):
"Get the texgen letter codes for the texture units."
return [shaderTexgenTypes[texunit[0]] for texunit in self.st]
! def setTexture(self, ind, texid):
! self.tex[ind] = str(texid)
def setupCode(self):
c = """
Enable TEXTURE_SHADER_NV
--- 87,94 ----
def getTexgenTypes(self):
"Get the texgen letter codes for the texture units."
return [shaderTexgenTypes[texunit[0]] for texunit in self.st]
! def setTexture(self, ind, tex):
! self.tex[ind] = tex
def setupCode(self):
c = """
Enable TEXTURE_SHADER_NV
***************
*** 104,110 ****
""" % locals()
if target != None:
! texid = self.tex[t]
if texid == None: raise NoTextureSetForStage()
c += """
Enable %(target)s
--- 104,112 ----
""" % locals()
if target != None:
! texid = self.tex[t].getTexId()
! minfilter = self.tex[t].minfilter
! magfilter = self.tex[t].magfilter
if texid == None: raise NoTextureSetForStage()
c += """
Enable %(target)s
***************
*** 112,119 ****
TexParameter %(target)s TEXTURE_WRAP_S REPEAT
TexParameter %(target)s TEXTURE_WRAP_T REPEAT
! TexParameter %(target)s TEXTURE_MIN_FILTER
LINEAR_MIPMAP_LINEAR
! TexParameter %(target)s TEXTURE_MAG_FILTER LINEAR
""" % locals()
if len(self.st[t]) > 2: # Previous texture input
c += """
--- 114,121 ----
TexParameter %(target)s TEXTURE_WRAP_S REPEAT
TexParameter %(target)s TEXTURE_WRAP_T REPEAT
! TexParameter %(target)s TEXTURE_MIN_FILTER %(minfilter)s
! TexParameter %(target)s TEXTURE_MAG_FILTER %(magfilter)s
""" % locals()
if len(self.st[t]) > 2: # Previous texture input
c += """
***************
*** 126,131 ****
--- 128,136 ----
"""
return [i for i in range(0,len(self.st))
if self.st[i][1] in ("RGB2", "RGB3")]
+
+ def getRGBoutputscales(self):
+ return [self.tex[i].scale for i in self.getRGBoutputs()]
def makeNormalShaderPass(maxaniso = None):
# XXX: TODO: implement maxaniso as in texops_STD
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz/gfx/libpaper papermill.py texops_NV2X.py,
Janne V. Kujala <=