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

Timestamp:

07/09/15 20:02:58 (10 years ago)

Author:

epyon

Message:

• naming scheme for data_descriptor changed
• channels can only be created by data_channel_creators

File:

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

trunk/src/formats/assimp_loader.cc

@@ -117 +117 @@
 
         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; 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< 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<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 );
+                }
 
         if ( skinned )
@@ -179 +180 @@
                 }
         }
+        data->add_channel( channel.release() );
         data->add_channel( ichannel.release() );
 }