[Gzz-commits] gzz gfx/demo/gldemo.py gzz/gfx/gl/GLSpans.java

[Tuomas J. Lukka]

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

Modified files:
        gfx/demo       : gldemo.py 
        gzz/gfx/gl     : GLSpans.java 

Log message:
        Loading as images

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/gldemo.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLSpans.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/gldemo.py
diff -c gzz/gfx/demo/gldemo.py:1.14 gzz/gfx/demo/gldemo.py:1.15
*** gzz/gfx/demo/gldemo.py:1.14 Sun Sep 15 07:41:40 2002
--- gzz/gfx/demo/gldemo.py      Tue Sep 17 02:46:45 2002
***************
*** 60,65 ****
--- 60,85 ----
        End
      """)
  
+ def partialquad(x0, y0, x1, y1, texid = None):
+     texcode = ""
+     if texid:
+       texcode = "BindTexture TEXTURE_2D %s"%texid
+     return getDList("""
+       PushAttrib TEXTURE_BIT
+       """+texcode+"""
+       Begin QUADS
+       TexCoord %(x0)s %(y0)s
+       Vertex -1 -1
+       TexCoord %(x0)s %(y1)s
+       Vertex -1 1
+       TexCoord %(x1)s %(y1)s
+       Vertex 1 1
+       TexCoord %(x1)s %(y0)s
+       Vertex 1 -1
+       End
+       PopAttrib
+     """ % locals())
+ 
  def getFont():
      global font
      try:
Index: gzz/gzz/gfx/gl/GLSpans.java
diff -c gzz/gzz/gfx/gl/GLSpans.java:1.1 gzz/gzz/gfx/gl/GLSpans.java:1.2
*** gzz/gzz/gfx/gl/GLSpans.java:1.1     Tue Sep 17 02:08:47 2002
--- gzz/gzz/gfx/gl/GLSpans.java Tue Sep 17 02:46:45 2002
***************
*** 13,21 ****
  public class GLSpans {
      /** A rectangle in a texture.
       */
!     static class Rect {
!       int texId;
!       float x0, y0, x1, y1;
      };
      static HashMap pages = new HashMap();
  
--- 13,21 ----
  public class GLSpans {
      /** A rectangle in a texture.
       */
!     static public class Rect {
!       public int texId;
!       public float x0, y0, x1, y1;
      };
      static HashMap pages = new HashMap();