Changeset 287 for trunk/nv/gfx/animation.hh

Timestamp:

07/23/14 15:24:03 (11 years ago)

Author:

epyon

Message:

• mesh_data_pack's in every format
• md5_mesh_data removed, uses standard mesh_data
• BONE_ARRAY in NMD is now a simple set of animation nodes
• bone and animation node concepts merged
• several minor changes

File:

• trunk/nv/gfx/animation.hh (modified) (4 diffs)

trunk/nv/gfx/animation.hh

@@ -73 +73 @@
 
                         uint32 slot = 0;
-                        int index    = -1;
+                        int index0  = -1;
+                        int index1  = -1;
                         float factor = 1.0f;
                         if ( desc.slots[0].vslot == animation_slot::TIME )
                         {
+                                NV_ASSERT( desc.slots[0].offset == 0, "time offset not zero!" );
                                 slot++;
                                 keyfresult--;
@@ -84 +86 @@
                                         return keyfresult;
                                 }
-                                uint32 toffset = desc.slots[0].offset / 4;
-                                for ( int i = 0 ; i < (int)count - 1 ; i++ )
+                                for ( int i = 1 ; i < (int)count ; i++ )
                                 {
-                                        if ( time < fdata[ i * keyfsize + keyfsize + toffset ] ) { index = i; break; }
+                                        if ( time < fdata[ i * keyfsize ] ) { index0 = i - 1; break; }
                                 }
-                                NV_ASSERT( index >= 0, "animation time fail!");
-                                float time0  = fdata[ index * keyfsize + toffset ];
-                                float time1  = fdata[ index * keyfsize + keyfsize + toffset ];
+                                NV_ASSERT( index0 >= 0, "animation time fail!");
+                                index1 = index0 + 1;
+                                float time0  = fdata[ index0 * keyfsize ];
+                                float time1  = fdata[ index1 * keyfsize ];
                                 float delta  = time1 - time0;
                                 factor = glm::clamp( (time - time0) / delta, 0.0f, 1.0f );
@@ -102 +104 @@
                                         return keyfresult;
                                 }
-                                index  = glm::clamp<int>( int( time ), 0, count - 2 );
-                                factor = glm::clamp<float> ( time - index, 0.0f, 1.0f );
+                                index0 = glm::clamp<int>( int( time ), 0, count - 2 );
+                                index1 = index0 + 1;
+                                factor = glm::clamp<float> ( time - index0, 0.0f, 1.0f );
                         }
                         uint32 ret = 0;
@@ -110 +113 @@
                                 ret += nv::interpolate_raw( 
                                         desc.slots[slot], factor, 
-                                        fdata + index * keyfsize + desc.slots[slot].offset / 4,
-                                        fdata + index * keyfsize + keyfsize + desc.slots[slot].offset / 4,
+                                        fdata + index0 * keyfsize + desc.slots[slot].offset / 4,
+                                        fdata + index1 * keyfsize + desc.slots[slot].offset / 4,
                                         result + ret );
                         }