Changeset 512

Timestamp:

02/20/08 14:04:56 (11 months ago)

Author:

phill

Message:

o More work.

Files:

• branches/morph-targets/libx42make/include/x42make-modelbuilder.h (modified) (6 diffs)
• branches/morph-targets/libx42make/libx42make.vcproj (modified) (1 diff)
• branches/morph-targets/libx42make/modelbuilder-enumerators.cpp (added)
• branches/morph-targets/libx42make/modelbuilder-geometry.cpp (modified) (1 diff)
• branches/morph-targets/libx42make/modelbuilder-influences.cpp (added)
• branches/morph-targets/libx42make/modelbuilder-skeleton.cpp (modified) (2 diffs)
• branches/morph-targets/libx42make/modelbuilder.cpp (modified) (1 diff)
• branches/morph-targets/x42maya/Export-Gather.cpp (modified) (1 diff)

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

@@ -370 +370 @@
-        void remap_vertices( const std::vector< index > &remap );
-
+        size_t vertex_count() const { return base_shape.size(); }
+        size_t index_count() const { return indices.size(); }
+
-        bool is_valid() const;
-};
@@ -386 +389 @@
-};
-
+class group_enumerator;
+
-class lod : public ref_obj
-{
@@ -396 +401 @@
-
-private:
-
+
+
-
-        friend class model_builder;
+        friend class group_enumerator;
-};
-
@@ -437 +444 @@
-        void begin_skeleton_update();
-        void end_skeleton_update();
+
+        //unbinds all vertices from influence
+        void unbind_influence( const influence_ptr &influence );
+        //unbinds all vertices from influence and removes it from the model
+        void unbind_and_remove_influence( const influence_ptr &influence );
+        //unbinds all vertices from old_influence and binds them to new_influence with the same weight
+        void rebind_influence( const influence_ptr &old_influence, const influence_ptr &new_influence );
+        //unbinds all vertices from old_influence and binds them to new_influence with the same weight, then removes old_influence
+        void rebind_and_remove_influence( const influence_ptr &old_influence, const influence_ptr &new_influence );
-
-private:
@@ -455 +471 @@
-        void notify_influence_bone( influence *influence );
-        void validate_influences();
+        void erase_influence( const influence_ptr &influence );
-
-        void validate_tag_bone( tag *tag, const bone_ptr &new_bone );
@@ -465 +482 @@
-};
-
+class group_enumerator
+{
+public:
+        group_enumerator();
+
+        explicit group_enumerator( model_builder &model );
+        explicit group_enumerator( const lod_ptr &lod );
+
+        group_enumerator( const group_enumerator &src );
+
+        void reset();
+        bool next();
+        group_ptr current();
+
+private:
+        model_builder   *model;
+        size_t                  beg_lod, end_lod, cur_lod;
+        int                             cur_grp;
+};
+
+class vertex_enumerator
+{
+public:
+        vertex_enumerator();
+
+        vertex_enumerator( model_builder &model );
+        vertex_enumerator( const lod_ptr &lod );
+        vertex_enumerator( const group_ptr &group );
+
+        vertex_enumerator( const vertex_enumerator &src );
+
+        void reset();
+        bool next();
+        size_t current_index();
+        geometry& current_geometry();
+
+private:
+        group_enumerator        groups;
+        group_ptr                       cur_grp;
+        int                                     cur_idx;
+};
+
-};
-};

branches/morph-targets/libx42make/libx42make.vcproj

@@ -657 +657 @@
-                </File>
-                <File
+                        RelativePath=".\modelbuilder-enumerators.cpp"
+                        >
+                </File>
+                <File
-                        RelativePath=".\modelbuilder-geometry.cpp"
+                        >
+                </File>
+                <File
+                        RelativePath=".\modelbuilder-influences.cpp"
-                        >
-                </File>

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

@@ -212 +212 @@
-}
-
+/*
+        class model_builder
+*/
+
-};
-};

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

@@ -51 +51 @@
-
-/*
-        class influence
-*/
-
-void influence::bone( const bone_ptr &new_bone )
-{
-        owner->validate_influence_bone( this, new_bone );
-
-        _bone = new_bone;
-
-        owner->notify_influence_bone( this );
-}
-
-/*
-        class tag
-*/
@@ -274 +261 @@
-}
-
-void model_builder::begin_influence_update()
-{
-        _influence_update_count++;
-}
-
-void model_builder::end_influence_update()
-{
-        if( !_influence_update_count )
-                throw error();
-
-        if( _influence_update_count == 1 )
-        {
-                validate_influences();
-        }
-
-        _influence_update_count--;
-}
-
-influence_ptr model_builder::create_influence( const bone_ptr &bone, const affine &matrix )
-{
-        validate_influence_bone( null, bone );
-
-        influence_ptr ret( new influence( this ) );
-
-        ret->_bone = bone;
-        ret->matrix = matrix;
-
-        ret->_index = influences.size();
-        influences.push_back( ret );
-
-        return ret;
-}
-
-void model_builder::validate_influence_bone( influence * /* influence */, const bone_ptr &new_bone ) const
-{
-        if( _influence_update_count )
-                return;
-
-        validate_bone_prop( new_bone );
-}
-
-void model_builder::notify_influence_bone( influence * /* influence */ )
-{
-}
-
-void model_builder::validate_influences()
-{
-        if( _influence_update_count )
-                return;
-
-        for( size_t i = 0; i < influences.size(); i++ )
-        {
-                validate_influence_bone( influences[i].get(), influences[i]->_bone );
-        }
-}
-
-void model_builder::begin_tag_update()
-{

branches/morph-targets/libx42make/modelbuilder.cpp

@@ -92 +92 @@
-        }
-
-
+ this 
-
-        ret->lod_number = lod_number;

branches/morph-targets/x42maya/Export-Gather.cpp

@@ -200 +200 @@
-                return true;
-        }
-
+x42::
-        {
-                return false;