Changeset 390

Timestamp:

09/21/11 11:37:12 (8 months ago)

Author:

Carsten

Message:

Model Editor:
Continuing r383 to r385, this change addresses some issues with model skins,
making sure that the number of materials in each skin always matches the number of meshes.

Location:

cafu/trunk

Files:

• CaWE/ModelEditor/Commands/Add.cpp (modified) (3 diffs)
• CaWE/ModelEditor/Commands/SetMaterial.cpp (moved) (moved from cafu/trunk/CaWE/ModelEditor/Commands/SetMeshMaterial.cpp) (8 diffs)
• CaWE/ModelEditor/Commands/SetMaterial.hpp (moved) (moved from cafu/trunk/CaWE/ModelEditor/Commands/SetMeshMaterial.hpp) (2 diffs)
• CaWE/ModelEditor/MeshInspector.cpp (modified) (3 diffs)
• CaWE/ModelEditor/SkinsList.cpp (modified) (2 diffs)
• Libs/Models/Model_cmdl.cpp (modified) (2 diffs)
• Libs/Models/Model_cmdl.hpp (modified) (2 diffs)

cafu/trunk/CaWE/ModelEditor/Commands/Add.cpp

@@ -32 +32 @@
       m_Skins()
 {
+    wxASSERT(Skin.Materials.Size()       == m_ModelDoc->GetModel()->GetMeshes().Size());
+    wxASSERT(Skin.RenderMaterials.Size() == m_ModelDoc->GetModel()->GetMeshes().Size());
+
     m_Skins.PushBack(Skin);
 }
