Changeset 414

Timestamp:

10/28/11 13:58:10 (7 months ago)

Author:

Carsten

Message:

Model code:

• Added new class ModelManagerT, which essentially does for models what the MaterialManagerImplT does for materials, and which is supposed to completely replace the obsolete class ModelProxyT in the very near future.
• Added method CafuModelT::GetSharedPose() in order to make the switch from ModelProxyT to the ModelManagerT easy to implement and backwards-compatible. (Improving the caching by better sharing (or not sharing) AnimPoseT instances among related models is a subject for future consideration and implementation.)
• Exemplary started to update the related code in the Map Editor component of CaWE.

Location:

cafu/trunk

Files:

• CaWE/DialogInsp-PrimitiveProps.cpp (modified) (2 diffs)
• CaWE/GameConfig.cpp (modified) (1 diff)
• CaWE/GameConfig.hpp (modified) (3 diffs)
• CaWE/LoadSave_cmap.cpp (modified) (2 diffs)
• CaWE/MapCommands/ModifyModel.cpp (modified) (2 diffs)
• CaWE/MapHelperModel.cpp (modified) (8 diffs)
• CaWE/MapHelperModel.hpp (modified) (3 diffs)
• CaWE/MapModel.cpp (modified) (7 diffs)
• CaWE/MapModel.hpp (modified) (3 diffs)
• Libs/Models/ModelManager.cpp (added)
• Libs/Models/ModelManager.hpp (added)
• Libs/Models/Model_cmdl.cpp (modified) (1 diff)
• Libs/Models/Model_cmdl.hpp (modified) (1 diff)
• Libs/SConscript (modified) (1 diff)

cafu/trunk/CaWE/DialogInsp-PrimitiveProps.cpp

@@ -39 +39 @@
 #include "wx/propgrid/advprops.h"
 
+#include "Models/Model_cmdl.hpp"
 #include "TypeSys.hpp"
 
@@ -270 +271 @@
             MapModelT* Model=(MapModelT*)SelectedPrimitives[i];
 
-            PropMan->AppendIn(Cat, new GameFilePropertyT("Model",           wxPG_LABEL, Model->m_Model.GetFileName(), MapDoc, "All Files (*.*)|*.*|Model files (*.mdl)|*.mdl|Model Files (*.ase)|*.ase|Model Files (*.dlod)|*.dlod", "/Models/"))->SetClientData(Model);
+            PropMan->AppendIn(Cat, new GameFilePropertyT("Model",           wxPG_LABEL, Model->m_Model->GetFileName(), MapDoc, "All Files (*.*)|*.*|Model files (*.mdl)|*.mdl|Model Files (*.ase)|*.ase|Model Files (*.dlod)|*.dlod", "/Models/"))->SetClientData(Model);
             PropMan->AppendIn(Cat, new GameFilePropertyT("Collision Model", wxPG_LABEL, Model->m_CollModelFileName, MapDoc, "Collision Model (*.cmap)|*.cmap|All Files (*.*)|*.*", "/Models/"))->SetClientData(Model);
             PropMan->AppendIn(Cat, new wxStringProperty ("Label",           wxPG_LABEL, Model->m_Label))->SetClientData(Model);

cafu/trunk/CaWE/GameConfig.cpp

