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

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   02/11/02 15:08:08

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

Log message:
        jees.. doesn't blink anymore.

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

Patches:
Index: gzz/gfx/demo/calendarvobtest.py
diff -u gzz/gfx/demo/calendarvobtest.py:1.11 
gzz/gfx/demo/calendarvobtest.py:1.12
--- gzz/gfx/demo/calendarvobtest.py:1.11        Sat Nov  2 10:21:33 2002
+++ gzz/gfx/demo/calendarvobtest.py     Sat Nov  2 15:08:08 2002
@@ -27,7 +27,7 @@
                                       
 
         # these don't efect
-        gzz.vob.vobs.CalendarVob.setStatics(style_date, style_n, 0.04)
+        gzz.vob.vobs.CalendarVob.setStatics(style_date, style_n, 0.05)
 
         # 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.8 gzz/gfx/liblines/Lines.cxx:1.9
--- gzz/gfx/liblines/Lines.cxx:1.8      Sat Nov  2 10:21:33 2002
+++ gzz/gfx/liblines/Lines.cxx  Sat Nov  2 15:08:08 2002
@@ -15,13 +15,14 @@
 
     using std::cerr;
     using std::cout;
+    using std::endl;
     using std::ostream;
 
     const int SIZE = 256;
     const int MIPMAPS = 9;
 
-    static GLfloat line_image[MIPMAPS][SIZE];
-    static GLuint texName[MIPMAPS];
+    static GLfloat line_image[SIZE];
+    static GLuint texName[1];
 
 
   // PRIVATE:
@@ -34,7 +35,8 @@
      */
     void Lines::init() {
 
-        glGenTextures(MIPMAPS, texName);
+        glGenTextures(1, texName);
+       glBindTexture(GL_TEXTURE_1D, texName[0]);
       
         int size = SIZE;
         for (int level=0; level<MIPMAPS; level++) {
@@ -42,25 +44,35 @@
            if (level != 0) size /= 2;
 
            for (int i=0; i<size; i++) {
-                line_image[level][i] = 0.0;
+                line_image[i] = 0.0;
            } 
 
            int steps = size / 8;
            int low   = steps * 3;
            int high  = steps * 5;
 
-           for (int i=low; i<high; i++) {
-               line_image[level][i] = 1.0;
+           if ( size > 4) {
+               for (int i=low; i<high; i++) {
+                   line_image[i] = 1;
+               }
+           } else {
+               switch(size) {
+               case 4: line_image[1] = 1;
+                   line_image[2] = 1; break;
+               case 2: line_image[1] = 1; break;
+               case 1: line_image[0] = 1; break;
+               }
            }
 
-           glBindTexture(GL_TEXTURE_1D, texName[level]);
-
-           glTexImage1D(GL_TEXTURE_1D, 0,
-                        GL_RGBA, //internal format - correct?
-                        size, 0, GL_ALPHA, // 
-                        GL_FLOAT, line_image[level]);
-
+           glTexImage1D(GL_TEXTURE_1D, level, GL_ALPHA, 
+                        size, 0, GL_ALPHA,
+                        GL_FLOAT, line_image);
        }
+       glTexParameterf(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER,
+                       GL_LINEAR);
+       glTexParameterf(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER,
+                       GL_LINEAR_MIPMAP_LINEAR);
+
        has_not_inited = false;
     }
 
@@ -78,36 +90,38 @@
        glPushAttrib(GL_ENABLE_BIT);
          glDisable(GL_TEXTURE_2D);
          glEnable(GL_TEXTURE_1D);
+
          glEnable(GL_BLEND);
-         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+           glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+           //glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
 
        if (has_not_inited) init();
 
 
        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);
 
+       glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+
+       float l = linewidth /2;
 
        glBegin(GL_QUADS);
          
-           glTexCoord2f(1,0);
-           glVertex3f(a.x, a.y, 0);
+           glTexCoord2f(0,0);
+           glVertex3f(a.x - 1 -l, a.y - 1-l, 0);
+
+           glTexCoord2f(1,0);
+           glVertex3f(a.x + 1 + l, a.y + 1 + l, 0);
 
            glTexCoord2f(1,1);
-           glVertex3f(a.x+linewidth, a.y+linewidth, 0);
+           glVertex3f(b.x + 1 +l, b.y + 1 + l, 0);
 
            glTexCoord2f(0,1);
-           glVertex3f(b.x+linewidth, b.y+linewidth, 0);
-
-           glTexCoord2f(0,0);
-           glVertex3f(b.x, b.y, 0);
+           glVertex3f(b.x - 1-l, b.y - 1 - l, 0);
 
        glEnd();
 
        glPopAttrib();
     }
 }
+
Index: gzz/gfx/liblines/Lines.hxx
diff -u gzz/gfx/liblines/Lines.hxx:1.4 gzz/gfx/liblines/Lines.hxx:1.5
--- gzz/gfx/liblines/Lines.hxx:1.4      Sat Nov  2 08:56:32 2002
+++ gzz/gfx/liblines/Lines.hxx  Sat Nov  2 15:08:08 2002
@@ -26,13 +26,12 @@
 
     public:
         Lines(float l): linewidth(l), has_not_inited(true) { }
+        ~Lines();
 
         /** Draws a line from point a to b.
          *  You have to transform a and b _before_
          */
         void draw(ZPt a, ZPt b);
-
-        ~Lines();
     };
 }