Changeset 471 for cafu/trunk

Timestamp:

01/22/12 11:33:07 (4 months ago)

Author:

Carsten

Message:

Game code:
Added the new model blending feature also to static detail entities:
Those that are animated and change their animation sequence are now smoothly blended from the first sequence to the next.
(This is nicely demonstrated in map Kidney with the Skeleton and the Face Hugger.)

Location:

cafu/trunk/Games/DeathMatch

Files:

• Code/CompanyBot.cpp (modified) (1 diff)
• Code/StaticDetailModel.cpp (modified) (10 diffs)
• Code/StaticDetailModel.hpp (modified) (2 diffs)
• GUIs/TechDemo/gui1.cgui (modified) (1 diff)
• Worlds/Kidney.lua (modified) (1 diff)

cafu/trunk/Games/DeathMatch/Code/CompanyBot.cpp

@@ -421 +421 @@
         }
 
-        m_LastStdAE=m_CompanyBotModel->GetAnimExprPool().GetStandard(State.ModelSequNr, State.ModelFrameNr);
+        m_LastStdAE=m_CompanyBotModel->GetAnimExprPool().GetStandard(State.ModelSequNr, 0.0f);
         m_AnimExpr =m_CompanyBotModel->GetAnimExprPool().GetBlend(m_AnimExpr, m_LastStdAE, BlendTime);
     }

cafu/trunk/Games/DeathMatch/Code/StaticDetailModel.cpp

@@ -136 +136 @@
       m_PlayAnim(State.Flags),
       m_SequNr(State.ModelSequNr),
-      m_FrameNr(0.0f),
+      m_AnimExpr(),     // Inited in the ctor body below.
+      m_LastStdAE(),
       GuiName(),
       Gui(NULL)
@@ -191 +192 @@
 
 
+    m_LastStdAE=m_Model->GetAnimExprPool().GetStandard(m_SequNr, 0.0f);
+    m_AnimExpr =m_LastStdAE;
+    m_SequNr   =m_LastStdAE->GetSequNr();   // Set m_SequNr to the m_LastStdAE's "normalized" value.
+
+
     // Set the proper Dimensions bounding box for this model.
     // Note that the bounding box depends on the current model sequence,
     // and it must be properly scaled and rotated for world space.
     VectorT V[8];
-    m_Model->GetSharedPose(m_Model->GetAnimExprPool().GetStandard(m_SequNr, 0.0f))->GetBB().AsBoxOfDouble().GetCornerVertices(V);
+    m_Model->GetSharedPose(m_AnimExpr)->GetBB().AsBoxOfDouble().GetCornerVertices(V);
 
     for (unsigned int VertexNr=0; VertexNr<8; VertexNr++)
@@ -262 +268 @@
     {
         case EventID_RestartSequ:
-            m_FrameNr=0.0f;
+            m_LastStdAE->SetFrameNr(0.0f);
             break;
     }
@@ -288 +294 @@
 
 
-    AnimPoseT* Pose=m_Model->GetSharedPose(m_Model->GetAnimExprPool().GetStandard(m_SequNr, m_FrameNr));
+    AnimPoseT* Pose=m_Model->GetSharedPose(m_AnimExpr);
     Pose->Draw(-1 /*default skin*/, LodDist);
 
