Changeset 408 for cafu/trunk

Timestamp:

10/14/11 11:54:40 (7 months ago)

Author:

Carsten

Message:

Model code:
Refactored the old and obsolete ModelDummyT code into the newly added LoaderDummyT class.
This change

• makes "dummy" models consistent with the rest,
• clears the path for further changes to the ModelT class hierarchy,
• is a huge improvement as the new dummy models are actually as powerful as all other models, i.e. they can be rendered, traced rays against, etc.

Location:

cafu/trunk

Files:

• CaWE/MapHelperModel.cpp (modified) (3 diffs)
• CaWE/MapModel.cpp (modified) (3 diffs)
• CaWE/ModelEditor/ModelDocument.cpp (modified) (2 diffs)
• Libs/Models/Loader.cpp (modified) (1 diff)
• Libs/Models/Loader_dummy.cpp (added)
• Libs/Models/Loader_dummy.hpp (added)
• Libs/Models/Model_dummy.cpp (deleted)
• Libs/Models/Model_dummy.hpp (deleted)
• Libs/Models/Model_proxy.cpp (modified) (4 diffs)
• Libs/SConscript (modified) (1 diff)

cafu/trunk/CaWE/MapHelperModel.cpp

@@ -34 +34 @@
 #include "Math3D/BoundingBox.hpp"
 #include "Math3D/Matrix3x3.hpp"
-#include "Models/Model_dummy.hpp"
 #include "EditorMaterialManager.hpp"
 #include "MaterialSystem/Renderer.hpp"
@@ -107 +106 @@
 
     // TODO: Cache!
-    if (dynamic_cast<const ModelDummyT*>(m_ModelProxy.GetRealModel())==NULL)
-    {
-        const cf::math::AnglesfT Angles=m_ParentEntity->GetAngles();
-
-        // 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);
-
-        // Rotate all eight vertices.
-        for (unsigned long VertexNr=0; VertexNr<8; VertexNr++)
-            VerticesBB[VertexNr]=VerticesBB[VertexNr].GetRotX(Angles[ROLL]).GetRotY(-Angles[PITCH]).GetRotZ(Angles[YAW]);
-
-        // Build a new BB of the rotated BB.
-        BoundingBox3fT RotBB(VerticesBB[0]);
-
-        for (unsigned long VertexNr=1; VertexNr<8; VertexNr++)
-            RotBB.Insert(VerticesBB[VertexNr]);
-
-        RotBB.Min+=Origin;
-        RotBB.Max+=Origin;
-
-        return RotBB;
-    }
-
-    return BoundingBox3fT(Origin-Vector3fT(10, 10, 10), Origin+Vector3fT(10, 10, 10));
+    const cf::math::AnglesfT Angles=m_ParentEntity->GetAngles();
+
+    // 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);
+
+    // Rotate all eight vertices.
+    for (unsigned long VertexNr=0; VertexNr<8; VertexNr++)
+        VerticesBB[VertexNr]=VerticesBB[VertexNr].GetRotX(Angles[ROLL]).GetRotY(-Angles[PITCH]).GetRotZ(Angles[YAW]);
+
+    // Build a new BB of the rotated BB.
+    BoundingBox3fT RotBB(VerticesBB[0]);
+
+    for (unsigned long VertexNr=1; VertexNr<8; VertexNr++)
+        RotBB.Insert(VerticesBB[VertexNr]);
+
+    RotBB.Min+=Origin;
+    RotBB.Max+=Origin;
+
+    return RotBB;
 }
 
@@ -150 +144 @@
     UpdateModelCache();
 
