Changeset 395 for cafu/trunk

Timestamp:

09/27/11 11:52:41 (8 months ago)

Author:

Carsten

Message:

Model Editor:

• Fixed minor bug in ChannelInspectorT.
• Revised and rearranged code for creating new skins, GUI fixtures and channels.
• Added skin inspector (a text explaining how skins are edited).

Location:

cafu/trunk/CaWE/ModelEditor

Files:

• ChannelInspector.cpp (modified) (1 diff)
• ChildFrame.cpp (modified) (13 diffs)
• ChildFrame.hpp (modified) (4 diffs)
• ElementsList.cpp (modified) (2 diffs)

cafu/trunk/CaWE/ModelEditor/ChannelInspector.cpp

@@ -155 +155 @@
         ok=m_Parent->SubmitCommand(new CommandRenameT(m_ModelDoc, CHAN, ChanNr, Event.GetValue().GetString()));
     }
-    else if (PropName.StartsWith("Joint."))
+    else if (PropName.StartsWith("Joints."))
     {
         ok=m_Parent->SubmitCommand(new CommandUpdateChannelT(m_ModelDoc, ChanNr, Event.GetProperty()->GetIndexInParent(), Event.GetValue().GetBool()));

cafu/trunk/CaWE/ModelEditor/ChildFrame.cpp

@@ -93 +93 @@
       m_ChannelInspector(NULL),
       m_SkinsList(NULL),
-   // m_SkinInspector(NULL),
+      m_SkinInspector(NULL),
       m_GuiFixturesList(NULL),
       m_GuiFixtureInspector(NULL),
@@ -152 +152 @@
     ViewMenu->AppendCheckItem(ID_MENU_VIEW_AUIPANE_GUIFIXTURE_INSPECTOR, "GUI Fixture Inspector", "Show or hide the GUI fixture inspector");
     ViewMenu->AppendCheckItem(ID_MENU_VIEW_AUIPANE_SKINS_LIST,           "Skins List",            "Show or hide the skins list");
- // ViewMenu->AppendCheckItem(ID_MENU_VIEW_AUIPANE_SKIN_INSPECTOR,       "Skin Inspector",        "Show or hide the skin inspector");
+    ViewMenu->AppendCheckItem(ID_MENU_VIEW_AUIPANE_SKIN_INSPECTOR,       "Skin Inspector",        "Show or hide the skin inspector");
     ViewMenu->AppendSeparator();
     ViewMenu->AppendCheckItem(ID_MENU_VIEW_AUIPANE_SCENE_SETUP,          "Scene Setup",           "Show or hide the scene setup inspector");
@@ -168 +168 @@
     ModelMenu->AppendSeparator();
     ModelMenu->Append(ID_MENU_MODEL_TRANSFORM, "&Transform...\tCtrl+T", "Transform the model");
+    ModelMenu->Append(ID_MENU_MODEL_SKIN_ADD, "Add skin", "Adds a new skin to the model");
     ModelMenu->Append(ID_MENU_MODEL_GUIFIXTURE_ADD, "Add GUI fixture", "Adds a new GUI fixture to the model");
- // ModelMenu->Append(ID_MENU_MODEL_SKIN_ADD, "Add skin", "Adds a new skin to the model");
- // ModelMenu->Append(ID_MENU_MODEL_CHANNEL_ADD, "Add channel", "Adds a new animation channel to the model");
+    ModelMenu->Append(ID_MENU_MODEL_CHANNEL_ADD, "Add channel", "Adds a new animation channel to the model");
     ModelMenu->Append(-1, "Run benchmark", "Move the camera along a predefined path and determine the time taken")->Enable(false);
     ModelMenu->AppendSeparator();
@@ -215 +215 @@
     m_MeshesList=new ElementsPanelT(this, wxSize(230, 400), MESH);
     m_AUIManager.AddPane(m_MeshesList, wxAuiPaneInfo().
-                         Name("MeshesList").Caption("Meshes List").
+                         Name("MeshesList").Caption("Meshes").
                          Left().Position(3));
 
@@ -225 +225 @@
     m_AnimsList=new ElementsPanelT(this, wxSize(230, 400), ANIM);
     m_AUIManager.AddPane(m_AnimsList, wxAuiPaneInfo().
-                         Name("AnimsList").Caption("Animations List").
+                         Name("AnimsList").Caption("Animations").
                          Left().Position(5));
 
@@ -235 +235 @@
     m_ChannelsList=new ElementsPanelT(this, wxSize(230, 150), CHAN);
     m_AUIManager.AddPane(m_ChannelsList, wxAuiPaneInfo().
-                         Name("ChannelsList").Caption("Channels List").
+                         Name("ChannelsList").Caption("Channels").
                          Left().Position(7));
 
@@ -245 +245 @@
     m_GuiFixturesList=new ElementsPanelT(this, wxSize(230, 150), GFIX);
     m_AUIManager.AddPane(m_GuiFixturesList, wxAuiPaneInfo().
-                         Name("GuiFixturesList").Caption("Gui Fixtures List").
+                         Name("GuiFixturesList").Caption("Gui Fixtures").
                          Left().Position(9));
 
@@ -260 +260 @@
     m_SubmodelsPanel=new SubmodelsPanelT(this, wxSize(230, 150));
     m_AUIManager.AddPane(m_SubmodelsPanel, wxAuiPaneInfo().
-                         Name("SubmodelsPanel").Caption("Submodels List").
+                         Name("SubmodelsPanel").Caption("Submodels").
                          Right().Position(1));
 
     m_SkinsList=new ElementsPanelT(this, wxSize(230, 150), SKIN);
     m_AUIManager.AddPane(m_SkinsList, wxAuiPaneInfo().
-                         Name("SkinsList").Caption("Skins List").
+                         Name("SkinsList").Caption("Skins").
                          Right().Position(2));
+
+    m_SkinInspector=new wxStaticText(this, wxID_ANY, "\nSkins are used to assign alternative materials to the meshes in the model.\n\nTo use a skin, select it in the Skins list, then use the Mesh Inspector to assign a material to the mesh in the selected skin.", wxDefaultPosition, wxSize(260, 180));
+    m_AUIManager.AddPane(m_SkinInspector, wxAuiPaneInfo().
+                         Name("SkinInspector").Caption("Skin Inspector").
+                         Float().Hide());
 
     m_TransformDialog=new TransformDialogT(this, wxSize(248, 240));
@@ -348 +353 @@
 
 
+bool ModelEditor::ChildFrameT::SubmitNewSkin()
+{
+    CafuModelT::SkinT Skin;
+
+    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);
+
+    return SubmitCommand(new CommandAddT(m_ModelDoc, Skin));
+}
+
+
+bool ModelEditor::ChildFrameT::SubmitNewGuiFixture()
+{
+    ArrayT<CafuModelT::GuiFixtureT> GuiFixtures;
+
+    GuiFixtures.PushBackEmpty();
+    GuiFixtures[0].Name="New GUI Fixture";
+
+    return SubmitCommand(new CommandAddT(m_ModelDoc, GuiFixtures));
+}
+
+
+bool ModelEditor::ChildFrameT::SubmitNewChannel()
+{
+    CafuModelT::ChannelT Channel;
+
+    Channel.Name="New Channel";
+    return SubmitCommand(new CommandAddT(m_ModelDoc, Channel));
+}
+
+
 void ModelEditor::ChildFrameT::SaveMaterials(const wxString& OldBaseName, const wxString& BaseName)
 {
@@ -598 +635 @@
          if (List==m_JointsHierarchy) Insp=m_JointInspector;
     else if (List==m_MeshesList)      Insp=m_MeshInspector;
+    else if (List==m_SkinsList)       Insp=m_SkinInspector;
     else if (List==m_AnimsList)       Insp=m_AnimInspector;
     else if (List==m_ChannelsList)    Insp=m_ChannelInspector;
@@ -747 +785 @@
         case ID_MENU_VIEW_AUIPANE_CHANNEL_INSPECTOR:    PaneToggleShow(m_AUIManager.GetPane(m_ChannelInspector   )); break;
         case ID_MENU_VIEW_AUIPANE_SKINS_LIST:           PaneToggleShow(m_AUIManager.GetPane(m_SkinsList          )); break;
-     // case ID_MENU_VIEW_AUIPANE_SKINS_INSPECTOR:      PaneToggleShow(m_AUIManager.GetPane(m_SkinsInspector     )); break;
+        case ID_MENU_VIEW_AUIPANE_SKIN_INSPECTOR:       PaneToggleShow(m_AUIManager.GetPane(m_SkinInspector      )); break;
         case ID_MENU_VIEW_AUIPANE_GUIFIXTURES_LIST:     PaneToggleShow(m_AUIManager.GetPane(m_GuiFixturesList    )); break;
         case ID_MENU_VIEW_AUIPANE_GUIFIXTURE_INSPECTOR: PaneToggleShow(m_AUIManager.GetPane(m_GuiFixtureInspector)); break;
@@ -783 +821 @@
         case ID_MENU_VIEW_AUIPANE_CHANNEL_INSPECTOR:    UE.Check(m_AUIManager.GetPane(m_ChannelInspector   ).IsShown()); break;
         case ID_MENU_VIEW_AUIPANE_SKINS_LIST:           UE.Check(m_AUIManager.GetPane(m_SkinsList          ).IsShown()); break;
-     // case ID_MENU_VIEW_AUIPANE_SKIN_INSPECTOR:       UE.Check(m_AUIManager.GetPane(m_SkinInspector      ).IsShown()); break;
+        case ID_MENU_VIEW_AUIPANE_SKIN_INSPECTOR:       UE.Check(m_AUIManager.GetPane(m_SkinInspector      ).IsShown()); break;
         case ID_MENU_VIEW_AUIPANE_GUIFIXTURES_LIST:     UE.Check(m_AUIManager.GetPane(m_GuiFixturesList    ).IsShown()); break;
         case ID_MENU_VIEW_AUIPANE_GUIFIXTURE_INSPECTOR: UE.Check(m_AUIManager.GetPane(m_GuiFixtureInspector).IsShown()); break;
@@ -840 +878 @@
         }
 
