Changeset 299 for trunk/src/gui

Timestamp:

08/07/14 10:10:24 (11 years ago)

Author:

epyon

Message:

• all bind and update function for graphics objects are done via context (will simplify directx device, and allow for handles instead of objects)

File:

• trunk/src/gui/gui_renderer.cc (modified) (5 diffs)

trunk/src/gui/gui_renderer.cc

@@ -65 +65 @@
 {
 public:
-        screen_render_data( device* dev, size_t initial_size )
-                : buffer( dev, nv::DYNAMIC_DRAW, initial_size ), varray( nullptr ), shader(nullptr), texture(nullptr) 
+        screen_render_data( context* ctx, size_t initial_size )
+                : buffer( ctx, nv::DYNAMIC_DRAW, initial_size ), varray( nullptr ), shader(nullptr), texture(nullptr) 
         {
 
@@ -98 +98 @@
         , m_reupload( true )
 {
+        m_context = w->get_context();
         m_area.dim( dimension( w->get_width(), w->get_height() ) );
         region white = m_atlas.get_region( ivec2(3,3) );
@@ -107 +108 @@
         delete[] wfill;
 
-        screen_render_data* sr = new screen_render_data( w->get_device(), 1024 );
+        screen_render_data* sr = new screen_render_data( w->get_context(), 1024 );
         m_render_data = sr;
         // ** EXTREMELY TEMPORARY!
@@ -261 +262 @@
         if ( m_reupload )
         {
-                sr->texture->assign( (void*)m_atlas.get_data() );
+                m_context->update( sr->texture, (void*)m_atlas.get_data() );
                 m_reupload = false;
         }
@@ -272 +273 @@
                 sr->varray->update_vertex_buffer( nv::slot::COLOR,    vb, false );
         }
-        sr->texture->bind( nv::TEX_DIFFUSE );
-        m_window->get_context()->draw( TRIANGLES, m_render_state, m_scene_state, sr->shader, sr->varray, sr->buffer.get_size() * 6 );
+        m_context->bind( sr->texture, TEX_DIFFUSE );
+        m_context->draw( TRIANGLES, m_render_state, m_scene_state, sr->shader, sr->varray, sr->buffer.get_size() * 6 );
 }