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

Timestamp:

07/08/15 17:33:38 (10 years ago)

Author:

epyon

Message:

• merge of vertex_descriptor and key_descriptor concepts - unified raw data description via data_descriptor
• minor bugfixes

File:

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

trunk/src/formats/assimp_loader.cc

@@ -50 +50 @@
 };
 
-struct assimp_key_p  { float time; vec3 position; };
+struct assimp_key_p  { float time; vec3 translation; };
 struct assimp_key_r  { float time; quat rotation; };
 struct assimp_key_s  { float time; vec3 scale; };
@@ -430 +430 @@
         for ( unsigned np = 0; np < node->mNumPositionKeys; ++np )
         {
-                pchannel[np].time     = static_cast<float>( node->mPositionKeys[np].mTime );
-                pchannel[np].position = assimp_vec3_cast(node->mPositionKeys[np].mValue);
+                pchannel[np].time        = static_cast<float>( node->mPositionKeys[np].mTime );
+                pchannel[np].translation = assimp_vec3_cast(node->mPositionKeys[np].mValue);
         }
         for ( unsigned np = 0; np < node->mNumRotationKeys; ++np )