Changeset 264 for trunk

Timestamp:

06/19/14 01:57:53 (11 years ago)

Author:

epyon

Message:

• decoupling - root doesn't have to be an object
• decoupling - gui::environment doesn't need a root object at all

Location:

trunk

Files:

• nv/gui/gui_environment.hh (modified) (2 diffs)
• nv/root.hh (modified) (3 diffs)
• src/gui/gui_environment.cc (modified) (3 diffs)
• src/root.cc (modified) (1 diff)

trunk/nv/gui/gui_environment.hh

@@ -33 +33 @@
                 };
 
-                class environment : public root
+                class environment
                 {
                 public:
@@ -44 +44 @@
                         void update();
                         void draw();
-                        virtual void add_child( object* child );
+                        void add_child( element* child );
+                        void destroy_element( element* e );
+                        void destroy_children( element* e );
                         virtual ~environment();
                 protected:
+
                         renderer*    m_renderer;
                         window*      m_window;

trunk/nv/root.hh

@@ -17 +17 @@
          * Implements the root of a object tree-like structure.
          */
-        class root : public object
+        class root 
         {
         public:
-                root() : object( "" ), m_lua_state( nullptr ), m_uid_store( nullptr ) {}
+                root() : m_lua_state( nullptr ), m_uid_store( nullptr ) {}
                 lua::state*    get_lua_state()     const { return m_lua_state; }
                 uid_store*     get_uid_store()     const { return m_uid_store; }
@@ -33 +33 @@
                 void destroy_children( object* o );
                 virtual void destroy_object( object* o );
-                virtual ~root() { destroy_object( this ); }
+                virtual ~root() {}
         protected:
                 virtual void object_created( object* o );
@@ -40 +40 @@
                 uid_store*     m_uid_store; 
         };
-
+        
 } // namespace nv
 

trunk/src/gui/gui_environment.cc

@@ -36 +36 @@
         m_screen = new screen( m_area );
         m_renderer = new renderer( w, shader_path );
-        root::add_child( m_screen );
 }
 
@@ -47 +46 @@
 {
         element* result = new element( r );
-        object_created( result );
         if ( parent == nullptr ) parent = m_screen;
         parent->add_child( result );
         return result;
+}
+
+void nv::gui::environment::destroy_element( element* e )
+{
+        destroy_children( e );
+        e->detach();
+        delete e;
 }
 
@@ -94 +99 @@
 }
 
-void environment::add_child( object* child )
+void environment::add_child( element* child )
 {
-        // TODO: check if element
         m_screen->add_child( child );
 }
 
+void environment::destroy_children( element* e )
+{
+        while ( !e->m_children.empty() )
+        {
+                destroy_element( (element*)e->m_children.front() );
+        }
+}
+
+
 environment::~environment()
 {
-        destroy_children( this );
+        destroy_element( m_screen );
         delete m_renderer;
 }

trunk/src/root.cc

@@ -30 +30 @@
                 m_uid_store->remove( o->m_uid );
         }
-        if ( o != this) delete o;
+        delete o;
 }