[Gzz-commits] gzz/gfx/librenderables renderables.py

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/09/16 10:18:01

Modified files:
        gfx/librenderables: renderables.py 

Log message:
        Fix projective mapping

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.31&tr2=1.32&r1=text&r2=text

Patches:
Index: gzz/gfx/librenderables/renderables.py
diff -c gzz/gfx/librenderables/renderables.py:1.31 
gzz/gfx/librenderables/renderables.py:1.32
*** gzz/gfx/librenderables/renderables.py:1.31  Mon Sep 16 09:59:42 2002
--- gzz/gfx/librenderables/renderables.py       Mon Sep 16 10:18:01 2002
***************
*** 752,758 ****
  
          glBindTexture(GL_TEXTURE_2D, texid);
          glEnable(GL_TEXTURE_2D);
! 
  
          glBegin(GL_QUADS);
          for (int i = 0; i < 4; i++) {
--- 752,758 ----
  
          glBindTexture(GL_TEXTURE_2D, texid);
          glEnable(GL_TEXTURE_2D);
!         //glDisable(GL_REGISTER_COMBINERS_NV);
  
          glBegin(GL_QUADS);
          for (int i = 0; i < 4; i++) {
***************
*** 771,780 ****
  
              float w = (i & 2) ? wy : wx;
  
!             glTexCoord3f(tex1.x * w, tex1.y * w, w);
              coords1.vertex(sides[i][2]);
  
!             glTexCoord3f(tex0.x * w, tex0.y * w, w);
              coords1.vertex(sides[i][3]);
  
              //cout << tex0 << coords1.transform(sides[i][0]) << "\\n";
--- 771,780 ----
  
              float w = (i & 2) ? wy : wx;
  
!             glTexCoord4f(tex1.x * w, tex1.y * w, 0, w);
              coords1.vertex(sides[i][2]);
  
!             glTexCoord4f(tex0.x * w, tex0.y * w, 0, w);
              coords1.vertex(sides[i][3]);
  
              //cout << tex0 << coords1.transform(sides[i][0]) << "\\n";
***************
*** 787,792 ****
--- 787,793 ----
  
          glPopAttrib();
          GLERR;
+ 
      """,
  }    ,