@@ -250 +250 @@
 
 
+const CafuModelT* GameConfigT::GetModel(const wxString& FileName, wxString* ErrorMsg) const
+{
+    std::string       Msg;
+    const CafuModelT* Model=m_ModelMan.GetModel(std::string(ModDir + "/" + FileName), Msg);
+
+    if (ErrorMsg)
+        *ErrorMsg=Msg;
+
+    return Model;
+}
+
+
 BoundingBox3fT GameConfigT::GetMaxMapBB() const
 {

cafu/trunk/CaWE/GameConfig.hpp

@@ -25 +25 @@
 #include "EditorMaterialManager.hpp"
 #include "Math3D/BoundingBox.hpp"
+#include "Models/ModelManager.hpp"
 #include "Templates/Array.hpp"
 #include "wx/wx.h"
@@ -59 +60 @@
     const EditorMatManT& GetMatMan() const { return m_MatMan; }
 
+    /// Returns the model for the given FileName that is relative to ModDir.
+    const CafuModelT* GetModel(const wxString& FileName, wxString* ErrorMsg=NULL) const;
+
     int GetMaxMapCoord() const { return  m_MaxMapCoord; }
     int GetMinMapCoord() const { return -m_MaxMapCoord; }
@@ -84 +88 @@
     void operator = (const GameConfigT&);   ///< Use of the Assignment Operator is not allowed.
 
-
     ArrayT<cf::FileSys::FileSystemT*> m_MountedFileSystems;     ///< The file systems that have been mounted for this game config.
     ArrayT<const EntityClassT*>       m_EntityClasses;          ///< The entity classes as obtained from the EntityClassDefs.lua script.
-    EditorMatManT                     m_MatMan;                 ///< This material manager of this game config.
+    EditorMatManT                     m_MatMan;                 ///< The material manager for this game config.
+    ModelManagerT                     m_ModelMan;               ///< The model manager for this game config.
     int                               m_MaxMapCoord;
 };

cafu/trunk/CaWE/LoadSave_cmap.cpp

@@ -505 +505 @@
 
     m_ModelFileName    =TP.GetNextToken();
-    m_Model            =ModelProxyT(std::string(MapDoc.GetGameConfig()->ModDir+"/"+m_ModelFileName));
+    m_Model            =MapDoc.GetGameConfig()->GetModel(m_ModelFileName);
     m_CollModelFileName=TP.GetNextToken();
 
