Changeset 257 for trunk/src/object.cc

Timestamp:

06/14/14 22:40:25 (11 years ago)

Author:

epyon

Message:

• object can now only created from root
• all registration is done root side
• gui::element draw and update logic fully in environment
• root removed from object - a lot less coupling

File:

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

trunk/src/object.cc

@@ -8 +8 @@
 
 #include <algorithm>
-#include "nv/root.hh"
 #include "nv/types.hh"
 #include "nv/lua/lua_state.hh"
@@ -15 +14 @@
 using namespace nv;
 
-object::object()
-        : m_root( nullptr )
-        , m_id()
+object::object( const string& aid )
+        : m_id( aid )
         , m_name()
         , m_uid(0)
@@ -26 +24 @@
         , 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_lua_proto_index(lua::ref_none)
-        , m_parent( nullptr )
-        , m_children()
-        , m_child_count(0)
-{
-        if ( m_root )
-        {
-                m_root->object_created( this );
-        }
 }
 
@@ -56 +37 @@
                 m_children.push_back( child );
                 m_child_count++;
-                m_root->child_added( child );
         }
 }
@@ -71 +51 @@
                 (*it)->m_parent = nullptr;
                 m_children.erase(it);
-                m_root->child_removed( child );
         }       
 }
@@ -89 +68 @@
 }
 
-void object::destroy_children()
-{
-        while ( !m_children.empty() )
-        {
-                delete m_children.front();
-        }
-}
-
 object::~object()
 {
-        if ( m_root )
-        {
-                m_root->object_destroyed( this );
-        }
-        detach();
-        destroy_children();
 }
 
@@ -195 +160 @@
 //      db->create_type<object>("object").fields(fields);
 // }
-
-void nv::object::register_with_lua( const char* lua_name, const char* storage )
-{
-        lua::state* state = get_root()->get_lua_state();
-        if (state)
-        {
-                if ( lua_name != nullptr )
-                {
-                        m_lua_index       = state->register_object( this, lua_name );
-                }
-                if ( storage != nullptr )
-                {
-                        m_lua_proto_index = state->register_proto( this, storage );
-                }
-        }
-}