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

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   02/11/02 09:47:57

Modified files:
        gfx/liblines   : Lines.cxx 

Log message:
        Still not blending.

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

Patches:
Index: gzz/gfx/liblines/Lines.cxx
diff -u gzz/gfx/liblines/Lines.cxx:1.6 gzz/gfx/liblines/Lines.cxx:1.7
--- gzz/gfx/liblines/Lines.cxx:1.6      Sat Nov  2 09:22:21 2002
+++ gzz/gfx/liblines/Lines.cxx  Sat Nov  2 09:47:57 2002
@@ -42,7 +42,7 @@
            if (level != 0) size /= 2;
 
            for (int i=0; i<size; i++) {
-                line_image[level][i] = 0;
+                line_image[level][i] = 0.0;
            } 
 
            int steps = size / 8;
@@ -55,8 +55,15 @@
 
            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]);
+
+           glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_BLEND);
        }
        has_not_inited = false;
     }
@@ -74,26 +81,27 @@
 
        if (has_not_inited) init();
 
-       glLineWidth(linewidth);
+       //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]);
 
          glBegin(GL_QUADS);
          
-           glTexCoord2f(0,0);
+           glTexCoord2f(1,0);
            glVertex3f(a.x, a.y, 0);
 
-           glTexCoord2f(0,1);
+           glTexCoord2f(1,1);
            glVertex3f(a.x+linewidth, a.y+linewidth, 0);
 
-           glTexCoord2f(1,1);
+           glTexCoord2f(0,1);
            glVertex3f(b.x+linewidth, b.y+linewidth, 0);
 
-           glTexCoord2f(1,0);
+           glTexCoord2f(0,0);
            glVertex3f(b.x, b.y, 0);
 
          glEnd();