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

Timestamp:

07/21/14 02:19:34 (11 years ago)

Author:

epyon

Message:

• full pure data model for animation
• all loaders now use pure data model instead of the template/virtual one

File:

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

trunk/src/formats/assimp_loader.cc

@@ -367 +367 @@
         if (this_id == 0)
                 a_data.transform = mat4();
-        a_data.channel_count = 0;
+        a_data.data = nullptr;
 
         if (anode) 
@@ -394 +394 @@
         size_t max_keys = glm::max( node->mNumPositionKeys, node->mNumRotationKeys );
 
-        data->channel_count = 1;
-        data->channels[0] = key_raw_channel::create<assimp_key_tr>( max_keys );
-        assimp_key_tr* channel = ((assimp_key_tr*)(data->channels[0]->data));
+        key_raw_channel* raw_channel = key_raw_channel::create<assimp_key_tr>( max_keys );
+        data->data = new key_data;
+        data->data->add_channel( raw_channel );
+        assimp_key_tr* channel = ((assimp_key_tr*)(raw_channel->data));
 
         for ( unsigned n = 0; n < max_keys; ++n )
@@ -406 +407 @@
                 // TODO: only do the calculation when a rotate transform is present!
                 nv::transform ptr;
-                if ( parent )
-                {
-                        key_raw_channel* pchannel = parent->channels[0];
-                        if ( parent->channels[0] && parent->channels[0]->count > 0 )
-                        {
-                                ptr = ((assimp_key_tr*)pchannel->data)[ glm::min( n, parent->channels[0]->count-1 ) ].tform;
+                if ( parent && parent->data )
+                {
+                        const key_raw_channel* pchannel = parent->data->get_channel(0);
+                        if ( pchannel && pchannel->count > 0 )
+                        {
+                                ptr = ((assimp_key_tr*)pchannel->data)[ glm::min( n, pchannel->count-1 ) ].tform;
                         }
                 }
@@ -422 +423 @@
 void nv::assimp_loader::create_direct_keys( assimp_animated_node_data* data, const void* vnode )
 {
-        data->channel_count = 0;
         const aiNodeAnim* node = (const aiNodeAnim*)vnode;
         if ( node->mNumPositionKeys == 0 && node->mNumRotationKeys == 0 && node->mNumScalingKeys == 0 )
@@ -429 +429 @@
         }
 
-        data->channel_count = 3;
-        data->channels[0] = key_raw_channel::create<assimp_key_p>( node->mNumPositionKeys );
-        data->channels[1] = key_raw_channel::create<assimp_key_r>( node->mNumRotationKeys );
-        data->channels[2] = key_raw_channel::create<assimp_key_s>( node->mNumScalingKeys );
-        assimp_key_p* pchannel = ((assimp_key_p*)(data->channels[0]->data));
-        assimp_key_r* rchannel = ((assimp_key_r*)(data->channels[1]->data));
-        assimp_key_s* schannel = ((assimp_key_s*)(data->channels[2]->data));
+        data->data = new key_data;
+        key_raw_channel* raw_pchannel = key_raw_channel::create<assimp_key_p>( node->mNumPositionKeys );
+        key_raw_channel* raw_rchannel = key_raw_channel::create<assimp_key_r>( node->mNumRotationKeys );
+        key_raw_channel* raw_schannel = key_raw_channel::create<assimp_key_s>( node->mNumScalingKeys );
+        data->data->add_channel( raw_pchannel );
+        data->data->add_channel( raw_rchannel );
+        data->data->add_channel( raw_schannel );
+        assimp_key_p* pchannel = ((assimp_key_p*)(raw_pchannel->data));
+        assimp_key_r* rchannel = ((assimp_key_r*)(raw_rchannel->data));
+        assimp_key_s* schannel = ((assimp_key_s*)(raw_schannel->data));
 
         for ( unsigned np = 0; np < node->mNumPositionKeys; ++np )