Changeset 217 for trunk/src/object.cc

Timestamp:

09/10/13 18:11:39 (12 years ago)

Author:

epyon

Message:

• lua/nova - almost complete reimplementation of "core" from FPC Valkyrie
• lua/state - nova loaded by default
• object - prototype reference caching

File:

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

trunk/src/object.cc

@@ -16 +16 @@
 
 object::object()
-        : 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)
+        : m_root( nullptr )
+        , m_id()
+        , m_name()
+        , m_uid(0)
+        , m_lua_index(lua::ref_none)
+        , m_lua_proto_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(lua::ref_none), 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_lua_proto_index(lua::ref_none)
+        , m_parent( nullptr )
+        , m_children()
+        , m_child_count(0)
 {
         if ( m_root )
@@ -191 +207 @@
 }
 
-void nv::object::register_with_lua( const char* lua_name /*= nullptr*/ )
+void nv::object::register_with_lua( const char* lua_name, const char* storage )
 {
         lua::state* state = get_root()->get_lua_state();
@@ -198 +214 @@
                 if ( lua_name != nullptr )
                 {
-                        m_lua_index = state->register_object( this, lua_name );
-                }
-                else
-                {
-                        m_lua_index = state->register_object( this );
-                }
-        }
-}
+                        m_lua_index       = state->register_object( this, lua_name );
+                }
+                if ( storage != nullptr )
+                {
+                        m_lua_proto_index = state->register_proto( this, storage );
+                }
+        }
+}