-    if (dynamic_cast<const ModelDummyT*>(m_ModelProxy.GetRealModel())==NULL)
+    const Vector3fT ViewPoint=Renderer.GetViewWin3D().GetCamera().Pos;
+    const float     ModelDist=length(Origin-ViewPoint);
+
+    if (Options.view3d.AnimateModels)
+        m_ModelFrameNr=m_ModelProxy.AdvanceFrameNr(SequenceNr, m_ModelFrameNr, float(m_Timer.GetSecondsSinceLastCall()));
+
+    if (ModelDist < float(Options.view3d.ModelDistance))
     {
-        const Vector3fT ViewPoint=Renderer.GetViewWin3D().GetCamera().Pos;
-        const float     ModelDist=length(Origin-ViewPoint);
-
-        if (Options.view3d.AnimateModels)
-            m_ModelFrameNr=m_ModelProxy.AdvanceFrameNr(SequenceNr, m_ModelFrameNr, float(m_Timer.GetSecondsSinceLastCall()));
-
-        if (ModelDist<float(Options.view3d.ModelDistance))
-        {
-            const cf::math::AnglesfT Angles=m_ParentEntity->GetAngles();
-            const float              CAFU_ENG_SCALE=25.4f;
-
-            MatSys::Renderer->SetCurrentAmbientLightColor(1.0f, 1.0f, 1.0f);
-            MatSys::Renderer->PushMatrix(MatSys::RendererI::MODEL_TO_WORLD);
-
-            MatSys::Renderer->Translate(MatSys::RendererI::MODEL_TO_WORLD, Origin[0], Origin[1], Origin[2]);
-            MatSys::Renderer->RotateZ  (MatSys::RendererI::MODEL_TO_WORLD,  Angles[YAW  ]);
-            MatSys::Renderer->RotateY  (MatSys::RendererI::MODEL_TO_WORLD, -Angles[PITCH]);
-            MatSys::Renderer->RotateX  (MatSys::RendererI::MODEL_TO_WORLD,  Angles[ROLL ]);
-
-            m_ModelProxy.Draw(SequenceNr, m_ModelFrameNr, CAFU_ENG_SCALE*ModelDist, NULL);
-
-            MatSys::Renderer->PopMatrix(MatSys::RendererI::MODEL_TO_WORLD);
-
-            if (m_ParentEntity->IsSelected()) Renderer.RenderBox(GetBB(), Options.colors.Selection, false /* Solid? */);
-            return;
-        }
+        const cf::math::AnglesfT Angles=m_ParentEntity->GetAngles();
+        const float              CAFU_ENG_SCALE=25.4f;
+
+        MatSys::Renderer->SetCurrentAmbientLightColor(1.0f, 1.0f, 1.0f);
+        MatSys::Renderer->PushMatrix(MatSys::RendererI::MODEL_TO_WORLD);
+
+        MatSys::Renderer->Translate(MatSys::RendererI::MODEL_TO_WORLD, Origin[0], Origin[1], Origin[2]);
+        MatSys::Renderer->RotateZ  (MatSys::RendererI::MODEL_TO_WORLD,  Angles[YAW  ]);
+        MatSys::Renderer->RotateY  (MatSys::RendererI::MODEL_TO_WORLD, -Angles[PITCH]);
+        MatSys::Renderer->RotateX  (MatSys::RendererI::MODEL_TO_WORLD,  Angles[ROLL ]);
+
+        m_ModelProxy.Draw(SequenceNr, m_ModelFrameNr, CAFU_ENG_SCALE*ModelDist, NULL);
+
+        MatSys::Renderer->PopMatrix(MatSys::RendererI::MODEL_TO_WORLD);
+
+        if (m_ParentEntity->IsSelected()) Renderer.RenderBox(GetBB(), Options.colors.Selection, false /* Solid? */);
     }
-
-    // Did not render the real model (either because we only have a dummy model,
-    // or the distance was too great), thus render a replacement bounding-box.
-    Renderer.RenderBox(GetBB(),
-        m_ParentEntity->IsSelected() ? Options.colors.Selection : m_ParentEntity->GetColor(Options.view2d.UseGroupColors), true /* Solid? */);
+    else
+    {
+        // Did not render the real model (the distance was too great), thus render a replacement bounding-box.
+        Renderer.RenderBox(GetBB(),
+            m_ParentEntity->IsSelected() ? Options.colors.Selection : m_ParentEntity->GetColor(Options.view2d.UseGroupColors), true /* Solid? */);
+    }
 }
 

