Changeset 416

Timestamp:

11/01/11 11:39:31 (7 months ago)

Author:

Carsten

Message:

Model code / GuiSys:
Replaced obsolete class ModelProxyT in the GuiSys's ModelWindowT class with new model code.

Location:

cafu/trunk

Files:

• CaWE/GuiEditor/Commands/ModifyWindow.cpp (modified) (3 diffs)
• CaWE/GuiEditor/Windows/EditorModelWindow.cpp (modified) (4 diffs)
• Libs/GuiSys/WindowModel.cpp (modified) (12 diffs)
• Libs/GuiSys/WindowModel.hpp (modified) (3 diffs)
• Libs/Models/AnimPose.hpp (modified) (1 diff)

cafu/trunk/CaWE/GuiEditor/Commands/ModifyWindow.cpp

@@ -28 +28 @@
 #include "MaterialSystem/Renderer.hpp"
 #include "MaterialSystem/MaterialManager.hpp"
-#include "Fonts/FontTT.hpp"
+#include "Models/Model_cmdl.hpp"
 
 
@@ -126 +126 @@
     else if (m_PropertyName=="Model")
     {
+        std::string ErrorMsg;
         cf::GuiSys::ModelWindowT* ModelWindow=dynamic_cast<cf::GuiSys::ModelWindowT*>(m_Window);
         wxASSERT(ModelWindow!=NULL);
 
-        ModelProxyT& Model=ModelWindow->GetModel();
-
-        m_OldString=Model.GetFileName();
-
-        Model=ModelProxyT(m_NewString);
+        m_OldString=ModelWindow->GetModel()->GetFileName();
+
+        ModelWindow->SetModel(m_NewString, ErrorMsg);
     }
     else
@@ -195 +194 @@
     else if (m_PropertyName=="Model")
     {
+        std::string ErrorMsg;
         cf::GuiSys::ModelWindowT* ModelWindow=dynamic_cast<cf::GuiSys::ModelWindowT*>(m_Window);
         wxASSERT(ModelWindow!=NULL);
 
-        ModelWindow->GetModel()=ModelProxyT(m_OldString);
+        ModelWindow->SetModel(m_OldString, ErrorMsg);
     }
     else

cafu/trunk/CaWE/GuiEditor/Windows/EditorModelWindow.cpp

@@ -27 +27 @@
 #include "GuiSys/WindowModel.hpp"
 #include "GuiSys/WindowCreateParams.hpp"
+#include "Models/Model_cmdl.hpp"
 
 #include "wx/propgrid/manager.h"
@@ -45 +46 @@
     EditorWindowT::FillInPG(PropMan);
 
-    PropMan->Append(new wxStringProperty("Model", wxPG_LABEL, m_ModelWindow->GetModel().GetFileName()));
+    PropMan->Append(new wxStringProperty("Model", wxPG_LABEL, m_ModelWindow->GetModel()->GetFileName()));
 
     PropMan->Append(new wxIntProperty("ModelSequNr", wxPG_LABEL, m_ModelWindow->GetModelSequNr()));
@@ -74 +75 @@
     wxString PropName=Property->GetName();
 
-         if (PropName=="Model")         Property->SetValueFromString(m_ModelWindow->GetModel().GetFileName());
+         if (PropName=="Model")         Property->SetValueFromString(m_ModelWindow->GetModel()->GetFileName());
     else if (PropName=="ModelSequNr")   Property->SetValue(m_ModelWindow->GetModelSequNr());
     else if (PropName=="ModelPos.x")    Property->SetValue(m_ModelWindow->GetModelPos().x);
@@ -181 +182 @@
     cf::GuiSys::ModelWindowT        Default(Params);
 
-    if (m_ModelWindow->GetModel().GetFileName()!=Default.GetModel().GetFileName())
-        OutFile << "    self:SetModel(\"" << m_ModelWindow->GetModel().GetFileName() << "\");\n";
+    if (m_ModelWindow->GetModel()->GetFileName()!=Default.GetModel()->GetFileName())
+        OutFile << "    self:SetModel(\"" << m_ModelWindow->GetModel()->GetFileName() << "\");\n";
 
     if (m_ModelWindow->GetModelSequNr()!=Default.GetModelSequNr())