@@ -53 +56 @@
     switch (m_Type)
     {
+        case MESH:
+            // If we supported adding meshes, note that we had to add a
+            // new "NULL" material (and render material) to each skin as well.
+            break;
+
         case SKIN:
             for (unsigned long SkinNr=0; SkinNr<m_Skins.Size(); SkinNr++)
@@ -92 +100 @@
     switch (m_Type)
     {
+        case MESH:
+            // For undoing the addition of a mesh, note that we had to remove
+            // the related material (and render material) in each skin as well.
+            break;
+
         case SKIN:
             for (unsigned long SkinNr=0; SkinNr<m_Skins.Size(); SkinNr++)

cafu/trunk/CaWE/ModelEditor/Commands/SetMaterial.cpp

@@ -20 +20 @@
 */
 
-#include "SetMeshMaterial.hpp"
+#include "SetMaterial.hpp"
 #include "../ModelDocument.hpp"
 #include "MaterialSystem/Renderer.hpp"
@@ -29 +29 @@
 
 
-CommandSetMeshMaterialT::CommandSetMeshMaterialT(ModelDocumentT* ModelDoc, unsigned int MeshNr, int SkinNr, const wxString& NewName)
+CommandSetMaterialT::CommandSetMaterialT(ModelDocumentT* ModelDoc, unsigned int MeshNr, int SkinNr, const wxString& NewName)
     : m_ModelDoc(ModelDoc),
       m_MeshNr(MeshNr),
@@ -39 +39 @@
 
 
-bool CommandSetMeshMaterialT::Do()
+bool CommandSetMaterialT::Do()
 {
     wxASSERT(!m_Done);
@@ -60 +60 @@
     }
 
-    m_ModelDoc->UpdateAllObservers_MeshChanged(m_MeshNr);
+    if (m_SkinNr<0) m_ModelDoc->UpdateAllObservers_MeshChanged(m_MeshNr);
+               else m_ModelDoc->UpdateAllObservers_SkinChanged(m_SkinNr);
+
     m_Done=true;
     return true;
@@ -66 +68 @@
 
 
-void CommandSetMeshMaterialT::Undo()
+void CommandSetMaterialT::Undo()
 {
     wxASSERT(m_Done);
@@ -81 +83 @@
     }
 
-    m_ModelDoc->UpdateAllObservers_MeshChanged(m_MeshNr);
+    if (m_SkinNr<0) m_ModelDoc->UpdateAllObservers_MeshChanged(m_MeshNr);
+               else m_ModelDoc->UpdateAllObservers_SkinChanged(m_SkinNr);
+
     m_Done=false;
 }
 
 
-MaterialT*& CommandSetMeshMaterialT::GetMaterial()
+MaterialT*& CommandSetMaterialT::GetMaterial()
 {
     if (m_SkinNr<0)
@@ -95 +99 @@
 
 
-MatSys::RenderMaterialT*& CommandSetMeshMaterialT::GetRenderMaterial()
+MatSys::RenderMaterialT*& CommandSetMaterialT::GetRenderMaterial()
 {
     if (m_SkinNr<0)
@@ -104 +108 @@
 
 
-wxString CommandSetMeshMaterialT::GetName() const
+wxString CommandSetMaterialT::GetName() const
 {
     return "Assign material";

cafu/trunk/CaWE/ModelEditor/Commands/SetMaterial.hpp

@@ -20 +20 @@
 */
 
-#ifndef _MODELEDITOR_SET_MESH_MATERIAL_HPP_
-#define _MODELEDITOR_SET_MESH_MATERIAL_HPP_
+#ifndef _MODELEDITOR_SET_MATERIAL_HPP_
+#define _MODELEDITOR_SET_MATERIAL_HPP_
 
 #include "../../CommandPattern.hpp"
@@ -34 +34 @@
     class ModelDocumentT;
 
-    class CommandSetMeshMaterialT : public CommandT
+    /// This command sets a new material for a given mesh in a given skin.
+    class CommandSetMaterialT : public CommandT
     {
         public:
 
-        CommandSetMeshMaterialT(ModelDocumentT* ModelDoc, unsigned int MeshNr, int SkinNr, const wxString& NewName);
+        CommandSetMaterialT(ModelDocumentT* ModelDoc, unsigned int MeshNr, int SkinNr, const wxString& NewName);
 
         // CommandT implementation.

cafu/trunk/CaWE/ModelEditor/MeshInspector.cpp

@@ -24 +24 @@
 #include "ModelDocument.hpp"
 #include "Commands/Rename.hpp"
-#include "Commands/SetMeshMaterial.hpp"
+#include "Commands/SetMaterial.hpp"
 
 #include "../EditorMaterial.hpp"
@@ -177 +177 @@
 
         Append(new MaterialPropertyT(wxString::Format("Material (%s)", m_ModelDoc->GetSelSkinString()),
-            wxPG_LABEL, Mat ? Mat->Name : "<NULL>", m_ModelDoc));
+            "Material", Mat ? Mat->Name : "<NULL>", m_ModelDoc));
 
         wxPGProperty* UseGivenTS=Append(new wxBoolProperty("Use given TS", wxPG_LABEL, false));
@@ -225 +225 @@
 
          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 CommandSetMeshMaterialT(m_ModelDoc, MeshNr, m_ModelDoc->GetSelSkinNr(), Event.GetValue().GetString()));
+    else if (PropName=="Material") ok=m_Parent->SubmitCommand(new CommandSetMaterialT(m_ModelDoc, MeshNr, m_ModelDoc->GetSelSkinNr(), Event.GetValue().GetString()));
     else
     {

cafu/trunk/CaWE/ModelEditor/SkinsList.cpp

@@ -195 +195 @@
 
             Skin.Name="New Skin";
+            while (Skin.Materials.Size()       < m_ModelDoc->GetModel()->GetMeshes().Size()) Skin.Materials.PushBack(NULL);
+            while (Skin.RenderMaterials.Size() < m_ModelDoc->GetModel()->GetMeshes().Size()) Skin.RenderMaterials.PushBack(NULL);
 
             m_MainFrame->SubmitCommand(new CommandAddT(m_ModelDoc, Skin));
@@ -326 +328 @@
 
             Skin.Name="New Skin";
+            while (Skin.Materials.Size()       < m_ModelDoc->GetModel()->GetMeshes().Size()) Skin.Materials.PushBack(NULL);
+            while (Skin.RenderMaterials.Size() < m_ModelDoc->GetModel()->GetMeshes().Size()) Skin.RenderMaterials.PushBack(NULL);
 
             m_MainFrame->SubmitCommand(new CommandAddT(m_ModelDoc, Skin));

cafu/trunk/Libs/Models/Model_cmdl.cpp

@@ -239 +239 @@
  // if (m_Meshes.Size()==0) throw ModelT::LoadError();  // Consider models with no meshes as valid, skeleton-only meshes are sometimes useful for testing.
 
+    // Make sure that each skin has as many materials as there are meshes.
+    for (unsigned long SkinNr=0; SkinNr<m_Skins.Size(); SkinNr++)
+    {
+        SkinT& Skin=m_Skins[SkinNr];
+
+        while (Skin.Materials.Size() > m_Meshes.Size()) Skin.Materials.DeleteBack();
+        while (Skin.Materials.Size() < m_Meshes.Size()) Skin.Materials.PushBack(NULL);
+
+        while (Skin.RenderMaterials.Size() > m_Meshes.Size()) Skin.RenderMaterials.DeleteBack();
+        while (Skin.RenderMaterials.Size() < m_Meshes.Size()) Skin.RenderMaterials.PushBack(NULL);
+    }
+
     InitMeshes();
 
@@ -255 +267 @@
         SkinT& Skin=m_Skins[SkinNr];
 
-        assert(Skin.Materials.Size()==m_Meshes.Size());
-        assert(Skin.Materials.Size()==Skin.RenderMaterials.Size());
+        assert(Skin.Materials.Size()      ==m_Meshes.Size());
+        assert(Skin.RenderMaterials.Size()==m_Meshes.Size());
 
         for (unsigned long MatNr=0; MatNr<Skin.Materials.Size(); MatNr++)

cafu/trunk/Libs/Models/Model_cmdl.hpp

@@ -39 +39 @@
 namespace ModelEditor { class CommandSetAnimFPST; }
 namespace ModelEditor { class CommandSetAnimNextT; }
-namespace ModelEditor { class CommandSetMeshMaterialT; }
+namespace ModelEditor { class CommandSetMaterialT; }
 namespace ModelEditor { class CommandTransformJointT; }
 namespace ModelEditor { class CommandUpdateAnimT; }
@@ -292 +292 @@
     friend class ModelEditor::CommandSetAnimFPST;
     friend class ModelEditor::CommandSetAnimNextT;
-    friend class ModelEditor::CommandSetMeshMaterialT;
+    friend class ModelEditor::CommandSetMaterialT;
     friend class ModelEditor::CommandTransformJointT;
     friend class ModelEditor::CommandUpdateAnimT;