cafu/trunk/CaWE/MapModel.cpp

@@ -31 +31 @@
 #include "Renderer3D.hpp"
 
-#include "Models/Model_dummy.hpp"
 #include "MaterialSystem/Renderer.hpp"
 #include "MaterialSystem/Mesh.hpp"
@@ -159 +158 @@
 {
     // TODO: Cache!
-    if (dynamic_cast<const ModelDummyT*>(m_Model.GetRealModel())==NULL)
-    {
-        // 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);
-
-        // Rotate all eight vertices.
-        for (unsigned long VertexNr=0; VertexNr<8; VertexNr++)
-            VerticesBB[VertexNr]=VerticesBB[VertexNr].GetRotX(m_Angles[ROLL]).GetRotY(m_Angles[PITCH]).GetRotZ(m_Angles[YAW]);
-
-        // Build a new BB of the rotated BB.
-        BoundingBox3fT RotBB(VerticesBB[0]);
-
-        for (unsigned long VertexNr=1; VertexNr<8; VertexNr++)
-            RotBB.Insert(VerticesBB[VertexNr]);
-
-        RotBB.Min=RotBB.Min*m_Scale+m_Origin;
-        RotBB.Max=RotBB.Max*m_Scale+m_Origin;
-
-        return RotBB;
-    }
-
-    return BoundingBox3fT(m_Origin-Vector3fT(10, 10, 10), m_Origin+Vector3fT(10, 10, 10));
+    // 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);
+
+    // Rotate all eight vertices.
+    for (unsigned long VertexNr=0; VertexNr<8; VertexNr++)
+        VerticesBB[VertexNr]=VerticesBB[VertexNr].GetRotX(m_Angles[ROLL]).GetRotY(m_Angles[PITCH]).GetRotZ(m_Angles[YAW]);
+
+    // Build a new BB of the rotated BB.
+    BoundingBox3fT RotBB(VerticesBB[0]);
+
+    for (unsigned long VertexNr=1; VertexNr<8; VertexNr++)
+        RotBB.Insert(VerticesBB[VertexNr]);
+
+    RotBB.Min=RotBB.Min*m_Scale+m_Origin;
+    RotBB.Max=RotBB.Max*m_Scale+m_Origin;
+
+    return RotBB;
 }
 
