Changeset 108 for trunk

Timestamp:

06/05/13 17:19:34 (12 years ago)

Author:

epyon

Message:

• gui_common.hh - render_data did not have virtual destructor - fixed
• position.hh - fixed comparison operators (were not const)
• gl_context - draw will not be done if count = 0 (state will be applied though?)
• gl_context - unpack alignment set to 1 (possibly not needed if careful)

Location:

trunk

Files:

• nv/gui/gui_common.hh (modified) (1 diff)
• nv/position.hh (modified) (1 diff)
• src/gl/gl_context.cc (modified) (2 diffs)

trunk/nv/gui/gui_common.hh

@@ -33 +33 @@
                 {
                 public:
-                        ~render_data(){}
+                        virtual ~render_data(){}
                 };
 
                 class element;
                 class environment;
+                class renderer;
 
         } // namespace gui

trunk/nv/position.hh

@@ -59 +59 @@
                 rectangle& operator-=( const position& pos ) { ul -= pos; lr -= pos; return (*this); }
                 rectangle operator-( const position& pos ) const {      rectangle r(*this); return r -= pos; }
-                bool operator==( const rectangle& r ) { return r.ul == ul && r.lr == lr; }
-                bool operator!=( const rectangle& r ) { return r.ul != ul || r.lr != lr; }
+                bool operator==( const rectangle& r ) const { return r.ul == ul && r.lr == lr; }
+                bool operator!=( const rectangle& r ) const { return r.ul != ul || r.lr != lr; }
 
                 bool contains( const position& r ) const{ return y2 >= r.y && y1 <= r.y && x2 >= r.x && x1 <= r.x; }

trunk/src/gl/gl_context.cc

@@ -351 +351 @@
 gl_context::gl_context()
 {
+        // TODO: do we really need this?
+        glPixelStorei( GL_UNPACK_ALIGNMENT, 1 );
         force_apply_render_state( m_render_state );
 }
@@ -357 +359 @@
 {
         apply_render_state( rs );
-        p->bind();
-        va->bind();
-        glDrawArrays( primitive_to_enum(prim), 0, count);
-        va->unbind();
-        p->unbind();
-}
+        if ( count > 0 )
+        {
+                p->bind();
+                va->bind();
+                glDrawArrays( primitive_to_enum(prim), 0, count);
+                va->unbind();
+                p->unbind();
+        }
+}