Changeset 514

Timestamp:

02/21/08 03:01:30 (11 months ago)

Author:

phill

Message:

o Geometry optimization.

Files:

• branches/morph-targets/libx42make/include/x42make-modelbuilder.h (modified) (2 diffs)
• branches/morph-targets/libx42make/modelbuilder-geometry.cpp (modified) (7 diffs)

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

@@ -371 +371 @@
-
-        std::vector< index > get_triangle_list_indices() const;
-
+
+
+
+
+
+
+
+
-
-        size_t vertex_count() const { return base_shape.size(); }
@@ -435 +442 @@
-        influence_ptr create_influence( const bone_ptr &bone = bone_ptr(), const ::x42::math::affine &matrix = ::x42::math::affinei() );
-        tag_ptr create_tag( const std::string &name = std::string(), const bone_ptr &bone = bone_ptr(), const ::x42::math::affine &matrix = ::x42::math::affinei() );
+
+        void optimize_geometry( geometry::optimize_type opt_type = geometry::optimize_type::match_current );
-
-        void begin_bone_update(); //suspends bone validation and sorting

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

@@ -232 +232 @@
-}
-
-bool generate_stitched_strips
+optimize_type opt_type
-{
-        if( !indices.size() )
@@ -238 +238 @@
-                return;
-
+        bool generate_stitched_strips;
+
-        switch( prim_type )
-        {
@@ -244 +246 @@
-                return;
-
+        case primitive_type::triangle_fan:
+                if( opt_type == optimize_type::match_current )
+                        return;
+
+                generate_stitched_strips = false; //silence warning
+                break;
+
-        case primitive_type::triangle_list:
+                generate_stitched_strips = false;
+                break;
+
-        case primitive_type::triangle_strip:
-case primitive_type::triangle_fan:
+       generate_stitched_strips = true;
-                break;
-
@@ -254 +266 @@
-        }
-
+        switch( opt_type )
+        {
+        case optimize_type::prefer_lists:
+                generate_stitched_strips = false;
+                break;
+
+        case optimize_type::prefer_strips:
+                generate_stitched_strips = true;
+                break;
+        }
+
-        if( vertex_count() > index_traits::max_val )
-                //nv's lib can't handle these
@@ -285 +308 @@
-        {
-                if( num_prim_groups != 1 )
-
-
-
-
-
-
+
+
+
-        }
-        else
@@ -296 +316 @@
-
-        //build the remap table (wheee!)
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        remap_vertices( remap_table );
-}
@@ -330 +375 @@
-*/
-
+void model_builder::optimize_geometry( geometry::optimize_type opt_type )
+{
+        for( group_enumerator iter( *this ); iter.next(); )
+        {
+                iter.current()->group_geometry.optimize( opt_type );
+        }
+}
+
-};
-};