[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/06/25 06:35:37

Modified files:
        org/fenfire/demo/detail: pagespanbgfilter.py 
        org/fenfire/spanimages/gl: PlainPaperMaker.java papermakers.py 
Added files:
        org/fenfire/spanimages: __init__.py 
        org/fenfire/spanimages/gl: __init__.py 

Log message:
        Demoing - not tested yet

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/detail/pagespanbgfilter.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/papermakers.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/detail/pagespanbgfilter.py
diff -u fenfire/org/fenfire/demo/detail/pagespanbgfilter.py:1.3 
fenfire/org/fenfire/demo/detail/pagespanbgfilter.py:1.4
--- fenfire/org/fenfire/demo/detail/pagespanbgfilter.py:1.3     Wed Apr 30 
08:13:43 2003
+++ fenfire/org/fenfire/demo/detail/pagespanbgfilter.py Wed Jun 25 06:35:36 2003
@@ -32,6 +32,8 @@
 
 from vob.putil.demokeys import *
 
+from org.fenfire.spanimages.gl import papermakers
+
 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')
@@ -39,9 +41,16 @@
 
 class Scene:
     def __init__(self):
+       w = vob.putil.demowindow.w
+       self.types = [
+           papermakers.white(w),
+           papermakers.fancyBlend(w),
+           papermakers.fancyHalo(w),
+           papermakers.fancyBlur(w),
+       ]
        self.key = KeyPresses(
             self, 
-           Toggle("blur", 0, "Blur bg", "b"),
+           ListIndex("type", "types", 0, "Papermaker", "P", "p"),
            SlideLin("x", 0, 50, "x coord", "Right", "Left"),
            SlideLin("y", 0, 50, "y coord", "Down", "Up"),
            SlideLog("scale", 1, "scale", "-", "+"),
@@ -51,9 +60,10 @@
 
        scaled = vs.orthoCS(0, "X", 0, self.x, self.y, self.scale, self.scale)
 
-       layout = ff.view.PageSpanLayout(enfMaker.makeEnfilade(sc.getCurrent()))
-        ff.util.PageSpanPaper.paperMill = vob.gl.PaperMill.getInstance()
-        ff.util.PageSpanPaper.paperMillWindow = vob.putil.demowindow.w
+       layout = ff.view.PageSpanLayout(
+               sc.getCurrent(),
+               self.types[self.type]
+               )
        #layout.useBg = 0
 
         ff.util.PageSpanPaper.withBlur = self.blur
Index: fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java
diff -u fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java:1.5 
fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java:1.6
--- fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java:1.5  Wed Jun 25 
04:01:28 2003
+++ fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java      Wed Jun 25 
06:35:37 2003
@@ -26,6 +26,7 @@
 
 package org.fenfire.spanimages.gl;
 import java.io.File;
+import org.nongnu.libvob.*;
 import org.nongnu.libvob.gl.*;
 import org.nongnu.libvob.memory.*;
 
@@ -95,7 +96,8 @@
        int offs = 0;
        StringBuffer buf = new StringBuffer();
        if(papermill != null) {
-           p = papermill.getOptimizedPaper(img.scrollBlock.hashCode());
+           p = papermill.getOptimizedPaper(
+                       img.scrollBlock.hashCode(), w);
            if(p.getNPasses() != 1)
                throw new Error("Invalid paper gotten back");
            pass = p.getPass(0);
Index: fenfire/org/fenfire/spanimages/gl/papermakers.py
diff -u fenfire/org/fenfire/spanimages/gl/papermakers.py:1.2 
fenfire/org/fenfire/spanimages/gl/papermakers.py:1.3
--- fenfire/org/fenfire/spanimages/gl/papermakers.py:1.2        Wed Jun 25 
05:51:17 2003
+++ fenfire/org/fenfire/spanimages/gl/papermakers.py    Wed Jun 25 06:35:37 2003
@@ -7,35 +7,37 @@
 
 from org.fenfire.spanimages.gl import PlainPaperMaker
 
-paperfilter = """
-   Enable TEXTURE_2D
+anisofilter = """
    TexParameter TEXTURE_2D TEXTURE_MIN_FILTER LINEAR_MIPMAP_NEAREST
    TexParameter TEXTURE_2D TEXTURE_MAG_FILTER LINEAR
    TexParameter TEXTURE_2D TEXTURE_MAX_ANISOTROPY_EXT 10
 """
 
-def white():
+def white(w = None, paperMill = None, filter = anisofilter):
     return PlainPaperMaker(1, """
        PushAttrib TEXTURE_BIT
        TexEnv TEXTURE_ENV TEXTURE_ENV_MODE REPLACE
+       Enable TEXTURE_2D
        Disable BLEND
-    """ + paperfilter, """
+    """ + filter, """
        PopAttrib
     """, None)
 
-def fancyBlend(w, paperMill = None):
+def fancyBlend(w, paperMill = None, filter = anisofilter):
     if paperMill == None:
        paperMill = PaperMill.getInstance()
     return PlainPaperMaker(1, 
        """
            ActiveTexture TEXTURE0
            TexEnv TEXTURE_ENV TEXTURE_ENV_MODE REPLACE
+           Enable TEXTURE_2D
            ActiveTexture TEXTURE1
            TexEnv TEXTURE_ENV TEXTURE_ENV_MODE MODULATE
+           Enable TEXTURE_2D
            %s
            Disable BLEND
            ActiveTexture TEXTURE0
-       """ % paperfilter, "", None, paperMill, w)
+       """ % filter, "", None, paperMill, w)
 
 def fancyHalo(w, paperMill = None):
     if not GL.hasExtension("GL_NV_register_combiners"):