Changeset 431

Timestamp:

11/25/11 13:56:35 (6 months ago)

Author:

Carsten

Message:

Model Editor:

• Add support for "debug materials" so that the user can better inspect the surface lighting and surface details of the model.
• Fixed the definition of the ModelLoaderT's default material, and generally the related serialization of materials.

Closes #90.

Location:

cafu/trunk

Files:

• CaWE/ModelEditor/Renderer3D.cpp (modified) (2 diffs)
• CaWE/ModelEditor/Renderer3D.hpp (modified) (2 diffs)
• CaWE/ModelEditor/ScenePropGrid.cpp (modified) (3 diffs)
• CaWE/ModelEditor/ScenePropGrid.hpp (modified) (1 diff)
• CaWE/ModelEditor/SceneView3D.cpp (modified) (2 diffs)
• CaWE/res/CaWE.cmat (modified) (1 diff)
• CaWE/res/white.png (added)
• Libs/MaterialSystem/Expression.cpp (modified) (1 diff)
• Libs/MaterialSystem/Material.cpp (modified) (2 diffs)
• Libs/Models/Loader.cpp (modified) (1 diff)

cafu/trunk/CaWE/ModelEditor/Renderer3D.cpp

@@ -43 +43 @@
     m_RMatTerrainEdit      =MatSys::Renderer->RegisterMaterial(MaterialManager->GetMaterial("CaWE/TerrainEditTool3D"));
     m_RMatTerrainEyeDropper=MatSys::Renderer->RegisterMaterial(MaterialManager->GetMaterial("CaWE/TerrainEyeDropper"));
+    m_RMatWhite            =MatSys::Renderer->RegisterMaterial(MaterialManager->GetMaterial("CaWE/White"            ));
+    m_RMatTexturedWireframe=MatSys::Renderer->RegisterMaterial(MaterialManager->GetMaterial("CaWE/TexturedWireframe"));
 }
 
@@ -56 +58 @@
     MatSys::Renderer->FreeMaterial(m_RMatTerrainEdit      );
     MatSys::Renderer->FreeMaterial(m_RMatTerrainEyeDropper);
+    MatSys::Renderer->FreeMaterial(m_RMatWhite            );
+    MatSys::Renderer->FreeMaterial(m_RMatTexturedWireframe);
 }
 

cafu/trunk/CaWE/ModelEditor/Renderer3D.hpp

@@ -56 +56 @@
         MatSys::RenderMaterialT* GetRMatTerrainEditorTool()  const { return m_RMatTerrainEdit;       }
         MatSys::RenderMaterialT* GetRMatTerrainEyeDropper()  const { return m_RMatTerrainEyeDropper; }
+        MatSys::RenderMaterialT* GetRMatWhite()              const { return m_RMatWhite; }
+        MatSys::RenderMaterialT* GetRMatTexturedWireframe()  const { return m_RMatTexturedWireframe; }
 
         /// Returns a "shade" according to the direction of the given normal vector.
@@ -90 +92 @@
         MatSys::RenderMaterialT* m_RMatOverlayOZ;           ///< The render material for selection overlays (added in a second pass) (with polygon z-offset, e.g. for decals).
         MatSys::RenderMaterialT* m_RMatTerrainEdit;         ///< The render material overlay that is used to render the tool position in a terrain if the terrain edit tool is active.
-        MatSys::RenderMaterialT* m_RMatTerrainEyeDropper;   ///< The Render material overlay that is used to render the eyedropper tool position on a terrain.
+        MatSys::RenderMaterialT* m_RMatTerrainEyeDropper;   ///< The render material overlay that is used to render the eyedropper tool position on a terrain.
+        MatSys::RenderMaterialT* m_RMatWhite;               ///< This render material is intended as "debug" material for models in the Model Editor, so that the user can better inspect the surface lighting of the model.
+        MatSys::RenderMaterialT* m_RMatTexturedWireframe;   ///< This render material is intended as "debug" material for models in the Model Editor, so that the user can better inspect the surface details of the model, e.g. at what vertex exactly are the GUI fixture points, etc.
     };
 }

