Changeset 277 for trunk/src/formats

Timestamp:

07/07/14 22:38:55 (11 years ago)

Author:

epyon

Message:

• fixed and corrected the transformation mess in the assimp loader
• fixed set_opt_uniform_array

File:

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

trunk/src/formats/assimp_loader.cc

@@ -13 +13 @@
 using namespace nv;
 
+const int MAX_BONES = 64;
 
 nv::assimp_loader::assimp_loader( const string& a_ext, const mat4& a_rotate_transform, float a_scale, uint32 a_assimp_flags /*= 0 */ ) : m_ext( a_ext ), m_rotate_transform( a_rotate_transform ), m_scale( a_scale ), m_assimp_flags( a_assimp_flags ), m_mesh_count(0), m_scene( nullptr )
@@ -35 +36 @@
 }
 
-
+nv::assimp_loader::assimp_loader( const string& a_ext, uint32 a_assimp_flags /*= 0 */ ) : m_ext( a_ext ), m_rotate_transform(), m_scale( 1.0f ), m_assimp_flags( a_assimp_flags ), m_mesh_count(0), m_scene( nullptr )
+{
+        if ( m_assimp_flags == 0 )
+        {
+                m_assimp_flags = ( 
+                        aiProcess_CalcTangentSpace                              |  
+                        aiProcess_GenSmoothNormals                              |  
+                        aiProcess_JoinIdenticalVertices                 |   
+                        aiProcess_ImproveCacheLocality                  |  
+                        aiProcess_LimitBoneWeights                              |  
+                        aiProcess_RemoveRedundantMaterials      |  
+                        aiProcess_SplitLargeMeshes                              |  
+                        aiProcess_Triangulate                                   |  
+                        aiProcess_GenUVCoords                   |  
+                        aiProcess_SortByPType                   |  
+                        aiProcess_FindDegenerates               |  
+                        aiProcess_FindInvalidData               |  
+                        0 );
+        }
+}
 bool nv::assimp_loader::load( stream& source )
 {
@@ -68 +88 @@
         mat3 scaled_rotatation = glm::mat3( glm::scale( m_scale, m_scale, m_scale ) * m_rotate_transform );
         vec3 vertex_offset     = glm::vec3(); 
-        mat3 vertex_transform  = glm::mat3( glm::transpose( scaled_rotatation ) );
-        mat3 normal_transform  = glm::mat3( glm::transpose( glm::inverse( scaled_rotatation ) ) );
-        mat4 bone_transform    = glm::scale( 1.0f/m_scale, 1.0f/m_scale, 1.0f/m_scale ) * m_rotate_transform;
+        mat3 vertex_transform  = scaled_rotatation;
+        mat3 normal_transform  = glm::mat3( m_rotate_transform );
 
         bool skinned = mesh->mNumBones > 0;
@@ -104 +123 @@
                 {
                         aiBone* bone  = mesh->mBones[m];
-                        nv::mat4 offset = nv::assimp_mat4_cast( bone->mOffsetMatrix ) * bone_transform;
                         for (unsigned int w=0; w<bone->mNumWeights; w++)
                         {
@@ -151 +169 @@
         if ( mesh->mNumBones == 0 ) return false;
 
-        mat4 bone_transform    = glm::scale( 1.0f/m_scale, 1.0f/m_scale, 1.0f/m_scale ) * m_rotate_transform;
+        mat4 bone_transform    = glm::inverse( glm::scale( m_scale, m_scale, m_scale ) * glm::mat4(m_rotate_transform) ); //glm::scale( 1.f/m_scale, 1.f/m_scale, 1.f/m_scale ) * m_rotate_transform;
 
         for (unsigned int m=0; m<mesh->mNumBones; m++)
@@ -250 +268 @@
         for ( unsigned int m = 0; m < model->meshes.size(); ++m )
         {
-                nv::sint16 translate[64];
+                sint16 translate[MAX_BONES];
                 std::vector< assimp_bone > bones;
                 load_bones( m, bones );
@@ -256 +274 @@
                 {
 
-                        nv::assimp_bone& bone = bones[b];
+                        assimp_bone& bone = bones[b];
                         auto iname = names.find( bone.name );
                         if ( iname == names.end() )
                         {
-                                NV_ASSERT( model->bones.size() < 64, "Too many bones to merge!" );
-                                nv::sint16 index = (nv::sint16)model->bones.size();
+                                NV_ASSERT( model->bones.size() < MAX_BONES, "Too many bones to merge!" );
+                                sint16 index = (sint16)model->bones.size();
                                 model->bones.push_back( bone );
                                 names[ bone.name ] = index;
@@ -268 +286 @@
                         else
                         {
-                                translate[b] = (nv::sint16)iname->second;
+                                translate[b] = (sint16)iname->second;
                         }
                 }
@@ -274 +292 @@
                 {
                         mesh_data* mesh = model->meshes[m];
-                        nv::mesh_raw_channel* channel = mesh->get_channel_data()[0];
-                        nv::assimp_skinned_vtx* va = (nv::assimp_skinned_vtx*)channel->data;
+                        mesh_raw_channel* channel = mesh->get_channel_data()[0];
+                        assimp_skinned_vtx* va = (assimp_skinned_vtx*)channel->data;
                         for ( unsigned v = 0; v < channel->count; ++v )
                         {
-                                nv::assimp_skinned_vtx& vertex = va[v];
-
-                                for (nv::uint32 i = 0 ; i < 4; ++i)
+                                assimp_skinned_vtx& vertex = va[v];
+
+                                for (uint32 i = 0 ; i < 4; ++i)
                                 {
                                         if ( vertex.boneweight[i] > 0.0f )