Changeset 187 for trunk/src/object.cc

Timestamp:

08/03/13 12:07:12 (12 years ago)

Author:

epyon

Message:

• object - lua registration will now be manual, with an option to be separate from the type system
• lua/state - explicit object registration

File:

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

trunk/src/object.cc

@@ -16 +16 @@
 
 object::object()
-        : m_root( nullptr ), 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(lua::ref_none), 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)
+        : m_root( aroot ), m_id(aid), m_name(), m_uid( 0 ), m_lua_index(lua::ref_none), m_parent( nullptr ), m_children(), m_child_count(0)
 {
         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 );
                 }
         }
@@ -195 +190 @@
         db->create_type<object>("object").fields(fields);
 }
+
+void nv::object::register_with_lua( const char* lua_name /*= nullptr*/ )
+{
+        lua::state* state = get_root()->get_lua_state();
+        if (state)
+        {
+                if ( lua_name != nullptr )
+                {
+                        m_lua_index = state->register_object( this, lua_name );
+                }
+                else
+                {
+                        m_lua_index = state->register_object( this );
+                }
+        }
+}