Changeset 64

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

Files:

• nv/common.hh (modified) (4 diffs)
• nv/interface/program.hh (modified) (2 diffs)
• nv/logging.hh (modified) (1 diff)
• nv/object.hh (modified) (3 diffs)
• nv/root.hh (added)
• nv/string.hh (modified) (3 diffs)
• src/gl/gl_context.cc (modified) (3 diffs)
• src/gl/texture_font.cc (modified) (3 diffs)
• src/library.cc (modified) (2 diffs)
• src/logger.cc (modified) (2 diffs)
• src/object.cc (modified) (3 diffs)
• src/root.cc (added)

trunk/nv/common.hh

@@ -10 +10 @@
 #include <typeinfo>
 #include <cstddef>
+#include <cassert>
+#include <nv/logging.hh>
 
 // NV Library version
@@ -112 +114 @@
 #endif
 
-#include <cassert>
+#define NV_STRINGIZE_DETAIL(x) #x
+#define NV_STRINGIZE(x) NV_STRINGIZE_DETAIL(x)
+
 #define NV_ASSERT(cond, msg) assert( (cond) && msg )
+#define NV_THROW(eobj, ...) { \
+        NV_LOG( LOG_ERROR, __FILE__ " line " NV_STRINGIZE(__LINE__) " - exception thrown - " #eobj ); \
+  throw eobj( __VA_ARGS__ ); \
+} 
 
 #if NV_COMPILER == NV_MSVC 
@@ -122 +130 @@
 {
         class object;
+        class root;
+        class type_database;
+        class uid_store;
+
+        namespace lua
+        {
+                class state;
+        }
 
         // Typedefs for fixed size types.
@@ -164 +180 @@
 #if NV_DEBUG
         T* p = dynamic_cast<T*>(x);
-        if (p == 0) throw std::bad_cast();
+        if (p == 0) THROW( std::bad_cast, () );
         return p;
 #else

trunk/nv/interface/program.hh

@@ -127 +127 @@
                         }
                         NV_LOG( LOG_ERROR, "Attribute '" << name << "' not found in program!" );
-                        throw runtime_error( "Attribute '"+name+"' not found!" );
+                        NV_THROW( runtime_error, ( "Attribute '"+name+"' not found!" ) );
                 }
 
@@ -148 +148 @@
                         }
                         NV_LOG( LOG_ERROR, "Uniform '" << name << "' not found in program!" );
-                        throw runtime_error( "Uniform '"+name+"' not found!" );
+                        NV_THROW( runtime_error, ( "Uniform '"+name+"' not found!" ) );
                 }
 

trunk/nv/logging.hh

@@ -14 +14 @@
 #define NV_LOGGING_HH
 
-#include <nv/common.hh>
 #include <nv/singleton.hh>
 #include <sstream>

trunk/nv/object.hh

