Changeset 429 for cafu/trunk

Timestamp:

11/23/11 10:59:48 (6 months ago)

Author:

Carsten

Message:

Model code:
Added support for skipping triangles when drawing the mesh (but not for casting stencil shadows and not for collision detection).
This is useful for hiding triangles that are in the same plane as GUI panels and would otherwise cause z-fighting.

Location:

cafu/trunk

Files:

• CaWE/ModelEditor/Commands/UpdateTriangle.cpp (added)
• CaWE/ModelEditor/Commands/UpdateTriangle.hpp (added)
• CaWE/ModelEditor/SceneView3D.cpp (modified) (4 diffs)
• Games/DeathMatch/Code/StaticDetailModel.hpp (modified) (1 diff)
• Libs/MaterialSystem/MapComposition.cpp (modified) (2 diffs)
• Libs/Models/AnimPose.cpp (modified) (3 diffs)
• Libs/Models/Loader_cmdl.cpp (modified) (1 diff)
• Libs/Models/Model_cmdl.cpp (modified) (2 diffs)
• Libs/Models/Model_cmdl.hpp (modified) (3 diffs)

cafu/trunk/CaWE/ModelEditor/SceneView3D.cpp

@@ -25 +25 @@
 #include "ScenePropGrid.hpp"
 #include "Commands/UpdateGuiFixture.hpp"
+#include "Commands/UpdateTriangle.hpp"
 #include "../AppCaWE.hpp"
 #include "../Camera.hpp"
@@ -228 +229 @@
         ID_MENU_SET_GUIFIX_ORIGIN,
         ID_MENU_SET_GUIFIX_ENDPOINT_X,
-        ID_MENU_SET_GUIFIX_ENDPOINT_Y
+        ID_MENU_SET_GUIFIX_ENDPOINT_Y,
+        ID_MENU_TRIANGLE_INFO,
+        ID_MENU_TRIANGLE_SKIPDRAW
     };
 
@@ -244 +247 @@
     }
 
+
     wxMenu Menu;
     const ArrayT<unsigned int>& Sel=m_Parent->GetModelDoc()->GetSelection(GFIX);
@@ -269 +273 @@
     }
 
-    const int PointNr=GetPopupMenuSelectionFromUser(Menu)-ID_MENU_SET_GUIFIX_ORIGIN;
-
-    if (HaveModelHit && PointNr>=0 && PointNr<=2)
-    {
-        CafuModelT::GuiFixtureT GF=Model->GetGuiFixtures()[Sel[0]];
-
-        GF.Points[PointNr].MeshNr  =ModelTR.MeshNr;
-        GF.Points[PointNr].VertexNr=BestVertexNr;
-
-        m_Parent->SubmitCommand(new CommandUpdateGuiFixtureT(m_Parent->GetModelDoc(), Sel[0], GF));
+    if (HaveModelHit)
+    {
+        const bool SkipDraw=Model->GetMeshes()[ModelTR.MeshNr].Triangles[ModelTR.TriNr].SkipDraw;
+
+        Menu.AppendSeparator();
+        Menu.Append(ID_MENU_TRIANGLE_INFO, wxString::Format("Mesh %u, Triangle %u:", ModelTR.MeshNr, ModelTR.TriNr))->Enable(false);
+        Menu.AppendCheckItem(ID_MENU_TRIANGLE_SKIPDRAW, "Hide Triangle (skip drawing)")->Check(SkipDraw);
+    }
+
+
+    const int MenuSelID=GetPopupMenuSelectionFromUser(Menu);
+
+    switch (MenuSelID)
+    {
+        case ID_MENU_TRIANGLE_SKIPDRAW:
+        {
+            if (HaveModelHit)
+            {
+                const bool SkipDraw=Model->GetMeshes()[ModelTR.MeshNr].Triangles[ModelTR.TriNr].SkipDraw;
+
+                m_Parent->SubmitCommand(new CommandUpdateTriangleT(m_Parent->GetModelDoc(), ModelTR.MeshNr, ModelTR.TriNr, !SkipDraw));
+            }
+        }
+
+        default:
+        {
+            const int PointNr=MenuSelID-ID_MENU_SET_GUIFIX_ORIGIN;
+
+            if (HaveModelHit && PointNr>=0 && PointNr<=2)
+            {
+                CafuModelT::GuiFixtureT GF=Model->GetGuiFixtures()[Sel[0]];
+
+                GF.Points[PointNr].MeshNr  =ModelTR.MeshNr;
+                GF.Points[PointNr].VertexNr=BestVertexNr;
+
+                m_Parent->SubmitCommand(new CommandUpdateGuiFixtureT(m_Parent->GetModelDoc(), Sel[0], GF));
+            }
+        }
     }
 }

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

