Changeset 419 for trunk/src/formats

Timestamp:

07/14/15 20:19:52 (10 years ago)

Author:

epyon

Message:

• animation - key_channel_set simplified to data_channel_set
• animation - raw_channel_interpolator

Location:

trunk/src/formats

Files:

• assimp_loader.cc (modified) (1 diff)
• md3_loader.cc (modified) (1 diff)
• md5_loader.cc (modified) (1 diff)
• nmd_loader.cc (modified) (1 diff)

trunk/src/formats/assimp_loader.cc

@@ -418 +418 @@
         }
 
-        data->data = key_channel_set_creator::create( 2 );
-        key_channel_set_creator key_set( data->data );
+        data->data = data_channel_set_creator::create( 2 );
+        data_channel_set_creator key_set( data->data );
 
         assimp_key_p* pchannel = key_set.add_channel< assimp_key_p >( node->mNumPositionKeys ).data();

trunk/src/formats/md3_loader.cc

@@ -429 +429 @@
                 nodes[i].parent_id = -1;
                 nodes[i].target_id = -1;
-                nodes[i].data      = key_channel_set_creator::create( 1 );
-                load_tags( key_channel_set_creator( nodes[i].data ).add_channel<md3_key>( uint32( md3->header.num_frames ) ).channel(), name );
+                nodes[i].data      = data_channel_set_creator::create( 1 );
+                load_tags( data_channel_set_creator( nodes[i].data ).add_channel<md3_key>( uint32( md3->header.num_frames ) ).channel(), name );
         }
         return new mesh_nodes_data( "tags", node_count, nodes );

trunk/src/formats/md5_loader.cc

@@ -250 +250 @@
                                 nodes[i].transform = mat4();
                                 nodes[i].target_id = -1;
-                                nodes[i].data = key_channel_set_creator::create( 1 );
-                                key_channel_set_creator( nodes[i].data ).add_channel< md5_key_t >( num_frames );
+                                nodes[i].data = data_channel_set_creator::create( 1 );
+                                data_channel_set_creator( nodes[i].data ).add_channel< md5_key_t >( num_frames );
                                 next_line( sstream );
                         }

trunk/src/formats/nmd_loader.cc

@@ -121 +121 @@
                 if ( ch_count > 0 )
                 {
-                        key_channel_set* kdata = key_channel_set_creator::create( ch_count );
-                        key_channel_set_creator kaccess( kdata );
+                        data_channel_set* kdata = data_channel_set_creator::create( ch_count );
+                        data_channel_set_creator kaccess( kdata );
                         m_node_array[i].data = kdata;
                         for ( uint32 c = 0; c < ch_count; ++c )