@@ -12 +12 @@
 namespace nv
 {
-        class type_database;
-
         /**
          * Implements a object tree-like structure.
@@ -36 +34 @@
                  * Object constructor
                  */
-                object( string aid, uid auid );
+                object( root* aroot, const string& aid, uid auid );
 
                 /**
@@ -154 +152 @@
 
         protected:
+                root*   m_root;        ///< pointer to root
                 string  m_id;          ///< id type of the object
                 string  m_name;        ///< name of the object

trunk/nv/string.hh

@@ -16 +16 @@
         using std::string;
 
-    /**
-     * Utility function for converting any value to string.
-     *
-     * @param value value to be converted, needs to have << operator
-     *        to stream
-     * @throw ore::runtime_error Throws ore::runtime_error on conversion fail
-     * @return value converted to string
-     */
-    template < class T >
-    string to_string( const T& value )
-    {
-      std::stringstream stream;
-      stream << value;
+        /**
+        * Utility function for converting any value to string.
+        *
+        * @param value value to be converted, needs to have << operator
+        *        to stream
+        * @throw runtime_error Throws runtime_error on conversion fail
+        * @return value converted to string
+        */
+        template < class T >
+        string to_string( const T& value )
+        {
+                std::stringstream stream;
+                stream << value;
 
-      if ( stream.fail() )
-      {
-        throw runtime_error( "bad cast" );
-      }
+                if ( stream.fail() )
+                {
+                        NV_THROW( runtime_error, "bad cast" );
+                }
 
-      return stream.str();
-    }
+                return stream.str();
+        }
 
-    /**
-     * Override function for special treatment of strings. Returns the
-     * value passed.
-     */
-    inline string to_string( const string& value)
-    {
-        return value;
-    }
+        /**
+        * Override function for special treatment of strings. Returns the
+        * value passed.
+        */
+        inline string to_string( const string& value)
+        {
+                return value;
+        }
 
-    /**
-     * Utility function for converting a string to the given type
-     *
-     * @param vin the string representing the value
-     * @param vout the value to be read. Must be streamable with >>
-     * @throw ore::runtime_error Throws ore::runtime_error on conversion fail
-     */
-    template < class T >
-    void from_string( const string& vin, T& vout )
-    {
-      std::istringstream value( vin );
-      value >> vout;
+        /**
+        * Utility function for converting a string to the given type
+        *
+        * @param vin the string representing the value
+        * @param vout the value to be read. Must be streamable with >>
+        * @throw runtime_error Throws runtime_error on conversion fail
+        */
+        template < class T >
+        void from_string( const string& vin, T& vout )
+        {
+                std::istringstream value( vin );
+                value >> vout;
 
-      if ( value.fail() )
-      {
-        throw runtime_error( "bad cast" );
-      }
-    }
+                if ( value.fail() )
+                {
+                        NV_THROW( runtime_error, "bad cast" );
+                }
+        }
 
-    /**
-     * Utility function for converting a string to the given type
-     *
-     * @param vin the string representing the value
-     * @throw ore::runtime_error Throws ore::runtime_error on conversion fail
-     */
+        /**
+        * Utility function for converting a string to the given type
+        *
+        * @param vin the string representing the value
+        * @throw runtime_error Throws runtime_error on conversion fail
+        */
         template < class T >
         T string_cast( const string& vin )
@@ -81 +81 @@
                 if ( value.fail() )
                 {
-                        throw runtime_error( "bad cast" );
+                        NV_THROW( runtime_error, "bad cast" );
                 }
                 return vout;
@@ -87 +87 @@
 
 
-    /**
-     * Override function for special treatment of strings. Returns the
-     * value passed.
-     */
-    inline void from_string( const string& vin, string& vout )
+        /**
+        * Override function for special treatment of strings. Returns the
+        * value passed.
+        */
+        inline void from_string( const string& vin, string& vout )
         {
-      vout = vin;
-    }
+                vout = vin;
+        }
 
         /**
-     * Override function for special treatment of strings. Returns the
-     * value passed.
-     */
+        * Override function for special treatment of strings. Returns the
+        * value passed.
+        */
         template <>
-    inline std::string string_cast( const string& vin )
+        inline std::string string_cast( const string& vin )
         {
                 return vin;
-    }
+        }
 
 
         /**
-         * Simple function for slurping a file into a string.
-         */
+        * Simple function for slurping a file into a string.
+        */
         inline std::string slurp( const std::string& filename )
         {
                 std::ifstream input(filename);
-                if ( !input.is_open() ) throw std::runtime_error("File "+filename+" not found!");
+                if ( !input.is_open() ) NV_THROW( std::runtime_error, "File "+filename+" not found!");
                 std::stringstream sstr;
                 while(input >> sstr.rdbuf());

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;

trunk/src/library.cc

@@ -75 +75 @@
     if ( m_handle == NULL )
     {
-        throw library_error( "Can't load library!", name );
+        NV_THROW( library_error, "Can't load library!", name );
     }
     NV_LOG( LOG_NOTICE, "library : '" + name + "' loaded." );
@@ -85 +85 @@
     if ( !result )
     {
-        throw library_error( "Can't find symbol " + symbol + "!", m_name );
+        NV_THROW( library_error, "Can't find symbol " + symbol + "!", m_name );
     }
         return result;

trunk/src/logger.cc

@@ -5 +5 @@
 #include "nv/logger.hh"
 
+#include "nv/common.hh"
 #include <iostream>
 #include <utility>
@@ -208 +209 @@
         {
                 // throw if not open
-                throw runtime_error( "Could not open file \""+file_name+"\" for logging!" );
+                NV_THROW( runtime_error, "Could not open file \""+file_name+"\" for logging!" );
         }
 

trunk/src/object.cc

@@ -7 +7 @@
 #include "nv/object.hh"
 
+#include "nv/root.hh"
 #include "nv/types.hh"
 
@@ -12 +13 @@
 
 object::object()
-        : m_id(), m_name(), m_uid(0), m_lua_index(-2), m_parent( nullptr ), m_children(), m_child_count(0)
+        : m_root( nullptr ), m_id(), m_name(), m_uid(0), m_lua_index(-2), m_parent( nullptr ), m_children(), m_child_count(0)
 {
 //      m_uid = uid_store::get_free_uid();
@@ -18 +19 @@
 }
 
-object::object( string aid, uid auid )
-        : m_id(aid), m_name(), m_uid( auid ), m_lua_index(-2), m_parent( nullptr ), m_children(), m_child_count(0)
+object::object( root* aroot, const string& aid, uid auid )
+        : m_root( aroot ), m_id(aid), m_name(), m_uid( auid ), m_lua_index(-2), m_parent( nullptr ), m_children(), m_child_count(0)
 {
         //      uid_store::register_object( this, auid );