Changeset 404 for cafu/trunk

Timestamp:

10/09/11 23:19:43 (8 months ago)

Author:

Carsten

Message:

Model support:
Removed the obsolete class ModelMdlT. In its place, HL1 mdl models are now loaded via the LoaderHL1mdlT into the newer and better class CafuModelT.

Also fixed the orientation of stencil shadow polygons (silhouette and "endcaps") of face occluders in the world BSP tree, making their orientation consistent to those used in CafuModelT. Without this, the sign of the stencil count of the world shadows mismatches that of the models shadows, yielding artifacts whenever model shadows and world shadows overlap.

Location:

cafu/trunk/Libs

Files:

• Models/Model_mdl.cpp (deleted)
• Models/Model_mdl.h (deleted)
• Models/Model_mdl.hpp (deleted)
• Models/Model_proxy.cpp (modified) (2 diffs)
• SConscript (modified) (1 diff)
• SceneGraph/FaceNode.cpp (modified) (3 diffs)

cafu/trunk/Libs/Models/Model_proxy.cpp

@@ -24 +24 @@
 #include "Loader_lwo.hpp"
 #include "Loader_md5.hpp"
+#include "Loader_mdl.hpp"
 #include "Model_cmdl.hpp"
 #include "Model_dlod.hpp"
 #include "Model_dummy.hpp"
-#include "Model_mdl.hpp"
 #include "Model_proxy.hpp"
 #include "String.hpp"
@@ -120 +120 @@
     try
     {
+        const int Flags=ModelLoaderT::REMOVE_DEGEN_TRIANGLES | ModelLoaderT::REMOVE_UNUSED_VERTICES | ModelLoaderT::REMOVE_UNUSED_WEIGHTS;
+
         // TODO: This duplicates the code in CaWE/ModelEditor/ModelDocument.cpp and should be combined elsewhere, e.g. into class ModelLoaderT.
-             if (cf::String::EndsWith(FileName, "ase"    )) { LoaderAseT  Loader(FileName); NewModel=new CafuModelT(Loader); }
-        else if (cf::String::EndsWith(FileName, "cmdl"   )) { LoaderCafuT Loader(FileName); NewModel=new CafuModelT(Loader); }
+        //       Better yet: Use the type system with the loaders, and be able to iterate over them.
+     //      if (cf::String::EndsWith(FileName, "3ds"    )) { LoaderFbxT    Loader(FileName);        NewModel=new CafuModelT(Loader); }
+    /*else*/ if (cf::String::EndsWith(FileName, "ase"    )) { LoaderAseT    Loader(FileName);        NewModel=new CafuModelT(Loader); }
+        else if (cf::String::EndsWith(FileName, "cmdl"   )) { LoaderCafuT   Loader(FileName);        NewModel=new CafuModelT(Loader); }
+     // else if (cf::String::EndsWith(FileName, "dae"    )) { LoaderFbxT    Loader(FileName);        NewModel=new CafuModelT(Loader); }
+     // else if (cf::String::EndsWith(FileName, "dxf"    )) { LoaderFbxT    Loader(FileName);        NewModel=new CafuModelT(Loader); }
+     // else if (cf::String::EndsWith(FileName, "fbx"    )) { LoaderFbxT    Loader(FileName);        NewModel=new CafuModelT(Loader); }
         else if (cf::String::EndsWith(FileName, "dlod"   )) NewModel=new ModelDlodT(FileName);
-        else if (cf::String::EndsWith(FileName, "mdl"    )) NewModel=new ModelMdlT (FileName);
-        else if (cf::String::EndsWith(FileName, "md5"    )) { LoaderMd5T  Loader(FileName); NewModel=new CafuModelT(Loader); }
-        else if (cf::String::EndsWith(FileName, "md5mesh")) { LoaderMd5T  Loader(FileName); NewModel=new CafuModelT(Loader); }
-        else if (cf::String::EndsWith(FileName, "lwo"    )) { LoaderLwoT  Loader(FileName); NewModel=new CafuModelT(Loader); }
+        else if (cf::String::EndsWith(FileName, "lwo"    )) { LoaderLwoT    Loader(FileName);        NewModel=new CafuModelT(Loader); }
+        else if (cf::String::EndsWith(FileName, "mdl"    )) { LoaderHL1mdlT Loader(FileName, Flags); NewModel=new CafuModelT(Loader); }   // Need these flags in order to pass all assertions in the CafuModelT code.
+        else if (cf::String::EndsWith(FileName, "md5"    )) { LoaderMd5T    Loader(FileName);        NewModel=new CafuModelT(Loader); }
+        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();
+
+        // LoaderAssimpT Loader(fn, Flags);
+        // NewModel=new CafuModelT(Loader);
     }
     catch (const ModelT::LoadError&)

