Changeset 256

Timestamp:

06/14/14 21:06:00 (11 years ago)

Author:

epyon

Message:

• various minor fixes

Location:

trunk

Files:

• nv/exception.hh (modified) (3 diffs)
• nv/gfx/texture_font.hh (modified) (3 diffs)
• nv/interface/vertex_buffer.hh (modified) (1 diff)
• nv/library.hh (modified) (10 diffs)
• nv/logger.hh (modified) (1 diff)
• nv/logging.hh (modified) (1 diff)
• nv/lua/lua_state.hh (modified) (2 diffs)
• nv/object.hh (modified) (2 diffs)
• nv/root.hh (modified) (1 diff)
• src/gfx/texture_font.cc (modified) (1 diff)
• src/library.cc (modified) (9 diffs)
• src/lua/lua_state.cc (modified) (1 diff)
• src/object.cc (modified) (3 diffs)
• src/root.cc (modified) (1 diff)

trunk/nv/exception.hh

@@ -14 +14 @@
 #define NV_EXCEPTION_HH
 
+#include <nv/common.hh>
+#include <string>
 #include <exception>
 #include <stdexcept>
-#include <string>
 
 namespace nv
@@ -28 +29 @@
         {
         public:
-                explicit logic_error(const std::string&  __arg) : std::logic_error( __arg ) {}
+                explicit logic_error( const std::string& msg ) : std::logic_error( msg ) {}
         };
 
@@ -39 +40 @@
         {
         public:
-                explicit runtime_error(const std::string&  __arg) : std::runtime_error( __arg ) {}
+                explicit runtime_error( const std::string& msg ) : std::runtime_error( msg ) {}
         };
 }

trunk/nv/gfx/texture_font.hh

@@ -9 +9 @@
 
 #include <nv/common.hh>
-#include <string>
+#include <nv/string.hh>
 #include <unordered_map>
 #include <nv/math.hh>
@@ -45 +45 @@
                         texture_font( texture_atlas* atlas, const char * filename, float size );
                         const texture_glyph* get_glyph( uint16 charcode ) const;
-                        bool load_glyphs( const std::string& codes );
+                        bool load_glyphs( const string& codes );
                         float get_size() const { return m_size; }
                         ~texture_font();
@@ -54 +54 @@
 
                         texture_atlas* m_atlas; //!< Atlas Image object for this font.
-                        std::string m_filename; //!< Name of the file.
+                        string m_filename; //!< Name of the file.
                         float m_size;           //!< Font size.
                         float m_height;         //!< Height of the font. (x-height?)

trunk/nv/interface/vertex_buffer.hh

@@ -18 +18 @@
 #include <nv/interface/mesh_data.hh>
 #include <unordered_map>
-#include <string>
 
 namespace nv

trunk/nv/library.hh

@@ -15 +15 @@
 
 #include <nv/exception.hh>
-#include <string>
+#include <nv/string.hh>
 
 namespace nv
@@ -37 +37 @@
                  * Throws library_error on failure
                  */
-                void open( const std::string& name );
+                void open( const string& name );
 
                 /**
@@ -44 +44 @@
                  * returns true if succeeded, false otherwise
                  */
-                bool try_open( const std::string& name );
+                bool try_open( const string& name );
 
                 /**
@@ -54 +54 @@
                  * Returns library name
                  */
-                const std::string& get_name() const;
+                const string& get_name() const;
 
                 /**
@@ -61 +61 @@
                  * Throws on symbol not found
                  */
-                void* get( const std::string& symbol );
+                void* get( const string& symbol );
 
                 /**
@@ -68 +68 @@
                  * Returns null if symbol not found
                  */
-                void* try_get( const std::string& symbol );
+                void* try_get( const string& symbol );
 
                 /**
@@ -82 +82 @@
                  * Exact implementation depends on platform/compiler.
                  */
-                static std::string get_error();
+                static string get_error();
 
         protected:
@@ -107 +107 @@
 
                 /// Library name
-                std::string m_name;
+                string m_name;
 
         };  // class Library
