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

Timestamp:

07/10/15 19:50:47 (10 years ago)

Author:

epyon

Message:

• further access restrictions improvements

File:

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

trunk/src/formats/assimp_loader.cc

@@ -124 +124 @@
         else
                 desc.initialize< assimp_plain_vtx >();
-        raw_data_channel_creator channel( desc, mesh->mNumVertices );
-        uint8* cdata = channel.raw_data();
+        data_channel_set_creator maccess( data );
+        maccess.set_name( mesh->mName.data );
+        uint8*  cdata   = maccess.add_channel( desc, mesh->mNumVertices ).raw_data();
+        uint16* indices = reinterpret_cast<uint16*>( maccess.add_channel< index_u16 >( mesh->mNumFaces * 3 ).raw_data() );
 
         if ( mesh->mTangents && mesh->mBitangents )
@@ -171 +173 @@
         }
 
-        data_channel_creator< index_u16 > ichannel( mesh->mNumFaces * 3 );
-        uint16* indices = reinterpret_cast<uint16*>( ichannel.raw_data() );
         for (unsigned int i=0; i<mesh->mNumFaces; i++)
         {
@@ -182 +182 @@
         }
 
-        data_channel_set_creator maccess( data );
-        maccess.set_name( mesh->mName.data );
-        maccess.add_channel( channel.release() );
-        maccess.add_channel( ichannel.release() );
 }
 
@@ -321 +317 @@
                         if ( m > 0 && bones.size() > 0 )
                         {
-                                data_channel_creator< assimp_skinned_vtx > channel( const_cast< raw_data_channel* >( meshes[m].get_channel(0) ) );
+                                data_channel_access< assimp_skinned_vtx > channel( const_cast< raw_data_channel* >( meshes[m].get_channel(0) ) );
                                 for ( unsigned v = 0; v < channel.size(); ++v )
                                 {
@@ -422 +418 @@
         }
 
-        data->data = new key_data;
-        data_channel_creator< assimp_key_p > pchannel_creator( node->mNumPositionKeys );
-        data_channel_creator< assimp_key_r > rchannel_creator( node->mNumRotationKeys );
-//      data_channel_creator< assimp_key_s > schannel_creator( node->mNumScalingKeys );
-
-        assimp_key_p* pchannel = pchannel_creator.data();
-        assimp_key_r* rchannel = rchannel_creator.data();
-        //assimp_key_s* schannel = ((assimp_key_s*)(raw_schannel->data));
+        data->data = key_channel_set_creator::create( 2 );
+        key_channel_set_creator key_set( data->data );
+
+        assimp_key_p* pchannel = key_set.add_channel< assimp_key_p >( node->mNumPositionKeys ).data();
+        assimp_key_r* rchannel = key_set.add_channel< assimp_key_r >( node->mNumRotationKeys ).data();
+//      assimp_key_s* schannel = key_set.add_channel< assimp_key_s >( node->mNumScalingKeys ).data();
 
         for ( unsigned np = 0; np < node->mNumPositionKeys; ++np )
@@ -460 +454 @@
 //              }
 //      }
-        data->data->add_key_channel( pchannel_creator.release() );
-        data->data->add_key_channel( rchannel_creator.release() );
-//      data->data->add_key_channel( schannel_creator.release() );
+
 }