Changeset 126 for trunk

Timestamp:

06/17/13 22:20:08 (12 years ago)

Author:

epyon

Message:

• commiting the gui_element/gui_environment and gui_renderer in it's current state
• the implementation is very WIP though, but too long stayed out of SVN
• minor fix to c_file_system

Location:

trunk

Files:

• nv/gui/gui_element.hh (modified) (1 diff)
• nv/gui/gui_environment.hh (modified) (2 diffs)
• nv/gui/gui_renderer.hh (added)
• src/gui/gui_element.cc (modified) (1 diff)
• src/gui/gui_environment.cc (modified) (1 diff)
• src/gui/gui_renderer.cc (added)
• src/io/c_file_system.cc (modified) (1 diff)

trunk/nv/gui/gui_element.hh

@@ -197 +197 @@
                 protected:
                         friend class environment;
+                        friend class renderer;
 
                         string    m_class; ///< Class name.

trunk/nv/gui/gui_environment.hh

@@ -15 +15 @@
 
 #include <nv/gui/gui_element.hh>
+#include <nv/gui/gui_style.hh>
+#include <nv/lua/lua_state.hh>
+#include <nv/interface/window.hh>
 #include <nv/root.hh>
 
@@ -22 +25 @@
         namespace gui
         {
+                class screen : public element
+                {
+                public:
+                        screen( root* aroot, const rectangle& r ) : element( aroot, r ) {}
+                        virtual bool on_event( const io_event& ) { return false; }
+                        virtual void recalculate_absolute() { recalculate_absolute_children(); }
+                };
 
                 class environment : public root
                 {
                 public:
+                        environment( window* w );
+                        // temporary
+                        void load_style( const std::string& filename );
+                        void update( element* e, uint32 elapsed );
                         void draw( element* e );
+                        void update();
+                        void draw();
+                        virtual void add_child( object* child );
+                        virtual ~environment();
+                protected:
+                        renderer*    m_renderer;
+                        window*      m_window;
+                        screen*      m_screen;
+                        rectangle    m_area;
                 };
 

trunk/src/gui/gui_element.cc

@@ -27 +27 @@
                 }
         }
-        //((environment*)m_root)->update( this, elapsed );
+        ((environment*)m_root)->update( this, elapsed );
 }
 

trunk/src/gui/gui_environment.cc

@@ -7 +7 @@
 #include "nv/gui/gui_environment.hh"
 
+#include "nv/gui/gui_renderer.hh"
+
+
+        /*
+
+        TODO: parse a lua stylesheet as per Trac wiki
+
+        IDEA: Store everything in std::unordered_maps, with lua_value's?
+
+        A lua_value is a variant stores strings as const char* that deletes them on destructor?
+        Question is that there might not be much gained on speed anyway, due to Lua's speed.
+        Special function field allows delayed per parse execution?
+
+        */
+
+#include "nv/interface/mesh.hh"
+#include "nv/gfx/cached_buffer.hh"
+#include "nv/gfx/texture_atlas.hh"
+
+#include <vector>
+
 using namespace nv;
 using namespace nv::gui;
 
+environment::environment( window* w )
+        : m_renderer( nullptr ), m_window( w ), m_screen( nullptr )
+{
+        m_area.dim( dimension( w->get_width(), w->get_height() ) );
+        m_screen = new screen( this, m_area );
+        m_renderer = new renderer( w );
+        root::add_child( m_screen );
+}
+
+void nv::gui::environment::load_style( const std::string& filename )
+{
+        m_renderer->load_style( filename );
+}
+
+void environment::update( element* e, uint32 elapsed )
+{
+        if ( e->is_dirty() || e->m_render_data == nullptr )
+        {
+                m_renderer->redraw( e, elapsed );
+                e->set_dirty( false );
+        }
+}
+
 void environment::draw( element* e )
 {
-        
+        m_renderer->draw( e );
 }
+
+void environment::update()
+{
+        m_screen->on_update( 0 );
+}
+
+void environment::draw()
+{
+        m_screen->on_draw();
+        m_renderer->draw();
+}
+
+void environment::add_child( object* child )
+{
+        // TODO: check if element
+        m_screen->add_child( child );
+}
+
+environment::~environment()
+{
+        destroy_children();
+        delete m_renderer;
+}
+

trunk/src/io/c_file_system.cc

@@ -32 +32 @@
 stream* c_file_system::open( const char* fpath, const char* fmode /*= "rb" */ )
 {
-        NV_ASSERT( fpath != nullptr && fpath != "" && fmode != nullptr );
+        NV_ASSERT( fpath != nullptr && fpath != "" && fmode != nullptr, "Bad parameters passed to open" );
         FILE* file = ::fopen( fpath, fmode );
         if ( !file )