cafu/trunk/CaWE/ModelEditor/ScenePropGrid.cpp

@@ -53 +53 @@
       m_Model_ShowTriangleNormals(wxConfigBase::Get()->Read("ModelEditor/SceneSetup/Model_ShowTriangleNormals", 0l)!=0),
       m_Model_ShowTangentSpace(wxConfigBase::Get()->Read("ModelEditor/SceneSetup/Model_ShowTangentSpace", 0l)!=0),
+      m_Model_DebugMaterial(0),
       m_AmbientLightColor(wxColour(wxConfigBase::Get()->Read("ModelEditor/SceneSetup/AmbientLightColor", "rgb(96, 96, 96)"))),
       m_AmbientTexture(NULL),
@@ -133 +134 @@
     AppendIn(ModelProps, new wxBoolProperty("Show triangle normals", wxPG_LABEL, m_Model_ShowTriangleNormals));
     AppendIn(ModelProps, new wxBoolProperty("Show tangent-space", wxPG_LABEL, m_Model_ShowTangentSpace));
+    const wxChar* DebugMaterialStrings[] = { wxT("normal/none"), wxT("plain (white)"), wxT("wire-frame"), NULL };
+    const long    DebugMaterialIndices[] = { 0, 1, 2 };
+    AppendIn(ModelProps, new wxEnumProperty("Debug material", wxPG_LABEL, DebugMaterialStrings, DebugMaterialIndices, m_Model_DebugMaterial));
 
 
@@ -224 +228 @@
     else if (PropName=="Model.Show triangle normals") m_Model_ShowTriangleNormals=Prop->GetValue().GetBool();
     else if (PropName=="Model.Show tangent-space")    m_Model_ShowTangentSpace   =Prop->GetValue().GetBool();
+    else if (PropName=="Model.Debug material")        m_Model_DebugMaterial      =Prop->GetValue().GetInteger();
     else if (PropName=="Frame No.") { AnimState.Pose.SetFrameNr(PropValueF); m_IsRecursiveSelfNotify=true; m_Parent->GetModelDoc()->UpdateAllObservers_AnimStateChanged(); m_IsRecursiveSelfNotify=false; }
     else if (PropName=="Speed")     { AnimState.Speed=PropValueF; m_IsRecursiveSelfNotify=true; m_Parent->GetModelDoc()->UpdateAllObservers_AnimStateChanged(); m_IsRecursiveSelfNotify=false; }

cafu/trunk/CaWE/ModelEditor/ScenePropGrid.hpp

@@ -60 +60 @@
         bool                 m_Model_ShowTriangleNormals;
         bool                 m_Model_ShowTangentSpace;
+        unsigned int         m_Model_DebugMaterial;   ///< 0 for "normal/none", 1 for "plain (white)", 2 for "wire-frame"
         wxColour             m_AmbientLightColor;
         MatSys::TextureMapI* m_AmbientTexture;    ///< A uniform 2x2 texture colored in the ambient light color, used as lightmap for the ground plane.

cafu/trunk/CaWE/ModelEditor/SceneView3D.cpp

@@ -404 +404 @@
     if (ScenePropGrid->m_Model_ShowMesh)
     {
+        switch (ScenePropGrid->m_Model_DebugMaterial)
+        {
+            case 1:
+                MatSys::Renderer->SetCurrentMaterial(m_Renderer.GetRMatWhite());
+                MatSys::Renderer->LockCurrentMaterial(true);
+                break;
+
+            case 2:
+                MatSys::Renderer->SetCurrentMaterial(m_Renderer.GetRMatTexturedWireframe());
+                MatSys::Renderer->LockCurrentMaterial(true);
+                break;
+        }
+
         Anim.Pose.Draw(ModelDoc->GetSelSkinNr(), 0.0f /*LodDist*/);
 
@@ -415 +428 @@
             SmPose.SetSuperPose(NULL);
         }
+
+        MatSys::Renderer->LockCurrentMaterial(false);
     }
 

cafu/trunk/CaWE/res/CaWE.cmat

@@ -126 +126 @@
     blue  1.0
 }
