[Gzz-commits] gzz ./TODO gfx/demo/xupdf.py gzz/gfx/gl/Stencil...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/29 12:26:45

Modified files:
        .              : TODO 
        gfx/demo       : xupdf.py 
        gzz/gfx/gl     : Stencil.java 
        gzz/view       : pagespanview.py 

Log message:
        Figured out why depth test was going wrong: Disable DEPTH_TEST not only 
disables the test but also writing :(. To write, Enable DEPTH_TEST and use 
DepthFunc ALWAYS. Sigh...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.180&tr2=1.181&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/xupdf.py.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/Stencil.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/pagespanview.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.180 gzz/TODO:1.181
*** gzz/TODO:1.180      Sun Sep 29 10:52:29 2002
--- gzz/TODO    Sun Sep 29 12:26:45 2002
***************
*** 67,72 ****
--- 67,74 ----
          (inverse should be in the functions themselves)
            - needed for mouse click positioning in distorted cs.
        - think about how to combine client and xupdf
+           - just keep abstracting out parts of xupdf and finally
+             make them usable from Java.
        - stencil: use depth
        - xupdf: distorted multi-page PDF view with xu links
            - frame rate ~= 25
Index: gzz/gfx/demo/xupdf.py
diff -c gzz/gfx/demo/xupdf.py:1.31 gzz/gfx/demo/xupdf.py:1.32
*** gzz/gfx/demo/xupdf.py:1.31  Sun Sep 29 10:52:29 2002
--- gzz/gfx/demo/xupdf.py       Sun Sep 29 12:26:45 2002
***************
*** 16,22 ****
  screenctr = (0.9 * screensize[0]/2, screensize[1]/2)
  
  # Slow animation for the demo.
! AbstractUpdateManager.defaultAnimationTime = 2000
  AbstractUpdateManager.fractCalc = AbstractUpdateManager.LinearCalculator()
  
  from test.tools import tools
--- 16,22 ----
  screenctr = (0.9 * screensize[0]/2, screensize[1]/2)
  
  # Slow animation for the demo.
! AbstractUpdateManager.defaultAnimationTime = 3000
  AbstractUpdateManager.fractCalc = AbstractUpdateManager.LinearCalculator()
  
  from test.tools import tools
Index: gzz/gzz/gfx/gl/Stencil.java
diff -c gzz/gzz/gfx/gl/Stencil.java:1.14 gzz/gzz/gfx/gl/Stencil.java:1.15
*** gzz/gzz/gfx/gl/Stencil.java:1.14    Mon Sep 23 04:24:25 2002
--- gzz/gzz/gfx/gl/Stencil.java Sun Sep 29 12:26:45 2002
***************
*** 48,55 ****
        if(initStencil != null) return;
  
        initStencil = GLRen.createCallList(
! " PushAttrib DEPTH_BUFFER_BIT ENABLE_BIT STENCIL_BUFFER_BIT 
COLOR_BUFFER_BIT\n"+
  "    Enable STENCIL_TEST\n"+
  "    StencilFunc ALWAYS 1 255\n"+
  "    StencilOp ZERO ZERO REPLACE\n"+ // XXX
  "    StencilMask 255\n"+
--- 48,56 ----
        if(initStencil != null) return;
  
        initStencil = GLRen.createCallList(
! " PushAttrib DEPTH_BUFFER_BIT ENABLE_BIT STENCIL_BUFFER_BIT COLOR_BUFFER_BIT 
DEPTH_BUFFER_BIT\n"+
  "    Enable STENCIL_TEST\n"+
+ "    Enable DEPTH_TEST\n"+
  "    StencilFunc ALWAYS 1 255\n"+
  "    StencilOp ZERO ZERO REPLACE\n"+ // XXX
  "    StencilMask 255\n"+
***************
*** 59,75 ****
  
        initOutside = GLRen.createCallList(
  "    StencilFunc EQUAL 0 1\n"+
  "    ColorMask 1 1 1 1\n"+
  "    StencilMask 0\n"+
  "    DepthMask 1\n"
            );
  
        initBackplane = GLRen.createCallList(
! " PushAttrib ENABLE_BIT STENCIL_BUFFER_BIT COLOR_BUFFER_BIT\n"+
  " PushMatrix \n"+
! " Translate 0 0 10000 \n"+
  "    StencilFunc EQUAL 1 1\n"+
! "    Disable DEPTH_TEST\n"
                );
  
        exitBackplane = GLRen.createCallList(
--- 60,79 ----
  
        initOutside = GLRen.createCallList(
  "    StencilFunc EQUAL 0 1\n"+
+ "    Enable DEPTH_TEST\n"+
  "    ColorMask 1 1 1 1\n"+
  "    StencilMask 0\n"+
  "    DepthMask 1\n"
            );
  
        initBackplane = GLRen.createCallList(
! " PushAttrib ENABLE_BIT STENCIL_BUFFER_BIT COLOR_BUFFER_BIT 
DEPTH_BUFFER_BIT\n"+
  " PushMatrix \n"+
! " Translate 0 0 1000 \n"+
  "    StencilFunc EQUAL 1 1\n"+
! "    Enable DEPTH_TEST\n"+
! "    DepthFunc ALWAYS\n"+
! "    DepthMask 1\n"
                );
  
        exitBackplane = GLRen.createCallList(
***************
*** 80,92 ****
        initContents_depth = GLRen.createCallList(
  "    ColorMask 1 1 1 1\n"+
  "    StencilFunc EQUAL 1 1\n"+
! "    StencilMask 0\n"
            );
        initContents_nodepth = GLRen.createCallList(
  "    ColorMask 1 1 1 1\n"+
  "    StencilFunc EQUAL 1 1\n"+
- "    DepthMask 0\n"+
  "    StencilMask 0\n"+
  "    Disable DEPTH_TEST\n"
            );
  
--- 84,98 ----
        initContents_depth = GLRen.createCallList(
  "    ColorMask 1 1 1 1\n"+
  "    StencilFunc EQUAL 1 1\n"+
! "    StencilMask 0\n"+
! "    DepthMask 1\n"+
! "    Enable DEPTH_TEST\n"
            );
        initContents_nodepth = GLRen.createCallList(
  "    ColorMask 1 1 1 1\n"+
  "    StencilFunc EQUAL 1 1\n"+
  "    StencilMask 0\n"+
+ "    DepthMask 0\n"+
  "    Disable DEPTH_TEST\n"
            );
  
***************
*** 94,99 ****
--- 100,107 ----
  "    StencilFunc EQUAL 1 1\n"+
  "    StencilOp ZERO ZERO ZERO\n"+ // XXX
  "    StencilMask 255\n"+
+ "    Enable DEPTH_TEST\n"+ 
+ "    DepthFunc ALWAYS\n"+ 
  "    DepthMask 1\n"+ // Do write now.
  "    ColorMask 0 0 0 0\n"
            );
Index: gzz/gzz/view/pagespanview.py
diff -c gzz/gzz/view/pagespanview.py:1.1 gzz/gzz/view/pagespanview.py:1.2
*** gzz/gzz/view/pagespanview.py:1.1    Sun Sep 29 10:52:29 2002
--- gzz/gzz/view/pagespanview.py        Sun Sep 29 12:26:45 2002
***************
*** 193,199 ****
                    None,
                    FrameR(),
                    pp,
!                   0)
                
        else:
            pp.run()
--- 193,199 ----
                    None,
                    FrameR(),
                    pp,
!                   1)
                
        else:
            pp.run()