@@ -334 +340 @@
 void EntStaticDetailModelT::PostDraw(float FrameTime, bool /*FirstPersonView*/)
 {
+    const int SequNr=(m_SequNr==255) ? -1 : m_SequNr;   // This is a hack, because m_SequNr actually has the wrong (unsigned) datatype...
+
+    if (SequNr != m_LastStdAE->GetSequNr())
+    {
+        if (m_PlayAnim)
+        {
+            m_LastStdAE=m_Model->GetAnimExprPool().GetStandard(SequNr, 0.0f);
+            m_AnimExpr =m_Model->GetAnimExprPool().GetBlend(m_AnimExpr, m_LastStdAE, 3.0f);
+        }
+        else
+        {
+            m_LastStdAE->SetSequNr(m_SequNr);
+        }
+
+        m_SequNr=m_LastStdAE->GetSequNr();  // Set m_SequNr to the m_LastStdAE's "normalized" value.
+    }
+
     if (Gui!=NULL)
     {
@@ -346 +369 @@
     {
         // Advance the client-local animation.
-        IntrusivePtrT<AnimExprStandardT> StdAE=m_Model->GetAnimExprPool().GetStandard(m_SequNr, m_FrameNr);
-
-        StdAE->AdvanceTime(FrameTime, true);
-        m_FrameNr=StdAE->GetFrameNr();
-    }
-
-
-    /* glColor3f(1.0, 0.0, 0.0);
-
-    VectorT V1=VectorT(State.Dimensions.Min.x, State.Dimensions.Min.y, State.Dimensions.Min.z)+State.Origin;
-    VectorT V2=VectorT(State.Dimensions.Min.x, State.Dimensions.Min.y, State.Dimensions.Max.z)+State.Origin;
-    VectorT V3=VectorT(State.Dimensions.Min.x, State.Dimensions.Max.y, State.Dimensions.Min.z)+State.Origin;
-    VectorT V4=VectorT(State.Dimensions.Min.x, State.Dimensions.Max.y, State.Dimensions.Max.z)+State.Origin;
-    VectorT V5=VectorT(State.Dimensions.Max.x, State.Dimensions.Min.y, State.Dimensions.Min.z)+State.Origin;
-    VectorT V6=VectorT(State.Dimensions.Max.x, State.Dimensions.Min.y, State.Dimensions.Max.z)+State.Origin;
-    VectorT V7=VectorT(State.Dimensions.Max.x, State.Dimensions.Max.y, State.Dimensions.Min.z)+State.Origin;
-    VectorT V8=VectorT(State.Dimensions.Max.x, State.Dimensions.Max.y, State.Dimensions.Max.z)+State.Origin;
-
-    glBegin(GL_LINES);
-        glVertex3f(V1.x, V1.z, -V1.y); glVertex3f(V2.x, V2.z, -V2.y);
-        glVertex3f(V3.x, V3.z, -V3.y); glVertex3f(V4.x, V4.z, -V4.y);
-        glVertex3f(V5.x, V5.z, -V5.y); glVertex3f(V6.x, V6.z, -V6.y);
-        glVertex3f(V7.x, V7.z, -V7.y); glVertex3f(V8.x, V8.z, -V8.y);
-
-        glVertex3f(V1.x, V1.z, -V1.y); glVertex3f(V3.x, V3.z, -V3.y);
-        glVertex3f(V3.x, V3.z, -V3.y); glVertex3f(V7.x, V7.z, -V7.y);
-        glVertex3f(V7.x, V7.z, -V7.y); glVertex3f(V5.x, V5.z, -V5.y);
-        glVertex3f(V5.x, V5.z, -V5.y); glVertex3f(V1.x, V1.z, -V1.y);
-
-        glVertex3f(V2.x, V2.z, -V2.y); glVertex3f(V4.x, V4.z, -V4.y);
-        glVertex3f(V4.x, V4.z, -V4.y); glVertex3f(V8.x, V8.z, -V8.y);
-        glVertex3f(V8.x, V8.z, -V8.y); glVertex3f(V6.x, V6.z, -V6.y);
-        glVertex3f(V6.x, V6.z, -V6.y); glVertex3f(V2.x, V2.z, -V2.y);
-    glEnd(); */
+        m_AnimExpr->AdvanceTime(FrameTime, true);
+    }
 }
 
@@ -418 +409 @@
 bool EntStaticDetailModelT::GetGuiPlane(unsigned int GFNr, Vector3fT& GuiOrigin, Vector3fT& GuiAxisX, Vector3fT& GuiAxisY) const
 {
-    if (!m_Model->GetSharedPose(m_Model->GetAnimExprPool().GetStandard(m_SequNr, m_FrameNr))->GetGuiPlane(GFNr, GuiOrigin, GuiAxisX, GuiAxisY)) return false;
+    if (!m_Model->GetSharedPose(m_AnimExpr)->GetGuiPlane(GFNr, GuiOrigin, GuiAxisX, GuiAxisY)) return false;
 
     // Okay, got the plane. Now transform it from model space into world space.
@@ -471 +462 @@
     EntStaticDetailModelT* Ent=(EntStaticDetailModelT*)cf::GameSys::ScriptStateT::GetCheckedObjectParam(LuaState, 1, TypeInfo);
 
-    lua_pushinteger(LuaState, Ent->m_SequNr);
+    lua_pushinteger(LuaState, Ent->m_LastStdAE->GetSequNr());
     return 1;
 }
