Changeset 267 for trunk/src/gui/gui_renderer.cc

Timestamp:

06/19/14 19:03:25 (11 years ago)

Author:

epyon

Message:

• gui::element class now pure data
• gui::element related code in environment
• gui shaders use general library mechanism

File:

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

trunk/src/gui/gui_renderer.cc

@@ -112 +112 @@
         sr->varray     = m_window->get_device()->create_vertex_array();
         sr->shader     = m_window->get_device()->create_program( nv::slurp( shader_path + ".vert" ), nv::slurp( shader_path + ".frag" ) );
-        sr->shader->set_uniform( "tex", 0 );
-        glm::mat4 projection = glm::ortho( 0.0f, float( m_window->get_width() ), float( m_window->get_height() ), 0.0f, -1.0f, 1.0f );
-        sr->shader->set_uniform( "nv_projection", projection );
+        m_scene_state.get_camera().set_ortho( 0.0f, float( m_window->get_width() ), float( m_window->get_height() ), 0.0f );
 
         vertex_buffer* vb = (vertex_buffer*)sr->buffer.get_buffer();
@@ -274 +272 @@
                 sr->varray->update_vertex_buffer( nv::COLOR,    vb, false );
         }
-        sr->texture->bind( 0 );
-        sr->shader->set_uniform( "tex", 0 );
-        m_window->get_context()->draw( TRIANGLES, m_render_state, sr->shader, sr->varray, sr->buffer.get_size() * 6 );
+        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 );
 }