Changeset 483 for trunk

Timestamp:

11/17/15 20:25:58 (10 years ago)

Author:

epyon

Message:

• skeleton updates

Location:

trunk

Files:

• nv/gfx/skeleton_instance.hh (modified) (1 diff)
• nv/interface/scene_node.hh (modified) (1 diff)
• src/gfx/skeleton_instance.cc (modified) (1 diff)

trunk/nv/gfx/skeleton_instance.hh

@@ -84 +84 @@
                 const transform* transforms() const { return m_transforms.data(); }
                 size_t size() const { return m_transforms.size(); }
+                void assign( const data_node_list* node_data );
+                void assign( const skeleton_transforms& other );
+                void interpolate( const skeleton_transforms& a, const skeleton_transforms& b, float t );
                 void animate_local( const mesh_nodes_data* node_data, const skeleton_binding& binding, float frame );
                 void animate( const mesh_nodes_data* node_data, const skeleton_binding& binding, float frame, bool local = false )

trunk/nv/interface/scene_node.hh

@@ -81 +81 @@
                 list::const_iterator begin() { return m_children.cbegin(); }
                 list::const_iterator end()   { return m_children.cend(); }
+                list& children() { return m_children; }
 
                 virtual ~scene_node()

trunk/src/gfx/skeleton_instance.cc

@@ -60 +60 @@
         if ( bones.size() != m_matrix.size() )
                 m_matrix.resize( bones.size() );
+}
+
+void nv::skeleton_transforms::assign( const data_node_list* node_data )
+{
+        NV_ASSERT( node_data, "!!!" );
+        if ( m_transforms.size() != node_data->size() )
+                m_transforms.resize( node_data->size() );
+        for ( uint32 n = 0; n < node_data->size(); ++n )
+        {
+                const data_node_info& info = (*node_data)[ n ];
+                m_transforms[n] = transform( info.transform );
+        }
+}
+
+void nv::skeleton_transforms::interpolate( const skeleton_transforms& a, const skeleton_transforms& b, float t )
+{
+        NV_ASSERT( a.size() == b.size(), "!!!" );
+        if ( m_transforms.size() != a.size() )
+                m_transforms.resize( a.size() );
+        for ( uint32 n = 0; n < a.size(); ++n )
+        {
+                m_transforms[n] = nv::interpolate( a.m_transforms[n], b.m_transforms[n], t );
+        }
+}
+
+void nv::skeleton_transforms::assign( const skeleton_transforms& other )
+{
+        m_transforms.assign( other.m_transforms );
 }