Changeset 391 for cafu/trunk

Timestamp:

09/22/11 14:13:56 (8 months ago)

Author:

Carsten

Message:

Model support:
Added data structures and load/save code for "animation channels".

Location:

cafu/trunk/Libs/Models

Files:

• Loader.hpp (modified) (1 diff)
• Loader_ase.hpp (modified) (1 diff)
• Loader_assimp.hpp (modified) (1 diff)
• Loader_cmdl.cpp (modified) (1 diff)
• Loader_cmdl.hpp (modified) (1 diff)
• Loader_fbx.hpp (modified) (1 diff)
• Loader_lwo.hpp (modified) (1 diff)
• Loader_md5.hpp (modified) (1 diff)
• Loader_mdl.hpp (modified) (1 diff)
• Model_cmdl.cpp (modified) (3 diffs)
• Model_cmdl.hpp (modified) (5 diffs)

cafu/trunk/Libs/Models/Loader.hpp

@@ -65 +65 @@
     virtual void Load(ArrayT<CafuModelT::GuiFixtureT>& GuiFixtures, ArrayT<CafuModelT::GuiLocT>& GuiLocs)=0;
 
+    /// Loads the animation channels (groups of joints) of the Cafu model.
+    virtual void Load(ArrayT<CafuModelT::ChannelT>& Channels)=0;
+
     /// Postprocesses the file data according to flags given to the constructor.
     virtual void Postprocess(ArrayT<CafuModelT::MeshT>& Meshes);

cafu/trunk/Libs/Models/Loader_ase.hpp

@@ -43 +43 @@
     void Load(ArrayT<CafuModelT::SkinT>& Skins, const MaterialManagerImplT& MaterialMan) { }
     void Load(ArrayT<CafuModelT::GuiFixtureT>& GuiFixtures, ArrayT<CafuModelT::GuiLocT>& GuiLocs);
+    void Load(ArrayT<CafuModelT::ChannelT>& Channels) { }
 
 

cafu/trunk/Libs/Models/Loader_assimp.hpp

@@ -47 +47 @@
     void Load(ArrayT<CafuModelT::SkinT>& Skins, const MaterialManagerImplT& MaterialMan) { }
     void Load(ArrayT<CafuModelT::GuiFixtureT>& GuiFixtures, ArrayT<CafuModelT::GuiLocT>& GuiLocs) { }
+    void Load(ArrayT<CafuModelT::ChannelT>& Channels) { }
 
 

cafu/trunk/Libs/Models/Loader_cmdl.cpp

@@ -528 +528 @@
 
 
+void LoaderCafuT::Load(ArrayT<CafuModelT::ChannelT>& Channels)
+{
+    // Read the channels.
+    lua_getglobal(m_LuaState, "Channels");
+    {
+        Channels.Overwrite();
+        Channels.PushBackEmptyExact(lua_objlen_ul(m_LuaState, -1));
+
+        for (unsigned long ChannelNr=0; ChannelNr<Channels.Size(); ChannelNr++)
+        {
+            CafuModelT::ChannelT& Channel=Channels[ChannelNr];
+
+            lua_rawgeti(m_LuaState, -1, ChannelNr+1);
+            {
+                lua_getfield(m_LuaState, -1, "name");
+                {
+                    const char* Name=lua_tostring(m_LuaState, -1);
+                    Channel.Name=Name ? Name : "Channel";
+                }
+                lua_pop(m_LuaState, 1);
+
+                lua_getfield(m_LuaState, -1, "joints");
+                {
+                    const unsigned long NumJoints=lua_objlen_ul(m_LuaState, -1);
+
+                    for (unsigned int c=0; c<NumJoints; c++)
+                    {
+                        lua_rawgeti(m_LuaState, -1, c+1);
+                        Channel.SetMember(lua_tointeger(m_LuaState, -1));
+                        lua_pop(m_LuaState, 1);
+                    }
+                }
+                lua_pop(m_LuaState, 1);
+            }
+            lua_pop(m_LuaState, 1);
+        }
+    }
+    lua_pop(m_LuaState, 1);
+}
+
+
 /*static*/ int LoaderCafuT::SetVersion(lua_State* LuaState)
 {

cafu/trunk/Libs/Models/Loader_cmdl.hpp

@@ -46 +46 @@
     void Load(ArrayT<CafuModelT::SkinT>& Skins, const MaterialManagerImplT& MaterialMan);
     void Load(ArrayT<CafuModelT::GuiFixtureT>& GuiFixtures, ArrayT<CafuModelT::GuiLocT>& GuiLocs);
+    void Load(ArrayT<CafuModelT::ChannelT>& Channels);
 
 

cafu/trunk/Libs/Models/Loader_fbx.hpp

@@ -44 +44 @@
     void Load(ArrayT<CafuModelT::SkinT>& Skins, const MaterialManagerImplT& MaterialMan);
     void Load(ArrayT<CafuModelT::GuiFixtureT>& GuiFixtures, ArrayT<CafuModelT::GuiLocT>& GuiLocs);
+    void Load(ArrayT<CafuModelT::ChannelT>& Channels) { }
 
 

cafu/trunk/Libs/Models/Loader_lwo.hpp

@@ -40 +40 @@
     void Load(ArrayT<CafuModelT::SkinT>& Skins, const MaterialManagerImplT& MaterialMan) { }
     void Load(ArrayT<CafuModelT::GuiFixtureT>& GuiFixtures, ArrayT<CafuModelT::GuiLocT>& GuiLocs) { }
+    void Load(ArrayT<CafuModelT::ChannelT>& Channels) { }
 
 

cafu/trunk/Libs/Models/Loader_md5.hpp

@@ -42 +42 @@
     void Load(ArrayT<CafuModelT::SkinT>& Skins, const MaterialManagerImplT& MaterialMan) { }
     void Load(ArrayT<CafuModelT::GuiFixtureT>& GuiFixtures, ArrayT<CafuModelT::GuiLocT>& GuiLocs) { }
+    void Load(ArrayT<CafuModelT::ChannelT>& Channels) { }
 };
 

