Index: trunk/src/formats/assimp_loader.cc =================================================================== --- trunk/src/formats/assimp_loader.cc (revision 410) +++ trunk/src/formats/assimp_loader.cc (revision 411) @@ -118,9 +118,9 @@ bool skinned = mesh->mNumBones > 0; - mesh_raw_channel* channel = nullptr; + raw_data_channel* channel = nullptr; if ( skinned ) - channel = mesh_raw_channel::create< assimp_skinned_vtx >( mesh->mNumVertices ); + channel = raw_data_channel::create< assimp_skinned_vtx >( mesh->mNumVertices ); else - channel = mesh_raw_channel::create< assimp_plain_vtx >( mesh->mNumVertices ); + channel = raw_data_channel::create< assimp_plain_vtx >( mesh->mNumVertices ); data->add_channel( channel ); @@ -169,5 +169,5 @@ } - mesh_raw_channel* ichannel = mesh_raw_channel::create_index( USHORT, mesh->mNumFaces * 3 ); + raw_data_channel* ichannel = raw_data_channel::create_index( USHORT, mesh->mNumFaces * 3 ); data->add_channel( ichannel ); uint16* indices = reinterpret_cast( ichannel->data ); @@ -315,5 +315,5 @@ if ( m > 0 && bones.size() > 0 ) { - mesh_raw_channel* channel = meshes[m].get_raw_channels()[0]; + raw_data_channel* channel = meshes[m].get_raw_channels()[0]; assimp_skinned_vtx* va = reinterpret_cast< assimp_skinned_vtx* >( channel->data ); for ( unsigned v = 0; v < channel->count; ++v ) @@ -418,7 +418,7 @@ data->data = new key_data; - key_raw_channel* raw_pchannel = key_raw_channel::create( node->mNumPositionKeys ); - key_raw_channel* raw_rchannel = key_raw_channel::create( node->mNumRotationKeys ); - //key_raw_channel* raw_schannel = key_raw_channel::create( node->mNumScalingKeys ); + raw_data_channel* raw_pchannel = raw_data_channel::create( node->mNumPositionKeys ); + raw_data_channel* raw_rchannel = raw_data_channel::create( node->mNumRotationKeys ); + //raw_data_channel* raw_schannel = raw_data_channel::create( node->mNumScalingKeys ); data->data->add_channel( raw_pchannel ); data->data->add_channel( raw_rchannel ); Index: trunk/src/formats/md2_loader.cc =================================================================== --- trunk/src/formats/md2_loader.cc (revision 410) +++ trunk/src/formats/md2_loader.cc (revision 411) @@ -324,5 +324,5 @@ size_t frame_count = ( frame == -1 ? num_frames : 1 ); - mesh_raw_channel* mc_pn = mesh_raw_channel::create< vtx_md2_pn >( num_verts * frame_count ); + raw_data_channel* mc_pn = raw_data_channel::create< vtx_md2_pn >( num_verts * frame_count ); vtx_md2_pn* vtx_pn = reinterpret_cast< vtx_md2_pn* >( mc_pn->data ); @@ -347,5 +347,5 @@ } - mesh_raw_channel* mc_t = mesh_raw_channel::create< vtx_md2_t >( num_verts ); + raw_data_channel* mc_t = raw_data_channel::create< vtx_md2_t >( num_verts ); vtx_md2_t* vtx_t = reinterpret_cast< vtx_md2_t* >( mc_t->data ); @@ -357,5 +357,5 @@ } - mesh_raw_channel* ic = mesh_raw_channel::create_index< uint16 >( m_new_indexes.size() ); + raw_data_channel* ic = raw_data_channel::create_index< uint16 >( m_new_indexes.size() ); if ( m_new_indexes.size() > 0 ) { Index: trunk/src/formats/md3_loader.cc =================================================================== --- trunk/src/formats/md3_loader.cc (revision 410) +++ trunk/src/formats/md3_loader.cc (revision 411) @@ -286,8 +286,8 @@ } -nv::key_raw_channel* nv::md3_loader::load_tags( const string_view& tag ) +nv::raw_data_channel* nv::md3_loader::load_tags( const string_view& tag ) { md3_t* md3 = reinterpret_cast< md3_t* >( m_md3 ); - key_raw_channel* result = key_raw_channel::create( uint32( md3->header.num_frames ) ); + raw_data_channel* result = raw_data_channel::create( uint32( md3->header.num_frames ) ); // TODO: is this brain damaged in efficiency (loop nest order) or what? for ( sint32 f = 0; f < md3->header.num_frames; ++f ) @@ -352,7 +352,7 @@ } - mesh_raw_channel* mc_pn = mesh_raw_channel::create< vtx_md3_pn >( uint32( num_verts * frame_count ) ); - mesh_raw_channel* mc_t = mesh_raw_channel::create< vtx_md3_t >( uint32( num_verts ) ); - mesh_raw_channel* ic = mesh_raw_channel::create_index< uint16 >( uint32( index_count ) ); + raw_data_channel* mc_pn = raw_data_channel::create< vtx_md3_pn >( uint32( num_verts * frame_count ) ); + raw_data_channel* mc_t = raw_data_channel::create< vtx_md3_t >( uint32( num_verts ) ); + raw_data_channel* ic = raw_data_channel::create_index< uint16 >( uint32( index_count ) ); vtx_md3_pn* vtx_pn = reinterpret_cast< vtx_md3_pn* >( mc_pn->data ); vtx_md3_t* vtx_t = reinterpret_cast< vtx_md3_t* >( mc_t->data ); @@ -435,5 +435,5 @@ nodes[i].data = new key_data; - key_raw_channel* keys = load_tags( name ); + raw_data_channel* keys = load_tags( name ); nodes[i].data->add_channel( keys ); } Index: trunk/src/formats/md5_loader.cc =================================================================== --- trunk/src/formats/md5_loader.cc (revision 410) +++ trunk/src/formats/md5_loader.cc (revision 411) @@ -159,7 +159,7 @@ md5_vtx_t* tdata = nullptr; { - mesh_raw_channel* ch_pnt = mesh_raw_channel::create( num_verts ); - mesh_raw_channel* ch_t = mesh_raw_channel::create( num_verts ); - mesh_raw_channel* ch_pntiw = mesh_raw_channel::create( num_verts ); + raw_data_channel* ch_pnt = raw_data_channel::create( num_verts ); + raw_data_channel* ch_t = raw_data_channel::create( num_verts ); + raw_data_channel* ch_pntiw = raw_data_channel::create( num_verts ); tdata = reinterpret_cast< md5_vtx_t* >( ch_t->data ); mesh->add_channel( ch_pnt ); @@ -190,5 +190,5 @@ sstream >> num_tris; - mesh_raw_channel* ch_i = mesh_raw_channel::create_index( num_tris * 3 ); + raw_data_channel* ch_i = raw_data_channel::create_index( num_tris * 3 ); uint32* vtx_i = reinterpret_cast< uint32* >( ch_i->data ); uint32 idx = 0; @@ -256,5 +256,5 @@ nodes[i].target_id = -1; nodes[i].data = new key_data; - nodes[i].data->add_channel( key_raw_channel::create< md5_key_t >( num_frames ) ); + nodes[i].data->add_channel( raw_data_channel::create< md5_key_t >( num_frames ) ); next_line( sstream ); } Index: trunk/src/formats/nmd_loader.cc =================================================================== --- trunk/src/formats/nmd_loader.cc (revision 410) +++ trunk/src/formats/nmd_loader.cc (revision 411) @@ -43,5 +43,5 @@ nmd_stream_header stream_header; source.read( &stream_header, sizeof( stream_header ), 1 ); - mesh_raw_channel* channel = mesh_raw_channel::create( stream_header.format, stream_header.count ); + raw_data_channel* channel = raw_data_channel::create( stream_header.format, stream_header.count ); source.read( channel->data, stream_header.format.element_size(), stream_header.count ); mesh->add_channel( channel ); @@ -128,5 +128,5 @@ nv::nmd_stream_header cheader; source.read( &cheader, sizeof( cheader ), 1 ); - key_raw_channel* channel = key_raw_channel::create( cheader.format, cheader.count ); + raw_data_channel* channel = raw_data_channel::create( cheader.format, cheader.count ); source.read( channel->data, channel->desc.element_size(), channel->count ); kdata->add_channel( channel ); @@ -162,5 +162,5 @@ static void nmd_dump_mesh( const mesh_data* mesh, stream& stream_out ) { - array_view< mesh_raw_channel* > data = mesh->get_raw_channels(); + array_view< raw_data_channel* > data = mesh->get_raw_channels(); uint32 size = sizeof( nmd_element_header ); @@ -248,5 +248,5 @@ for ( uint32 c = 0; c < chan_count; ++c ) { - const key_raw_channel* channel = node->data->get_channel(c); + const raw_data_channel* channel = node->data->get_channel(c); eheader.type = nmd_type::KEY_CHANNEL; Index: trunk/src/formats/obj_loader.cc =================================================================== --- trunk/src/formats/obj_loader.cc (revision 410) +++ trunk/src/formats/obj_loader.cc (revision 411) @@ -324,5 +324,5 @@ } - mesh_raw_channel* channel = new mesh_raw_channel(); + raw_data_channel* channel = new raw_data_channel(); nv::uint8* data = nullptr; Index: trunk/src/gfx/mesh_creator.cc =================================================================== --- trunk/src/gfx/mesh_creator.cc (revision 410) +++ trunk/src/gfx/mesh_creator.cc (revision 411) @@ -19,6 +19,6 @@ key_data* keys = m_data->m_nodes[i].data; key_data* pkeys = ( parent_id != -1 ? m_data->m_nodes[parent_id].data : nullptr ); - size_t count = ( keys ? keys->get_channel(0)->count : 0 ); - size_t pcount = ( pkeys ? pkeys->get_channel(0)->count : 0 ); + size_t count = ( keys ? keys->get_channel(0)->element_count() : 0 ); + size_t pcount = ( pkeys ? pkeys->get_channel(0)->element_count() : 0 ); max_frames = nv::max( count, max_frames ); if ( pkeys && pkeys->get_channel_count() > 0 && keys && keys->get_channel_count() > 0 ) @@ -66,5 +66,5 @@ } - key_raw_channel* raw_channel = key_raw_channel::create( max_keys ); + raw_data_channel* raw_channel = raw_data_channel::create( max_keys ); key_data* new_keys = new key_data; new_keys->add_channel( raw_channel ); @@ -80,5 +80,5 @@ { size_t idx = nv::min( old_keys->get_channel(c)->count - 1, n ); - pkey += old_keys->get_channel(c)->get_raw( idx, pkey ); + pkey += old_keys->get_raw( old_keys->get_channel(c), idx, pkey ); } channel[n].tform = extract_transform_raw( final_key, key ); @@ -106,5 +106,5 @@ for ( size_t c = 0; c < kdata->get_channel_count(); ++c ) { - const key_raw_channel* channel = kdata->get_channel(c); + const raw_data_channel* channel = kdata->get_channel(c); size_t key_size = channel->desc.element_size(); for ( size_t n = 0; n < channel->count; ++n ) @@ -125,5 +125,5 @@ for ( uint32 c = 0; c < m_data->get_channel_count(); ++c ) { - const mesh_raw_channel* channel = m_data->get_channel(c); + const raw_data_channel* channel = m_data->get_channel(c); const data_descriptor& desc = channel->desc; uint8* raw_data = channel->data; @@ -173,5 +173,5 @@ size_t n_offset = 0; if ( ch_n == -1 ) return; - mesh_raw_channel* channel = m_data->m_channels[ unsigned( ch_n ) ]; + raw_data_channel* channel = m_data->m_channels[ unsigned( ch_n ) ]; for ( const auto& cslot : channel->desc ) if ( cslot.vslot == slot::NORMAL ) @@ -196,12 +196,12 @@ uint32 n_channel_index = 0; - const mesh_raw_channel* p_channel = nullptr; - mesh_raw_channel* n_channel = nullptr; - const mesh_raw_channel* t_channel = nullptr; - const mesh_raw_channel* i_channel = nullptr; + const raw_data_channel* p_channel = nullptr; + raw_data_channel* n_channel = nullptr; + const raw_data_channel* t_channel = nullptr; + const raw_data_channel* i_channel = nullptr; for ( uint32 c = 0; c < m_data->get_channel_count(); ++c ) { - const mesh_raw_channel* channel = m_data->get_channel(c); + const raw_data_channel* channel = m_data->get_channel(c); for ( const auto& cslot : channel->desc ) @@ -247,5 +247,5 @@ } - mesh_raw_channel* g_channel = mesh_raw_channel::create( p_channel->count ); + raw_data_channel* g_channel = raw_data_channel::create( p_channel->count ); vec4* tangents = reinterpret_cast( g_channel->data ); vec3* tangents2 = new vec3[ p_channel->count ]; @@ -334,5 +334,5 @@ } -nv::mesh_raw_channel* nv::mesh_data_creator::merge_channels( mesh_raw_channel* a, mesh_raw_channel* b ) +nv::raw_data_channel* nv::mesh_data_creator::merge_channels( raw_data_channel* a, raw_data_channel* b ) { NV_ASSERT( a->count == b->count, "merge_channel - bad channels!" ); @@ -352,5 +352,5 @@ raw_copy_n( b->data + i * bdesc.element_size(), bdesc.element_size(), data + i*desc.element_size() + adesc.element_size() ); } - mesh_raw_channel* result = new mesh_raw_channel; + raw_data_channel* result = new raw_data_channel; result->count = count; result->desc = desc; @@ -359,5 +359,5 @@ } -nv::mesh_raw_channel* nv::mesh_data_creator::append_channels( mesh_raw_channel* a, mesh_raw_channel* b, uint32 frame_count ) +nv::raw_data_channel* nv::mesh_data_creator::append_channels( raw_data_channel* a, raw_data_channel* b, uint32 frame_count ) { if ( a->desc != b->desc ) return nullptr; @@ -391,7 +391,7 @@ } - mesh_raw_channel* result = new mesh_raw_channel; - result->count = a->count + b->count; - result->desc = a->desc; + raw_data_channel* result = new raw_data_channel; + result->count = a->element_count() + b->element_count(); + result->desc = a->descriptor(); result->data = data; return result; @@ -405,5 +405,5 @@ for ( uint32 c = 0; c < m_data->get_channel_count(); ++c ) { - if ( m_data->get_channel(c)->desc != other->get_channel(c)->desc ) + if ( m_data->get_channel(c)->descriptor() != other->get_channel(c)->descriptor() ) return false; } @@ -419,8 +419,8 @@ int och_ti = other->get_channel_index( slot::TEXCOORD ); if ( ch_pi == -1 || ch_ti == -1 ) return; - size_t size = m_data->m_channels[ unsigned(ch_ti) ]->count; - size_t osize = other->m_channels[ unsigned(och_ti) ]->count; - size_t count = m_data->m_channels[ unsigned(ch_pi) ]->count; - size_t ocount = other->m_channels[ unsigned(och_pi) ]->count; + size_t size = m_data->m_channels[ unsigned(ch_ti) ]->element_count(); + size_t osize = other->m_channels[ unsigned(och_ti) ]->element_count(); + size_t count = m_data->m_channels[ unsigned(ch_pi) ]->element_count(); + size_t ocount = other->m_channels[ unsigned(och_pi) ]->element_count(); if ( count % size != 0 || ocount % osize != 0 ) return; if ( count / size != ocount / osize ) return; @@ -428,6 +428,6 @@ for ( uint32 c = 0; c < m_data->get_channel_count(); ++c ) { - mesh_raw_channel* old = m_data->m_channels[c]; - size_t frame_count = ( old->get_buffer_type() == INDEX_BUFFER ? 1 : old->count / size ); + raw_data_channel* old = m_data->m_channels[c]; + size_t frame_count = ( old->get_buffer_type() == INDEX_BUFFER ? 1 : old->element_count() / size ); m_data->m_channels[c] = append_channels( old, other->m_channels[c], frame_count ); NV_ASSERT( m_data->m_channels[c], "Merge problem!" ); @@ -440,5 +440,5 @@ NV_ASSERT( size + osize < uint16(-1), "Index out of range!" ); uint16* indexes = reinterpret_cast( m_data->m_channels[c]->data ); - for ( uint16 i = uint16( old->count ); i < m_data->m_channels[c]->count; ++i ) + for ( uint16 i = uint16( old->element_count() ); i < m_data->m_channels[c]->element_count(); ++i ) indexes[i] += uint16( size ); @@ -448,5 +448,5 @@ { uint32* indexes = reinterpret_cast( m_data->m_channels[c]->data ); - for ( uint32 i = old->count; i < m_data->m_channels[c]->count; ++i ) + for ( uint32 i = old->element_count(); i < m_data->m_channels[c]->element_count(); ++i ) indexes[i] += size; } Index: trunk/src/gfx/skeletal_mesh.cc =================================================================== --- trunk/src/gfx/skeletal_mesh.cc (revision 410) +++ trunk/src/gfx/skeletal_mesh.cc (revision 411) @@ -15,5 +15,5 @@ , m_data( a_mesh_data ) { - const mesh_raw_channel* pnt_chan = a_mesh_data->get_channel(); + const raw_data_channel* pnt_chan = a_mesh_data->get_channel(); m_pntdata.assign( reinterpret_cast( pnt_chan->data ), pnt_chan->count ); m_bone_offset.resize( bones->get_count() );