Changeset 524

Timestamp:

02/25/08 17:48:11 (11 months ago)

Author:

phill

Message:

o Batcherizationish.

Files:

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

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

@@ -36 +36 @@
-{
-public:
-group_ptr      
+const_group_ptr
-        group_ptr                                               target_group;
-        std::vector< index >                    vertex_map;             //maps source vertices to the target group
-        std::vector< influence_ptr >    influences;
-        size_t                                                  prim_count;
+        size_t                                                  max_infs_per_vert;
-
-        void compute_append_vert_cost( index src_idx, size_t &inf_cost ) const;
@@ -62 +63 @@
-{
-public:
-group_ptr      
+const_group_ptr
-
-        size_t                                                  prim_count;
@@ -71 +72 @@
-        std::vector< group_split_target_ptr > target_groups;
-
-
+const_
-        group_split_target_ptr create_target();
-
@@ -78 +79 @@
-                return list_indices[prim_index * elems_per_prim + elem_index];
-        }
+
+        void split_by_weight_count();
-};
-
@@ -88 +91 @@
-        source_group( owner->source ), target_group( new group() ),
-        vertex_map( owner->source->geometry.vertex_count(), invalid_index ),
-
+, max_infs_per_vert( 0 )
-{
-        target_group->material_name = source_group->material_name;
@@ -136 +139 @@
-                dst.morph_targets[i]->vertices.push_back(
-                        src.morph_targets[i]->vertices[src_idx] );
+        }
+
+        const vertex_weights &wts = src.weights[src_idx];
+        size_t wt_count = wts.count();
+
+        max_infs_per_vert = max( wt_count, max_infs_per_vert );
+
+        for( size_t j = 0; j < wt_count; j++ )
+        {
+                const vertex_weight &w = wts[j];
+
+                if( std::find( influences.begin(), influences.end(),
+                        w.influence() ) == influences.end() )
+                {
+                        influences.push_back( w.influence() );
+                }
-        }
-
@@ -176 +195 @@
-                }
-
-
-
-
-
-
-
-
-
-
-
-
+
-        }
-}
@@ -194 +203 @@
-*/
-
-
+const_
-        : source( source ), prim_count( source->geometry.primitive_count() ),
-        elems_per_prim( source->geometry.prim_type.elems_per_prim() ),
@@ -209 +218 @@
-}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+