Index: trunk/src/formats/assimp_loader.cc =================================================================== --- trunk/src/formats/assimp_loader.cc (revision 413) +++ trunk/src/formats/assimp_loader.cc (revision 415) @@ -117,30 +117,31 @@ bool skinned = mesh->mNumBones > 0; - raw_data_channel* channel = nullptr; + + data_descriptor desc; if ( skinned ) - channel = raw_data_channel::create< assimp_skinned_vtx >( mesh->mNumVertices ); + desc.initialize< assimp_skinned_vtx >(); else - channel = raw_data_channel::create< assimp_plain_vtx >( mesh->mNumVertices ); - uint8* cdata = const_cast< uint8*>( channel->raw_data() ); - - data->add_channel( channel ); + desc.initialize< assimp_plain_vtx >(); + raw_data_channel_creator channel( desc, mesh->mNumVertices ); + uint8* cdata = channel.raw_data(); + if ( mesh->mTangents && mesh->mBitangents ) - for (unsigned int i=0; imNumVertices; i++) - { - vec3 v = assimp_vec3_cast( mesh->mVertices[ i ] ); - vec3 n = glm::normalize( assimp_vec3_cast( mesh->mNormals[ i ] ) ); - vec3 t = glm::normalize( assimp_vec3_cast( mesh->mTangents[ i ] ) ); - vec3 b = glm::normalize( assimp_vec3_cast( mesh->mBitangents[ i ] ) ); - vec2 s = assimp_st_cast( mesh->mTextureCoords[ 0 ][ i ] ); - - glm::vec3 t_i = glm::normalize (t - n * glm::dot (n, t)); - float det = (glm::dot (glm::cross (n, t), b)); - det = (det < 0.0f ? -1.0f : 1.0f ); - nv::vec4 vt ( t_i[0], t_i[1], t_i[2], det ); - if ( skinned ) - reinterpret_cast< assimp_skinned_vtx* >( cdata )[i] = assimp_skinned_vtx( v, s, n, vt ); - else - reinterpret_cast< assimp_plain_vtx* >( cdata )[i] = assimp_plain_vtx( v, s, n, vt ); - } + for ( unsigned int i = 0; i < mesh->mNumVertices; i++ ) + { + vec3 v = assimp_vec3_cast( mesh->mVertices[i] ); + vec3 n = glm::normalize( assimp_vec3_cast( mesh->mNormals[i] ) ); + vec3 t = glm::normalize( assimp_vec3_cast( mesh->mTangents[i] ) ); + vec3 b = glm::normalize( assimp_vec3_cast( mesh->mBitangents[i] ) ); + vec2 s = assimp_st_cast( mesh->mTextureCoords[0][i] ); + + glm::vec3 t_i = glm::normalize( t - n * glm::dot( n, t ) ); + float det = ( glm::dot( glm::cross( n, t ), b ) ); + det = ( det < 0.0f ? -1.0f : 1.0f ); + nv::vec4 vt( t_i[0], t_i[1], t_i[2], det ); + if ( skinned ) + reinterpret_cast( cdata )[i] = assimp_skinned_vtx( v, s, n, vt ); + else + reinterpret_cast( cdata )[i] = assimp_plain_vtx( v, s, n, vt ); + } if ( skinned ) @@ -179,4 +180,5 @@ } } + data->add_channel( channel.release() ); data->add_channel( ichannel.release() ); } Index: trunk/src/formats/md5_loader.cc =================================================================== --- trunk/src/formats/md5_loader.cc (revision 413) +++ trunk/src/formats/md5_loader.cc (revision 415) @@ -137,5 +137,4 @@ assert( m_type == MESH ); mesh_data* mesh = new mesh_data("md5_mesh"); - raw_data_channel* ch_pntiw = nullptr; uint32 num_verts = 0; @@ -160,7 +159,7 @@ md5_vtx_t* tdata = nullptr; { - data_channel_creator ch_pnt( num_verts ); - data_channel_creator ch_t( num_verts ); - ch_pntiw = raw_data_channel::create( num_verts ); + data_channel_creator ch_pnt( num_verts ); + data_channel_creator ch_t( num_verts ); + data_channel_creator ch_pntiw( num_verts ); tdata = ch_t.data(); mesh->add_channel( ch_pnt.release() ); @@ -168,5 +167,5 @@ // TODO: hack to prevent rendering //ch_pntiw->m_count = 0; - mesh->add_channel( ch_pntiw ); + mesh->add_channel( ch_pntiw.release() ); } weight_info.resize( num_verts ); @@ -236,5 +235,5 @@ } - prepare_mesh( reinterpret_cast< md5_vtx_pntiw* >( const_cast< uint8* >( ch_pntiw->raw_data() ) ), nodes, weight_info.size(), mesh, weights.data(), weight_info.data() ); + prepare_mesh( nodes, weight_info.size(), mesh, weights.data(), weight_info.data() ); m_meshes[ num_meshes ] = mesh; @@ -258,5 +257,6 @@ nodes[i].target_id = -1; nodes[i].data = new key_data; - nodes[i].data->add_channel( raw_data_channel::create< md5_key_t >( num_frames ) ); + data_channel_creator< md5_key_t > fc( num_frames ); + nodes[i].data->add_channel( fc.release() ); next_line( sstream ); } @@ -335,9 +335,11 @@ } -bool md5_loader::prepare_mesh( md5_vtx_pntiw* vtx_data, mesh_node_data* nodes, uint32 vtx_count, mesh_data* mdata, md5_weight* weights, md5_weight_info* weight_info ) +bool md5_loader::prepare_mesh( mesh_node_data* nodes, uint32 vtx_count, mesh_data* mdata, md5_weight* weights, md5_weight_info* weight_info ) { assert( m_type == MESH ); - data_channel_creator< md5_vtx_pnt > pnt( const_cast< raw_data_channel* >( mdata->get_channel< md5_vtx_pnt >() ) ); - md5_vtx_pnt* vtcs = pnt.data(); + data_channel_creator< md5_vtx_pnt > pnt ( const_cast< raw_data_channel* >( mdata->get_channel< md5_vtx_pnt >() ) ); + data_channel_creator< md5_vtx_pntiw > pntiw( const_cast< raw_data_channel* >( mdata->get_channel< md5_vtx_pntiw >() ) ); + md5_vtx_pntiw* vtx_data = pntiw.data(); + md5_vtx_pnt* vtcs = pnt.data(); for ( uint32 i = 0; i < vtx_count; ++i ) @@ -488,5 +490,5 @@ const transform* ptv = reinterpret_cast< const transform* >( pjoint.data->get_channel(0)->raw_data() ); transform ptr; - if ( pjoint.data->get_channel(0)->element_count() > index ) ptr = ptv[ index ]; + if ( pjoint.data->get_channel(0)->size() > index ) ptr = ptv[ index ]; vec3 rot_pos = ptr.get_orientation() * pos; Index: trunk/src/formats/nmd_loader.cc =================================================================== --- trunk/src/formats/nmd_loader.cc (revision 413) +++ trunk/src/formats/nmd_loader.cc (revision 415) @@ -189,7 +189,7 @@ nmd_stream_header sheader; sheader.format = chan->descriptor(); - sheader.count = chan->element_count(); + sheader.count = chan->size(); stream_out.write( &sheader, sizeof( sheader ), 1 ); - stream_out.write( chan->raw_data(), chan->element_size(), chan->element_count() ); + stream_out.write( chan->raw_data(), chan->element_size(), chan->size() ); } } @@ -257,7 +257,7 @@ nmd_stream_header cheader; cheader.format = channel->descriptor(); - cheader.count = channel->element_count(); + cheader.count = channel->size(); stream_out.write( &cheader, sizeof( cheader ), 1 ); - stream_out.write( channel->raw_data(), channel->element_size(), channel->element_count() ); + stream_out.write( channel->raw_data(), channel->element_size(), channel->size() ); } } Index: trunk/src/gfx/keyframed_mesh.cc =================================================================== --- trunk/src/gfx/keyframed_mesh.cc (revision 413) +++ trunk/src/gfx/keyframed_mesh.cc (revision 415) @@ -23,6 +23,6 @@ , m_active( false ) { - m_index_count = m_mesh_data->get_index_channel()->element_count(); - m_vertex_count = m_mesh_data->get_channel()->element_count(); + m_index_count = m_mesh_data->get_index_channel()->size(); + m_vertex_count = m_mesh_data->get_channel()->size(); m_vchannel = m_mesh_data->get_channel(); m_vsize = sizeof( vertex_pnt ); @@ -34,5 +34,5 @@ m_vsize = sizeof( vertex_pn ); } - m_frame_count = m_vchannel->element_count() / m_vertex_count; + m_frame_count = m_vchannel->size() / m_vertex_count; m_pbuffer = buffer(); } Index: trunk/src/gfx/mesh_creator.cc =================================================================== --- trunk/src/gfx/mesh_creator.cc (revision 413) +++ trunk/src/gfx/mesh_creator.cc (revision 415) @@ -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)->element_count() : 0 ); - size_t pcount = ( pkeys ? pkeys->get_channel(0)->element_count() : 0 ); + size_t count = ( keys ? keys->get_channel(0)->size() : 0 ); + size_t pcount = ( pkeys ? pkeys->get_channel(0)->size() : 0 ); max_frames = nv::max( count, max_frames ); if ( pkeys && pkeys->get_channel_count() > 0 && keys && keys->get_channel_count() > 0 ) @@ -58,5 +58,5 @@ size_t chan_count = old_keys->get_channel_count(); if ( chan_count == 1 - && old_keys->get_channel(0)->descriptor().slot_count() == 1 + && old_keys->get_channel(0)->descriptor().size() == 1 && old_keys->get_channel(0)->descriptor()[0].etype == TRANSFORM ) continue; @@ -64,5 +64,5 @@ for ( size_t c = 0; c < chan_count; ++c ) { - max_keys = nv::max( max_keys, old_keys->get_channel(c)->element_count() ); + max_keys = nv::max( max_keys, old_keys->get_channel(c)->size() ); } @@ -78,5 +78,5 @@ for ( uint16 c = 0; c < chan_count; ++c ) { - size_t idx = nv::min( old_keys->get_channel(c)->element_count() - 1, n ); + size_t idx = nv::min( old_keys->get_channel(c)->size() - 1, n ); pkey += old_keys->get_raw( old_keys->get_channel(c), idx, pkey ); } @@ -242,6 +242,6 @@ if ( !p_channel || !n_channel || !t_channel ) return; - if ( p_channel->element_count() != n_channel->element_count() - || p_channel->element_count() % t_channel->element_count() != 0 + if ( p_channel->size() != n_channel->size() + || p_channel->size() % t_channel->size() != 0 || ( i_type != UINT && i_type != USHORT && i_type != NONE ) ) { @@ -249,10 +249,10 @@ } - data_channel_creator< vertex_g > g_channel( p_channel->element_count() ); + data_channel_creator< vertex_g > g_channel( p_channel->size() ); vec4* tangents = &( g_channel.data()[0].tangent ); - vec3* tangents2 = new vec3[ p_channel->element_count() ]; - uint32 tri_count = i_channel ? i_channel->element_count() / 3 : t_channel->element_count() / 3; - uint32 vtx_count = p_channel->element_count(); - uint32 sets = p_channel->element_count() / t_channel->element_count(); + vec3* tangents2 = new vec3[ p_channel->size() ]; + uint32 tri_count = i_channel ? i_channel->size() / 3 : t_channel->size() / 3; + uint32 vtx_count = p_channel->size(); + uint32 sets = p_channel->size() / t_channel->size(); for ( unsigned int i = 0; i < tri_count; ++i ) @@ -292,7 +292,7 @@ for ( uint32 set = 0; set < sets; ++set ) { - uint32 nti0 = t_channel->element_count() * set + ti0; - uint32 nti1 = t_channel->element_count() * set + ti1; - uint32 nti2 = t_channel->element_count() * set + ti2; + uint32 nti0 = t_channel->size() * set + ti0; + uint32 nti1 = t_channel->size() * set + ti1; + uint32 nti2 = t_channel->size() * set + ti2; const vec3& v1 = *reinterpret_cast(p_channel->raw_data() + p_channel->element_size()*nti0 + p_offset ); const vec3& v2 = *reinterpret_cast(p_channel->raw_data() + p_channel->element_size()*nti1 + p_offset ); @@ -337,10 +337,10 @@ nv::raw_data_channel* nv::mesh_data_creator::merge_channels( raw_data_channel* a, raw_data_channel* b ) { - NV_ASSERT( a->element_count() == b->element_count(), "merge_channel - bad channels!" ); + NV_ASSERT( a->size() == b->size(), "merge_channel - bad channels!" ); data_descriptor desc = a->descriptor(); desc.append( b->descriptor() ); - raw_data_channel_creator result( desc, a->element_count() ); - for ( uint32 i = 0; i < a->element_count(); ++i ) + raw_data_channel_creator result( desc, a->size() ); + for ( uint32 i = 0; i < a->size(); ++i ) { raw_copy_n( a->raw_data() + i * a->element_size(), a->element_size(), result.raw_data() + i*desc.element_size() ); @@ -354,20 +354,20 @@ { if ( a->descriptor() != b->descriptor() ) return nullptr; - if ( a->element_count() % frame_count != 0 ) return nullptr; - if ( b->element_count() % frame_count != 0 ) return nullptr; + if ( a->size() % frame_count != 0 ) return nullptr; + if ( b->size() % frame_count != 0 ) return nullptr; size_t vtx_size = a->element_size(); - raw_data_channel_creator result( a->descriptor(), a->element_count() + b->element_count() ); + raw_data_channel_creator result( a->descriptor(), a->size() + b->size() ); if ( frame_count == 1 ) { - size_t a_size = vtx_size * a->element_count(); + size_t a_size = vtx_size * a->size(); raw_copy_n( a->raw_data(), a_size, result.raw_data() ); - raw_copy_n( b->raw_data(), vtx_size * b->element_count(), result.raw_data() + a_size ); + raw_copy_n( b->raw_data(), vtx_size * b->size(), result.raw_data() + a_size ); } else { - size_t frame_size_a = ( a->element_count() / frame_count ) * vtx_size; - size_t frame_size_b = ( b->element_count() / frame_count ) * vtx_size; + size_t frame_size_a = ( a->size() / frame_count ) * vtx_size; + size_t frame_size_b = ( b->size() / frame_count ) * vtx_size; size_t pos_a = 0; size_t pos_b = 0; @@ -406,8 +406,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) ]->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(); + size_t size = m_data->m_channels[ unsigned(ch_ti) ]->size(); + size_t osize = other->m_channels[ unsigned(och_ti) ]->size(); + size_t count = m_data->m_channels[ unsigned(ch_pi) ]->size(); + size_t ocount = other->m_channels[ unsigned(och_pi) ]->size(); if ( count % size != 0 || ocount % osize != 0 ) return; if ( count / size != ocount / osize ) return; @@ -416,6 +416,6 @@ { raw_data_channel* old = m_data->m_channels[c]; - bool old_is_index = old->element_count() > 0 && old->descriptor()[0].vslot == slot::INDEX; - size_t frame_count = ( old_is_index ? 1 : old->element_count() / size ); + bool old_is_index = old->size() > 0 && old->descriptor()[0].vslot == slot::INDEX; + size_t frame_count = ( old_is_index ? 1 : old->size() / size ); m_data->m_channels[c] = append_channels( old, other->m_channels[c], frame_count ); NV_ASSERT( m_data->m_channels[c], "Merge problem!" ); @@ -429,5 +429,5 @@ raw_data_channel_creator ic( m_data->m_channels[c] ); uint16* indexes = reinterpret_cast( ic.raw_data() ); - for ( uint16 i = uint16( old->element_count() ); i < ic.size(); ++i ) + for ( uint16 i = uint16( old->size() ); i < ic.size(); ++i ) indexes[i] += uint16( size ); @@ -438,5 +438,5 @@ raw_data_channel_creator ic( m_data->m_channels[c] ); uint32* indexes = reinterpret_cast( ic.raw_data() ); - for ( uint32 i = old->element_count(); i < ic.size(); ++i ) + for ( uint32 i = old->size(); i < ic.size(); ++i ) indexes[i] += size; } Index: trunk/src/gfx/skeletal_mesh.cc =================================================================== --- trunk/src/gfx/skeletal_mesh.cc (revision 413) +++ trunk/src/gfx/skeletal_mesh.cc (revision 415) @@ -17,5 +17,5 @@ const raw_data_channel* pntiw_chan = a_mesh_data->get_channel(); - m_pntdata.assign( pnt_chan->data_cast< md5_vtx_pnt >(), pnt_chan->element_count() ); + m_pntdata.assign( pnt_chan->data_cast< md5_vtx_pnt >(), pnt_chan->size() ); m_bone_offset.resize( bones->get_count() ); m_transform.resize( bones->get_count() ); @@ -34,5 +34,5 @@ { const raw_data_channel* channel = channels[ch]; - if ( channel->element_count() > 0 && channel != pntiw_chan ) + if ( channel->size() > 0 && channel != pntiw_chan ) { const data_descriptor& desc = channel->descriptor();