Changeset 522

Timestamp:

02/25/08 14:28:26 (11 months ago)

Author:

phill

Message:

o Now with bone extents.

Files:

• branches/morph-targets/libx42make/include/x42make-modelbuilder.h (modified) (1 diff)
• branches/morph-targets/libx42make/modelbuilder-animation.cpp (modified) (3 diffs)
• branches/morph-targets/libx42make/modelbuilder-cull.cpp (modified) (3 diffs)

branches/morph-targets/libx42make/include/x42make-modelbuilder.h

@@ -586 +586 @@
-        std::vector< size_t > count_bone_uses() const;
-
-
+
+
+
-
-        void remove_unused_influences();

branches/morph-targets/libx42make/modelbuilder-animation.cpp

@@ -634 +634 @@
-}
-
-
+
+
+
-{
-        if( _bone_update_count || _influence_update_count )
-                throw error();
-
-std::vector< affine > bone_mats( bones.size(), affinei
+bone_mats.resize( bones.size
-         
-        for( size_t i = 0; i < bones.size(); i++ )
@@ -651 +653 @@
-        }
-
-std::vector< affine > ret( influences.size(), affinei
+inf_mats.resize( influences.size
-
-        for( size_t i = 0; i < influences.size(); i++ )
@@ -658 +660 @@
-
-                if( inf->_bone )
-ret
+inf_mats
-                else
-
-
-
-
+
+
-}
-

branches/morph-targets/libx42make/modelbuilder-cull.cpp

@@ -217 +217 @@
-}
-
+template< typename InVec3IterTy, typename InWtIterTy,
+        typename InBoneMatIterTy, typename OutExtsIterTy >
+void update_bone_extents( InVec3IterTy pos_beg, InVec3IterTy pos_end,
+        InWtIterTy wt_beg, InBoneMatIterTy bone_mats_beg, OutExtsIterTy extents_begin )
+{
+        InVec3IterTy pos = pos_beg;
+        InWtIterTy wt = wt_beg;
+
+        for( ; pos != pos_end; ++pos, ++wt )
+        {
+                for( size_t i = 0; i < vertex_weights::max_weights; i++ )
+                {
+                        const vertex_weight &w = (*wt)[i];
+
+                        if( w.is_empty() )
+                                break;
+
+                        bone_ptr bone = w.influence()->bone();
+                        
+                        if( !bone )
+                                continue;
+
+                        InBoneMatIterTy mat = bone_mats_beg;
+                        std::advance( mat, bone->index() );
+
+                        OutExtsIterTy ext = extents_begin;
+                        std::advance( ext, bone->index() );
+
+                        *ext = max( *ext, dist( *pos, mat->col( 3 ) ) );
+                }
+        }
+}
-/*
-        class model_builder
@@ -265 +297 @@
-        std::vector< sphere > spheres;
-
+        std::vector< float > extents( bones.size(), 0 );
+
-        for( uint i = 0; i < _frame_count; i += frame_sample_stride )
-        {
-
+
+
+
+
-                animate_positions( anim_pos.begin(), anim_pos.end(),
-                        anim_weights.begin(), inf_mats.begin(), animed_pts.begin() );
-
+                if( !i )
+                {
+                        //only need to do this the first time
+                        update_bone_extents( anim_pos.begin(), anim_pos.end(),
+                                anim_weights.begin(), bone_mats.begin(), extents.begin() );
+                }
+
-                aabb box;
-                sphere sph;
-
-                bound_points( animed_pts.begin(), animed_pts.end(), sph, box );
-
+
-                boxes.push_back( box );
-                spheres.push_back( sph );
@@ -282 +326 @@
-        bounding_box = bound_boxes( boxes.begin(), boxes.end() );
-        bounding_sphere = bound_spheres( spheres.begin(), spheres.end() );
+
+        for( size_t i = 0; i < bones.size(); i++ )
+        {
+                bones[i]->extent = extents[i];
+        }
-}
-