[Gzz-commits] gzz/gfx demo/irregu3.py libtexture/irregu.texture

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/10/21 03:07:15

Modified files:
        gfx/demo       : irregu3.py 
        gfx/libtexture : irregu.texture 

Log message:
        Use the same accuracy for both the inner and outer edge

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/irregu3.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libtexture/irregu.texture.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/irregu3.py
diff -c gzz/gfx/demo/irregu3.py:1.6 gzz/gfx/demo/irregu3.py:1.7
*** gzz/gfx/demo/irregu3.py:1.6 Mon Oct 21 02:56:08 2002
--- gzz/gfx/demo/irregu3.py     Mon Oct 21 03:07:15 2002
***************
*** 69,74 ****
--- 69,76 ----
      BlendFunc ZERO ZERO
      Enable BLEND
  
+     # Draw outer edge
+     
      TexEnv TEXTURE_ENV TEXTURE_ENV_MODE COMBINE_ARB
      TexEnv TEXTURE_ENV COMBINE_RGB_ARB DOT3_RGBA_ARB
      TexEnv TEXTURE_ENV SOURCE0_RGB_ARB TEXTURE
***************
*** 109,135 ****
  
      Disable BLEND
  
!     TexEnv TEXTURE_ENV TEXTURE_ENV_MODE MODULATE
! 
!     #Translate 0 -1 0
!     #Scale 1 2 1
  
      Begin QUAD_STRIP
  
      TexCoord 0 0 0 1
!     Color 1 1 0 1
      Vertex 0 %(e)s 0 1
  
      TexCoord 0 0 0 %(e)s
!     Color 1 1 0 %(e)s
      Vertex 0 %(e)s 0 %(e)s
  
      TexCoord 1 0 0 1
!     Color 1 1 0 1
      Vertex 1 %(e)s 0 1
  
      TexCoord %(e)s 0 0 %(e)s
!     Color 1 1 0 %(e)s
      Vertex %(e)s %(e)s 0 %(e)s
  
      End
--- 111,136 ----
  
      Disable BLEND
  
!     # Draw inner edge
!     
!     TexEnv TEXTURE_ENV OPERAND0_RGB_ARB SRC_ALPHA
  
      Begin QUAD_STRIP
  
      TexCoord 0 0 0 1
!     Color 1 .5 .5 
      Vertex 0 %(e)s 0 1
  
      TexCoord 0 0 0 %(e)s
!     Color .75 .5 .5
      Vertex 0 %(e)s 0 %(e)s
  
      TexCoord 1 0 0 1
!     Color 1 .5 .5
      Vertex 1 %(e)s 0 1
  
      TexCoord %(e)s 0 0 %(e)s
!     Color .75 .5 .5
      Vertex %(e)s %(e)s 0 %(e)s
  
      End
Index: gzz/gfx/libtexture/irregu.texture
diff -c gzz/gfx/libtexture/irregu.texture:1.1 
gzz/gfx/libtexture/irregu.texture:1.2
*** gzz/gfx/libtexture/irregu.texture:1.1       Mon Oct 21 02:56:08 2002
--- gzz/gfx/libtexture/irregu.texture   Mon Oct 21 03:07:15 2002
***************
*** 82,92 ****
  
      }
  
-     for(int i = 0; i<width*height*components; i += 4) {
-       data[i + 3] -= .5;
-       data[i + 3] *= 2;
-     }
-     
      for(int i = 0; i<width*height*components; i++) {
        data[i] *= scale;
        data[i] += bias;
--- 82,87 ----