Changeset 510

Timestamp:

02/19/08 23:25:59 (11 months ago)

Author:

phill

Message:

o Bone list validation.

Files:

• branches/morph-targets/libx42make/include/x42make-modelbuilder.h (modified) (1 diff)
• branches/morph-targets/libx42make/modelbuilder-skeleton.cpp (modified) (2 diffs)

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

@@ -32 +32 @@
-{
-
+class error : public std::exception
+{
+public:
+        error() : exception() { }
+        error( const char *why ) : exception( why ) { }
+        error( const error &other ) : exception( other ) { }
+};
+
+class validation_error : public error
+{
+public:
+        validation_error() : error() { }
+        validation_error( const char *why ) : error( why ) { }
+        validation_error( const error &other ) : error( other ) { }
+};
+
-class ref_obj;
-typedef ::boost::intrusive_ptr< ref_obj > ref_obj_ptr;

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

@@ -87 +87 @@
-void model_builder::validate_bone_parent( bone *bone, const bone_ptr &new_parent ) const
-{
-
+
+
+
+
+
+
+
+
+
+
+
-void model_builder::validate_bone_anim_group( bone *bone, uint new_anim_group ) const
-{
-
-
-
+
+
+
+
+
+
+
+
-{
-        sort_bones();
-}
-bone
+ /* bone */
-{
-        sort_bones();
@@ -105 +120 @@
-        if( _bone_update_count )
-                return;
+
+        for( size_t i = 0; i < bones.size(); i++ )
+        {
+                bone_ptr b = bones[i];
+
+                if( b->owner != this )
+                        throw validation_error( "Bones includes a bone that does not belong to this model_builder." );
+
+                if( b->_parent )
+                {
+                        if( b->_parent->owner != this )
+                                throw validation_error( "Bones includes a bone with a parent that does not belong to this model_builder." );
+
+                        if( b->_parent->_index >= bones.size() || bones[b->_parent->_index] != b->_parent )
+                                throw validation_error( "Bones includes a bone with a parent that does not belong to this model_builder." );
+                }
+
+                validate_bone_parent( b.get(), b->_parent.get() );
+                validate_bone_anim_group( b.get(), b->_anim_group );
+
+                //check for duplicates
+                for( size_t j = i + 1; j < bones.size(); j++ )
+                {
+                        if( bones[j] == b )
+                                throw validation_error( "Duplicate bone." );
+                }
+        }
-}
-