+
+
+// This material is intended as "debug" material for models in the Model Editor,
+// so that the user can better inspect the surface lighting of the model.
+CaWE/White
+{
+    diffusemap white.png
+
+    red   ambientLightRed
+    green ambientLightGreen
+    blue  ambientLightBlue
+}
+
+
+// This material is intended as "debug" material for models in the Model Editor,
+// so that the user can better inspect the surface details of the model,
+// e.g. at what vertex exactly are the GUI fixture points, etc.
+CaWE/TexturedWireframe
+{
+    diffusemap white.png
+
+    red   ambientLightRed
+    green ambientLightGreen
+    blue  ambientLightBlue
+
+    // twoSided
+    polygonMode wireframe
+}

cafu/trunk/Libs/MaterialSystem/Expression.cpp

@@ -314 +314 @@
         }
 
+        case SymbolTime:
+            return "time";
+
+        case SymbolALRed:
+            return "ambientLightRed";
+
+        case SymbolALGreen:
+            return "ambientLightGreen";
+
+        case SymbolALBlue:
+            return "ambientLightBlue";
+
         default:
             return "<expr>";

cafu/trunk/Libs/MaterialSystem/Material.cpp

@@ -487 +487 @@
 void MaterialT::Save(std::ostream& OutStream) const
 {
+    const static MaterialT RefMat;  // Use a reference object here, just in case we ever change the defaults.
     const char* INDENT="    ";
 
@@ -514 +515 @@
     if (PolygonMode==Points)    OutStream << INDENT << "polygonMode points"    << "\n";
 
-    float f; const ExpressionT::SymbolsT ExpSym;
-    f=AlphaTestValue.Evaluate(ExpSym).GetAsFloat(); if (f>=0.0f) OutStream << INDENT << "alphaTest" << " " << f << "\n";
-    f=RedGen  .Evaluate(ExpSym).GetAsFloat(); if (f!=1.0f) OutStream << INDENT << "red"   << " " << f << "\n";
-    f=GreenGen.Evaluate(ExpSym).GetAsFloat(); if (f!=1.0f) OutStream << INDENT << "green" << " " << f << "\n";
-    f=BlueGen .Evaluate(ExpSym).GetAsFloat(); if (f!=1.0f) OutStream << INDENT << "blue"  << " " << f << "\n";
-    f=AlphaGen.Evaluate(ExpSym).GetAsFloat(); if (f!=1.0f) OutStream << INDENT << "alpha" << " " << f << "\n";
+    mcs=AlphaTestValue.GetString(); if (mcs!="<expr>" && mcs!=RefMat.AlphaTestValue.GetString()) OutStream << INDENT << "alphaTest" << " " << mcs << "\n";
+    mcs=RedGen        .GetString(); if (mcs!="<expr>" && mcs!=RefMat.RedGen        .GetString()) OutStream << INDENT << "red  "     << " " << mcs << "\n";
+    mcs=GreenGen      .GetString(); if (mcs!="<expr>" && mcs!=RefMat.GreenGen      .GetString()) OutStream << INDENT << "green"     << " " << mcs << "\n";
+    mcs=BlueGen       .GetString(); if (mcs!="<expr>" && mcs!=RefMat.BlueGen       .GetString()) OutStream << INDENT << "blue "     << " " << mcs << "\n";
+    mcs=AlphaGen      .GetString(); if (mcs!="<expr>" && mcs!=RefMat.AlphaGen      .GetString()) OutStream << INDENT << "alpha"     << " " << mcs << "\n";
 
     if (BlendFactorSrc!=None || BlendFactorDst!=None)

cafu/trunk/Libs/Models/Loader.cpp

@@ -150 +150 @@
  // Mat.DepthOffset    =-1.0f;
     Mat.DiffMapComp    =MapCompositionT("file-not-found", "./");
- // Mat.RedGen         =ExpressionT(1.0f);
- // 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.RedGen         =ExpressionT(ExpressionT::SymbolALRed);      // Modulate the model texture with the ambient light color.
+    Mat.GreenGen       =ExpressionT(ExpressionT::SymbolALGreen);
+    Mat.BlueGen        =ExpressionT(ExpressionT::SymbolALBlue);
+ // 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;