cafu/trunk/Libs/Models/Loader_mdl.hpp

@@ -48 +48 @@
     void Load(ArrayT<CafuModelT::SkinT>& Skins, const MaterialManagerImplT& MaterialMan);
     void Load(ArrayT<CafuModelT::GuiFixtureT>& GuiFixtures, ArrayT<CafuModelT::GuiLocT>& GuiLocs) { }
+    void Load(ArrayT<CafuModelT::ChannelT>& Channels) { }
 
 

cafu/trunk/Libs/Models/Model_cmdl.cpp

@@ -209 +209 @@
 
 
+bool CafuModelT::ChannelT::IsMember(unsigned int JointNr) const
+{
+    const unsigned int BlockNr=JointNr >> 5;
+    const unsigned int BitNr  =JointNr & 31;
+    const unsigned int BitMask=1 << BitNr;
+
+    if (BlockNr >= m_BitBlocks.Size()) return false;
+
+    return (m_BitBlocks[BlockNr] & BitMask) != 0;
+}
+
+
+void CafuModelT::ChannelT::SetMember(unsigned int JointNr, bool Member)
+{
+    const unsigned int BlockNr=JointNr >> 5;
+    const unsigned int BitNr  =JointNr & 31;
+    const unsigned int BitMask=1 << BitNr;
+
+    // Grow as needed.
+    while (BlockNr >= m_BitBlocks.Size())
+        m_BitBlocks.PushBack(0);
+
+    if (Member) m_BitBlocks[BlockNr] |=  BitMask;
+           else m_BitBlocks[BlockNr] &= ~BitMask;
+}
+
+
 CafuModelT::CafuModelT(ModelLoaderT& Loader)
     : m_FileName(Loader.GetFileName()),
@@ -234 +261 @@
     Loader.Load(m_Skins, m_MaterialMan);
     Loader.Load(m_GuiFixtures, m_GuiLocs);
+    Loader.Load(m_Channels);
     Loader.Postprocess(m_Meshes);
 
@@ -851 +879 @@
                   << "AxisY={ " << serialize(GuiLoc.AxisY) << " }; "
                   << "},\n";
+    }
+
+    OutStream << "}\n";
+
+
+    // *** Write the channels. ***
+    OutStream << "\nChannels=\n{\n";
+
+    for (unsigned long ChanNr=0; ChanNr<m_Channels.Size(); ChanNr++)
+    {
+        const ChannelT& Channel=m_Channels[ChanNr];
+        bool            IsFirst=true;
+
+        OutStream << "\t{\n"
+                  << "\t\tname=\"" << Channel.Name << "\";\n"
+                  << "\t\tjoints={ ";
+
+        for (unsigned long JointNr=0; JointNr<m_Joints.Size(); JointNr++)
+        {
+            if (Channel.IsMember(JointNr))
+            {
+                if (!IsFirst) OutStream << ", ";
+                OutStream << JointNr;
+                IsFirst=false;
+            }
+        }
+
+        OutStream << " };\n"
+                  << "\t},\n";
     }
 

cafu/trunk/Libs/Models/Model_cmdl.hpp

@@ -29 +29 @@
 #include "Math3D/Matrix.hpp"
 #include "Model.hpp"
+
+#if defined(_WIN32) && _MSC_VER<1600
+#include "pstdint.h"            // Paul Hsieh's portable implementation of the stdint.h header.
+#else
+#include <stdint.h>
+#endif
 
 
@@ -166 +172 @@
 
 
-    /// This struct describes additional/alternative skins for this model.
+    /// This struct describes additional/alternative skins for the meshes of this model.
     struct SkinT
     {
@@ -206 +212 @@
         Vector3fT AxisX;
         Vector3fT AxisY;
+    };
+
+
+    /// Channels allow animations to play only on a subset of the joints,
+    /// so that multiple animations can play on different parts of the model at the same time.
+    /// For example, you can play a walking animation on the legs, an animation for swinging
+    /// the arms on the upper body, and an animation for moving the eyes on the head. 
+    ///
+    /// Technically, a channel defines a group of joints. It is used to limit or "filter"
+    /// animations such that they affect only the joints that are members of the channel.
+    struct ChannelT
+    {
+        std::string Name;   ///< The name of this channel.
+
+        bool IsMember(unsigned int JointNr) const;
+        void SetMember(unsigned int JointNr, bool Member=true);
+
+
+        private:
+
+        ArrayT<uint32_t> m_BitBlocks;
     };
 
@@ -250 +277 @@
     const ArrayT<SkinT>&        GetSkins() const { return m_Skins; }
     const ArrayT<GuiFixtureT>&  GetGuiFixtures() const { return m_GuiFixtures; }
+    const ArrayT<ChannelT>&     GetChannels() const { return m_Channels; }
 
     /// This method returns the set of drawing matrices (one per joint) at the given sequence and frame number.
@@ -315 +343 @@
     ArrayT<GuiFixtureT>   m_GuiFixtures;            ///< Array of GUI fixtures in the model.
     ArrayT<GuiLocT>       m_GuiLocs;                ///< Array of locations where GUIs can be attached to this model.
+    ArrayT<ChannelT>      m_Channels;               ///< Array of channels in this model.