@@ -480 +471 @@
     EntStaticDetailModelT* Ent=(EntStaticDetailModelT*)cf::GameSys::ScriptStateT::GetCheckedObjectParam(LuaState, 1, TypeInfo);
 
-    Ent->m_SequNr=std::max(0, luaL_checkinteger(LuaState, 2));
-    Ent->m_FrameNr=0.0f;
-    Ent->State.Events^=(1 << EventID_RestartSequ);
-
-    if (Ent->m_SequNr >= int(Ent->m_Model->GetAnims().Size())) Ent->m_SequNr=0;
+    Ent->m_LastStdAE->SetSequNr(std::max(0, luaL_checkinteger(LuaState, 2)));
+    Ent->m_LastStdAE->SetFrameNr(0.0f);
+    Ent->m_SequNr=Ent->m_LastStdAE->GetSequNr();    // Set m_SequNr to the m_LastStdAE's "normalized" value.
     return 0;
 }
@@ -493 +482 @@
     EntStaticDetailModelT* Ent=(EntStaticDetailModelT*)cf::GameSys::ScriptStateT::GetCheckedObjectParam(LuaState, 1, TypeInfo);
 
-    Ent->m_FrameNr=0.0f;
+    Ent->m_LastStdAE->SetFrameNr(0.0f);
     Ent->State.Events^=(1 << EventID_RestartSequ);
     return 0;

cafu/trunk/Games/DeathMatch/Code/StaticDetailModel.hpp

@@ -24 +24 @@
 
 #include "../../BaseEntity.hpp"
+#include "Models/AnimExpr.hpp"
 
 
@@ -75 +76 @@
     char&             m_PlayAnim;   ///< If 1, play the animation, i.e. advance the frames over time. If 0, keep still. This is a reference to State.Flags to have it sync'ed over the network.
     char&             m_SequNr;     ///< The number of the animation sequence to play. This is a reference to State.ModelSequNr to have it sync'ed over the network.
-    float             m_FrameNr;    ///< The current frame of the played animation sequence. Used <em>independently</em> on the server and the clients; only a <em>restart</em> of a sequence is sync'ed over the network via the EventID_RestartSequ event.
+
+    mutable IntrusivePtrT<AnimExpressionT>   m_AnimExpr;    ///< The state of the currently playing animation sequence. Used <em>independently</em> on the server and the clients; only a <em>restart</em> of a sequence is sync'ed over the network via the EventID_RestartSequ event.
+    mutable IntrusivePtrT<AnimExprStandardT> m_LastStdAE;   ///< The most recent standard expression that we set (as a subexpression of m_AnimExpr).
+
     std::string       GuiName;      ///< If our "gui" entity key is set, store the value here.
     cf::GuiSys::GuiI* Gui;          ///< If the model has GUI fixtures, we load the GUI here, *both* on the server- as well as on the client-side.

cafu/trunk/Games/DeathMatch/GUIs/TechDemo/gui1.cgui

@@ -61 +61 @@
     self:set("rect", 43, 91, 558, 324);
     self:set("backColor", 1, 1, 1, 0);      -- Set alpha value to zero!
-    self:set("text", "Planned features for the next (autumn '08) release:\n"..
+    self:set("text", "Planned features for the next release:\n"..
              "    1) Vegetation for the island\n"..
              "    2) better model support\n"..

cafu/trunk/Games/DeathMatch/Worlds/Kidney.lua

@@ -11 +11 @@
 end
 
-Skeleton.delay=5
+Skeleton.delay=6
 thread(CycleAnimSequences, Skeleton);
 
-FaceHugger.delay=3
+FaceHugger.delay=4
 thread(CycleAnimSequences, FaceHugger);