Changeset 414 for trunk

Timestamp:

07/09/15 19:19:26 (10 years ago)

Author:

epyon

Message:

• fix for key_data - everything is fine again

Location:

trunk/nv

Files:

• gfx/animation.hh (modified) (1 diff)
• interface/data_descriptor.hh (modified) (1 diff)

trunk/nv/gfx/animation.hh

@@ -29 +29 @@
                         NV_ASSERT( channel, "nullptr passed to add_channel!" );
                         m_channels.push_back( channel );
-                        m_final_key.append( channel->descriptor() );
+                        for ( const auto& cslot : channel->descriptor() )
+                                if ( cslot.vslot != slot::TIME )
+                                        m_final_key.push_slot( cslot.etype, cslot.vslot );
+                        //m_final_key.append( channel->descriptor() );
                 }
 

trunk/nv/interface/data_descriptor.hh

@@ -272 +272 @@
                 }
 
+                void push_slot( datatype etype, slot vslot )
+                {
+                        m_slots[m_count].etype  = etype;
+                        m_slots[m_count].offset = m_size;
+                        m_slots[m_count].vslot  = vslot;
+                        m_size += get_datatype_info( etype ).size;
+                        m_count++;
+                }
+
                 void append( const data_descriptor& desc )
                 {