@@ -209 +203 @@
 void MapModelT::Render3D(Renderer3DT& Renderer) const
 {
-    if (dynamic_cast<const ModelDummyT*>(m_Model.GetRealModel())==NULL)
+    const Vector3fT ViewPoint=Renderer.GetViewWin3D().GetCamera().Pos;
+    const float     ModelDist=length(m_Origin-ViewPoint);
+
+    if (Options.view3d.AnimateModels && m_Animated)
+        m_FrameNumber=m_Model.AdvanceFrameNr(m_SeqNumber, m_FrameNumber, float(m_Timer.GetSecondsSinceLastCall())*m_FrameTimeScale);
+
+    if (ModelDist<float(Options.view3d.ModelDistance))
     {
-        const Vector3fT ViewPoint=Renderer.GetViewWin3D().GetCamera().Pos;
-        const float     ModelDist=length(m_Origin-ViewPoint);
-
-        if (Options.view3d.AnimateModels && m_Animated)
-            m_FrameNumber=m_Model.AdvanceFrameNr(m_SeqNumber, m_FrameNumber, float(m_Timer.GetSecondsSinceLastCall())*m_FrameTimeScale);
-
-        if (ModelDist<float(Options.view3d.ModelDistance))
-        {
-            const float CAFU_ENG_SCALE=25.4f;
-
-            MatSys::Renderer->SetCurrentAmbientLightColor(1.0f, 1.0f, 1.0f);
-            MatSys::Renderer->PushMatrix(MatSys::RendererI::MODEL_TO_WORLD);
-
-            MatSys::Renderer->Translate(MatSys::RendererI::MODEL_TO_WORLD, m_Origin.x, m_Origin.y, m_Origin.z);
-            MatSys::Renderer->RotateZ  (MatSys::RendererI::MODEL_TO_WORLD, m_Angles[YAW  ]);
-            MatSys::Renderer->RotateY  (MatSys::RendererI::MODEL_TO_WORLD, m_Angles[PITCH]);
-            MatSys::Renderer->RotateX  (MatSys::RendererI::MODEL_TO_WORLD, m_Angles[ROLL ]);
-            MatSys::Renderer->Scale    (MatSys::RendererI::MODEL_TO_WORLD, m_Scale);
-
-            m_Model.Draw(m_SeqNumber, m_FrameNumber, CAFU_ENG_SCALE*ModelDist, NULL);
-
-            MatSys::Renderer->PopMatrix(MatSys::RendererI::MODEL_TO_WORLD);
-
-            if (IsSelected()) Renderer.RenderBox(GetBB(), Options.colors.Selection, false /* Solid? */);
-        }
-        else
-        {
-            // Did not render the real model (the distance was too great), thus render a replacement bounding-box.
-            Renderer.RenderBox(GetBB(),
-                IsSelected() ? Options.colors.Selection : GetColor(Options.view2d.UseGroupColors), true /* Solid? */);
-        }
+        const float CAFU_ENG_SCALE=25.4f;
+
+        MatSys::Renderer->SetCurrentAmbientLightColor(1.0f, 1.0f, 1.0f);
+        MatSys::Renderer->PushMatrix(MatSys::RendererI::MODEL_TO_WORLD);
+
+        MatSys::Renderer->Translate(MatSys::RendererI::MODEL_TO_WORLD, m_Origin.x, m_Origin.y, m_Origin.z);
+        MatSys::Renderer->RotateZ  (MatSys::RendererI::MODEL_TO_WORLD, m_Angles[YAW  ]);
+        MatSys::Renderer->RotateY  (MatSys::RendererI::MODEL_TO_WORLD, m_Angles[PITCH]);
+        MatSys::Renderer->RotateX  (MatSys::RendererI::MODEL_TO_WORLD, m_Angles[ROLL ]);
+        MatSys::Renderer->Scale    (MatSys::RendererI::MODEL_TO_WORLD, m_Scale);
+
+        m_Model.Draw(m_SeqNumber, m_FrameNumber, CAFU_ENG_SCALE*ModelDist, NULL);
+
+        MatSys::Renderer->PopMatrix(MatSys::RendererI::MODEL_TO_WORLD);
+
+        if (IsSelected()) Renderer.RenderBox(GetBB(), Options.colors.Selection, false /* Solid? */);
     }
     else
     {
-        // Did not render the real model (we only have a dummy model), thus render a replacement bounding-box.
+        // Did not render the real model (the distance was too great), thus render a replacement bounding-box.
         Renderer.RenderBox(GetBB(),
             IsSelected() ? Options.colors.Selection : GetColor(Options.view2d.UseGroupColors), true /* Solid? */);

cafu/trunk/CaWE/ModelEditor/ModelDocument.cpp

@@ -31 +31 @@
 #include "Models/Loader_cmdl.hpp"
 #include "Models/Loader_dlod.hpp"
+#include "Models/Loader_dummy.hpp"
 #include "Models/Loader_fbx.hpp"
 #include "Models/Loader_lwo.hpp"
@@ -270 +271 @@
     else if (cf::String::EndsWith(fn, "cmdl"   )) { LoaderCafuT   Loader(fn, Flags);          return new CafuModelT(Loader); }
     else if (cf::String::EndsWith(fn, "dae"    )) { LoaderFbxT    Loader(fn, UserCbs, Flags); return new CafuModelT(Loader); }
+    else if (cf::String::EndsWith(fn, "dummy"  )) { LoaderDummyT  Loader(fn, Flags);          return new CafuModelT(Loader); }
     else if (cf::String::EndsWith(fn, "dxf"    )) { LoaderFbxT    Loader(fn, UserCbs, Flags); return new CafuModelT(Loader); }
     else if (cf::String::EndsWith(fn, "fbx"    )) { LoaderFbxT    Loader(fn, UserCbs, Flags); return new CafuModelT(Loader); }

cafu/trunk/Libs/Models/Loader.cpp

@@ -149 +149 @@
     Mat.PolygonMode    =MaterialT::Wireframe;
  // Mat.DepthOffset    =-1.0f;
+    Mat.DiffMapComp    =MapCompositionT("file-not-found", ".");
  // Mat.RedGen         =ExpressionT(1.0f);
-    Mat.UseMeshColors  =true;
- // Mat.TwoSided       =true;   // Required e.g. for terrains being selected.
+ // Mat.UseMeshColors  =true;       // Mesh colors aren't used for rendering models, but unfortunately required for rendering wire-frame without diffuse-map texture image.
+    Mat.TwoSided       =true;       // For wire-frame, render the backsides as well.
     Mat.meta_EditorSave=EditorSave;
 

cafu/trunk/Libs/Models/Model_proxy.cpp

@@ -23 +23 @@
 #include "Loader_cmdl.hpp"
 #include "Loader_dlod.hpp"
+#include "Loader_dummy.hpp"
 #include "Loader_lwo.hpp"
 #include "Loader_md5.hpp"
 #include "Loader_mdl.hpp"
 #include "Model_cmdl.hpp"
-#include "Model_dummy.hpp"
 #include "Model_proxy.hpp"
 #include "String.hpp"
@@ -80 +80 @@
     ModelPoolManagerT()
     {
-        ModelPool      .PushBack(new ModelDummyT("dummy"));
+        LoaderDummyT Loader("dummy");
+
+        ModelPool      .PushBack(new CafuModelT(Loader));
         ModelPoolCounts.PushBack(1);
     }
@@ -134 +136 @@
         else if (cf::String::EndsWith(FileName, "md5mesh")) { LoaderMd5T    Loader(FileName); NewModel=new CafuModelT(Loader); }
      // else if (cf::String::EndsWith(FileName, "obj"    )) { LoaderFbxT    Loader(FileName); NewModel=new CafuModelT(Loader); }
-        else throw ModelT::LoadError();
+        else { LoaderDummyT Loader(FileName); NewModel=new CafuModelT(Loader); }
 
         // LoaderAssimpT Loader(fn, Flags);
@@ -143 +145 @@
         // Okay, the model could not be loaded for some reason.
         // Do just substitute a dummy model for now.
-        NewModel=new ModelDummyT(FileName);
+        LoaderDummyT Loader(FileName);
+
+        NewModel=new CafuModelT(Loader);
     }
 

cafu/trunk/Libs/SConscript

@@ -13 +13 @@
                     FileSys/FileManImpl.cpp FileSys/FileSys_LocalPath.cpp FileSys/FileSys_ZipArchive_GV.cpp FileSys/File_local.cpp FileSys/File_memory.cpp FileSys/Password.cpp
                     MapFile.cpp
-                    Models/Loader.cpp Models/Loader_ase.cpp Models/Loader_dlod.cpp Models/Loader_cmdl.cpp Models/Loader_lwo.cpp Models/Loader_md5.cpp
+                    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_dummy.cpp Models/Model_proxy.cpp
+                    Models/Model_cmdl.cpp Models/Model_proxy.cpp
                     Network/Network.cpp ParticleEngine/ParticleEngineMS.cpp PlatformAux.cpp Terrain/Terrain.cpp
                     TextParser/TextParser.cpp