Changeset 412 for trunk/src/formats/assimp_loader.cc

Timestamp:

07/09/15 14:40:36 (10 years ago)

Author:

epyon

Message:

• refactoring of raw_data_channel and data_descriptor access

File:

• trunk/src/formats/assimp_loader.cc (modified) (2 diffs)

trunk/src/formats/assimp_loader.cc

@@ -169 +169 @@
         }
 
-        raw_data_channel* ichannel = raw_data_channel::create_index( USHORT, mesh->mNumFaces * 3 );
+        raw_data_channel* ichannel = raw_data_channel::create< index_u16 >( mesh->mNumFaces * 3 );
         data->add_channel( ichannel );
         uint16* indices = reinterpret_cast<uint16*>( ichannel->data );
@@ -317 +317 @@
                                 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 )
+                                for ( unsigned v = 0; v < channel->element_count(); ++v )
                                 {
                                         assimp_skinned_vtx& vertex = va[v];