+        case ID_MENU_MODEL_SKIN_ADD:
+        {
+            SubmitNewSkin();
+            break;
+        }
+
         case ID_MENU_MODEL_GUIFIXTURE_ADD:
         {
-            ArrayT<CafuModelT::GuiFixtureT> GuiFixtures;
-
-            GuiFixtures.PushBackEmpty();
-            GuiFixtures[0].Name="New GUI Fixture";
-
-            SubmitCommand(new CommandAddT(m_ModelDoc, GuiFixtures));
-            break;
-        }
-
-        // case ID_MENU_MODEL_SKIN_ADD:
-        // {
-        //     break;
-        // }
-
-        // case ID_MENU_MODEL_CHANNEL_ADD:
-        // {
-        //     break;
-        // }
+            SubmitNewGuiFixture();
+            break;
+        }
+
+        case ID_MENU_MODEL_CHANNEL_ADD:
+        {
+            SubmitNewChannel();
+            break;
+        }
 
         case ID_MENU_MODEL_LOAD_SUBMODEL:

cafu/trunk/CaWE/ModelEditor/ChildFrame.hpp

@@ -67 +67 @@
         bool SubmitCommand(CommandT* Command);
 
+        /// Creates a new skin, calls SubmitCommand() accordingly and returns its result.
+        bool SubmitNewSkin();
+
+        /// Creates a new GUI fixture, calls SubmitCommand() accordingly and returns its result.
+        bool SubmitNewGuiFixture();
+
+        /// Creates a new animation channel, calls SubmitCommand() accordingly and returns its result.
+        bool SubmitNewChannel();
+
         /// Saves the model under the known or a new file name.
         /// @param AskForFileName   Whether the method should ask the user to enter a new file name, used for "Save as...".
