Changeset 515

Timestamp:

02/22/08 12:55:54 (11 months ago)

Author:

phill

Message:

o Animation algorithms.

Files:

• branches/morph-targets/libx42make/helpers.h (added)
• branches/morph-targets/libx42make/include/x42make-helpers.h (deleted)
• branches/morph-targets/libx42make/include/x42make-modelbuilder.h (modified) (10 diffs)
• branches/morph-targets/libx42make/include/x42make.h (modified) (1 diff)
• branches/morph-targets/libx42make/libx42make.vcproj (modified) (3 diffs)
• branches/morph-targets/libx42make/local.h (modified) (1 diff)
• branches/morph-targets/libx42make/modelbuilder-animation.cpp (added)

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

@@ -122 +122 @@
-};
-
-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
-{
@@ -171 +156 @@
-};
-
+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;
+
+        void require_tracks();
+        void require_local();
+        void require_world();
+
+        void clean_tracks();
+
+private:
+        bone *owner;
+
+        animation_tracks()
+        {
+        }
+
+        void set_tracks( const std::vector< vec3_track_elem > &pos,
+                const std::vector< quat_track_elem > &rot,
+                const std::vector< vec3_track_elem > &scale );
+        void set_world_mats( const std::vector< affine_track_elem > &world_mats );
+        void set_local_mats( const std::vector< affine_track_elem > &local_mats );
+
+        void make_tracks_from_local();
+        void make_local_from_tracks();
+        void make_local_from_world();
+        void make_world_from_local();
+
+        friend class bone;
+        friend class model_builder;
+};
+
-class bone : public ref_obj
-{
@@ -181 +209 @@
-        animation_tolerances    tight_tolerances;
-
+        bool                                    static_bone_hint;
+
-        bone_ptr                                parent() const { return _parent; }
-        void                                    parent( const bone_ptr &new_parent );
@@ -195 +225 @@
-        uint                                    _anim_group;
-        bone_ptr                                _parent;
-
+
-        float                                   extent;                         //computed value
-        animation_tracks                anim_tracks;
@@ -202 +232 @@
-                : owner( owner ), _anim_group( 0 ), extent( 0 ),
-                loose_tolerances( animation_tolerances::inherit_defaults() ),
-
-
-
-
+
+
+
+
+
+
+
-        friend class model_builder;
-};
@@ -426 +459 @@
-        std::vector< tag_ptr >                  tags;
-
+        std::vector< animation >                animations;
+        std::vector< uint >                             pinned_frames;
+
-        animation_tolerances                    loose_tolerances;
-        animation_tolerances                    tight_tolerances;
@@ -432 +468 @@
-                : loose_tolerances( animation_tolerances::loose_defaults() ),
-                tight_tolerances( animation_tolerances::tight_defaults() ),
-
+
+
-        {
-        }
@@ -444 +481 @@
-
-        void optimize_geometry( geometry::optimize_type opt_type = geometry::optimize_type::match_current );
+
+        //all anim_track_elem frame values are relative to this value
+        int base_frame() const { return _base_frame; }
+        uint frame_count() const { return _frame_count; }
+        //sets the frame range and clears all animation data
+        void set_frame_range( uint frame_count, int base_frame = 0 );
-
-        void begin_bone_update(); //suspends bone validation and sorting
@@ -477 +520 @@
-
-private:
+        int _base_frame;
+        uint _frame_count;
+
-        int _bone_update_count;
-        int _influence_update_count;
@@ -499 +545 @@
-        void validate_tags();
-
+        std::vector< uint > get_critical_frames() const;
+
-        friend class bone;
+        friend class animation_tracks;
-        friend class influence;
-        friend class tag;

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"
-                                >
@@ -585 +581 @@
-                </Filter>
-                <File
+                        RelativePath=".\helpers.h"
+                        >
+                </File>
+                <File
-                        RelativePath=".\local.h"
-                        >
@@ -655 +655 @@
-                                />
-                        </FileConfiguration>
+                </File>
+                <File
+                        RelativePath=".\modelbuilder-animation.cpp"
+                        >
-                </File>
-                <File

branches/morph-targets/libx42make/local.h

@@ -47 +47 @@
-
-#include "batcher.h"
+#include "helpers.h"
-
-#define null NULL