Changeset 257 for trunk/src/root.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/root.cc (modified) (2 diffs)

trunk/src/root.cc

@@ -18 +18 @@
 }
 
-void nv::root::object_destroyed( object* o )
+void nv::root::destroy_object( object* o )
 {
+        destroy_children( o );
+        o->detach();
         if ( m_lua_state && o->m_lua_index != lua::ref_none )
         {
@@ -28 +30 @@
                 m_uid_store->remove( o->m_uid );
         }
+        if ( o != this) delete o;
 }
+
+void nv::root::destroy_children( object* o )
+{
+        while ( !o->m_children.empty() )
+        {
+                destroy_object( o->m_children.front() );
+        }
+}
+
+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 );
+                }
+                if ( storage != nullptr )
+                {
+                        o->m_lua_proto_index = m_lua_state->register_proto( o, storage );
+                }
+        }
+
+}
+