cafu/trunk/Libs/GuiSys/WindowModel.cpp

@@ -25 +25 @@
 #include "MaterialSystem/Renderer.hpp"
 #include "Math3D/Matrix.hpp"
+#include "Models/AnimPose.hpp"
+#include "Models/Model_cmdl.hpp"
 
 extern "C"
@@ -64 +66 @@
 ModelWindowT::ModelWindowT(const cf::GuiSys::WindowCreateParamsT& Params)
     : WindowT(Params),
-      Model(""),
-      ModelSequNr(0),
-      ModelFrameNr(0.0f),
+      m_Model(NULL),
+      m_Pose(NULL),
       ModelPos(0, 0, 0),
       ModelScale(1.0f),
@@ -72 +73 @@
       CameraPos(0, -200.0f, 0)
 {
+    std::string ErrorMsg;
+
+    SetModel("dummy", ErrorMsg);
     FillMemberVars();
 }
@@ -78 +82 @@
 ModelWindowT::ModelWindowT(const ModelWindowT& Window, bool Recursive)
     : WindowT(Window, Recursive),
-      Model(Window.Model),
-      ModelSequNr(Window.ModelSequNr),
-      ModelFrameNr(Window.ModelFrameNr),
+      m_Model(NULL),
+      m_Pose(NULL),
       ModelPos(Window.ModelPos),
       ModelScale(Window.ModelScale),
@@ -86 +89 @@
       CameraPos(Window.CameraPos)
 {
+    std::string ErrorMsg;
+
+    SetModel(Window.m_Model->GetFileName(), ErrorMsg);
     FillMemberVars();
 }
@@ -98 +104 @@
 ModelWindowT::~ModelWindowT()
 {
+    delete m_Pose;
+}
+
+
+void ModelWindowT::SetModel(const std::string& FileName, std::string& ErrorMsg)
+{
+    const CafuModelT* PrevModel=m_Model;
+
+    m_Model=m_Gui.GetGuiResources().GetModel(FileName, ErrorMsg);
+
+    if (m_Pose==NULL || PrevModel!=m_Model)
+    {
+        delete m_Pose;
+        m_Pose=new AnimPoseT(*m_Model, 0, 0.0f);
+    }
+}
+
+
+int ModelWindowT::GetModelSequNr() const
+{
+    return m_Pose->GetSequNr();
 }
 
@@ -128 +155 @@
     MatSys::Renderer->SetCurrentEyePosition(CameraPos.x, CameraPos.y, CameraPos.z);     // Required in some ambient shaders.
 
-    Model.Draw(ModelSequNr, ModelFrameNr, 0.0f, NULL);
+    m_Pose->Draw(-1 /*default skin*/, 0.0f);
 
     MatSys::Renderer->PopMatrix(MatSys::RendererI::PROJECTION    );
@@ -138 +165 @@
 bool ModelWindowT::OnClockTickEvent(float t)
 {
-    ModelFrameNr=Model.AdvanceFrameNr(ModelSequNr, ModelFrameNr, t, true);
+    m_Pose->Advance(t, true);
 
     return WindowT::OnClockTickEvent(t);
@@ -148 +175 @@
     WindowT::FillMemberVars();
 
-    MemberVars["modelSequNr"]=MemberVarT(ModelSequNr);
-    MemberVars["modelFrameNr"]=MemberVarT(ModelFrameNr);
     MemberVars["modelPos.x"]=MemberVarT(ModelPos.x);
     MemberVars["modelPos.y"]=MemberVarT(ModelPos.y);
@@ -165 +190 @@
 int ModelWindowT::SetModel(lua_State* LuaState)
 {
-    ModelWindowT* ModelWin=(ModelWindowT*)cf::GuiSys::GuiImplT::GetCheckedObjectParam(LuaState, 1, TypeInfo);
-
-    ModelWin->Model=ModelProxyT(luaL_checkstring(LuaState, 2));
+    std::string   ErrorMsg;
+    ModelWindowT* ModelWin=(ModelWindowT*)cf::GuiSys::GuiImplT::GetCheckedObjectParam(LuaState, 1, TypeInfo);
+
+    ModelWin->SetModel(luaL_checkstring(LuaState, 2), ErrorMsg);
+
+    if (ErrorMsg!="") return luaL_error(LuaState, "%s", ErrorMsg.c_str());
     return 0;
 }
@@ -176 +204 @@
     ModelWindowT* ModelWin=(ModelWindowT*)cf::GuiSys::GuiImplT::GetCheckedObjectParam(LuaState, 1, TypeInfo);
 
-    lua_pushinteger(LuaState, ModelWin->Model.GetNrOfSequences());
+    lua_pushinteger(LuaState, ModelWin->m_Model->GetAnims().Size());
     return 1;
 }
