Changeset 381 for cafu/trunk

Timestamp:

09/15/11 13:49:12 (8 months ago)

Author:

Carsten

Message:

Model Editor:
Added automatic alignment of the ground plane to the bottom of the model, taking the current animation sequence into account.
This makes inspecting a model a lot more convenient. :-)

Location:

cafu/trunk/CaWE/ModelEditor

Files:

• ModelDocument.cpp (modified) (2 diffs)
• ModelDocument.hpp (modified) (4 diffs)
• ScenePropGrid.cpp (modified) (3 diffs)
• ScenePropGrid.hpp (modified) (1 diff)
• SceneView3D.cpp (modified) (1 diff)

cafu/trunk/CaWE/ModelEditor/ModelDocument.cpp

@@ -63 +63 @@
 ModelEditor::ModelDocumentT::ModelDocumentT(GameConfigT* GameConfig, const wxString& FileName)
     : m_Model(LoadModel(FileName)),
+      m_SequenceBB(m_Model->GetBB(-1, 0.0f)),
       m_Submodels(),
       m_Gui(new cf::GuiSys::GuiImplT("Win1=gui:new('WindowT'); gui:SetRootWindow(Win1); gui:activate(true); "
@@ -106 +107 @@
     delete m_Gui;
     delete m_Model;
+}
+
+
+void ModelEditor::ModelDocumentT::SetSelection(ModelElementTypeT Type, const ArrayT<unsigned int>& NewSel)
+{
+    wxASSERT(Type<4);
+    m_Selection[Type]=NewSel;
+
+    if (Type==ANIM)
+    {
+        if (m_Selection[ANIM].Size()==0)
+        {
+            m_SequenceBB=m_Model->GetBB(-1, 0.0f);
+        }
+        else
+        {
+            m_SequenceBB=BoundingBox3fT();
+
+            for (unsigned long SelNr=0; SelNr<m_Selection[ANIM].Size(); SelNr++)
+            {
+                const CafuModelT::AnimT& Anim=m_Model->GetAnims()[m_Selection[ANIM][SelNr]];
+
+                for (unsigned long FrameNr=0; FrameNr<Anim.Frames.Size(); FrameNr++)
+                    m_SequenceBB+=Anim.Frames[FrameNr].BB;
+            }
+        }
+    }
 }
 

cafu/trunk/CaWE/ModelEditor/ModelDocument.hpp

@@ -25 +25 @@
 #include "ObserverPattern.hpp"
 #include "ElementTypes.hpp"
+#include "Math3D/BoundingBox.hpp"
 #include "Math3D/Vector3.hpp"
 #include "Templates/Array.hpp"
@@ -102 +103 @@
         const CafuModelT*               GetModel() const           { return m_Model; }
         const ArrayT<unsigned int>&     GetSelection(ModelElementTypeT Type) const { wxASSERT(Type<4); return m_Selection[Type]; }
+        const BoundingBox3fT&           GetSequenceBB() const      { return m_SequenceBB; }
         const ArrayT<EditorMaterialI*>& GetEditorMaterials() const { return m_EditorMaterials; }
         const AnimStateT&               GetAnimState() const       { return m_AnimState; }
@@ -112 +114 @@
 
         CafuModelT*      GetModel()      { return m_Model; }
-        void             SetSelection(ModelElementTypeT Type, const ArrayT<unsigned int>& NewSel) { wxASSERT(Type<4); m_Selection[Type]=NewSel; }
+        void             SetSelection(ModelElementTypeT Type, const ArrayT<unsigned int>& NewSel);
         AnimStateT&      GetAnimState()  { return m_AnimState; }
         void             LoadSubmodel(const wxString& FileName);
@@ -134 +136 @@
         CafuModelT*              m_Model;           ///< The model that is being edited.
         ArrayT<unsigned int>     m_Selection[4];    ///< The selected joints, meshes, animations and GUI fixtures.
+        BoundingBox3fT           m_SequenceBB;      ///< The bounding-box encompassing all frames of the currently selected animation sequence(s).
         ArrayT<EditorMaterialI*> m_EditorMaterials; ///< One editor material for each material in the model (its material manager).
         AnimStateT               m_AnimState;       ///< The current state of the model animation.

cafu/trunk/CaWE/ModelEditor/ScenePropGrid.cpp

@@ -47 +47 @@
       m_GridSpacing(Options.Grid.InitialSpacing),
       m_GroundPlane_Show(wxConfigBase::Get()->Read("ModelEditor/SceneSetup/GroundPlane_Show", 1l)!=0),
+      m_GroundPlane_PosZ(wxConfigBase::Get()->Read("ModelEditor/SceneSetup/GroundPlane_PosZ", 0.0f)),
+      m_GroundPlane_AutoZ(wxConfigBase::Get()->Read("ModelEditor/SceneSetup/GroundPlane_AutoZ", 1l)!=0),
       m_Model_ShowMesh(wxConfigBase::Get()->Read("ModelEditor/SceneSetup/Model_ShowMesh", 1l)!=0),
       m_Model_ShowSkeleton(wxConfigBase::Get()->Read("ModelEditor/SceneSetup/Model_ShowSkeleton", 0l)!=0),
@@ -118 +120 @@
     wxPGProperty* GroundPlane=AppendIn(SceneElemsCat, new wxStringProperty("Ground Plane", wxPG_LABEL, "<composed>"));
     AppendIn(GroundPlane, new wxBoolProperty("Show", wxPG_LABEL, m_GroundPlane_Show));
-    AppendIn(GroundPlane, new wxFloatProperty("Height (z-Pos)", wxPG_LABEL, Ground->GetBB().Max.z));
+    AppendIn(GroundPlane, new wxFloatProperty("Height (z-Pos)", wxPG_LABEL, m_GroundPlane_PosZ));
+    AppendIn(GroundPlane, new wxBoolProperty("Auto Height", wxPG_LABEL, m_GroundPlane_AutoZ));
     AppendIn(GroundPlane, new wxStringProperty("Material", wxPG_LABEL, Ground->GetFaces()[0].GetMaterial()->GetName()));   // TODO: MaterialProperty
 
@@ -199 +202 @@
     else if (PropName=="Camera.Advanced.far plane dist")  Camera.FarPlaneDist=PropValueF;
     else if (PropName=="Ground Plane.Show")               m_GroundPlane_Show=Prop->GetValue().GetBool();
-    else if (PropName=="Ground Plane.Height (z-Pos)")
-    {
-        Ground->TrafoMove(Vector3fT(0, 0, PropValueF - Ground->GetBB().Max.z));
-    }
+    else if (PropName=="Ground Plane.Height (z-Pos)")     m_GroundPlane_PosZ=PropValueF;
+    else if (PropName=="Ground Plane.Auto Height")        m_GroundPlane_AutoZ=Prop->GetValue().GetBool();
     else if (PropName=="Ground Plane.Material")
     {

cafu/trunk/CaWE/ModelEditor/ScenePropGrid.hpp

@@ -54 +54 @@
         float                m_GridSpacing;
         bool                 m_GroundPlane_Show;
+        float                m_GroundPlane_PosZ;
+        bool                 m_GroundPlane_AutoZ;
         bool                 m_Model_ShowMesh;
         bool                 m_Model_ShowSkeleton;

cafu/trunk/CaWE/ModelEditor/SceneView3D.cpp

@@ -578 +578 @@
     MatSys::Renderer->SetCurrentLightDirMap(NULL);    // The MatSys provides a default for LightDirMaps when NULL is set.
 
+    // Update the z-position of the ground plane.
+    if (ScenePropGrid->m_GroundPlane_Show)
+    {
+        MapBrushT*  Ground=m_Parent->GetModelDoc()->GetGround();
+        const float DeltaZ=(ScenePropGrid->m_GroundPlane_AutoZ
+            ? m_Parent->GetModelDoc()->GetSequenceBB().Min.z
+            : ScenePropGrid->m_GroundPlane_PosZ) - Ground->GetBB().Max.z;
+
+        if (fabs(DeltaZ) > 0.0001f)
+            Ground->TrafoMove(Vector3fT(0, 0, DeltaZ));
+    }
+
     // Render the world axes. They're great for technical and emotional reassurance.
     if (ScenePropGrid->m_ShowOrigin)