@@ -76 +76 @@
     float             m_FrameNr;    ///< The current frame of the played animation sequence. Used <em>independently</em> on the server and the clients; only a <em>restart</em> of a sequence is sync'ed over the network via the EventID_RestartSequ event.
     std::string       GuiName;      ///< If our "gui" entity key is set, store the value here.
-    cf::GuiSys::GuiI* Gui;          ///< If the Model can display a GUI (it has a "Textures/meta/EntityGUI" surface), we load it here, *both* on the server- as well as on the client-side.
+    cf::GuiSys::GuiI* Gui;          ///< If the model has GUI fixtures, we load the GUI here, *both* on the server- as well as on the client-side.
 
 

cafu/trunk/Libs/MaterialSystem/MapComposition.cpp

@@ -712 +712 @@
 {
     const static MapCompositionT RefMapComp;    // Use a reference object here, just in case we ever change the defaults.
+    const std::string            BaseString=GetString();
     std::string                  OptionsString="";
+
+    if (BaseString=="")
+    {
+        // If the base string is empty, don't attempt to attach any options.
+        return "";
+    }
 
     if (MinFilter!=RefMapComp.MinFilter)
@@ -779 +786 @@
     }
 
-    return GetString() + OptionsString;
+    return BaseString + OptionsString;
 }
 

cafu/trunk/Libs/Models/AnimPose.cpp

@@ -91 +91 @@
      // m_Draw_Meshes[MeshNr].Winding=MatSys::MeshT::CW;    // CW is the default.
 
-        if (m_Draw_Meshes[MeshNr].Vertices.Size()!=Mesh.Triangles.Size()*3)
+        unsigned long NumDrawTris=0;
+        for (unsigned long TriNr=0; TriNr<Mesh.Triangles.Size(); TriNr++)
+            if (!Mesh.Triangles[TriNr].SkipDraw)
+                NumDrawTris++;
+
+        if (m_Draw_Meshes[MeshNr].Vertices.Size()!=NumDrawTris*3)
         {
             m_Draw_Meshes[MeshNr].Vertices.Overwrite();
-            m_Draw_Meshes[MeshNr].Vertices.PushBackEmptyExact(Mesh.Triangles.Size()*3);
+            m_Draw_Meshes[MeshNr].Vertices.PushBackEmptyExact(NumDrawTris*3);
         }
     }