@@ -114 +114 @@
         {
                 /// Library name
-                std::string m_name;
+                string m_name;
         public:
                 /**
                  * Constructor
                  */
-                library_error( const std::string& message, const std::string& name )
+                library_error( const string& message, const string& name )
                         : runtime_error( "Library (" + name + ") : " + message + " [ " + library::get_error() + " ]"), m_name( name )
                 {
@@ -134 +134 @@
                  * Returns library name
                  */
-                const std::string& get_name()
+                const string& get_name()
                 {
                         return m_name;

trunk/nv/logger.hh

@@ -14 +14 @@
 #define NV_LOGGER_HH
 
-#include <string>
+#include <nv/string.hh>
+#include <nv/logging.hh>
 #include <iosfwd>
 #include <list>
-#include <nv/logging.hh>
 
 namespace nv

trunk/nv/logging.hh

@@ -16 +16 @@
 #include <nv/common.hh>
 #include <nv/singleton.hh>
+#include <string>
 #include <sstream>
-#include <string>
 
 namespace nv

trunk/nv/lua/lua_state.hh

@@ -142 +142 @@
                                 register_native_function( detail::function_wrapper< F, f >, name );
                         }
+
+                        template < typename C, typename F, F f >
+                        struct register_member
+                        {
+                                register_member( const char* ) { }
+                        };
 
                         template < typename C, typename F, F f >
@@ -211 +217 @@
 
                         void store_metadata( object* o, const std::string& metaname, void* pointer );
-                        void unregister_object( object * o );
+                        void unregister_object( object * o ); // DELETE ME
+                        void unregister_object( int index );
                         void register_native_object_method( const char* lua_name, const char* name, lfunction f );
                         template < typename F, F f >

trunk/nv/object.hh

@@ -12 +12 @@
 namespace nv
 {
+
         /**
          * Implements a object tree-like structure.
@@ -18 +19 @@
         {
         public:
+                friend class root;
+
                 /**
                  * Register the object type in the type database.
                  */
-                static void register_type( type_database* db );
+                //static void register_type( type_database* db );
 
                 /// List type

trunk/nv/root.hh

@@ -22 +22 @@
                 virtual void child_added( object* ) {}
                 virtual void child_removed( object* ) {}
+                virtual void object_created( object* o );
+                virtual void object_destroyed( object* o );
                 lua::state*    get_lua_state()     const { return m_lua_state; }
                 uid_store*     get_uid_store()     const { return m_uid_store; }
-                virtual ~root() { destroy_children(); }
+                virtual ~root() 
+                { 
+                        object_destroyed( this );
+                        destroy_children(); 
+                        m_root = nullptr; 
+                }
         protected:
                 lua::state*    m_lua_state;

trunk/src/gfx/texture_font.cc

@@ -92 +92 @@
 }
 
-bool texture_font::load_glyphs( const std::string& codes )
+bool texture_font::load_glyphs( const string& codes )
 {
         FT_Face face     = (FT_Face)(m_rface);

trunk/src/library.cc

@@ -4 +4 @@
 #include "nv/common.hh"
 #include "nv/library.hh"
-
-#include <string.h>
 
 #if NV_PLATFORM == NV_WINDOWS
@@ -41 +39 @@
 }
 
-void library::open( const std::string& name )
+void library::open( const string& name )
 {
         m_name = name;
@@ -51 +49 @@
 }
 
-bool nv::library::try_open( const std::string& name )
+bool nv::library::try_open( const string& name )
 {
         m_name = name;
@@ -62 +60 @@
 }
 
-const std::string& library::get_name() const
+const string& library::get_name() const
 {
     return m_name;
@@ -75 +73 @@
     NV_LOG( LOG_NOTICE, "library : loading '" + m_name + "'..." );
 
-    std::string name = m_name;
-    std::string ext  = NV_LIB_EXT;
+    string name = m_name;
+    string ext  = NV_LIB_EXT;
     size_t ext_len   = ext.length();
 
@@ -95 +93 @@
 }
 
-void* library::get( const std::string& symbol )
+void* library::get( const string& symbol )
 {
         void* result = (void*) NV_LIB_GET( (NV_LIB_HANDLE) m_handle, symbol.c_str() );
@@ -105 +103 @@
 }
 
-void* nv::library::try_get( const std::string& symbol )
+void* nv::library::try_get( const string& symbol )
 {
         return (void*) NV_LIB_GET( (NV_LIB_HANDLE) m_handle, symbol.c_str() );
@@ -133 +131 @@
 }
 
-std::string library::get_error()
+string library::get_error()
 {
 #if NV_PLATFORM == NV_WINDOWS
@@ -140 +138 @@
     FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
         NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &buffer, 0, NULL );
-    std::string msg( (char*)buffer );
+    string msg( (char*)buffer );
     LocalFree( buffer );
     return msg;
 #elif NV_PLATFORM == NV_LINUX || NV_PLATFORM == NV_APPLE
-    return std::string(dlerror());
+    return string(dlerror());
 #else
-    return std::string("");
+    return string("");
 #endif
 }

trunk/src/lua/lua_state.cc

@@ -383 +383 @@
 {
         if (!o) return;
+        unregister_object( o->get_lua_index() );
+}
+
+void lua::state::unregister_object( int index )
+{
         stack_guard guard( this );
-        lua_rawgeti( m_state, LUA_REGISTRYINDEX, o->get_lua_index() );
+        lua_rawgeti( m_state, LUA_REGISTRYINDEX, index );
         lua_pushstring( m_state, "__ptr" );
         lua_pushboolean( m_state, false );
         lua_rawset( m_state, -3 );
         lua_pop( m_state, 1 );
-        luaL_unref( m_state, LUA_REGISTRYINDEX, o->get_lua_index() );
-}
+        luaL_unref( m_state, LUA_REGISTRYINDEX, index );
+}
+
 
 void lua::state::deep_pointer_copy( int index, void* obj )