@@ -113 +122 @@
         ChannelInspectorT* m_ChannelInspector;
         ElementsPanelT*    m_SkinsList;
-     // SkinInspectorT*    m_SkinInspector;
+        wxStaticText*      m_SkinInspector;
         ElementsPanelT*    m_GuiFixturesList;
         GuiFixInspectorT*  m_GuiFixtureInspector;
@@ -140 +149 @@
             ID_MENU_VIEW_AUIPANE_CHANNEL_INSPECTOR,
             ID_MENU_VIEW_AUIPANE_SKINS_LIST,
-         // ID_MENU_VIEW_AUIPANE_SKIN_INSPECTOR,
+            ID_MENU_VIEW_AUIPANE_SKIN_INSPECTOR,
             ID_MENU_VIEW_AUIPANE_GUIFIXTURES_LIST,
             ID_MENU_VIEW_AUIPANE_GUIFIXTURE_INSPECTOR,
@@ -156 +165 @@
             ID_MENU_MODEL_TRANSFORM,
             ID_MENU_MODEL_GUIFIXTURE_ADD,
-         // ID_MENU_MODEL_SKIN_ADD,
-         // ID_MENU_MODEL_CHANNEL_ADD,
+            ID_MENU_MODEL_SKIN_ADD,
+            ID_MENU_MODEL_CHANNEL_ADD,
             ID_MENU_MODEL_LOAD_SUBMODEL,
             ID_MENU_MODEL_UNLOAD_SUBMODELS

