Changeset 470 for trunk/src/gfx/mesh_creator.cc

Timestamp:

09/17/15 17:19:14 (10 years ago)

Author:

epyon

Message:

• animation time definition fixes

File:

• trunk/src/gfx/mesh_creator.cc (modified) (4 diffs)

trunk/src/gfx/mesh_creator.cc

@@ -9 +9 @@
 #include "nv/interface/data_channel_access.hh"
 
+#include "nv/core/logging.hh"
+
 struct nv_key_transform { nv::transform tform; };
 
@@ -16 +18 @@
         merge_keys();
         uint32 max_frames = 0;
-        for ( auto keys : m_data->m_data )
-        {
+
+        nv::vector< sint16 > ids;
+        {
+                // TODO: simplify this shit!
+                // The complexity here is that we cannot pre-transform in any order
+                // as the bones depend on previous bones, but ARE NOT IN ORDER
+                // 
+                // Either rewrite this a lot nicer, or sort the bones on creation
+                // by tree-order.
+
+                ids.reserve( m_data->m_data.size() );
+                {
+                        nv::vector< sint16 > ids_next;
+                        ids_next.reserve( m_data->m_data.size() );
+                        ids_next.push_back( -1 );
+                        while ( !ids_next.empty() )
+                        {
+                                sint16 pid = ids_next.back();
+                                ids_next.pop_back();
+                                for ( sint16 i = 0; i < sint16(m_data->m_data.size()); ++i )
+                                        if ( m_data->m_data[i]->get_parent_id() == pid )
+                                        {
+                                                sint16* it = nv::find( ids.begin(), ids.end(), i );
+                                                if ( it == ids.end() )
+                                                {
+                                                        ids.push_back( i );
+                                                        ids_next.push_back( i );
+                                                }
+                                        }
+                        }
+                }
+
+                if ( ids.size() != m_data->m_data.size() )
+                {
+                        NV_LOG_WARNING( "Bad skeleton!" );
+                }
+        }
+
+        NV_LOG_DEBUG( "ID/PID" );
+        for ( auto id : ids )
+        {
+                data_channel_set* keys = m_data->m_data[id];
                 sint16 parent_id = keys->get_parent_id();
-                data_channel_set* pkeys  = ( parent_id != -1 ? m_data->m_data[parent_id] : nullptr );
+                NV_LOG_DEBUG( "Id : ", id, " PID", parent_id );
+                data_channel_set* pkeys = ( parent_id != -1 ? m_data->m_data[parent_id] : nullptr );
                 size_t count     = ( keys ? keys->get_channel_size(0) : 0 );
                 size_t pcount    = ( pkeys ? pkeys->get_channel_size(0) : 0 );
@@ -26 +69 @@
                 {
                         data_channel_access< nv_key_transform > channel_creator( keys, 0 );
+
                         nv_key_transform* channel = channel_creator.data();
                         const nv_key_transform* pchannel = pkeys->get_channel(0)->data_cast< nv_key_transform >();
@@ -38 +82 @@
         if ( m_data->m_frame_rate == 1 )
         {
-                m_data->m_frame_rate = 32;
-                m_data->m_duration   = static_cast<float>( max_frames );
+                m_data->m_frame_rate  = 32;
+                m_data->m_frame_count = max_frames;
         }