[Gzz-commits] gzz/gfx/librenderables Renderables.cxx Renderab...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/01/20 03:30:55

Modified files:
        gfx/librenderables: Renderables.cxx Renderables.hxx 
                            renderables.py 

Log message:
        just a commit - continuousline does not work.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/Renderables.cxx.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/Renderables.hxx.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.169&tr2=1.170&r1=text&r2=text

Patches:
Index: gzz/gfx/librenderables/Renderables.cxx
diff -u gzz/gfx/librenderables/Renderables.cxx:1.12 
gzz/gfx/librenderables/Renderables.cxx:1.13
--- gzz/gfx/librenderables/Renderables.cxx:1.12 Thu Dec 12 13:40:30 2002
+++ gzz/gfx/librenderables/Renderables.cxx      Mon Jan 20 03:30:55 2003
@@ -26,6 +26,7 @@
     DBGVAR(dbg_culledpaperquad, "Renderable.culledpaperquad");
     DBGVAR(dbg_irregularquad, "Renderable.irregularquad");
     DBGVAR(dbg_calendar, "Renderable.calendar");
+    DBGVAR(dbg_continuous_line, "Renderable.continuousline");
 
     void setStandardCoordinates(Vec windowSize) {
        int w = (int)windowSize.x;
Index: gzz/gfx/librenderables/Renderables.hxx
diff -u gzz/gfx/librenderables/Renderables.hxx:1.27 
gzz/gfx/librenderables/Renderables.hxx:1.28
--- gzz/gfx/librenderables/Renderables.hxx:1.27 Thu Dec 19 18:06:00 2002
+++ gzz/gfx/librenderables/Renderables.hxx      Mon Jan 20 03:30:55 2003
@@ -42,6 +42,7 @@
     PREDBGVAR(dbg_horiztext2);
     PREDBGVAR(dbg_irregularquad);
     PREDBGVAR(dbg_calendar);
+    PREDBGVAR(dbg_continuous_line);
 
     using namespace Vec23;
     using namespace VecGL;
Index: gzz/gfx/librenderables/renderables.py
diff -u gzz/gfx/librenderables/renderables.py:1.169 
gzz/gfx/librenderables/renderables.py:1.170
--- gzz/gfx/librenderables/renderables.py:1.169 Fri Jan 10 07:39:20 2003
+++ gzz/gfx/librenderables/renderables.py       Mon Jan 20 03:30:55 2003
@@ -1716,7 +1716,6 @@
 
        """,
     "ExtraClass" : """
-/*
        template<class Coords> struct Vertexer {
            const Coords &c;
             float scale;
@@ -1735,48 +1734,42 @@
                 c.vertex(tmp);
            }
        };
-*/
        """,
     "RenderCode" : """
-
-/*
-            // UNABLE TO IMPLEMENT AS LONG AS GL IS UNCOMPILABLE
-
             DBG(dbg_continuous_line)
               << "ContinuousLine - linewidth: " << width << "\\n"; 
     
-           glPushAttrib(GL_ENABLE_BIT);
-           glEnable(GL_BLEND);
-            glDisable(GL_TEXTURE_2D);
+           //glPushAttrib(GL_ENABLE_BIT);
+           //glEnable(GL_BLEND);
+            //glDisable(GL_TEXTURE_2D);
 
             if (color.size() >= 3) 
-              glColor3f(color[0], color[1], color[2];
+              glColor3f(color[0], color[1], color[2]);
 
 
             // Linewidth
             ZPt a = coords1.transform(ZPt(0,0,0));
-            ZPt b = coords1.transform(ZPt(0,linewidth,0));
+            ZPt b = coords1.transform(ZPt(0,width,0));
             float line_w = (b-a).length();
            
             Lines::ContinuousLine line(textId, "foo", line_w );
 
-
             for (unsigned int i=0; i+2<points.size(); i+=3) {
                  line.add(points[i], points[i+1], points[i+2]);
             }
 
 
-            
+            /*
             // left -vert
             line.draw(
               coords1.transform( ZPt(0.0, 0.0, 0.0) ),
-              coords1.transform( ZPt(0.0, weeks + weekday_h + month_name_h, 
0.0) )
-              );
-
+              coords1.transform(
+                 ZPt(0.0, weeks + weekday_h + month_name_h, 0.0))
+            );
+            */
             glColor3f(0.0, 0.0, 0.0);
 
-           glPopAttrib();
-*/
+           //glPopAttrib();
             if (dbg) cout << "ContinuousLine done\\n";
     """        
 },