Changeset 519

Timestamp:

02/25/08 00:34:47 (11 months ago)

Author:

phill

Message:

o Model data file generator function.

Files:

• branches/morph-targets/libx42make/helpers.h (modified) (1 diff)
• branches/morph-targets/libx42make/include/x42make-modelbuilder.h (modified) (8 diffs)
• branches/morph-targets/libx42make/libx42make.vcproj (modified) (1 diff)
• branches/morph-targets/libx42make/modelbuilder-geometry.cpp (modified) (1 diff)
• branches/morph-targets/libx42make/modelbuilder-write.cpp (added)
• branches/morph-targets/libx42make/modelbuilder.cpp (modified) (3 diffs)
• branches/morph-targets/libx42make/modeldata-write.cpp (modified) (1 diff)

branches/morph-targets/libx42make/helpers.h

@@ -156 +156 @@
-}
-
+template< typename T, typename Cmp >
+size_t index_of( const std::vector< T > &v, const T &val, Cmp cmp )
+{
+        std::vector< T >::const_iterator pos =
+                std::upper_bound( v.begin(), v.end(), val, cmp );
+
+        if( pos == v.begin() )
+                throw std::exception();
+
+        pos--;
+
+        const T &vp = *pos;
+
+        if( !cmp( vp, val ) && !cmp( val, vp ) )
+                //neither is less, they are "equal"
+                throw std::exception();
+
+        return pos - v.begin();
+}
+
-};
-};

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

@@ -58 +58 @@
-namespace _impl
-{
-
-
+
+
+
+
-};
-
@@ -73 +75 @@
-
-private:
-
+mutable 
-        
-
-
+const 
+const 
-};
-
@@ -256 +258 @@
-        friend class animation_tracks;
-        friend class model_builder;
+        friend class _impl::model_data_builder;
-};
-
@@ -434 +437 @@
-        size_t index_count() const { return indices.size(); }
-
+        size_t count_max_influences_per_vert() const;
+
-        bool is_valid() const;
-
@@ -465 +470 @@
-class lod : public ref_obj
-{
-
-
+
-        std::vector< group_ptr >        groups;
+
+        uint lod_number() const { return _lod_number; }
-
-        group_ptr create_group( const std::string &surface_name = std::string(),
@@ -473 +479 @@
-
-private:
+        uint                                            _lod_number;
+
-        model_builder                           *owner;
-
+
+
+
-
-        friend class model_builder;
@@ -490 +500 @@
-        std::vector< animation >                animations;
-        std::vector< uint >                             pinned_frames;
+
+        ::x42::geom::aabb                               bounding_box;
+        ::x42::geom::sphere                             bounding_sphere;
-
-        animation_tolerances                    loose_tolerances;
@@ -558 +571 @@
-        void remove_unused_bones();
-
+        model to_model( void ) const;
+
-private:
-        int _base_frame;

branches/morph-targets/libx42make/libx42make.vcproj

@@ -677 +677 @@
-                </File>
-                <File
+                        RelativePath=".\modelbuilder-write.cpp"
+                        >
+                </File>
+                <File
-                        RelativePath=".\modelbuilder.cpp"
-                        >

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

@@ -381 +381 @@
-}
-
+size_t geometry::count_max_influences_per_vert() const
+{
+        size_t ret = 0;
+
+        for( size_t i = 0; i < weights.size(); i++ )
+        {
+                ret = max( ret, weights[i].count() );
+        }
+}
+
-void geometry::bake_vertices( const std::vector< ::x42::math::affine > &inf_mats, const influence_ptr &rebind_inf )
-{

branches/morph-targets/libx42make/modelbuilder.cpp

@@ -35 +35 @@
-{
-
-
+const 
-{
-        r->_ref_count++;
-}
-
-
+const 
-{
-        if( !--r->_ref_count )
@@ -73 +73 @@
-        for( size_t i = 0; i < lods.size(); i++ )
-        {
-
+_
-                        return lods[i];
-        }
@@ -85 +85 @@
-        for( i = 0; i < lods.size(); i++ )
-        {
-
+_
-                        return lods[i];
-
-
+_
-                        break;
-        }
-
-
-
-
-
+
-        lods.insert( lods.begin() + i, ret );
-

branches/morph-targets/libx42make/modeldata-write.cpp

@@ -270 +270 @@
-        {
-                animGroups[i].name = _sb.intern_string( std::string( "" ) );
-(u16)data.numFrames
+integer_traits< u16 >::max_val
-                animGroups[i].endBone = 0;
-        }