Changeset 513

Timestamp:

02/20/08 18:03:47 (11 months ago)

Author:

phill

Message:

o Wheee!

Files:

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

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

@@ -369 +369 @@
-        */
-        void remap_vertices( const std::vector< index > &remap );
+
+        std::vector< index > get_triangle_list_indices() const;
+        void optimize( bool generate_stitched_strips = false );
-
-        size_t vertex_count() const { return base_shape.size(); }
@@ -454 +457 @@
-        void rebind_and_remove_influence( const influence_ptr &old_influence, const influence_ptr &new_influence );
-
+        void unbind_weak_influences( float min_weight, bool renormalize_weights = true );
+        void unbind_excess_influences( size_t max_influences, bool renormalize_weights = true );
+        void normalize_influence_weights();
+
+        std::vector< size_t > count_influence_uses() const;
+        std::vector< size_t > count_bone_uses() const;
+
+        void remove_unused_influences();
+        void remove_unused_bones();
+
-private:
-        int _bone_update_count;
@@ -494 +507 @@
-        void reset();
-        bool next();
-
+ const
-
-private:
@@ -515 +528 @@
-        void reset();
-        bool next();
-
-
+ const
+ const
-
-private:

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

@@ -94 +94 @@
-}
-
-
+ const
-{
-        if( !model || cur_lod == end_lod || cur_grp < 0 )
@@ -161 +161 @@
-}
-
-
+ const
-{
-
+|| cur_idx < 0 
-                throw error();
-
@@ -169 +169 @@
-}
-
-
+ const
-{
-
+|| cur_idx < 0 
-                throw error();
-

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

@@ -179 +179 @@
-        for( size_t i = 0; i < morph_targets.size(); i++ )
-        {
-
-
-
-
-
+morph_targets[i]->vertices = 
+
+
+weights = 
+indices = 
-
-        for( size_t i = 0; i < indices.size(); i++ )
-                indices[i] = remap[indices[i]];
+}
+
+std::vector< index > geometry::get_triangle_list_indices() const
+{
+        switch( prim_type )
+        {
+        case primitive_type::triangle_list:
+        case primitive_type::triangle_strip:
+        case primitive_type::triangle_fan:
+                break;
+
+        default:
+                throw error( "Can't get triangle indices for non-triangle geometry." );
+        }
+
+        size_t elem_count = index_count() ? index_count() : vertex_count();
+        size_t prim_count = (size_t)primitive_type::elems_to_prims( prim_type, (uint)elem_count );
+
+        std::vector< index > ret( prim_count * 3 );
+
+        if( prim_type == primitive_type::triangle_list && index_count() )
+        {
+                if( indices.size() != ret.size() )
+                        throw error( "Odd index count." );
+
+                std::copy( indices.begin(), indices.end(), ret.begin() );
+        }
+        else
+        {
+                size_t i = 0;
+
+                primitive_iterator< index > iter( prim_type, &indices[0], (uint)indices.size() );
+                while( iter.next() )
+                {
+                        ret[i + 0] = iter.current( 0 );
+                        ret[i + 1] = iter.current( 1 );
+                        ret[i + 2] = iter.current( 2 );
+
+                        i += 3;
+                }
+        }
+
+        return ret;
+}
+
+void geometry::optimize( bool generate_stitched_strips )
+{
+        if( !indices.size() )
+                //nothing to do on non-indexed geometry
+                return;
+
+        switch( prim_type )
+        {
+        case primitive_type::point_list:
+                //nothing to do here
+                return;
+
+        case primitive_type::triangle_list:
+        case primitive_type::triangle_strip:
+        case primitive_type::triangle_fan:
+                break;
+
+        default:
+                //should I bother with this?
+                return;
+        }
+
+        if( vertex_count() > index_traits::max_val )
+                //nv's lib can't handle these
+                return;
+
+        nv::DisableRestart();
+        nv::SetCacheSize( nv::CACHESIZE_GEFORCE3 );
+
+        if( generate_stitched_strips )
+        {
+                nv::SetListsOnly( false );
+                nv::SetStitchStrips( true );
+        }
+        else
+        {
+                nv::SetListsOnly( true );
+        }
+
+        ushort num_prim_groups;
+        nv::PrimitiveGroup *strip, *remap;
+
+        std::vector< index > tri_indices = get_triangle_list_indices();
+
+        nv::GenerateStrips( &tri_indices[0], (uint)tri_indices.size(), &strip, &num_prim_groups );
+        auto_array< nv::PrimitiveGroup > del_strip( strip );
+
+        nv::RemapIndices( strip, num_prim_groups, (ushort)vertex_count(), &remap );
+        auto_array< nv::PrimitiveGroup > del_remap( remap );
+
+        if( generate_stitched_strips )
+        {
+                if( num_prim_groups != 1 )
+                {
+                        optimize( false ); //failed strips, give it one more shot as lists
+                        return;
+                }
+                else
+                        prim_type = primitive_type::triangle_strip;
+        }
+        else
+                prim_type = primitive_type::triangle_list;
+
+        //build the remap table (wheee!)
+        std::vector< index > remap_table( vertex_count() );
+
+        //TODO
+
+        remap_vertices( remap_table );
-}
-

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

@@ -119 +119 @@
-        for( vertex_enumerator iter( *this ); iter.next(); )
-        {
-
+&
-
-                for( size_t i = 0; i < vertex_weights::max_weights; i++ )
@@ -126 +126 @@
-                                continue;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-        }
@@ -143 +152 @@
-void model_builder::erase_influence( const influence_ptr &influence )
-{
+        if( !influence )
+                return;
+
-        std::vector< influence_ptr >::iterator pos =
-                std::find( influences.begin(), influences.end(), influence );
@@ -150 +162 @@
-}
-
+void model_builder::unbind_weak_influences( float min_weight, bool renormalize_weights )
+{
+        for( vertex_enumerator iter( *this ); iter.next(); )
+        {
+                vertex_weights &weights = iter.current_geometry().weights[iter.current_index()];
+                weights.trim_weak( min_weight, renormalize_weights );
+        }
+}
+
+void model_builder::unbind_excess_influences( size_t max_influences, bool renormalize_weights )
+{
+        for( vertex_enumerator iter( *this ); iter.next(); )
+        {
+                vertex_weights &weights = iter.current_geometry().weights[iter.current_index()];
+                weights.trim_count( max_influences, renormalize_weights );
+        }
+}
+
+void model_builder::normalize_influence_weights()
+{
+        for( vertex_enumerator iter( *this ); iter.next(); )
+        {
+                vertex_weights &weights = iter.current_geometry().weights[iter.current_index()];
+                weights.normalize_weights();
+        }
+}
+
+std::vector< size_t > model_builder::count_influence_uses() const
+{
+        std::vector< size_t > ret( influences.size(), 0 );
+
+        for( vertex_enumerator iter( *const_cast< model_builder* >( this ) ); iter.next(); )
+        {
+                const vertex_weights &weights = iter.current_geometry().weights[iter.current_index()];
+
+                for( size_t i = 0; i < vertex_weights::max_weights; i++ )
+                {
+                        if( weights[i].influence() )
+                                ret[weights[i].influence()->_index]++;
+                }
+        }
+
+        return ret;
+}
+
+void model_builder::remove_unused_influences()
+{
+        std::vector< size_t > use_counts = count_influence_uses();
+        for( size_t i = influences.size(); i--; )
+        {
+                if( !use_counts[i] )
+                        influences.erase( influences.begin() + i );
+        }
+}
+
-};
-};

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

@@ -313 +313 @@
-}
-
+std::vector< size_t > model_builder::count_bone_uses() const
+{
+        std::vector< size_t > ret( bones.size(), 0 );
+
+        for( size_t i = 0; i < influences.size(); i++ )
+        {
+                if( influences[i]->_bone )
+                        ret[influences[i]->_bone->_index]++;
+        }
+
+        for( size_t i = 0; i < tags.size(); i++ )
+        {
+                if( tags[i]->_bone )
+                        ret[tags[i]->_bone->_index]++;
+        }
+
+        return ret;
+}
+
+void model_builder::remove_unused_bones()
+{
+        std::vector< size_t > use_counts = count_bone_uses();
+        for( size_t i = bones.size(); i--; )
+        {
+                if( !use_counts[i] )
+                        bones.erase( bones.begin() + i );
+        }
+}
-
-};