Changeset 428 for cafu/trunk

Timestamp:

11/20/11 12:01:24 (6 months ago)

Author:

Carsten

Message:

Model code:
Finally removed the last fragments of the old model code: the newer code is now used everywhere! :-D

References #78.

Location:

cafu/trunk

Files:

• CaWE/ModelEditor/Commands/TransformJoint.cpp (modified) (2 diffs)
• CaWE/ModelEditor/ModelDocument.cpp (modified) (5 diffs)
• CaWE/ModelEditor/ModelDocument.hpp (modified) (1 diff)
• CaWE/ModelEditor/SceneView3D.cpp (modified) (4 diffs)
• CaWE/ModelEditor/SceneView3D.hpp (modified) (1 diff)
• CaWE/ParentFrame.cpp (modified) (2 diffs)
• Games/DeathMatch/Code/GameImpl.cpp (modified) (1 diff)
• Games/DeathMatch/Code/StaticDetailModel.cpp (modified) (2 diffs)
• Libs/Models/AnimPose.cpp (modified) (1 diff)
• Libs/Models/AnimPose.hpp (modified) (6 diffs)
• Libs/Models/Loader_ase.cpp (modified) (3 diffs)
• Libs/Models/Loader_ase.hpp (modified) (1 diff)
• Libs/Models/Loader_assimp.cpp (modified) (1 diff)
• Libs/Models/Loader_assimp.hpp (modified) (1 diff)
• Libs/Models/Loader_cmdl.cpp (modified) (1 diff)
• Libs/Models/Loader_cmdl.hpp (modified) (1 diff)
• Libs/Models/Loader_dlod.cpp (modified) (1 diff)
• Libs/Models/Loader_dlod.hpp (modified) (1 diff)
• Libs/Models/Loader_fbx.hpp (modified) (1 diff)
• Libs/Models/Loader_lwo.cpp (modified) (2 diffs)
• Libs/Models/Loader_lwo.hpp (modified) (1 diff)
• Libs/Models/Loader_md5.cpp (modified) (16 diffs)
• Libs/Models/Loader_md5.hpp (modified) (1 diff)
• Libs/Models/Loader_mdl.cpp (modified) (5 diffs)
• Libs/Models/Loader_mdl.hpp (modified) (1 diff)
• Libs/Models/Model.hpp (deleted)
• Libs/Models/ModelManager.cpp (modified) (1 diff)
• Libs/Models/Model_cmdl.cpp (modified) (7 diffs)
• Libs/Models/Model_cmdl.hpp (modified) (7 diffs)
• Libs/Models/Model_proxy.cpp (deleted)
• Libs/Models/Model_proxy.hpp (deleted)
• Libs/SConscript (modified) (1 diff)

cafu/trunk/CaWE/ModelEditor/Commands/TransformJoint.cpp

@@ -50 +50 @@
     GetModelVec()=m_NewVec;
 
-    // Make sure that the BB is updated and the draw cache is refreshed.
-    m_ModelDoc->GetModel()->RecomputeBindPoseBB();
+    // Make sure that the caches are refreshed.
     m_ModelDoc->GetAnimState().Pose.SetNeedsRecache();
 
@@ -69 +68 @@
     GetModelVec()=m_OldVec;
 
-    // Make sure that the BB is updated and the draw cache is refreshed.
-    m_ModelDoc->GetModel()->RecomputeBindPoseBB();
+    // Make sure that the caches are refreshed.
     m_ModelDoc->GetAnimState().Pose.SetNeedsRecache();
 

cafu/trunk/CaWE/ModelEditor/ModelDocument.cpp

@@ -66 +66 @@
 ModelEditor::ModelDocumentT::ModelDocumentT(GameConfigT* GameConfig, const wxString& FileName)
     : m_Model(LoadModel(FileName)),
-      m_SequenceBB(m_Model->GetBB(-1, 0.0f)),
       m_AnimState(*m_Model),
