Changeset 521

Timestamp:

02/25/08 13:23:50 (11 months ago)

Author:

phill

Message:

o Culling infos!

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-animation.cpp (modified) (3 diffs)
• branches/morph-targets/libx42make/modelbuilder-cull.cpp (added)
• branches/morph-targets/libx42make/modelbuilder-geometry.cpp (modified) (4 diffs)

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

@@ -188 +188 @@
-        void offset_local( const ::x42::math::affine &offset );
-
+        ::x42::math::affine compute_local_matrix( float frame );
-        void resample_tracks( const std::vector< uint > &frames );
-
@@ -322 +323 @@
-};
-
+class vertex_weight;
-class vertex_weights;
-
+bool equal( const vertex_weight &a, const vertex_weight &b, float tol );
+
-class vertex_weight
-{
-public:
-
-
-
-
+
-
-        influence_ptr influence() const { return _influence; }
@@ -337 +338 @@
-        bool is_empty() const { return !_influence || _weight == 0; }
-
+        bool operator == ( const vertex_weight &other ) const;
+        bool operator != ( const vertex_weight &other ) const
+        {
+                return !operator == ( other );
+        }
+
-private:
-        influence_ptr _influence;
@@ -342 +349 @@
-
-        friend class vertex_weights;
-
+
+
+
+
-
-class vertex_weights
@@ -360 +370 @@
-        const vertex_weight& operator[] ( size_t index ) const { if( index >= max_weights ) throw error(); return _weights[index]; }
-
+        bool operator == ( const vertex_weights &other ) const;
+        bool operator != ( const vertex_weights &other ) const
+        {
+                return !operator == ( other );
+        }
+
-private:
-        vertex_weight _weights[max_weights];
+
+        friend bool equal( const vertex_weights &a, const vertex_weights &b, float tol );
-};
-
@@ -568 +586 @@
-        std::vector< size_t > count_bone_uses() const;
-
+        std::vector< ::x42::math::affine > compute_influence_matrices( float frame );
+
-        void remove_unused_influences();
-        void remove_unused_bones();
+
+        void compute_culling_info( uint frame_sample_stride = 1 );
-
-        model to_model( void ) const;

branches/morph-targets/libx42make/libx42make.vcproj

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

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

@@ -264 +264 @@
-}
-
+affine animation_tracks::compute_local_matrix( float frame )
+{
+        require_tracks();
+
+        if( owner->flags & bone_flags::use_inverse_parent_scale && owner->_parent )
+                owner->_parent->anim_tracks.require_tracks();
+
+        vec3 pos = sample_track( position, frame );
+        quat rot = sample_track( rotation, frame );
+        vec3 scl = sample_track( scale, frame );
+
+        affine ret = quat_to_affine( rot );
+        ret.col( 0 ) *= scl.x;
+        ret.col( 1 ) *= scl.y;
+        ret.col( 2 ) *= scl.z;
+
+        if( owner->flags & bone_flags::use_inverse_parent_scale && owner->_parent )
+        {
+                const vec3 ps = sample_track( owner->_parent->anim_tracks.scale, frame );
+                const vec3 ips = rcp( ps );
+
+                ret.col( 0 ) *= ips;
+                ret.col( 1 ) *= ips;
+                ret.col( 2 ) *= ips;
+        }
+
+        ret.col( 3 ) = pos;
+
+        return ret;
+}
+
-void animation_tracks::make_local_from_tracks()
-{
+        if( owner->flags & bone_flags::use_inverse_parent_scale && owner->_parent )
+                owner->_parent->anim_tracks.require_tracks();
+
-        local_matrices.resize( position.size() );
-
@@ -284 +318 @@
-                le.value.col( 2 ) *= se.value.z;
-
+                if( owner->flags & bone_flags::use_inverse_parent_scale && owner->_parent )
+                {
+                        const vec3 ps = sample_track( owner->_parent->anim_tracks.scale, (float)pe.frame );
+                        vec3 ips = rcp( ps );
+
+                        le.value.col( 0 ) *= ips;
+                        le.value.col( 1 ) *= ips;
+                        le.value.col( 2 ) *= ips;
+                }
+
-                le.value.col( 3 ) = pe.value;
-        }
@@ -590 +634 @@
-}
-
+std::vector< affine > model_builder::compute_influence_matrices( float frame )
+{
+        if( _bone_update_count || _influence_update_count )
+                throw error();
+
+        std::vector< affine > bone_mats( bones.size(), affinei() );
+         
+        for( size_t i = 0; i < bones.size(); i++ )
+        {
+                bone_ptr b = bones[i];
+
+                bone_mats[i] = b->anim_tracks.compute_local_matrix( frame );
+                
+                if( b->_parent )
+                        bone_mats[i] = bone_mats[b->_parent->_index] * bone_mats[i];
+        }
+
+        std::vector< affine > ret( influences.size(), affinei() );
+
+        for( size_t i = 0; i < influences.size(); i++ )
+        {
+                influence_ptr inf = influences[i];
+
+                if( inf->_bone )
+                        ret[inf->_index] = bone_mats[inf->_bone->_index] * inf->matrix;
+                else
+                        ret[inf->_index] = inf->matrix;
+        }
+
+        return ret;
+}
+
-};
-};

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

@@ -29 +29 @@
-
-/*
+        class vertex_weight
+*/
+vertex_weight::vertex_weight( influence_ptr influence, float weight )
+        : _influence( influence ), _weight( ::x42::math::saturate( weight ) )
+{
+        if( weight < 0 )
+                throw validation_error( "negative influence weight" );
+
+        if( !influence && weight )
+                throw validation_error( "attempting to create weight to null influence" );
+
+        if( !weight )
+                //don't store pointers when there's no weight
+                _influence = influence_ptr();
+}
+
+bool vertex_weight::operator == ( const vertex_weight &other ) const
+{
+        return _influence == other._influence && _weight == other._weight;
+}
+
+bool equal( const vertex_weight &a, const vertex_weight &b, float tol )
+{
+        return a._influence == b._influence && fabsf( a._weight - b._weight ) <= tol;
+}
+
+
+/*
-        class vertex_weights
-*/
@@ -143 +171 @@
-        }
-        return count;
+}
+
+bool vertex_weights::operator == ( const vertex_weights &other ) const
+{
+        for( size_t i = 0; i < vertex_weights::max_weights; i++ )
+        {
+                if( _weights[i] != other._weights[i] )
+                        return false;
+        }
+
+        return true;
+}
+
+bool equal( const vertex_weights &a, const vertex_weights &b, float tol )
+{
+        for( size_t i = 0; i < vertex_weights::max_weights; i++ )
+        {
+                if( !equal( a._weights[i], b._weights[i], tol ) )
+                        return false;
+        }
+
+        return true;
-}
-
@@ -388 +438 @@
-        {
-                ret = max( ret, weights[i].count() );
-
+
+
+
+
+
+
+
-}
-
@@ -429 +485 @@
-                
-                affine m = affinez();
-uin
-
-
+size_
+
+&
-
-                        if( wt.is_empty() )