Changeset 281 for trunk/src/gfx

Timestamp:

07/08/14 21:49:37 (11 years ago)

Author:

epyon

Message:

• animation key raw sizes (the whole system will be dumped though)
• bugfix for string_table
• nv::slot is now an enum class

Location:

trunk/src/gfx

Files:

• keyframed_mesh.cc (modified) (1 diff)
• skeletal_mesh.cc (modified) (1 diff)

trunk/src/gfx/keyframed_mesh.cc

@@ -139 +139 @@
         m_loc_next_position = a_program->get_attribute( "nv_next_position" )->get_location();
         m_loc_next_normal   = a_program->get_attribute( "nv_next_normal" )->get_location();
-        m_va = a_device->create_vertex_array( a_data, nv::STATIC_DRAW );
-        vertex_buffer* vb = m_va->find_buffer( nv::POSITION );
-        m_va->add_vertex_buffer( m_loc_next_position, vb, nv::FLOAT, 3, 0,              sizeof( vertex_pn ), false );
-        m_va->add_vertex_buffer( m_loc_next_normal,   vb, nv::FLOAT, 3, sizeof( vec3 ), sizeof( vertex_pn ), false );
+        m_va = a_device->create_vertex_array( a_data, STATIC_DRAW );
+        vertex_buffer* vb = m_va->find_buffer( slot::POSITION );
+        m_va->add_vertex_buffer( m_loc_next_position, vb, FLOAT, 3, 0,              sizeof( vertex_pn ), false );
+        m_va->add_vertex_buffer( m_loc_next_normal,   vb, FLOAT, 3, sizeof( vec3 ), sizeof( vertex_pn ), false );
 }
 

trunk/src/gfx/skeletal_mesh.cc

@@ -43 +43 @@
                 m_animation->update_skeleton( m_transform.data(), (float)m_animation_time * 0.001f );
                 m_mesh_data->apply( m_transform.data() );
-                vertex_buffer* vb = m_va->find_buffer( nv::POSITION );
+                vertex_buffer* vb = m_va->find_buffer( nv::slot::POSITION );
                 vb->bind();
                 vb->update( m_mesh_data->data(), 0, m_mesh_data->size() );