[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:12:21

Modified files:
        org/fenfire/demo/detail: pagespanbgfilter.py 
        org/fenfire/spanimages/gl: papermakers.py 
Added files:
        testdata       : paper.pdf 

Log message:
        Use paper paper

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/detail/pagespanbgfilter.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/papermakers.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/testdata/paper.pdf?rev=1.1

Patches:
Index: fenfire/org/fenfire/demo/detail/pagespanbgfilter.py
diff -u fenfire/org/fenfire/demo/detail/pagespanbgfilter.py:1.8 
fenfire/org/fenfire/demo/detail/pagespanbgfilter.py:1.9
--- fenfire/org/fenfire/demo/detail/pagespanbgfilter.py:1.8     Thu Jun 26 
04:54:36 2003
+++ fenfire/org/fenfire/demo/detail/pagespanbgfilter.py Mon Jul 14 10:12:21 2003
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2003, Janne V. Kujala
+# Copyright (c) 2003, Janne V. Kujala and Tuomas J. Lukka
 # 
 # This file is part of Fenfire.
 # 
@@ -36,7 +36,12 @@
 
 pool = org.nongnu.storm.impl.TransientPool(java.util.HashSet())
 myalph = alph.impl.StormAlph(pool)
-sc = myalph.addFile(java.io.File('../alph/testdata/test1.pdf'), 
'application/pdf')
+
+sc = [
+    myalph.addFile(java.io.File('../alph/testdata/test1.pdf'), 
'application/pdf'),
+    myalph.addFile(java.io.File('testdata/paper.pdf'), 'application/pdf')
+    ]
+
 enfMaker = alph.impl.Enfilade1DImpl.Enfilade1DImplMaker()
 
 class Scene:
@@ -48,12 +53,15 @@
            papermakers.fancyHalo(w),
            papermakers.fancyBlur(w),
        ]
+       self.scrolls = sc
+
        self.scrollimager = ff.spanimages.gl.PageScrollBlockImager()
        self.spanImageFactory = ff.spanimages.gl.DefaultSpanImageFactory(
                                        self.scrollimager)
        self.key = KeyPresses(
             self, 
            ListIndex("type", "types", 0, "Papermaker", "P", "p"),
+           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"),
            SlideLog("scale", 1, "scale", "-", "+"),
@@ -61,9 +69,6 @@
     def scene(self, vs):
 
        print "TEST:"
-       
-       self.sps = self.scrollimager.getSingleImage(sc.getPage(0), 
self.spanImageFactory.poolManager)
-       vob.putil.texture.printTex( self.sps.loader.getTexture().getTexId() )
 
        vs.map.put(vob.vobs.SolidBackdropVob(java.awt.Color.yellow))
 
@@ -72,7 +77,7 @@
        scaled = vs.orthoCS(0, "X", 0, self.x, self.y, self.scale, self.scale)
 
        layout = ff.view.PageSpanLayout(
-               sc.getCurrent(),
+               self.scrolls[self.scroll].getCurrent().subSpan(0,2),
                self.spanImageFactory
                )
        #layout.useBg = 0
Index: fenfire/org/fenfire/spanimages/gl/papermakers.py
diff -u fenfire/org/fenfire/spanimages/gl/papermakers.py:1.4 
fenfire/org/fenfire/spanimages/gl/papermakers.py:1.5
--- fenfire/org/fenfire/spanimages/gl/papermakers.py:1.4        Thu Jun 26 
04:53:54 2003
+++ fenfire/org/fenfire/spanimages/gl/papermakers.py    Mon Jul 14 10:12:21 2003
@@ -15,7 +15,13 @@
 #   TexParameter TEXTURE_2D TEXTURE_MAX_ANISOTROPY_EXT 10
 """
 
-def white(w = None, paperMill = None, filter = anisofilter):
+def getPaperMill(paperMill, paperOffset):
+    if paperMill:
+       return paperMill
+    return PaperMill.getInstance()
+
+def white(w = None, paperMill = None, paperOffset = 0,
+           filter = anisofilter):
     return PlainPaperMaker(1, """
        TexEnv TEXTURE_ENV TEXTURE_ENV_MODE REPLACE
        Enable TEXTURE_2D
@@ -23,7 +29,8 @@
     """ + filter, """
     """, None)
 
-def fancyBlend(w, paperMill = None, filter = anisofilter):
+def fancyBlend(w, paperMill = None, paperOffset = 0,
+           filter = anisofilter):
     if paperMill == None:
        paperMill = PaperMill.getInstance()
     return PlainPaperMaker(1, 
@@ -93,7 +100,7 @@
        return p
 
 
-def fancyHalo(w, paperMill = None):
+def fancyHalo(w, paperMill = None, paperOffset = 0):
     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"
@@ -135,7 +142,7 @@
     END
     """)
 
-def fancyBlur(w, paperMill = None):
+def fancyBlur(w, paperMill = None, paperOffset = 0):
     if not blurProgram:
        print "Fancy blurring is not possible without GL_ARB_fragment_program."
        print "Punting to Fancy halo"