Changeset 523

Timestamp:

02/25/08 15:52:26 (11 months ago)

Author:

phill

Message:

o Getting up to speed on the splitting algorithms. Whee!

Files:

• branches/morph-targets/libx42make/include/x42make-modelbuilder.h (modified) (5 diffs)
• branches/morph-targets/libx42make/libx42make.vcproj (modified) (1 diff)
• branches/morph-targets/libx42make/modelbuilder-batch.cpp (added)
• branches/morph-targets/libx42make/modelbuilder-geometry.cpp (modified) (2 diffs)

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

@@ -61 +61 @@
-        void intrusive_ptr_release( const ref_obj *r );
-
+        class group_split_target;
+        class group_split_context;
+
-        class model_data_builder;
-};
@@ -442 +445 @@
-        void remap_vertices( const std::vector< index > &remap );
-
+        std::vector< index > get_point_list_indices() const;
+        std::vector< index > get_line_list_indices() const;
-        std::vector< index > get_triangle_list_indices() const;
+
+        std::vector< index > get_list_indices() const;
-
-        X42_DECLARE_ENUM( optimize_type )
@@ -454 +461 @@
-        size_t vertex_count() const { return base_shape.size(); }
-        size_t index_count() const { return indices.size(); }
+        size_t element_count() const { return indices.size() ? indices.size() : vertex_count(); }
+        size_t primitive_count() const { return prim_type.elems_to_prims( (uint)element_count() ); }
-
-        size_t count_max_influences_per_vert() const;
@@ -467 +476 @@
-
-        friend class model_builder;
+
+        friend class _impl::group_split_target;
+        friend class _impl::group_split_context;
-};
-
@@ -482 +494 @@
-
-        friend class lod;
+
+        friend class _impl::group_split_target;
+        friend class _impl::group_split_context;
-};
-

branches/morph-targets/libx42make/libx42make.vcproj

@@ -661 +661 @@
-                </File>
-                <File
+                        RelativePath=".\modelbuilder-batch.cpp"
+                        >
+                </File>
+                <File
-                        RelativePath=".\modelbuilder-cull.cpp"
-                        >

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

@@ -239 +239 @@
-}
-
+std::vector< index > geometry::get_point_list_indices() const
+{
+        if( prim_type != primitive_type::point_list )
+                throw error( "Can't get point indices for non-point geometry." );
+
+        std::vector< index > ret;
+
+        if( indices.size() )
+        {
+                ret.insert( ret.end(), indices.begin(), indices.end() );
+        }
+        else
+        {
+                ret.resize( vertex_count() );
+                for( size_t i = 0; i < ret.size(); i++ )
+                        ret[i] = (index)i;
+        }
+
+        return ret;
+}
+
+std::vector< index > geometry::get_line_list_indices() const
+{
+        switch( prim_type )
+        {
+        case primitive_type::line_list:
+        case primitive_type::line_strip:
+                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 * 2 );
+
+        if( prim_type == primitive_type::line_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 );
+
+                        i += 2;
+                }
+        }
+
+        return ret;
+}
+
-std::vector< index > geometry::get_triangle_list_indices() const
-{
@@ -280 +342 @@
-
-        return ret;
+}
+
+std::vector< index > geometry::get_list_indices() const
+{
+        switch( prim_type )
+        {
+        case primitive_type::point_list:
+                return get_point_list_indices();
+
+        case primitive_type::line_list:
+        case primitive_type::line_strip:
+                return get_line_list_indices();
+
+        case primitive_type::triangle_list:
+        case primitive_type::triangle_strip:
+        case primitive_type::triangle_fan:
+                return get_triangle_list_indices();
+
+        default:
+                throw error( "Invalid primitive type." );
+        }
-}
-