@@ -398 +403 @@
     for (unsigned long MeshNr=0; MeshNr<Meshes.Size(); MeshNr++)
     {
-        const MeshT&     Mesh    =Meshes[MeshNr];
-        const MeshInfoT& MeshInfo=m_MeshInfos[MeshNr];
+        const MeshT&     Mesh     =Meshes[MeshNr];
+        const MeshInfoT& MeshInfo =m_MeshInfos[MeshNr];
+        unsigned long    DrawTriNr=0;
 
         for (unsigned long TriNr=0; TriNr<Mesh.Triangles.Size(); TriNr++)
         {
+            if (Mesh.Triangles[TriNr].SkipDraw)
+                continue;
+
             for (unsigned long i=0; i<3; i++)
             {
@@ -408 +417 @@
                 const MeshInfoT::VertexT& VertexInfo=MeshInfo.Vertices[VertexIdx];
 
-                m_Draw_Meshes[MeshNr].Vertices[TriNr*3+i].SetOrigin(VertexInfo.Pos.x, VertexInfo.Pos.y, VertexInfo.Pos.z);
-                m_Draw_Meshes[MeshNr].Vertices[TriNr*3+i].SetTextureCoord(Mesh.Vertices[VertexIdx].u, Mesh.Vertices[VertexIdx].v);
-                m_Draw_Meshes[MeshNr].Vertices[TriNr*3+i].SetNormal  (VertexInfo.Normal.x,   VertexInfo.Normal.y,   VertexInfo.Normal.z  );
-                m_Draw_Meshes[MeshNr].Vertices[TriNr*3+i].SetTangent (VertexInfo.Tangent.x,  VertexInfo.Tangent.y,  VertexInfo.Tangent.z );
-                m_Draw_Meshes[MeshNr].Vertices[TriNr*3+i].SetBiNormal(VertexInfo.BiNormal.x, VertexInfo.BiNormal.y, VertexInfo.BiNormal.z);
-            }
+                m_Draw_Meshes[MeshNr].Vertices[DrawTriNr*3+i].SetOrigin(VertexInfo.Pos.x, VertexInfo.Pos.y, VertexInfo.Pos.z);
+                m_Draw_Meshes[MeshNr].Vertices[DrawTriNr*3+i].SetTextureCoord(Mesh.Vertices[VertexIdx].u, Mesh.Vertices[VertexIdx].v);
+                m_Draw_Meshes[MeshNr].Vertices[DrawTriNr*3+i].SetNormal  (VertexInfo.Normal.x,   VertexInfo.Normal.y,   VertexInfo.Normal.z  );
+                m_Draw_Meshes[MeshNr].Vertices[DrawTriNr*3+i].SetTangent (VertexInfo.Tangent.x,  VertexInfo.Tangent.y,  VertexInfo.Tangent.z );
+                m_Draw_Meshes[MeshNr].Vertices[DrawTriNr*3+i].SetBiNormal(VertexInfo.BiNormal.x, VertexInfo.BiNormal.y, VertexInfo.BiNormal.z);
+            }
+
+            DrawTriNr++;
         }
     }

cafu/trunk/Libs/Models/Loader_cmdl.cpp

@@ -272 +272 @@
                                 lua_pop(m_LuaState, 1);
                             }
+
+                            lua_getfield(m_LuaState, -1, "skipDraw");
+                            Triangle.SkipDraw=lua_toboolean(m_LuaState, -1)!=0;
+                            lua_pop(m_LuaState, 1);
                         }
                         lua_pop(m_LuaState, 1);

cafu/trunk/Libs/Models/Model_cmdl.cpp

@@ -80 +80 @@
 
 CafuModelT::MeshT::TriangleT::TriangleT(unsigned int v0, unsigned int v1, unsigned int v2)
-    : Polarity(false)
+    : Polarity(false),
+      SkipDraw(false)
 {
     VertexIdx[0]=v0;
@@ -706 +707 @@
             OutStream << "\t\t\t"
                       << "{ "
-                      << Triangle.VertexIdx[0] << ", " << Triangle.VertexIdx[1] << ", " << Triangle.VertexIdx[2] << " "
+                      << Triangle.VertexIdx[0] << ", " << Triangle.VertexIdx[1] << ", " << Triangle.VertexIdx[2];
+            if (Triangle.SkipDraw) OutStream << ", skipDraw=true;";
+            OutStream << " "
                       << "},\n";
         }

cafu/trunk/Libs/Models/Model_cmdl.hpp

@@ -50 +50 @@
 namespace ModelEditor { class CommandUpdateChannelT; }
 namespace ModelEditor { class CommandUpdateGuiFixtureT; }
+namespace ModelEditor { class CommandUpdateTriangleT; }
 
 
@@ -82 +83 @@
             int          NeighbIdx[3];  ///< The array indices of the three neighbouring triangles at the edges 01, 12 and 20. -1 indicates no neighbour, -2 indicates more than one neighbour.
             bool         Polarity;      ///< True if this triangle has positive polarity (texture is not mirrored), or false if it has negative polarity (texture is mirrored, SxT points inward).
+            bool         SkipDraw;      ///< True if this triangle should be skipped when drawing the mesh (but not for casting stencil shadows and not for collision detection). This is useful for hiding triangles that are in the same plane as GUI panels and would otherwise cause z-fighting.
 
             Vector3fT    gts_Normal;    ///< The draw normal for this triangle, required for the shadow-silhouette determination.
@@ -303 +305 @@
     friend class ModelEditor::CommandUpdateChannelT;
     friend class ModelEditor::CommandUpdateGuiFixtureT;
+    friend class ModelEditor::CommandUpdateTriangleT;
 
     CafuModelT(const CafuModelT&);                  ///< Use of the Copy    Constructor is not allowed.