[Gzz-commits] gzz gfx/util/papersampler.py gzz/gfx/gl/PageSpa...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/03 10:35:12

Modified files:
        gfx/util       : papersampler.py 
        gzz/gfx/gl     : PageSpanPaper.java pagespanpaper.py 

Log message:
        Rid of initial halo

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/util/papersampler.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/PageSpanPaper.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/pagespanpaper.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gzz/gfx/util/papersampler.py
diff -u gzz/gfx/util/papersampler.py:1.10 gzz/gfx/util/papersampler.py:1.11
--- gzz/gfx/util/papersampler.py:1.10   Mon Mar  3 09:50:07 2003
+++ gzz/gfx/util/papersampler.py        Mon Mar  3 10:35:12 2003
@@ -122,6 +122,7 @@
            l = 0
            for opts in textConds:
                 gzz.gfx.gl.PageSpanPaper.withHalo = opts["halo"]
+               print "Using halo: ",gzz.gfx.gl.PageSpanPaper.withHalo
                gzz.gfx.gl.PageSpanPaper.paperMill = OptMill(
                                            ThePaperMill(), opts["paperopts"])
                gzz.gfx.gl.PageSpanPaper.paperMillWindow = w
Index: gzz/gzz/gfx/gl/PageSpanPaper.java
diff -u gzz/gzz/gfx/gl/PageSpanPaper.java:1.12 
gzz/gzz/gfx/gl/PageSpanPaper.java:1.13
--- gzz/gzz/gfx/gl/PageSpanPaper.java:1.12      Sun Mar  2 08:49:31 2003
+++ gzz/gzz/gfx/gl/PageSpanPaper.java   Mon Mar  3 10:35:12 2003
@@ -134,6 +134,7 @@
                bg = paperMill.getOptimizedPaper(paperSeed, paperMillWindow);
            }
            if(withHalo) {
+               pa("With halo!");
                if (bgHaloPaper == null) {
                    bgHaloPaper = (Paper)bg.clone();
                    if(bgHaloPaper.getNPasses() == 1 &&
@@ -160,6 +161,7 @@
                }
                return bgHaloPaper;
            } else {
+               pa("Without halo!");
                if(bgPaper == null) {
                    bgPaper = (Paper)bg.clone();
                    // Check if we have a single pass and single texture
Index: gzz/gzz/gfx/gl/pagespanpaper.py
diff -u gzz/gzz/gfx/gl/pagespanpaper.py:1.8 gzz/gzz/gfx/gl/pagespanpaper.py:1.9
--- gzz/gzz/gfx/gl/pagespanpaper.py:1.8 Sun Mar  2 08:49:32 2003
+++ gzz/gzz/gfx/gl/pagespanpaper.py     Mon Mar  3 10:35:12 2003
@@ -42,12 +42,14 @@
     Disable TEXTURE_2D
     ActiveTexture TEXTURE0
     Enable TEXTURE_2D
+    Disable REGISTER_COMBINERS_NV
 """
 PageSpanPaper.setupExtraPass = """
     PushAttrib ENABLE_BIT TEXTURE_BIT COLOR_BUFFER_BIT CURRENT_BIT
     TexEnv TEXTURE_ENV TEXTURE_ENV_MODE REPLACE
     Enable BLEND
     BlendFunc ZERO SRC_COLOR
+    Disable REGISTER_COMBINERS_NV
 """
 PageSpanPaper.setupDualPass = """
     PushAttrib ENABLE_BIT TEXTURE_BIT COLOR_BUFFER_BIT CURRENT_BIT
@@ -57,8 +59,12 @@
     Disable BLEND
     ActiveTexture TEXTURE1
     TexEnv TEXTURE_ENV TEXTURE_ENV_MODE MODULATE
+    Disable REGISTER_COMBINERS_NV
 """
-PageSpanPaper.withHalo = GL.hasExtension("GL_NV_register_combiners")
+
+# Turn on explicitly, not automatically.
+# PageSpanPaper.withHalo = GL.hasExtension("GL_NV_register_combiners")
+
 PageSpanPaper.setupHaloDualPass = parseCombiner("""
     PushAttrib ENABLE_BIT TEXTURE_BIT COLOR_BUFFER_BIT CURRENT_BIT
     ActiveTexture TEXTURE0