Changeset 517

Timestamp:

02/22/08 18:01:54 (11 months ago)

Author:

phill

Message:

o More WIP stuff.

Files:

• branches/morph-targets/libx42make/include/x42make-modelbuilder.h (modified) (4 diffs)
• branches/morph-targets/libx42make/modelbuilder-animation.cpp (modified) (2 diffs)
• branches/morph-targets/libx42make/modelbuilder-geometry.cpp (modified) (3 diffs)
• branches/morph-targets/libx42make/modelbuilder-influences.cpp (modified) (1 diff)
• branches/morph-targets/libx42make/modelbuilder-skeleton.cpp (modified) (1 diff)

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

@@ -430 +430 @@
-
-        void optimize( optimize_type opt_type = optimize_type::match_current );
+        
+        void bake_vertices( const std::vector< ::x42::math::affine > &inf_mats );
-
-        size_t vertex_count() const { return base_shape.size(); }
@@ -435 +437 @@
-
-        bool is_valid() const;
+
+private:
+        bool are_vert_arrays_parallell() const;
-};
-
@@ -522 +527 @@
-        void apply_root_scale( const ::x42::math::vec3 &pos_ofs, const ::x42::math::quat &rot_ofs,
-                const ::x42::math::vec3 &inner_scale_ofs, const ::x42::math::vec3 &outer_scale_ofs );
+
+        void collapse_constant_bones();
-
-        //unbinds all vertices from influence
@@ -534 +541 @@
-        void rebind_duplicate_influences();
-
+        void collapse_static_influences();
+
-        void unbind_weak_influences( float min_weight, bool renormalize_weights = true );
-        void unbind_excess_influences( size_t max_influences, bool renormalize_weights = true );

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

@@ -420 +420 @@
-        std::swap( rotation, new_rot );
-        std::swap( scale, new_scale );
+
+        local_matrices.clear();
+        world_matrices.clear();
-}
-
@@ -453 +456 @@
-        clean_track( rotation, tight_tol.rotation );
-        clean_track( scale, tight_tol.scale );
+
+        local_matrices.clear();
+        world_matrices.clear();
-}
-

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

@@ -348 +348 @@
-}
-
-is_valid
+are_vert_arrays_parallell
-{
-        size_t num_verts = base_shape.size();
@@ -362 +362 @@
-        }
-
+        return true;
+}
+
+bool geometry::is_valid() const
+{
+        size_t num_verts = base_shape.size();
+
+        if( !are_vert_arrays_parallell() )
+                return false;
+
-        for( size_t i = 0; i < indices.size(); i++ )
-        {
@@ -369 +379 @@
-
-        return true;
+}
+
+void geometry::bake_vertices( const std::vector< ::x42::math::affine > &inf_mats )
+{
+        if( !are_tracks_parallell() )
+                throw validation_error( "Can't bake non-parallell vertex arrays." );
+
+        std::vector< vertex_geometry > new_shape( base_shape.size() );
+        std::vector< morph_target_ptr > new_morph_targets( morph_targets.size() );
+
+        DO NOT LET THIS COMPILE UNTIL I FIX THIS SHIT
-}
-

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

@@ -205 +205 @@
-}
-
+void model_builder::collapse_static_influences()
+{
+        std::vector< affine > static_mats( influences.size(), affinei() );
+
+        for( size_t i = 0; i < influences.size(); i++ )
+        {
+                influence_ptr inf = influences[i];
+
+                if( !inf->_bone )
+                        static_mats[i] = inf->matrix;
+        }
+
+        for( group_enumerator iter( *this ); iter.next(); )
+        {
+                group_ptr g = iter.current();
+                std::vector< influence_ptr > grp_infs = g->get_influences();
+
+                bool is_static = true;
+                for( size_t i = 0; i < grp_infs.size(); i++ )
+                {
+                        if( grp_infs[i]->_bone )
+                        {
+                                is_static = false;
+                                break;
+                        }
+                }
+
+                if( !is_static )
+                        continue;
+
+                g->geometry.bake_vertices( static_mats );
+        }
+}
+
-void model_builder::erase_influence( const influence_ptr &influence )
-{

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

@@ -344 +344 @@
-}
-
+void model_builder::collapse_constant_bones()
+{
+        if( _bone_update_count )
+                throw error( "Can't do bone collapse while updating bones." );
+
+        for( size_t i = 0; i < bones.size(); i++ )
+        {
+                bone_ptr b = bones[i];
+                animation_tracks &anim = b->anim_tracks;
+
+                anim.require_tracks();
+                anim.require_local();
+
+                if( i > 0 && anim.local_matrices.size() !=
+                        bones[i - 1]->anim_tracks.local_matrices.size() )
+                        throw error( "Mismatched local matrix representation size." );
+
+                if( b->flags & bone_flags::use_inverse_parent_scale )
+                        throw error( "Can't do bone collapse if bones include use_inverse_parent_scale." );
+        }
+
+        begin_bone_update();
+
+        for( size_t i = 0; i < bones.size(); i++ )
+        {
+                bone_ptr bi = bones[i];
+
+                if( bi->no_remove )
+                        continue;
+
+                const animation_tracks &anim = bi->anim_tracks;
+
+                if( anim.position.size() != 1 || anim.rotation.size() != 1 ||
+                        anim.scale.size() != 1 )
+                        //not constant, skip
+                        continue;
+
+                const affine &m = anim.local_matrices[0].value;
+
+                //push it through to its child bones
+                for( size_t j = i + 1; j < bones.size(); j++ )
+                {
+                        bone_ptr bj = bones[j];
+
+                        if( bj->_parent == bi )
+                        {
+                                bj->anim_tracks.offset_local( m );
+                                bj->_parent = bi->_parent;
+
+                                bj->anim_tracks.clean_tracks();
+                        }
+                }
+
+                //push it to its influences
+                for( size_t j = 0; j < influences.size(); j++ )
+                {
+                        influence_ptr inf = influences[j];
+
+                        if( inf->_bone == bi )
+                        {
+                                inf->matrix = m * inf->matrix;
+                                inf->_bone = bi->_parent;
+                        }
+                }
+
+                //push it to its tags
+                for( size_t j = 0; j < tags.size(); j++ )
+                {
+                        tag_ptr tag = tags[j];
+
+                        if( tag->_bone == bi )
+                        {
+                                tag->matrix = m * tag->matrix;
+                                tag->_bone = bi->_parent;
+                        }
+                }
+        }
+
+        end_bone_update();
+}
+
-};
-};