Changeset 270

Timestamp:

07/04/14 13:57:51 (11 years ago)

Author:

epyon

Message:

• nv::handle - generic handle implementation
• nv::index_store - index store based on handles
• gui elements fully based on handles instead of pointers

Location:

trunk

Files:

• nv/common.hh (modified) (1 diff)
• nv/gui/gui_common.hh (modified) (2 diffs)
• nv/gui/gui_element.hh (modified) (2 diffs)
• nv/gui/gui_environment.hh (modified) (3 diffs)
• nv/handle.hh (added)
• src/gui/gui_environment.cc (modified) (6 diffs)

trunk/nv/common.hh

@@ -191 +191 @@
         };
 
+
 } // namespace nv
 

trunk/nv/gui/gui_common.hh

@@ -15 +15 @@
 
 #include <nv/common.hh>
+#include <nv/handle.hh>
 
 namespace nv
@@ -40 +41 @@
                 class renderer;
 
+                typedef nv::handle<> handle;
+                typedef nv::index_store<handle> index_store;
+
         } // namespace gui
 

trunk/nv/gui/gui_element.hh

@@ -24 +24 @@
         {
 
-                class handle
-                {
-                public:
-                        handle() : m_index(0), m_counter(0) {}
-
-                        inline bool operator==(const handle& rhs){return m_index == rhs.m_index && m_counter == rhs.m_counter; }
-                        inline bool operator!=(const handle& rhs){return !(*this == rhs);}
-
-                        bool is_nil() { return m_index == 0 && m_counter == 0; }
-                        bool is_valid() { return !is_nil(); }
-                private:
-                        friend class environment;
-
-                        explicit handle( uint16 a_index, uint16 a_counter ) : m_index( a_index ), m_counter(a_counter) {}
-
-                        uint16 m_index;
-                        uint16 m_counter;
-                };
-
-
                 class element
                 {
@@ -53 +33 @@
                         element()
                                 : m_id( "" )
-                                , m_this()
-                                , m_parent()
-                                , m_children()
                                 , m_child_count(0)
                                 , m_class("")
-                                , m_relative()
-                                , m_absolute()
                                 , m_enabled( true )
                                 , m_visible( true )
                                 , m_dirty( true )
                                 , m_render_data( nullptr ) {}
-
-                        friend class environment;
-                        friend class renderer;
-                        friend class style;
 
                         string    m_id;              ///< id type of the object

trunk/nv/gui/gui_environment.hh

@@ -26 +26 @@
         namespace gui
         {
+
                 class environment
                 {
@@ -43 +44 @@
                 protected:
                         handle create_handle();
-                        handle create_index( sint16 element_id );
                         element* get_element( handle h );
                         handle get_element( const position& p );
@@ -60 +60 @@
                         void recalculate_absolute( handle e );
                         
-                        struct index
-                        {
-                                sint16 element_id;
-                                uint16 counter;
-                                sint32 next_free;
+                        std::vector< element > m_elements;
 
-                                index() : element_id(0), counter(0), next_free(-1) {}
-                        };
-                        uint16 get_free_index();
-                        void free_index( uint16 idx_index );
-
-                        sint32 m_first_free;
-                        sint32 m_last_free;
-
-                        std::vector< element > m_elements;
-                        std::vector< index >   m_indices;
-
+                        index_store      m_indexes;
                         renderer*    m_renderer;
                         window*      m_window;

trunk/src/gui/gui_environment.cc

@@ -26 +26 @@
 
 nv::gui::environment::environment( window* w, const std::string& shader_path )
-        : m_renderer( nullptr ), m_window( w ), m_first_free(-1), m_last_free(-1)
+        : m_renderer( nullptr ), m_window( w )
 {
         m_area.dim( dimension( w->get_width(), w->get_height() ) );
@@ -62 +62 @@
 {
         m_elements.emplace_back();
-        m_elements.back().m_this = create_index( uint16( m_elements.size() - 1 ) );
+        m_elements.back().m_this = m_indexes.create_handle( sint32( m_elements.size() - 1 ) );
         return m_elements.back().m_this;
-}
-
-nv::gui::handle nv::gui::environment::create_index( sint16 element_id )
-{
-        uint16 i   = get_free_index();
-        index& idx = m_indices[i];
-        idx.element_id = element_id;
-        idx.counter++;
-        return handle( i, idx.counter );
-}
-
-nv::uint16 nv::gui::environment::get_free_index()
-{
-        if ( m_first_free != -1 )
-        {
-                uint16 result = (uint16)m_first_free;
-                m_first_free = m_indices[result].next_free;
-                m_indices[result].next_free = -1;
-                if ( m_first_free == -1 ) m_last_free = -1;
-                return result;
-        }
-        m_indices.emplace_back();
-        return uint16( m_indices.size() - 1 );
-}
-
-void nv::gui::environment::free_index( uint16 idx_index )
-{
-        // TODO: reuse
-        index& idx = m_indices[ idx_index ];
-        idx.element_id = -1;
-        idx.next_free  = -1;
-        if ( m_last_free == -1 )
-        {
-                m_first_free = m_last_free = idx_index;
-        }
-        else
-        {
-                m_indices[ m_last_free ].next_free = idx_index;
-                m_last_free = idx_index;
-        }
 }
 
@@ -117 +77 @@
         dead_element->m_parent = handle();
 
-        uint16 dead_index    = m_indices[ e.m_index ].element_id;
-        if ( dead_index != m_elements.size()-1 )
-        {
-                m_elements[ dead_index ] = m_elements.back();
-                m_elements.pop_back();
-                m_indices[ m_elements[ dead_index ].m_this.m_index ].element_id = dead_index;
-        }
-        else
-                m_elements.pop_back();
-        free_index( e.m_index );
+        handle swap_handle    = m_elements.back().m_this;
+        sint32 dead_eindex    = m_indexes.get_index( e );
+        if ( dead_eindex != (sint32)m_elements.size()-1 )
+        {
+                m_elements[ dead_eindex ] = m_elements.back();
+        }
+        m_elements.pop_back();
+        m_indexes.swap_indices( e, swap_handle );
+        m_indexes.free_handle( e );
 }
 
@@ -219 +178 @@
 {
         element* el = get_element( e );
-        return el && el->m_parent.m_index ? process_io_event( el->m_parent, ev ) : false;
+        return el && el->m_parent.is_valid() ? process_io_event( el->m_parent, ev ) : false;
 }
 
@@ -230 +189 @@
 {
         if ( h.is_nil() ) return nullptr;
-        const index& idx = m_indices[ h.m_index ];
-        return idx.counter == h.m_counter && idx.element_id >= 0 ? &m_elements[ idx.element_id ] : nullptr;
+        sint32 eindex = m_indexes.get_index( h );
+        return eindex >= 0 ? &m_elements[ eindex ] : nullptr;
 }
 
@@ -245 +204 @@
         {
                 result = get_deepest_child( *it, p );
-                if ( result.m_index ) return result;
+                if ( result.is_valid() ) return result;
                 ++it;
         }