Changeset 405 for cafu/trunk

Timestamp:

10/11/11 10:39:53 (7 months ago)

Author:

Carsten

Message:

Model support:
A temporary change to better support the old ModelT interface, just until it is removed in favor of the newer CafuModelT and AnimPoseT methods.

Location:

cafu/trunk/Libs/Models

Files:

• Model_cmdl.cpp (modified) (5 diffs)
• Model_cmdl.hpp (modified) (2 diffs)

cafu/trunk/Libs/Models/Model_cmdl.cpp

@@ -21 +21 @@
 
 #include "Model_cmdl.hpp"
-#include "AnimPose.hpp"     // Only for implementing the "old" ModelT interface methods.
 #include "Loader.hpp"
 #include "MaterialSystem/Material.hpp"
@@ -236 +235 @@
 
 
+// TEMPORARY!
+#if defined(_WIN32) && defined(_MSC_VER)
+// Turn off "warning C4355: 'this' : used in base member initializer list".
+#pragma warning(disable:4355)
+#endif
+
+
 CafuModelT::CafuModelT(ModelLoaderT& Loader)
     : m_FileName(Loader.GetFileName()),
@@ -241 +247 @@
       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_TEMP_Pose(*this)
 {
     // No matter the actual model file format (that is, even if the file format is not "cmdl"),
@@ -954 +961 @@
 void CafuModelT::Draw(int SequenceNr, float FrameNr, float LodDist, const ModelT* /*SubModel*/) const
 {
-    AnimPoseT Pose(*this, SequenceNr, FrameNr);     // TODO: This is reconstructed on each call -- no caching at all!
-
-    Pose.Draw(-1 /*default skin*/, LodDist);
+    m_TEMP_Pose.SetSequNr(SequenceNr);
+    m_TEMP_Pose.SetFrameNr(FrameNr);
+
+    m_TEMP_Pose.Draw(-1 /*default skin*/, LodDist);
 }
 
@@ -1033 +1041 @@
 bool CafuModelT::TraceRay(int SequenceNr, float FrameNr, int SkinNr, const Vector3fT& RayOrigin, const Vector3fT& RayDir, TraceResultT& Result) const
 {
-    AnimPoseT Pose(*this, SequenceNr, FrameNr);     // TODO: This is reconstructed on each call -- no caching at all!
-
-    return Pose.TraceRay(SkinNr, RayOrigin, RayDir, Result);
+    m_TEMP_Pose.SetSequNr(SequenceNr);
+    m_TEMP_Pose.SetFrameNr(FrameNr);
+
+    return m_TEMP_Pose.TraceRay(SkinNr, RayOrigin, RayDir, Result);
 }
 

cafu/trunk/Libs/Models/Model_cmdl.hpp

@@ -28 +28 @@
 #include "Math3D/BoundingBox.hpp"
 #include "Math3D/Matrix.hpp"
+#include "AnimPose.hpp"     // Only for TEMPORARILY implementing the "old" ModelT interface methods.
 #include "Model.hpp"
 
@@ -314 +315 @@
  // const bool            m_CastShadows;            ///< Should this model cast shadows?
     BoundingBox3fT        m_BindPoseBB;             ///< [REMOVE???] The bounding-box for the base pose of the model.
+
+    mutable AnimPoseT m_TEMP_Pose;      ///< TEMPORARY!
 };