@@ -690 +690 @@
         {
             // A model definition.
-            MapModelT* Model=new MapModelT();
+            MapModelT* Model=new MapModelT(MapDoc, "dummy", Vector3fT());
 
             Model->Load_cmap(TP, MapDoc);

cafu/trunk/CaWE/MapCommands/ModifyModel.cpp

@@ -66 +66 @@
 
     m_Model->m_ModelFileName    =m_NewModelFileName;
-    m_Model->m_Model            =ModelProxyT(std::string(m_MapDoc.GetGameConfig()->ModDir+"/"+m_NewModelFileName));
+    m_Model->m_Model            =m_MapDoc.GetGameConfig()->GetModel(m_NewModelFileName);
     m_Model->m_CollModelFileName=m_NewCollModelFileName;
     m_Model->m_Label            =m_NewLabel;
@@ -96 +96 @@
 
     m_Model->m_ModelFileName    =m_OldModelFileName;
-    m_Model->m_Model            =ModelProxyT(std::string(m_MapDoc.GetGameConfig()->ModDir+"/"+m_OldModelFileName));
+    m_Model->m_Model            =m_MapDoc.GetGameConfig()->GetModel(m_OldModelFileName);
     m_Model->m_CollModelFileName=m_OldCollModelFileName;
     m_Model->m_Label            =m_OldLabel;

cafu/trunk/CaWE/MapHelperModel.cpp

@@ -34 +34 @@
 #include "Math3D/BoundingBox.hpp"
 #include "Math3D/Matrix3x3.hpp"
+#include "Models/Model_cmdl.hpp"
 #include "EditorMaterialManager.hpp"
 #include "MaterialSystem/Renderer.hpp"
 #include "TypeSys.hpp"
 
-#include "wx/wx.h"
-#include "wx/sstream.h"
-#include "wx/txtstrm.h"
-
 
 /*** Begin of TypeSys related definitions for this class. ***/
@@ -58 +55 @@
     : MapHelperT(ParentEntity),
       m_HelperInfo(HelperInfo),
-      m_ModelProxy(),
+      m_Model(NULL),
       m_ModelFrameNr(0.0f),
       m_Timer()
@@ -68 +65 @@
     : MapHelperT(Model),
       m_HelperInfo(Model.m_HelperInfo),
-      m_ModelProxy(Model.m_ModelProxy),
+      m_Model(Model.m_Model),
       m_ModelFrameNr(0.0f),
       m_Timer(Model.m_Timer)
@@ -93 +90 @@
     m_ParentEntity=Model->m_ParentEntity;
     m_HelperInfo  =Model->m_HelperInfo;
-    m_ModelProxy  =Model->m_ModelProxy;
+    m_Model       =Model->m_Model;
     m_ModelFrameNr=Model->m_ModelFrameNr;
     m_Timer       =Model->m_Timer;
@@ -110 +107 @@
     // The 3D bounds are the bounds of the oriented model's first sequence, so that frustum culling works properly in the 3D view.
     Vector3fT VerticesBB[8];
-    m_ModelProxy.GetBB(GetSequenceNr(), 0.0f).GetCornerVertices(VerticesBB);
+    m_Model->GetSharedPose(GetSequenceNr(), 0.0f)->GetBB().GetCornerVertices(VerticesBB);
 
     // Rotate all eight vertices.
@@ -146 +143 @@
     const Vector3fT ViewPoint=Renderer.GetViewWin3D().GetCamera().Pos;
     const float     ModelDist=length(Origin-ViewPoint);
+    AnimPoseT*      Pose     =m_Model->GetSharedPose(SequenceNr, m_ModelFrameNr);
 
     if (Options.view3d.AnimateModels)
-        m_ModelFrameNr=m_ModelProxy.AdvanceFrameNr(SequenceNr, m_ModelFrameNr, float(m_Timer.GetSecondsSinceLastCall()));
+    {
+        Pose->Advance(float(m_Timer.GetSecondsSinceLastCall()));
+
+        m_ModelFrameNr=Pose->GetFrameNr();
+    }
 
     if (ModelDist < float(Options.view3d.ModelDistance))
@@ -163 +165 @@
         MatSys::Renderer->RotateX  (MatSys::RendererI::MODEL_TO_WORLD,  Angles[ROLL ]);
 
-        m_ModelProxy.Draw(SequenceNr, m_ModelFrameNr, CAFU_ENG_SCALE*ModelDist, NULL);
+        Pose->Draw(-1 /*default skin*/, CAFU_ENG_SCALE*ModelDist);
 
         MatSys::Renderer->PopMatrix(MatSys::RendererI::MODEL_TO_WORLD);
@@ -180 +182 @@
 void MapHelperModelT::UpdateModelCache() const
 {
-    const wxString* ModelName=m_HelperInfo->Parameters.Size()>0 ? &m_HelperInfo->Parameters[0] : NULL;
-
-    // If we weren't passed a model name as an argument, get it from our parent entity's "model" property.
-    if (ModelName==NULL)
-    {
+    wxString ModelName="";
+    wxString ErrorMsg ="";
+
+    if (m_HelperInfo->Parameters.Size() > 0)
+    {
+        ModelName=m_HelperInfo->Parameters[0];
+    }
+    else
+    {
+        // If we weren't passed a model name as an argument, get it from our parent entity's "model" property.
         // Calling FindProperty() each render frame is not particularly efficient...
         const EntPropertyT* ModelProp=m_ParentEntity->FindProperty("model");
 
-        if (ModelProp) ModelName=&ModelProp->Value;
-    }
-
-    // If the helper info has no argument and the parent has no "model" property, we shouldn't have gotten here.
-    if (ModelName==NULL) return;
-
-    const wxString FullName=m_ParentEntity->GetClass()->GetGameConfig().ModDir+"/"+(*ModelName);
-
-    if (m_ModelProxy.GetFileName()==FullName) return;
-
-    wxLogDebug("MapHelperModelT::UpdateModelCache(): Updating model from %s to %s.", m_ModelProxy.GetFileName(), FullName);
-
-    m_ModelProxy=ModelProxyT(std::string(FullName));
-    m_ModelFrameNr=0.0f;
+        if (ModelProp) ModelName=ModelProp->Value;
+    }
+
+    const CafuModelT* Model=m_ParentEntity->GetClass()->GetGameConfig().GetModel(ModelName, &ErrorMsg);
+
+    if (m_Model!=Model)
+    {
+        const std::string PrevFileName=m_Model ? m_Model->GetFileName() : "<none>";
+
+        wxLogDebug("MapHelperModelT::UpdateModelCache(): Updating model from %s to %s. %s", PrevFileName, Model->GetFileName(), ErrorMsg);
+
+        m_Model       =Model;
+        m_ModelFrameNr=0.0f;
+    }
 }
 

cafu/trunk/CaWE/MapHelperModel.hpp

@@ -24 +24 @@
 
 #include "MapHelper.hpp"
-#include "Models/Model_proxy.hpp"
 #include "Util/Util.hpp"
 
@@ -32 +31 @@
 class Renderer2DT;
 class Renderer3DT;
+
+class CafuModelT;
 namespace cf { namespace TypeSys { class TypeInfoT; } }
 namespace cf { namespace TypeSys { class TypeInfoManT; } }
@@ -70 +71 @@
     int  GetSequenceNr() const;
 
-    const HelperInfoT*  m_HelperInfo;       ///< The HelperInfoT instance that caused the instantiation of this helper.
-    mutable ModelProxyT m_ModelProxy;       ///< Our model (proxy).
-    mutable float       m_ModelFrameNr;     ///< The frame number of the sequence to render this model in.
-    mutable TimerT      m_Timer;
+    const HelperInfoT*        m_HelperInfo;     ///< The HelperInfoT instance that caused the instantiation of this helper.
+    mutable const CafuModelT* m_Model;          ///< Our model (obtained from the game config's model manager).
+    mutable float             m_ModelFrameNr;   ///< The frame number of the sequence to render this model in.
+    mutable TimerT            m_Timer;
 };
 