+      m_SequenceBB(m_AnimState.Pose.GetBB()),
       m_Submodels(),
       m_Gui(new cf::GuiSys::GuiImplT(GameConfig->GetGuiResources(),
@@ -141 +141 @@
         if (m_Selection[ANIM].Size()==0)
         {
-            m_SequenceBB=m_Model->GetBB(-1, 0.0f);
+            m_SequenceBB=m_AnimState.Pose.GetBB();
         }
         else
@@ -167 +167 @@
         m_Submodels.PushBack(new SubmodelT(LoadModel(FileName)));
     }
-    catch (const ModelT::LoadError& /*E*/)
-    {
-        // TODO: We really should have more detailed information about what exactly went wrong when loading the model...
-        wxMessageBox(wxString("The submodel file \"")+FileName+"\" could not be loaded!", "Couldn't load or import submodel");
-    }
     catch (const ModelLoaderT::LoadErrorT& LE)
     {
@@ -194 +189 @@
     const unsigned int   NextAnimSequNr=m_Selection[ANIM].Size()==0 ? 0 : m_Selection[ANIM][0]+1;
 
-    if (NextAnimSequNr < m_Model->GetNrOfSequences())
+    if (NextAnimSequNr < m_Model->GetAnims().Size())
         NextSel.PushBack(NextAnimSequNr);
 
@@ -204 +199 @@
 {
     ArrayT<unsigned int> NextSel;
-    const unsigned int   NextAnimSequNr=m_Selection[ANIM].Size()==0 ? m_Model->GetNrOfSequences()-1 : m_Selection[ANIM][0]-1;
-
-    if (NextAnimSequNr < m_Model->GetNrOfSequences())
+    const unsigned int   NextAnimSequNr=m_Selection[ANIM].Size()==0 ? m_Model->GetAnims().Size()-1 : m_Selection[ANIM][0]-1;
+
+    if (NextAnimSequNr < m_Model->GetAnims().Size())
         NextSel.PushBack(NextAnimSequNr);
 

cafu/trunk/CaWE/ModelEditor/ModelDocument.hpp

@@ -137 +137 @@
         CafuModelT*              m_Model;           ///< The model that is being edited.
         ArrayT<unsigned int>     m_Selection[6];    ///< The selected joints, meshes, animations, channels, skins and GUI fixtures.
-        BoundingBox3fT           m_SequenceBB;      ///< The bounding-box encompassing all frames of the currently selected animation sequence(s).
         ArrayT<EditorMaterialI*> m_EditorMaterials; ///< One editor material for each material in the model (its material manager).
         AnimStateT               m_AnimState;       ///< The current state of the model animation.
+        BoundingBox3fT           m_SequenceBB;      ///< The bounding-box encompassing all frames of the currently selected animation sequence(s).
         ArrayT<SubmodelT*>       m_Submodels;       ///< The submodels that are shown with the main model.
         cf::GuiSys::GuiImplT*    m_Gui;             ///< The GUI that is rendered where the model has GUI fixtures.

cafu/trunk/CaWE/ModelEditor/SceneView3D.cpp

@@ -61 +61 @@
 
 
-Vector3fT ModelEditor::SceneView3DT::TraceCameraRay(const wxPoint& RefPtWin, ModelT::TraceResultT& ModelTR) const
+Vector3fT ModelEditor::SceneView3DT::TraceCameraRay(const wxPoint& RefPtWin, AnimPoseT::TraceResultT& ModelTR) const
 {
     const ModelDocumentT* ModelDoc    =m_Parent->GetModelDoc();
@@ -101 +101 @@
 
     // Trace the ray against the model, which is a per-triangle accurate test.
-    ModelT::TraceResultT Result;
+    AnimPoseT::TraceResultT Result;
 
     if (ModelDoc->GetAnimState().Pose.TraceRay(ModelDoc->GetSelSkinNr(), RayOrigin, RayDir, Result) && Result.Fraction<BestFraction)
@@ -116 +116 @@
 Vector3fT ModelEditor::SceneView3DT::GetRefPtWorld(const wxPoint& RefPtWin) const
 {
-    ModelT::TraceResultT ModelTR;
+    AnimPoseT::TraceResultT ModelTR;
 
     return TraceCameraRay(RefPtWin, ModelTR);
@@ -231 +231 @@
     };
 
-    ModelT::TraceResultT ModelTR;
-    const Vector3fT      HitPos=TraceCameraRay(ScreenToClient(CE.GetPosition()), ModelTR);
-    const CafuModelT*    Model=m_Parent->GetModelDoc()->GetModel();
-    const AnimPoseT&     Pose=m_Parent->GetModelDoc()->GetAnimState().Pose;
-    unsigned int         BestVertexNr=0;
-    bool                 HaveModelHit=false;
+    AnimPoseT::TraceResultT ModelTR;
+    const Vector3fT         HitPos=TraceCameraRay(ScreenToClient(CE.GetPosition()), ModelTR);
+    const CafuModelT*       Model=m_Parent->GetModelDoc()->GetModel();
+    const AnimPoseT&        Pose=m_Parent->GetModelDoc()->GetAnimState().Pose;
+    unsigned int            BestVertexNr=0;
+    bool                    HaveModelHit=false;
 
     if (ModelTR.Fraction>0.0f && ModelTR.MeshNr<Model->GetMeshes().Size() && ModelTR.TriNr<Model->GetMeshes()[ModelTR.MeshNr].Triangles.Size())

cafu/trunk/CaWE/ModelEditor/SceneView3D.hpp

@@ -42 +42 @@
         SceneView3DT(ChildFrameT* Parent);
 
-        Vector3fT TraceCameraRay(const wxPoint& RefPtWin, ModelT::TraceResultT& ModelTR) const;
+        Vector3fT TraceCameraRay(const wxPoint& RefPtWin, AnimPoseT::TraceResultT& ModelTR) const;
 
 

cafu/trunk/CaWE/ParentFrame.cpp

@@ -40 +40 @@
 #include "MaterialSystem/TextureMap.hpp"
 #include "Models/Loader.hpp"    // Needed for the ModelLoaderT::LoadErrorT exception that must be caught when model loading failed.
-#include "Models/Model.hpp"     // Needed for the ModelT::LoadError exception that must be caught when model loading failed.
 #include "TextParser/TextParser.hpp"
 #include "PlatformAux.hpp"
@@ -554 +553 @@
     {
         wxMessageBox(wxString("The map file \"")+FileName+"\" could not be loaded!", "Couldn't load the map");
-    }
-    catch (const ModelT::LoadError& /*E*/)
-    {
-        // TODO: We really should have more detailed information about what exactly went wrong when loading the model...
-        wxMessageBox(wxString("The model file \"")+FileName+"\" could not be loaded!", "Couldn't load or import model");
     }
     catch (const ModelLoaderT::LoadErrorT& LE)

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

@@ -46 +46 @@
 
 #include "ConsoleCommands/Console.hpp"
-#include "Models/Model_proxy.hpp"
 
 #include <map>

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

@@ -299 +299 @@
         Vector3fT GuiAxisY;
 
-        if (m_Model->GetGuiPlane(m_SequNr, m_FrameNr, LodDist, GuiOrigin, GuiAxisX, GuiAxisY))
+        if (m_Model->GetGuiPlane(GuiOrigin, GuiAxisX, GuiAxisY))
         {
 #if 1
@@ -390 +390 @@
 bool EntStaticDetailModelT::GetGuiPlane(Vector3fT& GuiOrigin, Vector3fT& GuiAxisX, Vector3fT& GuiAxisY) const
 {
-    if (!m_Model->GetGuiPlane(m_SequNr, m_FrameNr, 0.0, GuiOrigin, GuiAxisX, GuiAxisY)) return false;
+    if (!m_Model->GetGuiPlane(GuiOrigin, GuiAxisX, GuiAxisY)) return false;
 
     // Okay, got the plane. Now transform it from model space into world space.

cafu/trunk/Libs/Models/AnimPose.cpp

@@ -706 +706 @@
 
 
-bool AnimPoseT::TraceRay(int SkinNr, const Vector3fT& RayOrigin, const Vector3fT& RayDir, ModelT::TraceResultT& Result) const
+bool AnimPoseT::TraceRay(int SkinNr, const Vector3fT& RayOrigin, const Vector3fT& RayDir, TraceResultT& Result) const
 {
     // if (m_Model.GetDlodModel() && LodDist >= m_Model.GetDlodDist())

cafu/trunk/Libs/Models/AnimPose.hpp

@@ -27 +27 @@
 #include "Math3D/BoundingBox.hpp"
 #include "Math3D/Matrix.hpp"
-#include "Model.hpp"    // For ModelT::TraceResultT
 
 
 class CafuModelT;
-// class TraceResultT;
+class MaterialT;
 
 
@@ -74 +73 @@
     };
 
+    /// This class describes the result of tracing a ray or a bounding box against the model.
+    struct TraceResultT
+    {
+        /// The constructor.
+        TraceResultT(float Fraction_=0.0f) : Fraction(Fraction_), Material(NULL), MeshNr(-1), TriNr(-1) { }
+
+        float            Fraction;  ///< The scalar along RayDir at which the hit occurred (RayOrigin + RayDir*Fraction).
+        Vector3fT        Normal;    ///< This is the normal vector of the hit surface.
+        const MaterialT* Material;  ///< The material at the point of impact. Can be NULL, e.g. when an edge (i.e. a bevel plane) was hit or the material is not available.
+        unsigned int     MeshNr;    ///< The number of the hit mesh. Can be -1 (that is, \emph{larger} then the number of meshes in the model) if the hit mesh cannot be determined.
+        unsigned int     TriNr;     ///< The number of the hit triangle in the hit mesh. Can be -1 (that is, \emph{larger} then the number of triangles in the mesh) if the hit triangle cannot be determined.
+    };
+
 
     /// The constructor.
@@ -101 +113 @@
 
     /// Advances the pose in time.
+    /// Use GetFrameNr() to learn the new frame number after calling this method.
     void Advance(float Time, bool ForceLoop=false);
 
@@ -107 +120 @@
 
     /// This method renders the model in this pose.
+    /// The current MatSys model-view matrix determines the position and orientation.
+    ///
     /// @param SkinNr     The skin to render the model with, -1 for the default skin.
     /// @param LodDist    The distance to the camera for reducing the level-of-detail.
@@ -120 +135 @@
     ///
     /// @returns true if the ray hit the model, false otherwise. When the model was hit, additional details are returned via the Result parameter.
-    bool TraceRay(int SkinNr, const Vector3fT& RayOrigin, const Vector3fT& RayDir, ModelT::TraceResultT& Result) const;
+    bool TraceRay(int SkinNr, const Vector3fT& RayOrigin, const Vector3fT& RayDir, TraceResultT& Result) const;
 
     /// Considers the given triangle in the given mesh, and returns the vertex that the given point P is closest to in this pose.
@@ -135 +150 @@
     const ArrayT<MeshInfoT>& GetMeshInfos() const;
 
-    /// Returns the MatSys meshes for this pose.
+    /// Returns the MatSys meshes for the model in this pose.
     const ArrayT<MatSys::MeshT>& GetDrawMeshes() const;
 
-    /// Returns the bounding-box for this pose.
+    /// Returns the bounding-box for the model in this pose.
     const BoundingBox3fT& GetBB() const;
 

cafu/trunk/Libs/Models/Loader_ase.cpp

@@ -297 +297 @@
 
 
-LoaderAseT::LoaderAseT(const std::string& FileName, int Flags) /*throw (ModelT::LoadError)*/
+LoaderAseT::LoaderAseT(const std::string& FileName, int Flags)
     : ModelLoaderT(FileName, Flags)
 {
@@ -332 +332 @@
     catch (const TextParserT::ParseError&)
     {
-        throw ModelT::LoadError();
+        throw LoadErrorT("Could not parse the file.");
     }
 
@@ -485 +485 @@
         {
             printf("ase model error (%s): GeomObject %lu refers to material index %lu, but there are only %lu materials total.\n", FileName.c_str(), GONr, m_GeomObjects[GONr].IndexMaterial, m_MaterialNames.Size());
-            throw ModelT::LoadError();
+            throw LoadErrorT("A GeomObject refers to an unknown material.");
         }
     }

cafu/trunk/Libs/Models/Loader_ase.hpp

@@ -37 +37 @@
     /// @param FileName   The name of the .ase file to import.
     /// @param Flags      The flags to load the model with. See ModelLoaderT::FlagsT for details.
-    LoaderAseT(const std::string& FileName, int Flags=NONE) /*throw (ModelT::LoadError)*/;
+    LoaderAseT(const std::string& FileName, int Flags=NONE);
 
     bool UseGivenTS() const { return true; }

cafu/trunk/Libs/Models/Loader_assimp.cpp

@@ -30 +30 @@
 
 
-LoaderAssimpT::LoaderAssimpT(const std::string& FileName, int Flags) /*throw (ModelT::LoadError)*/
+LoaderAssimpT::LoaderAssimpT(const std::string& FileName, int Flags)
     : ModelLoaderT(FileName, Flags),
       m_Scene(NULL)

cafu/trunk/Libs/Models/Loader_assimp.hpp

@@ -41 +41 @@
     /// If FileName ends with "md5", it is assumed that the file has a white-space separated list of one md5mesh and arbitrarily many md5anim files.
     /// If FileName ends with "md5mesh", this file is loaded without any animation information (e.g. for static detail models).
-    LoaderAssimpT(const std::string& FileName, int Flags=NONE) /*throw (ModelT::LoadError)*/;
+    LoaderAssimpT(const std::string& FileName, int Flags=NONE);
 
     bool UseGivenTS() const;

cafu/trunk/Libs/Models/Loader_cmdl.cpp

@@ -32 +32 @@
 
 
-LoaderCafuT::LoaderCafuT(const std::string& FileName, int Flags) /*throw (ModelT::LoadError)*/
+LoaderCafuT::LoaderCafuT(const std::string& FileName, int Flags)
     : ModelLoaderT(FileName, Flags),
       m_LuaState(lua_open()),

cafu/trunk/Libs/Models/Loader_cmdl.hpp

@@ -37 +37 @@
     /// @param FileName   The name of the .cmdl file to load.
     /// @param Flags      The flags to load the model with. See ModelLoaderT::FlagsT for details.
-    LoaderCafuT(const std::string& FileName, int Flags=NONE) /*throw (ModelT::LoadError)*/;
+    LoaderCafuT(const std::string& FileName, int Flags=NONE);
 
     /// The destructor.

cafu/trunk/Libs/Models/Loader_dlod.cpp

@@ -30 +30 @@
 
 
-LoaderDlodT::LoaderDlodT(const std::string& FileName, int Flags) /*throw (ModelT::LoadError)*/
+LoaderDlodT::LoaderDlodT(const std::string& FileName, int Flags)
     : ModelLoaderT(FileName, Flags)
 {

cafu/trunk/Libs/Models/Loader_dlod.hpp

@@ -34 +34 @@
     /// @param FileName   The name of the .dlod file to load.
     /// @param Flags      The flags to load the model with. See ModelLoaderT::FlagsT for details.
-    LoaderDlodT(const std::string& FileName, int Flags=NONE) /*throw (ModelT::LoadError)*/;
+    LoaderDlodT(const std::string& FileName, int Flags=NONE);
 
     /// The destructor.

cafu/trunk/Libs/Models/Loader_fbx.hpp

@@ -35 +35 @@
     /// @param UserCallbacks   An implementation of the UserCallbacksI interface.
     /// @param Flags      The flags to load the model with. See ModelLoaderT::FlagsT for details.
-    LoaderFbxT(const std::string& FileName, UserCallbacksI& UserCallbacks, int Flags=NONE) /*throw (ModelT::LoadError)*/;
+    LoaderFbxT(const std::string& FileName, UserCallbacksI& UserCallbacks, int Flags=NONE);
 
     /// The destructor.

cafu/trunk/Libs/Models/Loader_lwo.cpp

@@ -221 +221 @@
 // - LWOs store their vertex positions in "points", the CafuModelT class in "weights" (CafuModelT::MeshT::WeightT).
 // - LWOs store their texture-coordinates in "VMAPs" and "VMADs", the CafuModelT class in "vertices" (CafuModelT::MeshT::VertexT).
-LoaderLwoT::LoaderLwoT(const std::string& FileName, int Flags) /*throw (ModelT::LoadError)*/
+LoaderLwoT::LoaderLwoT(const std::string& FileName, int Flags)
     : ModelLoaderT(FileName, Flags | REMOVE_UNUSED_VERTICES | REMOVE_UNUSED_WEIGHTS)    // The code below relies on postprocessing removing unused vertices and weights.
 {
@@ -235 +235 @@
     if (lwo==NULL)
     {
-        Console->Warning("Model \""+m_FileName+"\" could not be loaded.\n");
-        throw ModelT::LoadError();
+        throw LoadErrorT("The model could not be loaded.\n");
     }
 

cafu/trunk/Libs/Models/Loader_lwo.hpp

@@ -34 +34 @@
     /// @param FileName   The name of the .lwo file to import.
     /// @param Flags      The flags to load the model with. See ModelLoaderT::FlagsT for details.
-    LoaderLwoT(const std::string& FileName, int Flags=NONE) /*throw (ModelT::LoadError)*/;
+    LoaderLwoT(const std::string& FileName, int Flags=NONE);
 
     bool UseGivenTS() const { return true; }

cafu/trunk/Libs/Models/Loader_md5.cpp

@@ -30 +30 @@
 
 
-LoaderMd5T::LoaderMd5T(const std::string& FileName, int Flags) /*throw (ModelT::LoadError)*/
+LoaderMd5T::LoaderMd5T(const std::string& FileName, int Flags)
     : ModelLoaderT(FileName, Flags)
 {
@@ -53 +53 @@
 
         while (!TP.IsAtEOF()) ComponentFiles.PushBack(TP.GetNextToken());
-        if (ComponentFiles.Size()<1) throw ModelT::LoadError();
+        if (ComponentFiles.Size()<1) throw LoadErrorT("No component files found in md5 file.");
 
         size_t PrefixLength=m_FileName.length();
@@ -88 +88 @@
             const std::string Token=TP.GetNextToken();
 
-                 if (Token=="MD5Version" ) { if (TP.GetNextToken()!="10") throw ModelT::LoadError(); }
+                 if (Token=="MD5Version" ) { if (TP.GetNextToken()!="10") throw LoadErrorT("MD5Version is not 10."); }
             else if (Token=="commandline") TP.GetNextToken();       // Ignore the command line.
             else if (Token=="numJoints"  ) TP.GetNextToken();       // Ignore the given number of joints - we just load as many as we find.
@@ -120 +120 @@
                     {
                         printf("WARNING: Bad bone order!  %lu bones read so far, and the next (name \"%s\") is referring to parent %i.\n", Joints.Size(), Joint.Name.c_str(), Joint.Parent);
-                        throw ModelT::LoadError();  // TODO: Fix this by re-sorting the joints rather than by abortion!
+                        throw LoadErrorT("The bones are not properly ordered.");  // TODO: Fix this by re-sorting the joints rather than by abortion!
                     }
 
@@ -153 +153 @@
 
                          if (Token=="}"         ) break;
-                    else if (Token=="numtris"   ) { if (Mesh.Triangles.Size()>0) throw ModelT::LoadError(); Mesh.Triangles.PushBackEmpty(TP.GetNextTokenAsInt()); }
-                    else if (Token=="numverts"  ) { if (Mesh.Vertices .Size()>0) throw ModelT::LoadError(); Mesh.Vertices .PushBackEmpty(TP.GetNextTokenAsInt()); }
-                    else if (Token=="numweights") { if (Mesh.Weights  .Size()>0) throw ModelT::LoadError(); Mesh.Weights  .PushBackEmpty(TP.GetNextTokenAsInt()); }
+                    else if (Token=="numtris"   ) { if (Mesh.Triangles.Size()>0) throw LoadErrorT("Mesh.Triangles.Size()>0"); Mesh.Triangles.PushBackEmpty(TP.GetNextTokenAsInt()); }
+                    else if (Token=="numverts"  ) { if (Mesh.Vertices .Size()>0) throw LoadErrorT("Mesh.Vertices .Size()>0"); Mesh.Vertices .PushBackEmpty(TP.GetNextTokenAsInt()); }
+                    else if (Token=="numweights") { if (Mesh.Weights  .Size()>0) throw LoadErrorT("Mesh.Weights  .Size()>0"); Mesh.Weights  .PushBackEmpty(TP.GetNextTokenAsInt()); }
                     else if (Token=="shader")
                     {
@@ -174 +174 @@
                         const unsigned long TriIdx=TP.GetNextTokenAsInt();
 
-                        if (TriIdx>=Mesh.Triangles.Size()) throw ModelT::LoadError();
+                        if (TriIdx>=Mesh.Triangles.Size()) throw LoadErrorT("TriIdx >= Mesh.Triangles.Size()");
 
                         Mesh.Triangles[TriIdx].VertexIdx[0]=TP.GetNextTokenAsInt();
@@ -184 +184 @@
                         const unsigned long VertIdx=TP.GetNextTokenAsInt();
 
-                        if (VertIdx>=Mesh.Vertices.Size()) throw ModelT::LoadError();
+                        if (VertIdx>=Mesh.Vertices.Size()) throw LoadErrorT("VertIdx >= Mesh.Vertices.Size()");
 
                         TP.AssertAndSkipToken("(");
@@ -197 +197 @@
                         const unsigned long WeightIdx=TP.GetNextTokenAsInt();
 
-                        if (WeightIdx>=Mesh.Weights.Size()) throw ModelT::LoadError();
+                        if (WeightIdx>=Mesh.Weights.Size()) throw LoadErrorT("WeightIdx >= Mesh.Weights.Size()");
 
                         Mesh.Weights[WeightIdx].JointIdx=TP.GetNextTokenAsInt();
@@ -222 +222 @@
     catch (const TextParserT::ParseError&)
     {
-        throw ModelT::LoadError();
+        throw LoadErrorT("Could not parse the file.");
     }
 
@@ -243 +243 @@
                 const std::string Token=TP.GetNextToken();
 
-                     if (Token=="MD5Version" ) { if (TP.GetNextToken()!="10") throw ModelT::LoadError(); }
+                     if (Token=="MD5Version" ) { if (TP.GetNextToken()!="10") throw LoadErrorT("MD5Version is not 10."); }
                 else if (Token=="commandline") TP.GetNextToken();       // Ignore the command line.
                 else if (Token=="frameRate"  ) Anim.FPS=TP.GetNextTokenAsFloat();
@@ -250 +250 @@
                     // Be stricter with numFrames than with some num* variables in the md5mesh file.
                     // This is required because for example there must be as many bounding boxes as frames.
-                    if (Anim.Frames.Size()>0) throw ModelT::LoadError();
+                    if (Anim.Frames.Size()>0) throw LoadErrorT("Anim.Frames.Size() > 0");
 
                     Anim.Frames.PushBackEmpty(TP.GetNextTokenAsInt());
@@ -259 +259 @@
                     const unsigned long numJoints=TP.GetNextTokenAsInt();
 
-                    if (numJoints!=Joints.Size()) { printf("%lu joints in md5anim file, %lu joints in md5mesh.\n", numJoints, Joints.Size()); throw ModelT::LoadError(); }
-                    if (Anim.AnimJoints.Size()>0) { printf("Anim.AnimJoints.Size()==%lu\n", Anim.AnimJoints.Size()); throw ModelT::LoadError(); }
+                    if (numJoints!=Joints.Size()) { printf("%lu joints in md5anim file, %lu joints in md5mesh.\n", numJoints, Joints.Size()); throw LoadErrorT("Number of joints in the md5anim file does not match number of bones in the md5mesh."); }
+                    if (Anim.AnimJoints.Size()>0) { printf("Anim.AnimJoints.Size()==%lu\n", Anim.AnimJoints.Size()); throw LoadErrorT("Anim.AnimJoints.Size() > 0"); }
 
                     Anim.AnimJoints.PushBackEmpty(numJoints);
@@ -270 +270 @@
                     // This is the number of components that is animated in the frames (and thus so many values are stored with each frame).
                     // Therefore, the number of frames must have been specified already, so we can allocate all the memory here.
-                    if (Anim.Frames.Size()==0) throw ModelT::LoadError();
+                    if (Anim.Frames.Size()==0) throw LoadErrorT("Anim.Frames.Size() == 0");
 
                     for (unsigned long FrameNr=0; FrameNr<Anim.Frames.Size(); FrameNr++)
@@ -282 +282 @@
                     {
                         // Make sure that the name and parent are identical with the joint from the md5mesh file.
-                        if (Joints[JointNr].Name  !=TP.GetNextToken()) throw ModelT::LoadError();
-                        if (Joints[JointNr].Parent!=TP.GetNextTokenAsInt()) throw ModelT::LoadError();
+                        if (Joints[JointNr].Name  !=TP.GetNextToken()) throw LoadErrorT("Mismatching joint name.");
+                        if (Joints[JointNr].Parent!=TP.GetNextTokenAsInt()) throw LoadErrorT("Mismatching joint parent.");
 
                         Anim.AnimJoints[JointNr].Flags       =TP.GetNextTokenAsInt();
@@ -366 +366 @@
             printf("WARNING: Loading animation sequence file %s failed just before input byte %lu!\n", ComponentFiles[FileNr].c_str(), TP.GetReadPosByte());
         }
-        catch (const ModelT::LoadError&)
+        catch (const LoadErrorT& LE)
         {
             // Loading this animation sequence failed, but as the base mesh (the md5mesh file)
@@ -375 +375 @@
             Anims.PushBack(InvalidAnim);    // Note that InvalidAnim.Frames.Size()==0, too.
 
-            printf("WARNING: Loading animation sequence file %s failed just before input byte %lu!\n", ComponentFiles[FileNr].c_str(), TP.GetReadPosByte());
+            printf("WARNING: Loading animation sequence file %s failed just before input byte %lu:\n", ComponentFiles[FileNr].c_str(), TP.GetReadPosByte());
+            printf("%s", LE.what());
         }
     }

cafu/trunk/Libs/Models/Loader_md5.hpp

@@ -36 +36 @@
     /// If FileName ends with "md5", it is assumed that the file has a white-space separated list of one md5mesh and arbitrarily many md5anim files.
     /// If FileName ends with "md5mesh", this file is loaded without any animation information (e.g. for static detail models).
-    LoaderMd5T(const std::string& FileName, int Flags=NONE) /*throw (ModelT::LoadError)*/;
+    LoaderMd5T(const std::string& FileName, int Flags=NONE);
 
     bool UseGivenTS() const;

cafu/trunk/Libs/Models/Loader_mdl.cpp

@@ -32 +32 @@
 
 
-LoaderHL1mdlT::LoaderHL1mdlT(const std::string& FileName, int Flags) /*throw (ModelT::LoadError)*/
+LoaderHL1mdlT::LoaderHL1mdlT(const std::string& FileName, int Flags)
     : ModelLoaderT(FileName, Flags |
           REMOVE_DEGEN_TRIANGLES |                          // Need this flag in order to pass all assertions in the CafuModelT code.
@@ -40 +40 @@
     // **********************************
 
-    if (!cf::String::EndsWith(m_FileName, ".mdl")) throw ModelT::LoadError();
+    if (!cf::String::EndsWith(m_FileName, ".mdl")) throw LoadErrorT("HL1 model file name doesn't end with .mdl");
 
     const std::string BaseName(m_FileName.c_str(), m_FileName.length()-4);
@@ -49 +49 @@
 
     FILE* InFile=fopen(m_FileName.c_str(), "rb");
-    if (InFile==NULL) throw ModelT::LoadError();
+    if (InFile==NULL) throw LoadErrorT("Could not fopen() the model file.");
 
     fseek(InFile, 0, SEEK_END); ModelData.PushBackEmpty(ftell(InFile));
@@ -74 +74 @@
     {
         InFile=fopen((BaseName+"T.mdl").c_str(), "rb");
-        if (InFile==NULL) throw ModelT::LoadError();
+        if (InFile==NULL) throw LoadErrorT("Could not open the textures file.");
 
         fseek(InFile, 0, SEEK_END); TextureData.PushBackEmpty(ftell(InFile));
@@ -99 +99 @@
 
             InFile=fopen((BaseName+NumStr+".mdl").c_str(), "rb");
-            if (InFile==NULL) throw ModelT::LoadError();
+            if (InFile==NULL) throw LoadErrorT("Could not open the file with anim sequences.");
 
             fseek(InFile, 0, SEEK_END); AnimationData[SeqGroupNr].PushBackEmpty(ftell(InFile));

cafu/trunk/Libs/Models/Loader_mdl.hpp

@@ -42 +42 @@
     /// @param FileName   The name of the .mdl file to import.
     /// @param Flags      The flags to load the model with. See ModelLoaderT::FlagsT for details.
-    LoaderHL1mdlT(const std::string& FileName, int Flags=NONE) /*throw (ModelT::LoadError)*/;
+    LoaderHL1mdlT(const std::string& FileName, int Flags=NONE);
 
     bool UseGivenTS() const;

cafu/trunk/Libs/Models/ModelManager.cpp

@@ -75 +75 @@
             "then load the cmdl model in place of this.");
     }
-    catch (const ModelT::LoadError&)
-    {
-        LoaderDummyT Loader(FileName);
-
-        NewModel=new CafuModelT(Loader);
-        if (ErrorMsg) (*ErrorMsg)="The file could not be loaded (unknown error).";
-    }
     catch (const ModelLoaderT::LoadErrorT& LE)
     {

cafu/trunk/Libs/Models/Model_cmdl.cpp

@@ -176 +176 @@
     Frames[FrameNr].BB=BoundingBox3fT();
 
-    // This is a modified version of the loop in CafuModelT::RecomputeBindPoseBB().
+    // This is very similar to the code in AnimPoseT::UpdateData().
     for (unsigned long MeshNr=0; MeshNr<Meshes.Size(); MeshNr++)
     {
@@ -247 +247 @@
       m_MaterialMan(),
       m_UseGivenTangentSpace(Loader.UseGivenTS()),  // Should we use the fixed, given tangent space, or recompute it ourselves here?
-      m_BindPoseBB(Vector3fT()),                    // Re-initialized in InitMeshes() calling RecomputeBindPoseBB(), but start with a valid box anyways (e.g. for testing models that have a skeleton, but no mesh).
       m_DlodModel(NULL),
       m_DlodDist(0.0f)
@@ -272 +271 @@
     Loader.Postprocess(m_Meshes);
 
-    if (m_Joints.Size()==0) throw ModelT::LoadError();
- // if (m_Meshes.Size()==0) throw ModelT::LoadError();  // Consider models with no meshes as valid, skeleton-only meshes are sometimes useful for testing.
+    if (m_Joints.Size()==0) throw ModelLoaderT::LoadErrorT("This model has no joints.");
+ // if (m_Meshes.Size()==0) throw ModelLoaderT::LoadErrorT("This model has no meshes.");  // Consider models with no meshes as valid, skeleton-only meshes are sometimes useful for testing.
 
     // Load the chain of dlod models, if any.
@@ -351 +350 @@
 
 
-bool CafuModelT::IsMeshNrOK(const GuiFixtureT& GF, unsigned int PointNr) const
-{
-    return GF.Points[PointNr].MeshNr < m_Meshes.Size();
-}
-
-
-bool CafuModelT::IsVertexNrOK(const GuiFixtureT& GF, unsigned int PointNr) const
-{
-    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;
-}
-
-
-void CafuModelT::RecomputeBindPoseBB()
-{
-    ArrayT<MatrixT> JointMatrices;
-    JointMatrices.PushBackEmpty(m_Joints.Size());
-
-    for (unsigned long JointNr=0; JointNr<m_Joints.Size(); JointNr++)
-    {
-        const JointT& J=m_Joints[JointNr];
-        const MatrixT RelMatrix(J.Pos, cf::math::QuaternionfT::FromXYZ(J.Qtr), J.Scale);
-
-        JointMatrices[JointNr]=(J.Parent==-1) ? RelMatrix : JointMatrices[J.Parent]*RelMatrix;
-    }
-
-    for (unsigned long MeshNr=0; MeshNr<m_Meshes.Size(); MeshNr++)
-    {
-        const MeshT& Mesh=m_Meshes[MeshNr];
-
-        for (unsigned long VertexNr=0; VertexNr<Mesh.Vertices.Size(); VertexNr++)
-        {
-            const MeshT::VertexT& Vertex=Mesh.Vertices[VertexNr];
-            Vector3fT             OutVert;
-
-            if (Vertex.NumWeights==1)
-            {
-                const MeshT::WeightT& Weight=Mesh.Weights[Vertex.FirstWeightIdx];
-
-                OutVert=JointMatrices[Weight.JointIdx].Mul_xyz1(Weight.Pos);
-            }
-            else
-            {
-                for (unsigned int WeightNr=0; WeightNr<Vertex.NumWeights; WeightNr++)
-                {
-                    const MeshT::WeightT& Weight=Mesh.Weights[Vertex.FirstWeightIdx+WeightNr];
-
-                    OutVert+=JointMatrices[Weight.JointIdx].Mul_xyz1(Weight.Pos) * Weight.Weight;
-                }
-            }
-
-            if (MeshNr==0 && VertexNr==0) m_BindPoseBB=BoundingBox3fT(OutVert);
-                                     else m_BindPoseBB.Insert(OutVert);
-        }
-    }
-}
-
-
 void CafuModelT::InitMeshes()
 {
-    // Compute the bounding box for the model in bind pose (stored in m_BindPoseBB), just in case this model has no animations.
-    RecomputeBindPoseBB();
-
-
     // Compute auxiliary data for each mesh.
     for (unsigned long MeshNr=0; MeshNr<m_Meshes.Size(); MeshNr++)
@@ -946 +874 @@
 
 
-/***********************************************/
-/*** Implementation of the ModelT interface. ***/
-/***********************************************/
-
-const std::string& CafuModelT::GetFileName() const
-{
-    return m_FileName;
-}
-
-
 const MaterialT* CafuModelT::GetMaterial(unsigned long MeshNr, int SkinNr) const
 {
@@ -990 +908 @@
 
 
-void CafuModelT::Draw(int SequenceNr, float FrameNr, float LodDist, const ModelT* /*SubModel*/) const
-{
-    m_TEMP_Pose->SetSequNr(SequenceNr);
+bool CafuModelT::IsMeshNrOK(const GuiFixtureT& GF, unsigned int PointNr) const
+{
+    return GF.Points[PointNr].MeshNr < m_Meshes.Size();
+}
+
+
+bool CafuModelT::IsVertexNrOK(const GuiFixtureT& GF, unsigned int PointNr) const
+{
+    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);
 
-    m_TEMP_Pose->Draw(-1 /*default skin*/, LodDist);
-}
-
-
-bool CafuModelT::GetGuiPlane(int SequenceNr, float FrameNr, float LodDist, Vector3fT& GuiOrigin, Vector3fT& GuiAxisX, Vector3fT& GuiAxisY) const
+    return m_TEMP_Pose;
+}
+
+
+bool CafuModelT::GetGuiPlane(Vector3fT& GuiOrigin, Vector3fT& GuiAxisX, Vector3fT& GuiAxisY) const
 {
     if (m_GuiLocs.Size()==0) return false;
@@ -1050 +981 @@
     }
 }
-
-
-unsigned int CafuModelT::GetNrOfSequences() const
-{
-    return m_Anims.Size();
-}
-
-
-BoundingBox3fT CafuModelT::GetBB(int SequenceNr, float FrameNr) const
-{
-    if (SequenceNr==-1 || SequenceNr>=int(m_Anims.Size()) || m_Anims[SequenceNr].Frames.Size()==0 || m_Anims[SequenceNr].FPS<0.0)
-        return m_BindPoseBB;
-
-    // Should we interpolate the bounding box between frames as we interpolate the bones?
-    const int FNr=(int(FrameNr+0.5f)) % m_Anims[SequenceNr].Frames.Size();
-
-    return m_Anims[SequenceNr].Frames[FNr].BB;
-}
-
-
-bool CafuModelT::TraceRay(int SequenceNr, float FrameNr, int SkinNr, const Vector3fT& RayOrigin, const Vector3fT& RayDir, TraceResultT& Result) const
-{
-    m_TEMP_Pose->SetSequNr(SequenceNr);
-    m_TEMP_Pose->SetFrameNr(FrameNr);
-
-    return m_TEMP_Pose->TraceRay(SkinNr, RayOrigin, RayDir, Result);
-}
-
-
-// float CafuModelT::GetNrOfFrames(int /*SequenceNr*/) const
-// {
-//     return 0.0;
-// }
-
-
-float CafuModelT::AdvanceFrameNr(int SequenceNr, float FrameNr, float DeltaTime, bool Loop) const
-{
-    if (SequenceNr<0 || SequenceNr>=int(m_Anims.Size())) return 0.0f;
-    if (m_Anims[SequenceNr].Frames.Size()<=1) return 0.0f;
-
-    const float NumFrames=float(m_Anims[SequenceNr].Frames.Size());
-
-    FrameNr+=DeltaTime*m_Anims[SequenceNr].FPS;
-
-    if (Loop)
-    {
-        // Wrap the sequence (it's a looping (repeating) sequence, like idle, walk, ...).
-        FrameNr=fmod(FrameNr, NumFrames);
-        if (FrameNr<0.0f) FrameNr+=NumFrames;
-    }
-    else
-    {
-        // Clamp the sequence (it's a play-once (non-repeating) sequence, like dying).
-        // On clamping, stop the sequence 1/100th sec before the end of the last frame.
-        if (FrameNr>=NumFrames-1.0f) FrameNr=NumFrames-1.0f-0.01f;
-        if (FrameNr<0.0f) FrameNr=0.0f;
-    }
-
-    return FrameNr;
-}

cafu/trunk/Libs/Models/Model_cmdl.hpp

@@ -29 +29 @@
 #include "Math3D/Matrix.hpp"
 #include "AnimPose.hpp"     // Only for TEMPORARILY implementing the "old" ModelT interface methods.
-#include "Model.hpp"
 
 #if defined(_WIN32) && _MSC_VER<1600
@@ -54 +53 @@
 
 /// This class represents a native Cafu model.
-class CafuModelT : public ModelT
+class CafuModelT
 {
     public:
@@ -255 +254 @@
 
     // Inspector methods.
-    bool GetUseGivenTS() const { return m_UseGivenTangentSpace; }
+    const std::string&          GetFileName() const { return m_FileName; }
     const MaterialManagerImplT& GetMaterialManager() const { return m_MaterialMan; }
     const ArrayT<JointT>&       GetJoints() const { return m_Joints; }
@@ -263 +262 @@
     const ArrayT<AnimT>&        GetAnims() const { return m_Anims; }
     const ArrayT<ChannelT>&     GetChannels() const { return m_Channels; }
+    bool                        GetUseGivenTS() const { return m_UseGivenTangentSpace; }
     const CafuModelT*           GetDlodModel() const { return m_DlodModel; }
     float                       GetDlodDist() const { return m_DlodDist; }
@@ -281 +281 @@
     AnimPoseT* GetSharedPose(int SequNr, float FrameNr) const;
 
-    // The ModelT interface.
-    const std::string& GetFileName() const;
-    void               Draw(int SequenceNr, float FrameNr, float LodDist, const ModelT* SubModel=NULL) const;
-    bool               GetGuiPlane(int SequenceNr, float FrameNr, float LodDist, Vector3fT& GuiOrigin, Vector3fT& GuiAxisX, Vector3fT& GuiAxisY) const;
-    void               Print() const;
-    unsigned int       GetNrOfSequences() const;
-    BoundingBox3fT     GetBB(int SequenceNr, float FrameNr) const;
-    bool               TraceRay(int SequenceNr, float FrameNr, int SkinNr, const Vector3fT& RayOrigin, const Vector3fT& RayDir, TraceResultT& Result) const;
- // float              GetNrOfFrames(int SequenceNr) const;
-    float              AdvanceFrameNr(int SequenceNr, float FrameNr, float DeltaTime, bool Loop=true) const;
-
-    static const unsigned int CMDL_FILE_VERSION;    ///< The current version of the \c cmdl file format.
+    /// An obsolete method that should not be used in new code.
+    bool GetGuiPlane(Vector3fT& GuiOrigin, Vector3fT& GuiAxisX, Vector3fT& GuiAxisY) const;
+
+    /// Prints some model data to stdout, used for debugging.
+    void Print() const;
+
+    /// The current version of the \c cmdl file format.
+    static const unsigned int CMDL_FILE_VERSION;
 
 
@@ -311 +307 @@
     void operator = (const CafuModelT&);            ///< Use of the Assignment Operator is not allowed.
 
-    void RecomputeBindPoseBB();                     ///< Recomputes the bounding box for the model in bind pose (stored in m_BindPoseBB).
     void InitMeshes();                              ///< An auxiliary method for the constructors.
 
@@ -326 +321 @@
     const bool           m_UseGivenTangentSpace;    ///< Whether this model should use the fixed, given tangent space that was loaded from the model file, or it the tangent space is dynamically recomputed (useful for animated models).
  // const bool           m_CastShadows;             ///< Should this model cast shadows?
-    BoundingBox3fT       m_BindPoseBB;              ///< [REMOVE???] The bounding-box for the base pose of the model.
 
     CafuModelT*          m_DlodModel;               ///< Use the m_DlodModel instead of this when the camera is more than m_DlodDist away.
     float                m_DlodDist;                ///< The distance beyond which the m_DlodModel is used instead of this.
 
-    mutable AnimPoseT* m_TEMP_Pose;      ///< TEMPORARY!
+    mutable AnimPoseT*   m_TEMP_Pose;               ///< TEMPORARY!
 };
 

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/ModelManager.cpp
+                    Models/Model_cmdl.cpp Models/ModelManager.cpp
                     Network/Network.cpp ParticleEngine/ParticleEngineMS.cpp PlatformAux.cpp Terrain/Terrain.cpp
                     TextParser/TextParser.cpp