Changeset 161 for trunk/src/gui

Timestamp:

07/15/13 02:48:06 (12 years ago)

Author:

epyon

Message:

• unified naming of attributes in nv
• predefined attribute bindings based on unified names
• unified naming of attributes in all tests

File:

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

trunk/src/gui/gui_renderer.cc

@@ -81 +81 @@
         nv::program*      shader;
         nv::texture2d*    texture;
-
-        int loc_coord;
-        int loc_color;
-        int loc_tcoord;
 };
 
@@ -116 +112 @@
         sr->varray     = m_window->get_device()->create_vertex_array();
         sr->shader     = m_window->get_device()->create_program( nv::slurp( "gui.vert" ), nv::slurp( "gui.frag" ) );
-        sr->loc_coord  = sr->shader->get_attribute("coord")->get_location();
-        sr->loc_tcoord = sr->shader->get_attribute("tcoord")->get_location();
-        sr->loc_color  = sr->shader->get_attribute("color")->get_location();
         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( "projection", projection );
+        sr->shader->set_uniform( "nv_projection", projection );
 
         vertex_buffer* vb = (vertex_buffer*)sr->buffer.get_buffer();
-        sr->varray->add_vertex_buffer( sr->loc_coord,  vb, nv::INT,   2, 0, sizeof( vertex ), false );
-        sr->varray->add_vertex_buffer( sr->loc_tcoord, vb, nv::FLOAT, 2, offset_of( &vertex::tcoord ), sizeof( vertex ), false );
-        sr->varray->add_vertex_buffer( sr->loc_color,  vb, nv::FLOAT, 4, offset_of( &vertex::color ), sizeof( vertex ), false );
+        sr->varray->add_vertex_buffer( slot::POSITION, vb, nv::INT,   2, 0, sizeof( vertex ), false );
+        sr->varray->add_vertex_buffer( slot::TEXCOORD, vb, nv::FLOAT, 2, offset_of( &vertex::tcoord ), sizeof( vertex ), false );
+        sr->varray->add_vertex_buffer( slot::COLOR,    vb, nv::FLOAT, 4, offset_of( &vertex::color ), sizeof( vertex ), false );
 
         nv::sampler sampler( nv::sampler::LINEAR, nv::sampler::CLAMP_TO_EDGE );
@@ -277 +270 @@
         {
                 nv::vertex_buffer* vb = (nv::vertex_buffer*)sr->buffer.get_buffer();
-                sr->varray->update_vertex_buffer( sr->loc_coord,  vb, false );
-                sr->varray->update_vertex_buffer( sr->loc_tcoord, vb, false );
-                sr->varray->update_vertex_buffer( sr->loc_color,  vb, false );
+                sr->varray->update_vertex_buffer( nv::POSITION, vb, false );
+                sr->varray->update_vertex_buffer( nv::TEXCOORD, vb, false );
+                sr->varray->update_vertex_buffer( nv::COLOR,    vb, false );
         }
         sr->texture->bind( 0 );