Changeset 538

Timestamp:

03/05/08 17:28:58 (10 months ago)

Author:

phill

Message:

o Greedy split.

Files:

• branches/morph-targets/libx42make/modelbuilder-batch.cpp (modified) (3 diffs)

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

@@ -56 +56 @@
-        void append_index( index src_idx );
-
+        size_t vertex_count() const { return dst_to_src_vert_map.size(); }
+
-private:
-        group_split_context *owner;
@@ -92 +94 @@
-
-        void split_by_weight_count();
+        void greedy_split( size_t max_verts, size_t max_prims, size_t max_influences );
+        void topological_split( size_t max_verts, size_t max_prims, size_t max_influences );
+
-        void cost_ordered_merge( size_t max_verts, float up_merge_limit_factor );
-
@@ -453 +458 @@
-}
-
+void group_split_context::greedy_split( size_t max_verts,
+        size_t max_prims, size_t max_influences )
+{
+        for( size_t i_prim = 0; i_prim < prim_count; i_prim++ )
+        {
+                //find the best group to add this triangle to
+                
+                group_split_target_ptr target;
+                size_t target_vert_cost, target_inf_cost;
+
+                for( size_t j = 0; j < target_groups.size(); j++ )
+                {
+                        group_split_target_ptr candidate = target_groups[j];
+                        
+                        //see if this candidate even has room for the insert
+                        if( candidate->prim_count + 1 > max_prims )
+                                continue;
+
+                        size_t vert_cost, inf_cost;
+                        candidate->compute_append_prim_cost( i_prim, vert_cost, inf_cost );
+
+                        if( candidate->vertex_count() + vert_cost > max_verts )
+                                continue;
+                        if( candidate->influences.size() + inf_cost > max_influences )
+                                continue;
+
+                        //it's OK to add to this group, see if it's the best one
+                        if( !target || inf_cost < target_inf_cost ||
+                                (inf_cost == target_inf_cost && vert_cost < target_vert_cost ) )
+                        {
+                                target = candidate;
+                                target_vert_cost = vert_cost;
+                                target_inf_cost = inf_cost;
+                        }
+                }
+
+                if( !target )
+                        target = create_target();
+
+                target->append_prim( i_prim );
+        }
+}
+
+void group_split_context::topological_split( size_t max_verts,
+        size_t max_prims, size_t max_influences )
+{
+        if( elems_per_prim != 3 )
+                throw error( "Topological split only works on triangles." );
+
+
+}
+
-group_split_target_ptr group_split_context::internal_merge_groups(
-        group_split_target_ptr a, group_split_target_ptr b )