cafu/trunk/CaWE/ModelEditor/ElementsList.cpp

@@ -326 +326 @@
         case ID_MENU_ADD_NEW:
         {
-            if (m_TYPE==SKIN)
-            {
-                CafuModelT::SkinT Skin;
-
-                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));
-            }
-            else if (m_TYPE==GFIX)
-            {
-                ArrayT<CafuModelT::GuiFixtureT> GuiFixtures;
-
-                GuiFixtures.PushBackEmpty();
-                GuiFixtures[0].Name="New GUI Fixture";
-
-                m_MainFrame->SubmitCommand(new CommandAddT(m_ModelDoc, GuiFixtures));
-            }
-            else if (m_TYPE==CHAN)
-            {
-                CafuModelT::ChannelT Channel;
-
-                Channel.Name="New Channel";
-                m_MainFrame->SubmitCommand(new CommandAddT(m_ModelDoc, Channel));
+            switch (m_TYPE)
+            {
+                case SKIN: m_MainFrame->SubmitNewSkin();       break;
+                case GFIX: m_MainFrame->SubmitNewGuiFixture(); break;
+                case CHAN: m_MainFrame->SubmitNewChannel();    break;
+                default: break;
             }
             break;
@@ -476 +457 @@
         case ID_BUTTON_ADD:
         {
-            if (m_TYPE==SKIN)
-            {
-                CafuModelT::SkinT Skin;
-
-                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));
-            }
-            else if (m_TYPE==GFIX)
-            {
-                ArrayT<CafuModelT::GuiFixtureT> GuiFixtures;
-
-                GuiFixtures.PushBackEmpty();
-                GuiFixtures[0].Name="New GUI Fixture";
-
-                m_MainFrame->SubmitCommand(new CommandAddT(m_ModelDoc, GuiFixtures));
-            }
-            else if (m_TYPE==CHAN)
-            {
-                CafuModelT::ChannelT Channel;
-
-                Channel.Name="New Channel";
-                m_MainFrame->SubmitCommand(new CommandAddT(m_ModelDoc, Channel));
+            switch (m_TYPE)
+            {
+                case SKIN: m_MainFrame->SubmitNewSkin();       break;
+                case GFIX: m_MainFrame->SubmitNewGuiFixture(); break;
+                case CHAN: m_MainFrame->SubmitNewChannel();    break;
+                default: break;
             }
             break;