[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire/spanimages/gl papermakers.py
From: |
Matti Katila |
Subject: |
[Gzz-commits] fenfire/org/fenfire/spanimages/gl papermakers.py |
Date: |
Wed, 06 Aug 2003 11:58:07 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Matti Katila <address@hidden> 03/08/06 11:58:06
Modified files:
org/fenfire/spanimages/gl: papermakers.py
Log message:
Removing redundant window parameter
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/papermakers.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/spanimages/gl/papermakers.py
diff -u fenfire/org/fenfire/spanimages/gl/papermakers.py:1.7
fenfire/org/fenfire/spanimages/gl/papermakers.py:1.8
--- fenfire/org/fenfire/spanimages/gl/papermakers.py:1.7 Mon Jul 14
10:44:13 2003
+++ fenfire/org/fenfire/spanimages/gl/papermakers.py Wed Aug 6 11:58:06 2003
@@ -41,7 +41,7 @@
""" + filter, """
""", None)
-def fancyBlend(w, paperMill = None, paperOffset = 0,
+def fancyBlend(paperMill = None, paperOffset = 0,
filter = anisofilter):
paperMill = getPaperMill(paperMill, paperOffset)
return PlainPaperMaker(1,
@@ -55,10 +55,10 @@
%s
Disable BLEND
ActiveTexture TEXTURE0
- """ % filter, "", None, paperMill, w)
+ """ % filter, "", None, paperMill)
class HaloPaperMaker_2tex(PlainPaperMaker):
- def __init__(self, paperMill, w):
+ def __init__(self, paperMill):
PlainPaperMaker.__init__(self, 1,
parseCombiner("""
ActiveTexture TEXTURE0
@@ -90,7 +90,7 @@
""" % { "filter" : anisofilter }),
"""
""",
- None, paperMill, w)
+ None, paperMill)
def makePaper(self, img, texgen):
p = PlainPaperMaker.makePaper(self, img, texgen)
#print p.getPass(0).getSetupcode()
@@ -111,15 +111,15 @@
return p
-def fancyHalo(w, paperMill = None, paperOffset = 0):
+def fancyHalo(paperMill = None, paperOffset = 0):
paperMill = getPaperMill(paperMill, paperOffset)
if not GL.hasExtension("GL_NV_register_combiners"):
print "fancy Halo for text not possible without
GL_NV_register_combiners"
print "Punting to standard blend"
- return fancyBlend(w, paperMill)
+ return fancyBlend(paperMill)
if paperMill == None:
paperMill = PaperMill.getInstance()
- return HaloPaperMaker_2tex(paperMill, w)
+ return HaloPaperMaker_2tex(paperMill)
blurProgram = None
@@ -154,12 +154,12 @@
END
""")
-def fancyBlur(w, paperMill = None, paperOffset = 0):
+def fancyBlur(paperMill = None, paperOffset = 0):
paperMill = getPaperMill(paperMill, paperOffset)
if not blurProgram:
print "Fancy blurring is not possible without GL_ARB_fragment_program."
print "Punting to Fancy halo"
- return fancyHalo(w, paperMill)
+ return fancyHalo(paperMill)
if paperMill == None:
paperMill = PaperMill.getInstance()
@@ -171,6 +171,6 @@
Disable BLEND
""" % blurProgram.getProgId(),
"""
- """, [blurProgram], paperMill, w)
+ """, [blurProgram], paperMill)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire/spanimages/gl papermakers.py,
Matti Katila <=