[Gzz-commits] fenfire/org/fenfire demo/detail/pagespanbgfilte...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/07/14 10:22:09

Modified files:
        org/fenfire/demo/detail: pagespanbgfilter.py 
        org/fenfire/spanimages/gl: papermakers.py 

Log message:
        Seed offset

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/detail/pagespanbgfilter.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/papermakers.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/detail/pagespanbgfilter.py
diff -u fenfire/org/fenfire/demo/detail/pagespanbgfilter.py:1.9 
fenfire/org/fenfire/demo/detail/pagespanbgfilter.py:1.10
--- fenfire/org/fenfire/demo/detail/pagespanbgfilter.py:1.9     Mon Jul 14 
10:12:21 2003
+++ fenfire/org/fenfire/demo/detail/pagespanbgfilter.py Mon Jul 14 10:22:09 2003
@@ -48,10 +48,10 @@
     def __init__(self):
        self.w = w = vob.putil.demowindow.w
        self.types = [
-           papermakers.white(w),
-           papermakers.fancyBlend(w),
-           papermakers.fancyHalo(w),
-           papermakers.fancyBlur(w),
+           papermakers.white,
+           papermakers.fancyBlend,
+           papermakers.fancyHalo,
+           papermakers.fancyBlur,
        ]
        self.scrolls = sc
 
@@ -64,6 +64,7 @@
            ListIndex("scroll", "scrolls", 0, "File to use", "F", "f"),
            SlideLin("x", 0, 50, "x coord", "Right", "Left"),
            SlideLin("y", 0, 50, "y coord", "Down", "Up"),
+           SlideLin("offset", 0, 1, "seed offset", "S", "s"),
            SlideLog("scale", 1, "scale", "-", "+"),
        )
     def scene(self, vs):
@@ -72,7 +73,8 @@
 
        vs.map.put(vob.vobs.SolidBackdropVob(java.awt.Color.yellow))
 
-       self.spanImageFactory.paperMaker = self.types[self.type]
+       self.spanImageFactory.paperMaker = self.types[self.type](
+           self.w, paperOffset = self.offset)
 
        scaled = vs.orthoCS(0, "X", 0, self.x, self.y, self.scale, self.scale)
 
Index: fenfire/org/fenfire/spanimages/gl/papermakers.py
diff -u fenfire/org/fenfire/spanimages/gl/papermakers.py:1.5 
fenfire/org/fenfire/spanimages/gl/papermakers.py:1.6
--- fenfire/org/fenfire/spanimages/gl/papermakers.py:1.5        Mon Jul 14 
10:12:21 2003
+++ fenfire/org/fenfire/spanimages/gl/papermakers.py    Mon Jul 14 10:22:09 2003
@@ -15,10 +15,22 @@
 #   TexParameter TEXTURE_2D TEXTURE_MAX_ANISOTROPY_EXT 10
 """
 
+class OffsetPaperMill(PaperMill):
+    def __init__(self, mill, offset):
+       self.mill = mill
+       self.offset = offset
+    def getPaper(self, seed):
+       return self.mill.getPaper(seed + self.offset)
+    def getOptimizedPaper(self, seed, w):
+       return self.mill.getOptimizedPaper(seed + self.offset, w);
+
+
 def getPaperMill(paperMill, paperOffset):
-    if paperMill:
-       return paperMill
-    return PaperMill.getInstance()
+    if not paperMill:
+       paperMill = PaperMill.getInstance()
+    if paperOffset:
+       return OffsetPaperMill(paperMill, paperOffset)
+    return paperMill
 
 def white(w = None, paperMill = None, paperOffset = 0,
            filter = anisofilter):
@@ -31,8 +43,7 @@
 
 def fancyBlend(w, paperMill = None, paperOffset = 0,
            filter = anisofilter):
-    if paperMill == None:
-       paperMill = PaperMill.getInstance()
+    paperMill = getPaperMill(paperMill, paperOffset)
     return PlainPaperMaker(1, 
        """
            ActiveTexture TEXTURE0
@@ -101,6 +112,7 @@
 
 
 def fancyHalo(w, 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"
@@ -143,6 +155,7 @@
     """)
 
 def fancyBlur(w, 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"