Changeset 475

Timestamp:

02/07/12 10:36:33 (4 months ago)

Author:

Carsten

Message:

Model code: Add per-mesh settings for tangent-space method and cast shadows.

Continuing r474, this change adds new members to the CafuModelT::MeshT class for setting

• the method for generating the tangent-space axes, and
• if the mesh should cast dynamic shadows.

The new settings are saved to and loaded from the Cafu cmdl model files, and have been made available to the user in the Model Editor's "Mesh Inspector" dialogs.

References #100 and #101.

Location:

cafu/trunk

Files:

• CaWE/ModelEditor/Commands/SetMeshShadows.cpp (added)
• CaWE/ModelEditor/Commands/SetMeshShadows.hpp (added)
• CaWE/ModelEditor/Commands/SetMeshTSMethod.cpp (added)
• CaWE/ModelEditor/Commands/SetMeshTSMethod.hpp (added)
• CaWE/ModelEditor/MeshInspector.cpp (modified) (3 diffs)
• CaWE/ModelEditor/MeshInspector.hpp (modified) (1 diff)
• Libs/Models/AnimPose.cpp (modified) (1 diff)
• Libs/Models/Loader_cmdl.cpp (modified) (1 diff)
• Libs/Models/Model_cmdl.cpp (modified) (2 diffs)
• Libs/Models/Model_cmdl.hpp (modified) (5 diffs)

cafu/trunk/CaWE/ModelEditor/MeshInspector.cpp

@@ -25 +25 @@
 #include "Commands/Rename.hpp"
 #include "Commands/SetMaterial.hpp"
+#include "Commands/SetMeshShadows.hpp"
+#include "Commands/SetMeshTSMethod.hpp"
 
 #include "../EditorMaterial.hpp"
@@ -179 +181 @@
             "Material", Mat ? Mat->Name : "<NULL>", m_ModelDoc));
 
-        wxPGProperty* UseGivenTS=Append(new wxBoolProperty("Use given TS", wxPG_LABEL, false));
-        DisableProperty(UseGivenTS);
-
-        wxPGProperty* CastShadows=Append(new wxBoolProperty("Cast Shadows", wxPG_LABEL, true));
-        DisableProperty(CastShadows);
+        const wxChar* TSM_Strings[] = { wxT("HARD"), wxT("GLOBAL"), wxT("SG_LOCAL"), wxT("SG_GLOBAL"), NULL };
+        const long    TSM_Indices[] = { CafuModelT::MeshT::HARD, CafuModelT::MeshT::GLOBAL, CafuModelT::MeshT::SG_LOCAL, CafuModelT::MeshT::SG_GLOBAL };
+        wxPGProperty* TSMethod=Append(new wxEnumProperty("Tangent-space method", wxPG_LABEL, TSM_Strings, TSM_Indices, Mesh.TSMethod));
+        TSMethod->SetHelpString("The method that is used for generating the tangent-space axes at the vertices of this mesh. See the documentation for details.");
+
+        wxPGProperty* CastShadows=Append(new wxBoolProperty("Cast Shadows", wxPG_LABEL, Mesh.CastShadows));
+        CastShadows->SetHelpString("If checked, this mesh casts shadows when lit by dynamic light sources.");
 
         wxPGProperty* NumTriangles=Append(new wxIntProperty("Num Triangles", wxPG_LABEL, Mesh.Triangles.Size()));
@@ -227 +231 @@
     bool ok=true;
 
