Changeset 161 for trunk/src/formats

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

Location:

trunk/src/formats

Files:

• md3_loader.cc (modified) (1 diff)
• obj_loader.cc (modified) (2 diffs)

trunk/src/formats/md3_loader.cc

@@ -313 +313 @@
         }
 
-        vertex_attribute< vec3 >* position = m->add_attribute<vec3>("position");
-        vertex_attribute< vec3 >* normal   = m->add_attribute<vec3>("normal");
-        vertex_attribute< vec2 >* texcoord = m->add_attribute<vec2>("texcoord");
+        vertex_attribute< vec3 >* position = m->add_attribute<vec3>("nv_position");
+        vertex_attribute< vec3 >* normal   = m->add_attribute<vec3>("nv_normal");
+        vertex_attribute< vec2 >* texcoord = m->add_attribute<vec2>("nv_texcoord");
         vertex_attribute< uint16 >* indices  = m->add_indices<uint16>();
 

trunk/src/formats/obj_loader.cc

@@ -140 +140 @@
         if ( m_position == nullptr )
         {
-                m_position  = m_mesh->add_attribute< vec3 >( "position" );
+                m_position  = m_mesh->add_attribute< vec3 >( "nv_position" );
         }
         if ( m_tex_coord == nullptr )
         {
-                m_tex_coord = m_mesh->add_attribute< vec2 >( "texcoord" );
+                m_tex_coord = m_mesh->add_attribute< vec2 >( "nv_texcoord" );
         }
         if ( m_normal == nullptr && ni != nullptr )
         {
-                m_normal = m_mesh->add_attribute< vec3 >( "normal" );
+                m_normal = m_mesh->add_attribute< vec3 >( "nv_normal" );
         }
 
@@ -174 +174 @@
 void mesh_obj_reader::calculate_tangents()
 {
-        m_tangent = m_mesh->add_attribute< vec4 >( "tangent" );
+        m_tangent = m_mesh->add_attribute< vec4 >( "nv_tangent" );
 
         std::vector< vec3 >& vp = m_position->get();