[Gzz-commits] fenfire/org/fenfire util/PageSpanPaper.java uti...

[Janne V. Kujala]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Janne V. Kujala <address@hidden>        03/04/28 09:12:09

Modified files:
        org/fenfire/util: PageSpanPaper.java pagespanpaper.py 
        org/fenfire/view: pagespanlayout.test 

Log message:
        Implement texture blurring readability enhancement in pagespanpaper; 
currently enabled by default if GL_ARB_fragment_program is available

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/PageSpanPaper.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/pagespanpaper.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/pagespanlayout.test.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/util/PageSpanPaper.java
diff -u fenfire/org/fenfire/util/PageSpanPaper.java:1.2 
fenfire/org/fenfire/util/PageSpanPaper.java:1.3
--- fenfire/org/fenfire/util/PageSpanPaper.java:1.2     Thu Mar 27 04:00:39 2003
+++ fenfire/org/fenfire/util/PageSpanPaper.java Mon Apr 28 09:12:09 2003
@@ -61,6 +61,7 @@
     Paper bgPaper;
     Paper bgHaloPaper;
     Paper noBgPaper;
+    GL.Program fpDualBlur;
 
     /** Return callgl code to bind this page's texture
      * to the given texunit.
Index: fenfire/org/fenfire/util/pagespanpaper.py
diff -u fenfire/org/fenfire/util/pagespanpaper.py:1.3 
fenfire/org/fenfire/util/pagespanpaper.py:1.4
--- fenfire/org/fenfire/util/pagespanpaper.py:1.3       Thu Apr 10 14:01:50 2003
+++ fenfire/org/fenfire/util/pagespanpaper.py   Mon Apr 28 09:12:09 2003
@@ -97,3 +97,35 @@
 PageSpanPaper.teardown = """
     PopAttrib
 """
+
+if GL.hasExtension("GL_ARB_fragment_program"):
+    PageSpanPaper.fpDualBlur = GL.createProgram("""!!ARBfp1.0
+
+    TEMP coord1;
+    MOV coord1, fragment.texcoord[1];
+    MOV coord1.w, 4.0;
+
+    TEMP tex1, tex1b;
+    TEX tex1, coord1, texture[1], 2D;
+    TXB tex1b, coord1, texture[1], 2D;
+
+    TEMP coord0;
+    MOV coord0, fragment.texcoord[0];
+
+    # Get intensity, invert, and multiply by a big number
+    DP4 coord0.w, {-100,-100,-100,300}, tex1b;
+
+    TEMP tex0;
+    TXB tex0, coord0, texture[0], 2D;
+
+    MUL result.color, tex0, tex1;
+    END
+    """)
+
+    PageSpanPaper.setupDualPass = ("""
+        PushAttrib ENABLE_BIT TEXTURE_BIT COLOR_BUFFER_BIT CURRENT_BIT
+        BindProgram FRAGMENT_PROGRAM_ARB %s
+        Enable FRAGMENT_PROGRAM_ARB
+        Disable REGISTER_COMBINERS_NV
+        Disable BLEND
+    """ % PageSpanPaper.fpDualBlur.getProgId())
Index: fenfire/org/fenfire/view/pagespanlayout.test
diff -u fenfire/org/fenfire/view/pagespanlayout.test:1.7 
fenfire/org/fenfire/view/pagespanlayout.test:1.8
--- fenfire/org/fenfire/view/pagespanlayout.test:1.7    Thu Apr 24 16:52:23 2003
+++ fenfire/org/fenfire/view/pagespanlayout.test        Mon Apr 28 09:12:09 2003
@@ -1,3 +1,4 @@
+# -*-python-*-
 # 
 # Copyright (c) 2003, Tuomas J. Lukka
 #