-         if (PropName=="Name"    ) ok=m_Parent->SubmitCommand(new CommandRenameT(m_ModelDoc, MESH, MeshNr, Event.GetValue().GetString()));
-    else if (PropName=="Material") ok=m_Parent->SubmitCommand(new CommandSetMaterialT(m_ModelDoc, MeshNr, m_ModelDoc->GetSelSkinNr(), Event.GetValue().GetString()));
+         if (PropName=="Name"    )             ok=m_Parent->SubmitCommand(new CommandRenameT(m_ModelDoc, MESH, MeshNr, Event.GetValue().GetString()));
+    else if (PropName=="Material")             ok=m_Parent->SubmitCommand(new CommandSetMaterialT(m_ModelDoc, MeshNr, m_ModelDoc->GetSelSkinNr(), Event.GetValue().GetString()));
+    else if (PropName=="Tangent-space method") ok=m_Parent->SubmitCommand(new CommandSetMeshTSMethodT(m_ModelDoc, MeshNr, CafuModelT::MeshT::TangentSpaceMethodT(Event.GetValue().GetInteger())));
+    else if (PropName=="Cast Shadows")         ok=m_Parent->SubmitCommand(new CommandSetMeshShadowsT(m_ModelDoc, MeshNr, Event.GetValue().GetBool()));
     else
     {

cafu/trunk/CaWE/ModelEditor/MeshInspector.hpp

@@ -54 +54 @@
         DECLARE_EVENT_TABLE()
 
-        ModelDocumentT*      m_ModelDoc;
-        ChildFrameT*         m_Parent;
-        bool                 m_IsRecursiveSelfNotify;
+        ModelDocumentT* m_ModelDoc;
+        ChildFrameT*    m_Parent;
+        bool            m_IsRecursiveSelfNotify;
     };
 }

cafu/trunk/Libs/Models/AnimPose.cpp

@@ -514 +514 @@
                 const MaterialT* MeshMat =m_Model.GetMaterial(MeshNr, SkinNr);
 
+                if (!Mesh.CastShadows) continue;
                 if (MeshMat==NULL || MeshMat->NoShadows) continue;
 

cafu/trunk/Libs/Models/Loader_cmdl.cpp

@@ -197 +197 @@
                         Mesh.Material=MaterialMan.RegisterMaterial(CreateDefaultMaterial(MatName));
                     }
+                }
+                lua_pop(m_LuaState, 1);
+
+                lua_getfield(m_LuaState, -1, "tsMethod");
+                {
+                    const char* Method=lua_tostring(m_LuaState, -1);
+                    Mesh.SetTSMethod(Method ? Method : "default");
+                }
+                lua_pop(m_LuaState, 1);
+
+                lua_getfield(m_LuaState, -1, "castShadows");
+                {
+                    Mesh.CastShadows=lua_isnumber(m_LuaState, -1) ? (lua_tonumber(m_LuaState, -1)!=0) : (lua_toboolean(m_LuaState, -1)!=0);
                 }
                 lua_pop(m_LuaState, 1);

cafu/trunk/Libs/Models/Model_cmdl.cpp

@@ -125 +125 @@
     // All weights were equal - the vertices are geodups of each other!
     return true;
+}
+
+
+std::string CafuModelT::MeshT::GetTSMethod() const
+{
+    switch (TSMethod)
+    {
+        case HARD:      return "HARD";
+        case GLOBAL:    return "GLOBAL";
+        case SG_LOCAL:  return "SG_LOCAL";
+        case SG_GLOBAL: return "SG_GLOBAL";
+    }
+
+    return "?";
+}
+
+
+void CafuModelT::MeshT::SetTSMethod(const std::string& m)
+{
+    TSMethod=GLOBAL;
+
+         if (m=="HARD")      TSMethod=HARD;
+    else if (m=="GLOBAL")    TSMethod=GLOBAL;
+    else if (m=="SG_LOCAL")  TSMethod=SG_LOCAL;
+    else if (m=="SG_GLOBAL") TSMethod=SG_GLOBAL;
 }
 
@@ -681 +706 @@
         OutStream << "\t\t" << "name=\"" << Mesh.Name << "\";\n";
         OutStream << "\t\t" << "Material=\"" << (Mesh.Material ? Mesh.Material->Name : "") << "\";\n";
+        OutStream << "\t\t" << "tsMethod=\"" << Mesh.GetTSMethod() << "\";\n";
+        OutStream << "\t\t" << "castShadows=" << (Mesh.CastShadows ? "true" : "false") << ";\n";    // Don't rely on the proper locale being set...
 
         // Write the mesh weights.

cafu/trunk/Libs/Models/Model_cmdl.hpp

@@ -47 +47 @@
 namespace ModelEditor { class CommandSetAnimNextT; }
 namespace ModelEditor { class CommandSetMaterialT; }
