Changeset 266 for trunk/src/root.cc

Timestamp:

06/19/14 03:49:49 (11 years ago)

Author:

epyon

Message:

• decoupling - uid_store independent of nv::object
• decoupling - nv::object no longer linked with lua in any way
• decoupling - gui::element related object methods moved to element
• uid_store can operate on void* or specialized base class
• root class no longer carries uid store nor lua state (will be removed later)

File:

• trunk/src/root.cc (modified) (2 diffs)

trunk/src/root.cc

@@ -10 +10 @@
 #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::destroy_object( object* o )
 {
         destroy_children( o );
         o->detach();
-        if ( m_lua_state && o->m_lua_index != lua::ref::none )
-        {
-                m_lua_state->unregister_object( lua::ref( o->m_lua_index ) );
-        }
-        if ( m_uid_store && o->m_uid != 0 )
-        {
-                m_uid_store->remove( o->m_uid );
-        }
         delete o;
 }
@@ -40 +24 @@
         }
 }
-
-void nv::root::register_with_lua( object* o, const char* lua_name, const char* storage )
-{
-        if ( m_lua_state )
-        {
-                if ( lua_name != nullptr )
-                {
-                        o->m_lua_index       = m_lua_state->register_object( o, lua_name ).get();
-                }
-                if ( storage != nullptr )
-                {
-                        o->m_lua_proto_index = m_lua_state->register_proto( o->get_id().c_str(), storage ).get();
-                }
-        }
-
-}
-