trunk/src/object.cc

@@ -41 +41 @@
         if ( m_root )
         {
-                uid_store*  store = get_root()->get_uid_store();
-                if (store)
-                {
-                        m_uid = store->insert( this );
-                }
-        }
-
+                m_root->object_created( this );
+        }
 }
 
@@ -104 +99 @@
 object::~object()
 {
-        if ( m_lua_index != lua::ref_none )
-        {
-                lua::state* state = get_root()->get_lua_state();
-                state->unregister_object( this );
-        }
-        if ( m_uid != 0 && m_root )
-        {
-                uid_store* store = get_root()->get_uid_store();
-                if (store) store->remove( m_uid );
+        if ( m_root )
+        {
+                m_root->object_destroyed( this );
         }
         detach();
@@ -194 +183 @@
 }
 
-void object::register_type( type_database* db )
-{
-        type_field fields[] = {
-                type_field("id",          &object::m_id),
-                type_field("uid",         &object::m_uid).flag( TF_READONLY ), 
-                type_field("lua_index",   &object::m_lua_index).flag( TF_READONLY | TF_NOSERIALIZE ),
-                type_field("parent",      &object::m_parent).flag( TF_READONLY | TF_NOSERIALIZE ),
-                type_field("child_count", &object::m_child_count).flag( TF_READONLY ),
-                type_field("children"   , &object::m_children).flag( TF_READONLY ),
-        };
-        db->create_type<object>("object").fields(fields);
-}
+// void object::register_type( type_database* db )
+// {
+//      type_field fields[] = {
+//              type_field("id",          &object::m_id),
+//              type_field("uid",         &object::m_uid).flag( TF_READONLY ), 
+//              type_field("lua_index",   &object::m_lua_index).flag( TF_READONLY | TF_NOSERIALIZE ),
+//              type_field("parent",      &object::m_parent).flag( TF_READONLY | TF_NOSERIALIZE ),
+//              type_field("child_count", &object::m_child_count).flag( TF_READONLY ),
+//              type_field("children"   , &object::m_children).flag( TF_READONLY ),
+//      };
+//      db->create_type<object>("object").fields(fields);
+// }
 
 void nv::object::register_with_lua( const char* lua_name, const char* storage )

trunk/src/root.cc

@@ +1 @@
+// Copyright (C) 2012-2014 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of NV Libraries.
+// For conditions of distribution and use, see copyright notice in nv.hh
+
+#include "nv/root.hh"
+
+#include "nv/uid.hh"
+#include "nv/lua/lua_state.hh"
+
+void nv::root::object_created( object* o )
+{
+        if ( m_uid_store )
+        {
+                o->m_uid = m_uid_store->insert( o );
+        }
+}
+
+void nv::root::object_destroyed( object* o )
+{
+        if ( m_lua_state && o->m_lua_index != lua::ref_none )
+        {
+                m_lua_state->unregister_object( o );
+        }
+        if ( m_uid_store && o->m_uid != 0 )
+        {
+                m_uid_store->remove( o->m_uid );
+        }
+}