+namespace ModelEditor { class CommandSetMeshTSMethodT; }
+namespace ModelEditor { class CommandSetMeshShadowsT; }
 namespace ModelEditor { class CommandTransformJointT; }
 namespace ModelEditor { class CommandUpdateAnimT; }
@@ -76 +78 @@
     struct MeshT
     {
+        /// The methods that can be used to generate the tangent-space axes at the vertices of a mesh.
+        ///
+        /// In this context, "global" smoothing means that when the side of a pyramid or cone is considered,
+        /// for computing the tangent-space of its tip vertex, all sides of the pyramid enter the average,
+        /// because they all share the common tip vertex.
+        /// As a result, the normal vector at the tip is straight (axial), the same for all sides, and the
+        /// interpolated "shape" in tangent-space is really a half-sphere rather than a cone.
+        ///
+        /// In contrast, "local" smoothing averages only the current side with its left and right neighbours.
+        /// The resulting tangent-space normal vectors at the tip vertices remain orthogonal to their triangle,
+        /// and the interpolated tangent-space shape is a cone rather than a half-sphere.
+        enum TangentSpaceMethodT
+        {
+            HARD,       ///< Hard edges, no smoothing: The tangent-space of the triangle is used as the tangent-space of its vertices. (Any smoothing groups info, if available, is ignored.)
+            GLOBAL,     ///< Considers all triangles in the mesh to be in the same common smoothing group, and smoothes them globally. (Any smoothing groups info, if available, is ignored.) This method is equivalent to SG_GLOBAL when all triangles are in the same smoothing group. It is also the default method, as it requires no smoothing groups info at all, provides better performance than SG_GLOBAL, and was implemented in earlier versions of Cafu.
+            SG_LOCAL,   ///< Takes the given smoothing groups into account and provides "local" smoothing.
+            SG_GLOBAL   ///< [NOT YET IMPLEMENTED! At this time, this is the same as GLOBAL.] Takes the given smoothing groups into account and provides "global" smoothing.
+        };
+
         /// A single triangle.
         struct TriangleT
@@ -118 +139 @@
 
         /// The default constructor.
-        MeshT() : Material(NULL), RenderMaterial(NULL) {}
+        MeshT() : Material(NULL), RenderMaterial(NULL), TSMethod(GLOBAL), CastShadows(true) {}
 
         /// Determines whether the two vertices with array indices Vertex1Nr and Vertex2Nr are geometrical duplicates of each other.
@@ -131 +152 @@
         bool AreGeoDups(unsigned int Vertex1Nr, unsigned int Vertex2Nr) const;
 
+        /// Returns a string representation of the TSMethod enum member.
+        std::string GetTSMethod() const;
+
+        /// Sets the TSMethod enum member by string.
+        /// The given string should be one of the strings returned by GetTSMethod().
+        /// If the string does not match a known method, TSMethod is set to GLOBAL.
+        /// @param m   The method to set TSMethod to.
+        void SetTSMethod(const std::string& m);
+
         std::string              Name;            ///< Name of this mesh.
         MaterialT*               Material;        ///< The material of this mesh.
         MatSys::RenderMaterialT* RenderMaterial;  ///< The render material used to render this mesh.
-     // bool                     CastShadows;     ///< Should this mesh cast shadows?
+        TangentSpaceMethodT      TSMethod;        ///< How to generate the tangent-space axes at the vertices of this mesh? For meshes with normal-maps, the method should match the one that was used in the program that created the normal-maps.
+        bool                     CastShadows;     ///< Should this mesh cast shadows?
         ArrayT<TriangleT>        Triangles;       ///< List of triangles this mesh consists of.
         ArrayT<VertexT>          Vertices;        ///< List of vertices this mesh consists of.
@@ -312 +343 @@
     friend class ModelEditor::CommandSetAnimNextT;
     friend class ModelEditor::CommandSetMaterialT;
+    friend class ModelEditor::CommandSetMeshTSMethodT;
+    friend class ModelEditor::CommandSetMeshShadowsT;
     friend class ModelEditor::CommandTransformJointT;
     friend class ModelEditor::CommandUpdateAnimT;