Changeset 77 for trunk/src/object.cc

Timestamp:

06/01/13 22:47:44 (12 years ago)

Author:

epyon

Message:

• types - typemap based on type_index, allowing type retrival by typeid
• object - autoinitialization of uid and lua_index, based on root's capabilities
• object - proper cleanup of uid and lua_index
• object - root accessor
• lua_state - implementation of register_object and unregister_object

File:

• trunk/src/object.cc (modified) (3 diffs)

trunk/src/object.cc

@@ -9 +9 @@
 #include "nv/root.hh"
 #include "nv/types.hh"
+#include "nv/lua/lua_state.hh"
+#include "nv/uid.hh"
 
 using namespace nv;
@@ -19 +21 @@
 }
 
-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)
+object::object( root* aroot, const string& aid )
+        : m_root( aroot ), m_id(aid), m_name(), m_uid( 0 ), m_lua_index(-2), m_parent( nullptr ), m_children(), m_child_count(0)
 {
-        //      uid_store::register_object( this, auid );
+        if ( m_root )
+        {
+                uid_store*  store = get_root()->get_uid_store();
+                lua::state* state = get_root()->get_lua_state();
+                if (store)
+                {
+                        m_uid = store->insert( this );
+                }
+                if (state)
+                {
+                        m_lua_index = state->register_object( this );
+                }
+        }
+
 }
 
@@ -77 +92 @@
 object::~object()
 {
-//      if ( m_lua_index != lua::ref_none )
-//      {
-//              lua::state::get()->unregister_object( this );
-//      }
-//      uid_store::unregister_object( m_uid );
+        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 );
+        }
         detach();
         destroy_children();