[Gzz-commits] gzz/gfx demo/papertest.py demo/texturelab.py jn...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/02 08:58:10

Modified files:
        gfx/demo       : papertest.py texturelab.py 
        gfx/jni        : GzzGL-jni.cxx 
        gfx/librenderables: renderables.py 

Log message:
        Twids

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/papertest.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/texturelab.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/jni/GzzGL-jni.cxx.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/papertest.py
diff -c gzz/gfx/demo/papertest.py:1.14 gzz/gfx/demo/papertest.py:1.15
*** gzz/gfx/demo/papertest.py:1.14      Sat Aug 31 03:06:06 2002
--- gzz/gfx/demo/papertest.py   Mon Sep  2 08:58:10 2002
***************
*** 86,91 ****
--- 86,92 ----
          i = int(k[1]) - 5
          global passmask
          passmask[i] = not passmask[i]
+       print passmask
          currentScene.initpaper()
      if k == "d":
          global dbg
Index: gzz/gfx/demo/texturelab.py
diff -c gzz/gfx/demo/texturelab.py:1.6 gzz/gfx/demo/texturelab.py:1.7
*** gzz/gfx/demo/texturelab.py:1.6      Fri Aug 30 07:25:27 2002
--- gzz/gfx/demo/texturelab.py  Mon Sep  2 08:58:10 2002
***************
*** 20,33 ****
            "bulgemagx": 0,
            "lfreq": 2,
            "hfreq": 10,
!           "bias": -3,
!             "scale": 10,
!             "file": "lava/gfx/map3d.dat"
        }
        self.colors = [ (1, 1, 1), (1, 0, 0), (0, 1, 0), (0, 0, 1)]
!       self.shadercomps = 3
!       self.shaderformat = "RGB"
!       self.internalformat = "RGB"
        self.angle = 0
        self.sca = 1
        self.shade()
--- 20,33 ----
            "bulgemagx": 0,
            "lfreq": 2,
            "hfreq": 10,
!           "bias": -.0,
!             "scale": 1,
!             "file": "lava/gfx/c.dat"
        }
        self.colors = [ (1, 1, 1), (1, 0, 0), (0, 1, 0), (0, 0, 1)]
!       self.shadercomps = 1
!       self.shaderformat = "LUMINANCE"
!       self.internalformat = "LUMINANCE"
        self.angle = 0
        self.sca = 1
        self.shade()
***************
*** 77,85 ****
                TexGen S TEXTURE_GEN_MODE EYE_LINEAR
                TexGen T TEXTURE_GEN_MODE EYE_LINEAR
                TexGen R TEXTURE_GEN_MODE EYE_LINEAR
!               TexGen S EYE_PLANE 0 0 0.01 0
!               TexGen T EYE_PLANE 0 0.01 0 0
!               TexGen R EYE_PLANE 0.01 0 0 0
            """))
        poptrans(vs, "coor")
        poptrans(vs, "rot")
--- 77,85 ----
                TexGen S TEXTURE_GEN_MODE EYE_LINEAR
                TexGen T TEXTURE_GEN_MODE EYE_LINEAR
                TexGen R TEXTURE_GEN_MODE EYE_LINEAR
!               TexGen S EYE_PLANE 0 0 0.003 0
!               TexGen T EYE_PLANE 0 0.003 0 0
!               TexGen R EYE_PLANE 0.003 0 0 0
            """))
        poptrans(vs, "coor")
        poptrans(vs, "rot")
Index: gzz/gfx/jni/GzzGL-jni.cxx
diff -c gzz/gfx/jni/GzzGL-jni.cxx:1.9 gzz/gfx/jni/GzzGL-jni.cxx:1.10
*** gzz/gfx/jni/GzzGL-jni.cxx:1.9       Mon Aug 26 04:17:21 2002
--- gzz/gfx/jni/GzzGL-jni.cxx   Mon Sep  2 08:58:10 2002
***************
*** 406,413 ****
--- 406,416 ----
          glBindTexture(GL_TEXTURE_2D, 0);
        } else {
          glBindTexture(GL_TEXTURE_3D, id);
+         GLERR
  
          glTexParameteri(GL_TEXTURE_3D, GL_GENERATE_MIPMAP_SGIS, GL_TRUE);
+         GLERR
+ 
          glTexImage3D(GL_TEXTURE_3D, 0,
                  tokenFromJstring(env, internalFormat),
                  w, h, d, 0, 
***************
*** 415,422 ****
--- 418,429 ----
                  GL_FLOAT,
                  value);
  
+         GLERR
+ 
  
          glBindTexture(GL_TEXTURE_3D, 0);
+         GLERR
+ 
        }
  
  
Index: gzz/gfx/librenderables/renderables.py
diff -c gzz/gfx/librenderables/renderables.py:1.14 
gzz/gfx/librenderables/renderables.py:1.15
*** gzz/gfx/librenderables/renderables.py:1.14  Mon Aug 26 04:17:21 2002
--- gzz/gfx/librenderables/renderables.py       Mon Sep  2 08:58:10 2002
***************
*** 380,390 ****
--- 380,392 ----
                    lightParam.e2 << " " <<
                    "\\n";
            }
+           GLERR
  
            for(Paper::Paper::iterator it = paper->begin(); it != paper->end(); 
++it) {
  
                (*it).setUp(&lightParam);
  
+               GLERR
                glBegin(GL_QUADS);
                coords1.vertex(corners[0]);
                coords1.vertex(corners[1]);
***************
*** 392,398 ****
--- 394,402 ----
                coords1.vertex(corners[3]);
                glEnd();
  
+               GLERR
                (*it).tearDown();
+               GLERR
            }
  
            GLERR