cafu/trunk/Libs/SConscript

@@ -15 +15 @@
                     Models/Loader.cpp Models/Loader_ase.cpp Models/Loader_cmdl.cpp Models/Loader_lwo.cpp Models/Loader_md5.cpp
                     Models/Loader_mdl.cpp Models/AnimPose.cpp
-                    Models/Model_cmdl.cpp Models/Model_dlod.cpp Models/Model_dummy.cpp Models/Model_mdl.cpp Models/Model_proxy.cpp
+                    Models/Model_cmdl.cpp Models/Model_dlod.cpp Models/Model_dummy.cpp Models/Model_proxy.cpp
                     Network/Network.cpp ParticleEngine/ParticleEngineMS.cpp PlatformAux.cpp Terrain/Terrain.cpp
                     TextParser/TextParser.cpp

cafu/trunk/Libs/SceneGraph/FaceNode.cpp

@@ -605 +605 @@
 
     // Render the silhouette quads.
-    static MatSys::MeshT SilhouetteMesh(MatSys::MeshT::QuadStrip, MatSys::MeshT::CCW);
+    static MatSys::MeshT SilhouetteMesh(MatSys::MeshT::QuadStrip);
     SilhouetteMesh.Vertices.Overwrite();
     SilhouetteMesh.Vertices.PushBackEmpty(2*Mesh.Vertices.Size()+2);
@@ -633 +633 @@
 
     // Render the occluders near cap (front-facing wrt. the light source).
-    // (The MatSys expects vertices for front-facing polygons to be specified in CCW order.
-    //  However, as we are considering a *back-facing* polygon as a occluder (oriented CW when looked at from behind),
-    //  we have to reverse the order of its vertices in order to turn it into a CCW ordered, front-facing polygon.)
-    static MatSys::MeshT M_front(MatSys::MeshT::TriangleFan, MatSys::MeshT::CCW);
-    M_front.Vertices.Overwrite();
-    M_front.Vertices.PushBackEmpty(Mesh.Vertices.Size());
+    // As we are considering a *back-facing* polygon as a occluder (oriented CCW when looked at from behind),
+    // we have to reverse the order of its vertices in order to turn it into a CW ordered, front-facing polygon.
+    static MatSys::MeshT CapMesh(MatSys::MeshT::TriangleFan);   // The default winding order is "CW".
+
+    CapMesh.Vertices.Overwrite();
+    CapMesh.Vertices.PushBackEmpty(Mesh.Vertices.Size());
 
     for (unsigned long VertexNr=0; VertexNr<Mesh.Vertices.Size(); VertexNr++)
-        M_front.Vertices[M_front.Vertices.Size()-VertexNr-1].SetOrigin(Mesh.Vertices[VertexNr].Origin[0],
+        CapMesh.Vertices[CapMesh.Vertices.Size()-VertexNr-1].SetOrigin(Mesh.Vertices[VertexNr].Origin[0],
                                                                        Mesh.Vertices[VertexNr].Origin[1],
                                                                        Mesh.Vertices[VertexNr].Origin[2], 1.0);
 
     // What a pity the order isn't the other way round. Could then simply write:  MatSys::Renderer->RenderMesh(Mesh);
-    MatSys::Renderer->RenderMesh(M_front);
+    MatSys::Renderer->RenderMesh(CapMesh);
 
 
@@ -652 +652 @@
     // As we are already dealing with a back-facing polygon, the vertex order is already as required,
     // we just have to project them to infinity as seen from the light source.
-    static MatSys::MeshT M_back(MatSys::MeshT::TriangleFan, MatSys::MeshT::CCW);
-    M_back.Vertices.Overwrite();
-    M_back.Vertices.PushBackEmpty(Mesh.Vertices.Size());
-
     for (unsigned long VertexNr=0; VertexNr<Mesh.Vertices.Size(); VertexNr++)
-        M_back.Vertices[VertexNr].SetOrigin(Mesh.Vertices[VertexNr].Origin[0]-LightPos.x,
-                                            Mesh.Vertices[VertexNr].Origin[1]-LightPos.y,
-                                            Mesh.Vertices[VertexNr].Origin[2]-LightPos.z, 0.0);
-
-    MatSys::Renderer->RenderMesh(M_back);
+        CapMesh.Vertices[VertexNr].SetOrigin(Mesh.Vertices[VertexNr].Origin[0]-LightPos.x,
+                                             Mesh.Vertices[VertexNr].Origin[1]-LightPos.y,
+                                             Mesh.Vertices[VertexNr].Origin[2]-LightPos.z, 0.0);
+
+    MatSys::Renderer->RenderMesh(CapMesh);
 }