Changeset 257 for trunk/src

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

Location:

trunk/src

Files:

• gui/gui_element.cc (modified) (1 diff)
• gui/gui_environment.cc (modified) (4 diffs)
• object.cc (modified) (7 diffs)
• root.cc (modified) (2 diffs)

trunk/src/gui/gui_element.cc

@@ -7 +7 @@
 #include "nv/gui/gui_element.hh"
 
-#include "nv/gui/gui_environment.hh"
-
 using namespace nv;
 using namespace nv::gui;
 
-element::element( root* aroot, const rectangle& r ) 
-        : object( aroot, "" ), m_class(""), m_relative( r ), m_absolute( r ), m_enabled( true ), m_visible( true ), m_dirty( true ), m_render_data( nullptr )
+element::element( const rectangle& r ) 
+        : object( "" ), m_class(""), m_relative( r ), m_absolute( r ), m_enabled( true ), m_visible( true ), m_dirty( true ), m_render_data( nullptr )
 {
 
-}
-
-void element::on_update( uint32 elapsed )
-{
-        if ( is_visible() )
-        {
-                for ( object* i : *this )
-                {
-                        ((element*)i)->on_update( elapsed );
-                }
-        }
-        ((environment*)m_root)->update( this, elapsed );
-}
-
-void element::on_draw()
-{
-        if ( is_visible() )
-        {
-                ((environment*)m_root)->draw( this );
-                for ( object* i : *this )
-                {
-                        ((element*)i)->on_draw();
-                }
-        }
 }
 

trunk/src/gui/gui_environment.cc

@@ -34 +34 @@
 {
         m_area.dim( dimension( w->get_width(), w->get_height() ) );
-        m_screen = new screen( this, m_area );
+        m_screen = new screen( m_area );
         m_renderer = new renderer( w, shader_path );
         root::add_child( m_screen );
@@ -44 +44 @@
 }
 
+element* nv::gui::environment::create_element( element* parent, const rectangle& r )
+{
+        element* result = new element( r );
+        object_created( result );
+        if ( parent == nullptr ) parent = m_screen;
+        parent->add_child( result );
+        return result;
+}
+
 void environment::update( element* e, uint32 elapsed )
 {
+        e->on_update( elapsed );
+        if ( e->is_visible() )
+        {
+                for ( object* i : *e )
+                {
+                        update( ((element*)i), elapsed );
+                }
+        }
         if ( e->is_dirty() || e->m_render_data == nullptr )
         {
@@ -55 +72 @@
 void environment::draw( element* e )
 {
-        m_renderer->draw( e );
+        if ( e->is_visible() )
+        {
+                e->on_draw();
+                m_renderer->draw( e );
+                for ( object* i : *e )
+                {
+                        draw((element*)i);
+                }
+        }
 }
 
 void environment::update()
 {
-        m_screen->on_update( 0 );
+        update( m_screen, 0 );
 }
 
 void environment::draw()
 {
-        m_screen->on_draw();
+        draw( m_screen );
         m_renderer->draw();
 }
@@ -77 +102 @@
 environment::~environment()
 {
-        destroy_children();
+        destroy_children( this );
         delete m_renderer;
 }

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 );
-                }
-        }
-}

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 );
+                }
+        }
+
+}
+