@@ -185 +213 @@
     ModelWindowT* ModelWin=(ModelWindowT*)cf::GuiSys::GuiImplT::GetCheckedObjectParam(LuaState, 1, TypeInfo);
 
-    ModelWin->ModelSequNr=luaL_checkinteger(LuaState, 2);
+    ModelWin->m_Pose->SetSequNr(luaL_checkinteger(LuaState, 2));
     return 0;
 }

cafu/trunk/Libs/GuiSys/WindowModel.hpp

@@ -24 +24 @@
 
 #include "Window.hpp"
-#include "Models/Model_proxy.hpp"
+#include "Math3D/Vector3.hpp"
+
+
+class CafuModelT;
+class AnimPoseT;
 
 
@@ -47 +51 @@
             ~ModelWindowT();
 
-            /// Returns the model this window shows.
-            ModelProxyT& GetModel() { return Model; }
-
-            int              GetModelSequNr() const { return ModelSequNr; }     ///< Returns the animation sequence number that is used for the model.
-         // float            GetModelFrameNr() const { return ModelFrameNr; }   ///< Returns the frame number of the sequence. The only variable that is not set by script, but advanced automatically.
+            const CafuModelT* GetModel() const { return m_Model; }
+            void SetModel(const std::string& FileName, std::string& ErrorMsg);
+            int              GetModelSequNr() const;
             const Vector3fT& GetModelPos() const { return ModelPos; }           ///< Returns the position of the model in world space.
             float            GetModelScale() const { return ModelScale; }       ///< Returns the scale factor applied to the model coordinates when converted to world space.
@@ -76 +78 @@
             private:
 
-            ModelProxyT Model;          ///< The model instance rendered by this window.
-            int         ModelSequNr;    ///< The animation sequence number that is used for the model.
-            float       ModelFrameNr;   ///< The frame number of the sequence. The only variable that is not set by script, but advanced automatically.
-            Vector3fT   ModelPos;       ///< The position of the model in world space.
-            float       ModelScale;     ///< The scale factor applied to the model coordinates when converted to world space.
-            Vector3fT   ModelAngles;    ///< The angles around the axes that determine the orientation of the model in world space.
-            Vector3fT   CameraPos;      ///< The position of the camera in world space.
+            const CafuModelT* m_Model;      ///< The model instance rendered by this window.
+            AnimPoseT*        m_Pose;       ///< The pose of the model.
+            Vector3fT         ModelPos;     ///< The position of the model in world space.
+            float             ModelScale;   ///< The scale factor applied to the model coordinates when converted to world space.
+            Vector3fT         ModelAngles;  ///< The angles around the axes that determine the orientation of the model in world space.
+            Vector3fT         CameraPos;    ///< The position of the camera in world space.
 
 

cafu/trunk/Libs/Models/AnimPose.hpp

@@ -105 +105 @@
     ~AnimPoseT();
 
+    int GetSequNr() const { return m_SequNr; }
+
     /// @param SequNr   The number of the animation sequence to use, -1 for the bind pose.
     void SetSequNr(int SequNr);