[Gzz-commits] gzz/gfx demo/calendarvobtest.py liblines/Lines.cxx

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   02/11/02 10:21:33

Modified files:
        gfx/demo       : calendarvobtest.py 
        gfx/liblines   : Lines.cxx 

Log message:
        Enough for today..

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/calendarvobtest.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/liblines/Lines.cxx.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/calendarvobtest.py
diff -u gzz/gfx/demo/calendarvobtest.py:1.10 
gzz/gfx/demo/calendarvobtest.py:1.11
--- gzz/gfx/demo/calendarvobtest.py:1.10        Sat Nov  2 06:31:52 2002
+++ gzz/gfx/demo/calendarvobtest.py     Sat Nov  2 10:21:33 2002
@@ -27,7 +27,7 @@
                                       
 
         # these don't efect
-        gzz.vob.vobs.CalendarVob.setStatics(style_date, style_n, 0.02)
+        gzz.vob.vobs.CalendarVob.setStatics(style_date, style_n, 0.04)
 
         # week number width, weekday height, month name height
         gzz.vob.vobs.CalendarVob.setBounds(0.5, 0.5, 1.0)
Index: gzz/gfx/liblines/Lines.cxx
diff -u gzz/gfx/liblines/Lines.cxx:1.7 gzz/gfx/liblines/Lines.cxx:1.8
--- gzz/gfx/liblines/Lines.cxx:1.7      Sat Nov  2 09:47:57 2002
+++ gzz/gfx/liblines/Lines.cxx  Sat Nov  2 10:21:33 2002
@@ -55,15 +55,11 @@
 
            glBindTexture(GL_TEXTURE_1D, texName[level]);
 
-           glTexParameterf(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER,
-                           GL_LINEAR);
-           glTexParameterf(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER,
-                           GL_LINEAR_MIPMAP_LINEAR);
-
-           glTexImage1D(GL_TEXTURE_1D, 0, GL_ALPHA, size, 
-                        0, GL_ALPHA, GL_FLOAT, line_image[level]);
+           glTexImage1D(GL_TEXTURE_1D, 0,
+                        GL_RGBA, //internal format - correct?
+                        size, 0, GL_ALPHA, // 
+                        GL_FLOAT, line_image[level]);
 
-           glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_BLEND);
        }
        has_not_inited = false;
     }
@@ -79,18 +75,24 @@
         if (dbg) cout <<" x: "<< a.x << ", "<< b.x 
                      <<" y: "<< a.y << ", "<< b.y <<"\n";
 
+       glPushAttrib(GL_ENABLE_BIT);
+         glDisable(GL_TEXTURE_2D);
+         glEnable(GL_TEXTURE_1D);
+         glEnable(GL_BLEND);
+         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
        if (has_not_inited) init();
 
-       //glLineWidth(linewidth);
-       glLineWidth(1);
 
-       glPushAttrib(GL_ENABLE_BIT);
-       glEnable(GL_BLEND);
-       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+       glBindTexture(GL_TEXTURE_1D, texName[0]);
+         glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+           glTexParameterf(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER,
+                           GL_LINEAR);
+           glTexParameterf(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER,
+                           GL_LINEAR_MIPMAP_LINEAR);
 
-         glBindTexture(GL_TEXTURE_1D, texName[0]);
 
-         glBegin(GL_QUADS);
+       glBegin(GL_QUADS);
          
            glTexCoord2f(1,0);
            glVertex3f(a.x, a.y, 0);
@@ -104,7 +106,7 @@
            glTexCoord2f(0,0);
            glVertex3f(b.x, b.y, 0);
 
-         glEnd();
+       glEnd();
 
        glPopAttrib();
     }