Index: trunk/src/gfx/keyframed_mesh.cc
===================================================================
--- trunk/src/gfx/keyframed_mesh.cc	(revision 223)
+++ trunk/src/gfx/keyframed_mesh.cc	(revision 224)
@@ -15,5 +15,5 @@
 using namespace nv;
 
-keyframed_mesh::keyframed_mesh( context* a_context, keyframed_mesh_data* a_data, program* a_program )
+keyframed_mesh::keyframed_mesh( context* a_context, mesh_data* a_data, program* a_program )
 	: m_context( a_context )
 	, m_data( a_data )
@@ -112,5 +112,5 @@
 }
 
-keyframed_mesh_gpu::keyframed_mesh_gpu( context* a_context, keyframed_mesh_data* a_data, program* a_program )
+keyframed_mesh_gpu::keyframed_mesh_gpu( context* a_context, mesh_data* a_data, program* a_program )
 	: keyframed_mesh( a_context, a_data, a_program )
 	, m_loc_next_position( 0 )
@@ -133,6 +133,6 @@
 	vb = m_context->get_device()->create_vertex_buffer( nv::STATIC_DRAW, m_data->get_vertex_count() * sizeof( nv::vec2 ), (void*)m_data->get_texcoords().data() );
 	m_va->add_vertex_buffer( nv::slot::TEXCOORD, vb, nv::FLOAT, 2 );
-	nv::index_buffer* ib = m_context->get_device()->create_index_buffer( nv::STATIC_DRAW, m_data->get_index_count() * sizeof( nv::uint16 ), (void*)m_data->get_indices().data() );
-	m_va->set_index_buffer( ib, nv::USHORT, true );
+	nv::index_buffer* ib = m_context->get_device()->create_index_buffer( nv::STATIC_DRAW, m_data->get_index_count() * sizeof( nv::uint32 ), (void*)m_data->get_indices().data() );
+	m_va->set_index_buffer( ib, nv::UINT, true );
 }
 
@@ -156,11 +156,11 @@
 
 
-nv::keyframed_mesh_cpu::keyframed_mesh_cpu( context* a_context, keyframed_mesh_data* a_data, program* a_program )
+nv::keyframed_mesh_cpu::keyframed_mesh_cpu( context* a_context, mesh_data* a_data, program* a_program )
 	: keyframed_mesh( a_context, a_data, a_program )
 {
-	m_vb_position = m_context->get_device()->create_vertex_buffer( nv::STATIC_DRAW, m_data->get_vertex_count() * sizeof( nv::vec3 ) * m_data->get_frame_count(), (void*)m_data->get_position_data(0) );
+	m_vb_position = m_context->get_device()->create_vertex_buffer( nv::STATIC_DRAW, m_data->get_vertex_count() * sizeof( nv::vec3 ), (void*)m_data->get_position_frame(0) );
 	m_va->add_vertex_buffer( nv::slot::POSITION, m_vb_position, nv::FLOAT, 3 );
 
-	m_vb_normal   = m_context->get_device()->create_vertex_buffer( nv::STATIC_DRAW, m_data->get_vertex_count() * sizeof( nv::vec3 ) * m_data->get_frame_count(), (void*)m_data->get_normal_data(0) );
+	m_vb_normal   = m_context->get_device()->create_vertex_buffer( nv::STATIC_DRAW, m_data->get_vertex_count() * sizeof( nv::vec3 ), (void*)m_data->get_normal_frame(0) );
 	m_va->add_vertex_buffer( nv::slot::NORMAL, m_vb_normal, nv::FLOAT, 3 );
 
@@ -169,6 +169,6 @@
 	m_va->add_vertex_buffer( nv::slot::TEXCOORD, vb, nv::FLOAT, 2 );
 
-	nv::index_buffer* ib = m_context->get_device()->create_index_buffer( nv::STATIC_DRAW, m_data->get_index_count() * sizeof( nv::uint16 ), (void*)m_data->get_indices().data() );
-	m_va->set_index_buffer( ib, nv::USHORT, true );
+	nv::index_buffer* ib = m_context->get_device()->create_index_buffer( nv::STATIC_DRAW, m_data->get_index_count() * sizeof( nv::uint32 ), (void*)m_data->get_indices().data() );
+	m_va->set_index_buffer( ib, nv::UINT, true );
 
 	m_position.resize( m_data->get_vertex_count() );
@@ -181,8 +181,8 @@
 
 	size_t vtx_count = m_data->get_vertex_count();
-	const vec3* prev_position = m_data->get_position_data( m_last_frame );
-	const vec3* next_position = m_data->get_position_data( m_next_frame );
-	const vec3* prev_normal   = m_data->get_normal_data( m_last_frame );
-	const vec3* next_normal   = m_data->get_normal_data( m_next_frame );
+	const vec3* prev_position = m_data->get_position_frame( m_last_frame );
+	const vec3* next_position = m_data->get_position_frame( m_next_frame );
+	const vec3* prev_normal   = m_data->get_normal_frame( m_last_frame );
+	const vec3* next_normal   = m_data->get_normal_frame( m_next_frame );
 
 	for ( size_t i = 0; i < vtx_count; ++i )