Changeset 64 for trunk/src/gl

Timestamp:

05/30/13 20:13:08 (12 years ago)

Author:

epyon

Message:

• root class for object trees
• revised exception throwing - now using NV_THROW macro
• exceptions thrown are logged
• formatting fixes

Location:

trunk/src/gl

Files:

• gl_context.cc (modified) (3 diffs)
• texture_font.cc (modified) (3 diffs)

trunk/src/gl/gl_context.cc

@@ -49 +49 @@
         if ( viewport.z < 0 || viewport.w < 0 )
         {
-                throw new logic_error("viewport width and height must be greater than zero!");
+                NV_THROW( logic_error, "viewport width and height must be greater than zero!");
         }
 
@@ -126 +126 @@
         if ( scissor.dim.x < 0 || scissor.dim.y < 0 )
         {
-                throw new logic_error("scissor_test.rect width and height must be greater than zero!");
+                NV_THROW( logic_error, "scissor_test.rect width and height must be greater than zero!" );
         }
 
@@ -174 +174 @@
         if ( range.near < 0.0 || range.near > 1.0 )
         {
-                throw new logic_error("render_state.depth_range.near must be between zero and one!");
+                NV_THROW( logic_error, "render_state.depth_range.near must be between zero and one!");
         }
         if ( range.far < 0.0 || range.far > 1.0 )
         {
-                throw new logic_error("render_state.depth_range.far must be between zero and one!");
+                NV_THROW( logic_error, "render_state.depth_range.far must be between zero and one!");
         }
 

trunk/src/gl/texture_font.cc

@@ -44 +44 @@
          
         error = FT_Init_FreeType( (FT_Library*)(&m_rlibrary) );
-        if ( error ) throw std::runtime_error( "FT_Error" );
+        if ( error ) NV_THROW( std::runtime_error, "FT_Error" );
 
         error = FT_New_Face( (FT_Library)(m_rlibrary), filename, 0, (FT_Face*)(&m_rface) );
-        if ( error ) throw std::runtime_error( "FT_Error" );
+        if ( error ) NV_THROW( std::runtime_error, "FT_Error" );
 
         error = FT_Set_Char_Size( (FT_Face)(m_rface), (int)(size*64), 0, 72*64, 72 ); 
-        if ( error ) throw std::runtime_error( "FT_Error" );
+        if ( error ) NV_THROW( std::runtime_error, "FT_Error" );
 
     FT_Set_Transform( (FT_Face)(m_rface), &matrix, NULL );
@@ -106 +106 @@
                         error_msg << "FT_Error while loading glyphs, error: "
                                 << error << " code: " << c; 
-                        throw std::runtime_error( error_msg.str().c_str() );
+                        NV_THROW( std::runtime_error, error_msg.str().c_str() );
                 }
 
@@ -124 +124 @@
                                 << "r.pos.x: " << r.pos.x << " code: "
                                 << c; 
-                        throw std::runtime_error( error_msg.str().c_str() );
+                        NV_THROW( std::runtime_error, error_msg.str().c_str() );
                 }
                 r.size.x -= 1;