cafu/trunk/CaWE/MapModel.cpp

@@ -32 +32 @@
 
 #include "MaterialSystem/Renderer.hpp"
-#include "MaterialSystem/Mesh.hpp"
 #include "Math3D/Matrix3x3.hpp"
+#include "Models/Model_cmdl.hpp"
 
 #include "wx/wx.h"
@@ -48 +48 @@
 
 /*** End of TypeSys related definitions for this class. ***/
-
-
-MapModelT::MapModelT()
-    : MapPrimitiveT(wxColour(150 + (rand() % 106), 150 + (rand() % 106), 0)),
-      m_ModelFileName(""),
-      m_Model(),
-      m_CollModelFileName(""),
-      m_Label(""),
-      m_Angles(),
-      m_Scale(1.0f),
-      m_SeqNumber(0),
-      m_FrameOffset(0.0f),
-      m_FrameTimeScale(1.0f),
-      m_FrameNumber(0.0f),
-      m_Animated(false),
-      m_Timer()
-{
-}
 
 
@@ -71 +53 @@
     : MapPrimitiveT(wxColour(150 + (rand() % 106), 150 + (rand() % 106), 0)),
       m_ModelFileName(ModelFileName),
-      m_Model(std::string(MapDoc.GetGameConfig()->ModDir+"/"+ModelFileName)),
+      m_Model(MapDoc.GetGameConfig()->GetModel(m_ModelFileName)),
       m_Origin(Position),
       m_CollModelFileName(""),
@@ -90 +72 @@
     : MapPrimitiveT(wxColour(150 + (rand() % 106), 150 + (rand() % 106), 0)),
       m_ModelFileName(ModelFileName),
-      m_Model(std::string(MapDoc.GetGameConfig()->ModDir+"/"+m_ModelFileName)),
+      m_Model(MapDoc.GetGameConfig()->GetModel(m_ModelFileName)),
       m_Origin(Position),
       m_CollModelFileName(CollisionModelFileName),
@@ -160 +142 @@
     // The 3D bounds are the bounds of the oriented model's first sequence, so that frustum culling works properly in the 3D view.
     Vector3fT VerticesBB[8];
-    m_Model.GetBB(m_SeqNumber, 0.0f).GetCornerVertices(VerticesBB);
+    m_Model->GetSharedPose(m_SeqNumber, 0.0f)->GetBB().GetCornerVertices(VerticesBB);
 
     // Rotate all eight vertices.
@@ -205 +187 @@
     const Vector3fT ViewPoint=Renderer.GetViewWin3D().GetCamera().Pos;
     const float     ModelDist=length(m_Origin-ViewPoint);
