Changeset 509

Timestamp:

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

Author:

phill

Message:

o Lots more work on the new exporter.

Files:

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

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

@@ -33 +33 @@
-
-class ref_obj;
+typedef ::boost::intrusive_ptr< ref_obj > ref_obj_ptr;
+typedef ::boost::intrusive_ptr< const ref_obj > const_ref_obj_ptr;
+
+class api_tag;
+typedef ::boost::intrusive_ptr< api_tag > api_tag_ptr;
+typedef ::boost::intrusive_ptr< const api_tag > const_api_tag_ptr;
-
-namespace _impl
@@ -43 +49 @@
-{
-public:
-size_t ref_count() const { return _ref_count; }
+api_tag_ptr user_tag;
-
-        ref_obj() : _ref_count( 0 ) { }
-        virtual ~ref_obj() { }
-
+        size_t ref_count() const { return _ref_count; }
+
-private:
-        size_t _ref_count;
-
+
-        friend void _impl::intrusive_ptr_add_ref( ref_obj *r );
-        friend void _impl::intrusive_ptr_release( ref_obj *r );
-};
-
-
+public 
-{
-public:
@@ -63 +71 @@
-
-class lod;
-class bone;
-class influence;
-class group;
-class morph_target;
-class model_builder;
-
-typedef ::boost::intrusive_ptr< ref_obj > ref_obj_ptr;
-typedef ::boost::intrusive_ptr< const ref_obj > const_ref_obj_ptr;
-typedef ::boost::intrusive_ptr< api_tag > api_tag_ptr;
-typedef ::boost::intrusive_ptr< const api_tag > const_api_tag_ptr;
-typedef ::boost::intrusive_ptr< lod > lod_ptr;
-typedef ::boost::intrusive_ptr< const lod > const_lod_ptr;
+
+class bone;
-typedef ::boost::intrusive_ptr< bone > bone_ptr;
-typedef ::boost::intrusive_ptr< const bone > const_bone_ptr;
+
+class influence;
-typedef ::boost::intrusive_ptr< influence > influence_ptr;
-typedef ::boost::intrusive_ptr< const influence > const_influence_ptr;
+
+class group;
-typedef ::boost::intrusive_ptr< group > group_ptr;
-typedef ::boost::intrusive_ptr< const group > const_group_ptr;
+
+class morph_target;
-typedef ::boost::intrusive_ptr< morph_target > morph_target_ptr;
-typedef ::boost::intrusive_ptr< const morph_target > const_morph_target_ptr;
+
+
+class model_builder;
-typedef ::boost::intrusive_ptr< model_builder > model_builder_ptr;
-typedef ::boost::intrusive_ptr< const model_builder > const_model_builder_ptr;
-
+template< typename T >
+struct anim_track_elem
+{
+        uint                            frame;
+        T                                       value;
+};
+
+typedef anim_track_elem< ::x42::math::vec3 > vec3_track_elem;
+typedef anim_track_elem< ::x42::math::quat > quat_track_elem;
+typedef anim_track_elem< ::x42::math::affine > affine_track_elem;
+
+class animation_tracks
+{
+public:
+        std::vector< vec3_track_elem >          position;
+        std::vector< quat_track_elem >          rotation;
+        std::vector< vec3_track_elem >          scale;
+
+        std::vector< affine_track_elem >        world_matrices;
+        std::vector< affine_track_elem >        local_matrices;
+};
+
+struct animation_tolerances
+{
+        float                           position;
+        float                           rotation;
+        float                           scale;
+
+        animation_tolerances()
+                : position( 0 ), rotation( 0 ), scale( 0 )
+        {
+        }
+
+        animation_tolerances( float position, float rotation, float scale )
+                : position( position ), rotation( rotation ), scale( scale )
+        {
+        }
+
+        animation_tolerances( const animation_tolerances &src )
+                : position( src.position ), rotation( src.rotation ), scale( src.scale )
+        {
+        }
+
+        static animation_tolerances resolve_inherited_values( const animation_tolerances &tol, const animation_tolerances &def )
+        {
+                return animation_tolerances(
+                        tol.position >= 0 ? tol.position : def.position,
+                        tol.rotation >= 0 ? tol.rotation : def.rotation,
+                        tol.scale >= 0 ? tol.scale : def.scale );
+        }
+
+        static animation_tolerances inherit_defaults() { return animation_tolerances( -1, -1, -1 ); }
+        static animation_tolerances loose_defaults() { return animation_tolerances( 0.01F, 0.003F, 0.02F ); }
+        static animation_tolerances tight_defaults() { return animation_tolerances( 1e-4F, 1e-3F, 1e-3F ); }
+};
+
+class bone : public ref_obj
+{
+public:
+        std::string                             name;
+
+        bone_flags                              flags;
+
+        animation_tolerances    loose_tolerances;
+        animation_tolerances    tight_tolerances;
+
+        bone_ptr                                parent() const { return _parent; }
+        void                                    parent( const bone_ptr &new_parent );
+
+        uint                                    anim_group() const { return _anim_group; }
+        void                                    anim_group( uint new_anim_group );
+
+        size_t                                  index() const { return _index; }
+
+private:
+        model_builder                   *owner;
+
+        size_t                                  _index;
+
+        uint                                    _anim_group;
+        bone_ptr                                _parent;
+        
+        float                                   extent;                         //computed value
+        animation_tracks                anim_tracks;
+
+        bone( model_builder *owner )
+                : owner( owner ), _anim_group( 0 ), extent( 0 ),
+                loose_tolerances( animation_tolerances::inherit_defaults() ),
+                tight_tolerances( animation_tolerances::inherit_defaults() )
+        {
+        }
+
+        friend class model_builder;
+};
+
+class influence : public ref_obj
+{
+public:
+        bone_ptr                        bone;
+        ::x42::math::affine     matrix;
+
+private:
+        influence() { }
+
+        friend class model_builder;
+};
+
+class tag : public ref_obj
+{
+public:
+        std::string                     name;
+        bone_ptr                        bone;
+        ::x42::math::affine     matrix;
+
+private:
+        tag() { }
+
+        friend class model_builder;
+};
+
+class animation : public ref_obj
+{
+public:
+        std::string                     name;
+
+        uint                            first_frame;
+        uint                            last_frame;
+        uint                            loop_start;
+        uint                            loop_end;
+
+        float                           frame_rate;
+
+private:
+        animation() { }
+
+        friend class model_builder;
+};
+
-class vertex_weights;
-
@@ -91 +238 @@
-{
-public:
-0
+influence_ptr()
-                : _influence( influence ), _weight( ::x42::math::saturate( weight ) )
-        {
@@ -160 +307 @@
-{
-public:
+        api_tag_ptr                                                     user_tag;
+
+        primitive_type                                          prim_type;
-        std::vector< vertex_geometry >          base_shape;
-        std::vector< morph_target_ptr >         morph_targets;
@@ -166 +316 @@
-        std::vector< index >                            indices;
-
+        geometry()
+                : prim_type( primitive_type::triangle_list )
+        {
+        }
+
-        morph_target_ptr find_morph_target( const std::string &name ) const;
-        morph_target_ptr create_morph_target( const std::string &name );
-
+        /*
+                Reorders the group's vertices based on a remapping table.
+
+                The remapping table is a simple push mapping (value at index i is
+                the target position of the element currently at index i).
+        */
+        void remap_vertices( const std::vector< index > &remap );
+
-        bool is_valid() const;
-};
@@ -175 +338 @@
-{
-public:
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-

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

@@ -33 +33 @@
-#include "x42make-modeldata.h"
-#include "x42make-modelbuilder.h"
+#include "x42make-helpers.h"
-
-#endif

branches/morph-targets/libx42make/libx42make.vcproj

@@ -492 +492 @@
-                        >
-                        <File
+                                RelativePath=".\include\x42make-helpers.h"
+                                >
+                        </File>
+                        <File
-                                RelativePath=".\include\x42make-modelbuilder.h"
-                                >
@@ -654 +658 @@
-                <File
-                        RelativePath=".\modelbuilder-geometry.cpp"
+                        >
+                </File>
+                <File
+                        RelativePath=".\modelbuilder-skeleton.cpp"
-                        >
-                </File>

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

@@ -27 +27 @@
-namespace make
-{
+
+/*
+        class vertex_weights
+*/
-
-void vertex_weights::add( const vertex_weight &weight, bool renormalize_weights )
@@ -103 +107 @@
-}
-
+/*
+        class geometry
+*/
+
-morph_target_ptr geometry::find_morph_target( const std::string &name ) const
-{
@@ -127 +135 @@
-}
-
+void geometry::remap_vertices( const std::vector< index > &remap )
+{
+        apply_push_mapping( base_shape, remap );
+        
+        for( size_t i = 0; i < morph_targets.size(); i++ )
+        {
+                apply_push_mapping( morph_targets[i]->vertices, remap );
+        }
+
+        apply_push_mapping( weights, remap );
+        apply_push_mapping( indices, remap );
+
+        for( size_t i = 0; i < indices.size(); i++ )
+                indices[i] = remap[indices[i]];
+}
+
+bool geometry::is_valid() const
+{
+        size_t num_verts = base_shape.size();
+
+        if( weights.size() != num_verts ||
+                attributes.size() != num_verts )
+                return false;
+
+        for( size_t i = 0; i < morph_targets.size(); i++ )
+        {
+                if( morph_targets[i]->vertices.size() != num_verts )
+                        return false;
+        }
+
+        for( size_t i = 0; i < indices.size(); i++ )
+        {
+                if( indices[i] >= num_verts )
+                        return false;
+        }
+
+        return true;
+}
+
-};
-};

branches/morph-targets/libx42make/modelbuilder.cpp

@@ -28 +28 @@
-{
-
+/*
+        class ref_obj
+*/
+
-namespace _impl
-{
@@ -44 +48 @@
-};
-
+/*
+        class lod
+*/
+
+group_ptr lod::create_group( const std::string &surface_name,
+        const std::string &material_name )
+{
+        group_ptr ret( new group );
+
+        ret->surface_name = surface_name;
+        ret->material_name = material_name;
+
+        groups.push_back( ret );
+
+        return ret;
+}
+
+/*
+        class model_builder
+*/
+
+lod_ptr model_builder::find_lod( uint lod_number )
+{
+        for( size_t i = 0; i < lods.size(); i++ )
+        {
+                if( lods[i]->lod_number == lod_number )
+                        return lods[i];
+        }
+
+        return lod_ptr();
+}
+
+lod_ptr model_builder::find_or_create_lod( uint lod_number )
+{
+        size_t i;
+        for( i = 0; i < lods.size(); i++ )
+        {
+                if( lods[i]->lod_number == lod_number )
+                        return lods[i];
+
+                if( lods[i]->lod_number > lod_number )
+                        break;
+        }
+
+        lod_ptr ret( new lod() );
+
+        ret->lod_number = lod_number;
+
+        lods.insert( lods.begin() + i, ret );
+
+        return ret;
+}
+
-};
-};