+    AnimPoseT*      Pose     =m_Model->GetSharedPose(m_SeqNumber, m_FrameNumber);
 
     if (Options.view3d.AnimateModels && m_Animated)
-        m_FrameNumber=m_Model.AdvanceFrameNr(m_SeqNumber, m_FrameNumber, float(m_Timer.GetSecondsSinceLastCall())*m_FrameTimeScale);
+    {
+        Pose->Advance(float(m_Timer.GetSecondsSinceLastCall())*m_FrameTimeScale);
+
+        m_FrameNumber=Pose->GetFrameNr();
+    }
 
     if (ModelDist<float(Options.view3d.ModelDistance))
@@ -222 +209 @@
         MatSys::Renderer->Scale    (MatSys::RendererI::MODEL_TO_WORLD, m_Scale);
 
-        m_Model.Draw(m_SeqNumber, m_FrameNumber, CAFU_ENG_SCALE*ModelDist, NULL);
+        Pose->Draw(-1 /*default skin*/, CAFU_ENG_SCALE*ModelDist);
 
         MatSys::Renderer->PopMatrix(MatSys::RendererI::MODEL_TO_WORLD);

cafu/trunk/CaWE/MapModel.hpp

@@ -24 +24 @@
 
 #include "MapPrimitive.hpp"
-
-#include "Models/Model_proxy.hpp"
 #include "Util/Util.hpp"
 
 
 class MapDocumentT;
+class CafuModelT;
 
 
@@ -36 +35 @@
     public:
 
-    MapModelT();
-
     MapModelT(MapDocumentT& MapDoc, const wxString& ModelFileName, const Vector3fT& Position);
-
     MapModelT(MapDocumentT& MapDoc, const wxString& ModelFileName, const wxString& CollisionModelFileName, const wxString& Label, const Vector3fT& Position, const Vector3fT& Angles, float Scale, int Sequence, float FrameOffset, float FrameTimeScale, bool Animated);
 
@@ -83 +79 @@
 
     wxString           m_ModelFileName;
-    ModelProxyT        m_Model;
+    const CafuModelT*  m_Model;
     Vector3fT          m_Origin;
     wxString           m_CollModelFileName;

cafu/trunk/Libs/Models/Model_cmdl.cpp

@@ -353 +353 @@
     return IsMeshNrOK(GF, PointNr) &&
            GF.Points[PointNr].VertexNr < m_Meshes[GF.Points[PointNr].MeshNr].Vertices.Size();
+}
+
+
+AnimPoseT* CafuModelT::GetSharedPose(int SequNr, float FrameNr) const
+{
+    m_TEMP_Pose->SetSequNr(SequNr);
+    m_TEMP_Pose->SetFrameNr(FrameNr);
+
+    return m_TEMP_Pose;
 }
 

cafu/trunk/Libs/Models/Model_cmdl.hpp

@@ -275 +275 @@
     bool IsVertexNrOK(const GuiFixtureT& GF, unsigned int PointNr) const;
 
+    /// This method is strictly for backwards-compatibility only, do not use in new code!
+    AnimPoseT* GetSharedPose(int SequNr, float FrameNr) const;
+
     // The ModelT interface.
     const std::string& GetFileName() const;     // TODO: Remove!?!

cafu/trunk/Libs/SConscript

@@ -15 +15 @@
                     Models/Loader.cpp Models/Loader_ase.cpp Models/Loader_cmdl.cpp Models/Loader_dlod.cpp Models/Loader_dummy.cpp Models/Loader_lwo.cpp Models/Loader_md5.cpp
                     Models/Loader_mdl.cpp Models/AnimPose.cpp
-                    Models/Model_cmdl.cpp Models/Model_proxy.cpp
+                    Models/Model_cmdl.cpp Models/Model_proxy.cpp Models/ModelManager.cpp
                     Network/Network.cpp ParticleEngine/ParticleEngineMS.cpp PlatformAux.cpp Terrain/Terrain.cpp
                     TextParser/TextParser.cpp