Changeset 393 for cafu/trunk

Timestamp:

09/23/11 11:24:21 (8 months ago)

Author:

Carsten

Message:

Model Editor: Merged class SkinsListT back into ElementsListT.

Location:

cafu/trunk/CaWE/ModelEditor

Files:

• ChildFrame.cpp (modified) (2 diffs)
• ChildFrame.hpp (modified) (2 diffs)
• ElementsList.cpp (modified) (14 diffs)
• ElementsList.hpp (modified) (3 diffs)
• SkinsList.cpp (deleted)
• SkinsList.hpp (deleted)

cafu/trunk/CaWE/ModelEditor/ChildFrame.cpp

@@ -31 +31 @@
 #include "SceneView3D.hpp"
 #include "ScenePropGrid.hpp"
-#include "SkinsList.hpp"
 #include "SubmodelsList.hpp"
 #include "TransformDialog.hpp"
@@ -245 +244 @@
                          Right().Position(1));
 
-    m_SkinsList=new SkinsPanelT(this, wxSize(230, 150), SKIN);
+    m_SkinsList=new ElementsPanelT(this, wxSize(230, 150), SKIN);
     m_AUIManager.AddPane(m_SkinsList, wxAuiPaneInfo().
                          Name("SkinsList").Caption("Skins List").

cafu/trunk/CaWE/ModelEditor/ChildFrame.hpp

@@ -44 +44 @@
     class ScenePropGridT;
     class SceneView3DT;
-    class SkinsPanelT;
     class SubmodelsPanelT;
     class TransformDialogT;
@@ -110 +109 @@
         ElementsPanelT*    m_AnimsList;
         AnimInspectorT*    m_AnimInspector;
-        SkinsPanelT*       m_SkinsList;
+        ElementsPanelT*    m_SkinsList;
         ElementsPanelT*    m_GuiFixturesList;
         GuiFixInspectorT*  m_GuiFixtureInspector;

cafu/trunk/CaWE/ModelEditor/ElementsList.cpp

@@ -50 +50 @@
     : wxListView(Parent, wxID_ANY, wxDefaultPosition, Size, wxLC_REPORT | wxLC_EDIT_LABELS),
       m_TYPE(Type),
+      m_NUM_DEFAULT_ITEMS(m_TYPE==SKIN ? 1 : 0),
       m_ModelDoc(MainFrame->GetModelDoc()),
       m_MainFrame(MainFrame),
       m_IsRecursiveSelfNotify(false)
 {
-    wxASSERT(m_TYPE==ANIM || m_TYPE==MESH || m_TYPE==GFIX);
+    wxASSERT(m_TYPE==MESH || m_TYPE==SKIN || m_TYPE==GFIX || m_TYPE==ANIM);
 
     // TODO: Make it up to the caller code to call this?
@@ -76 +77 @@
 
 
+bool ElementsListT::AreDefaultItemsSelected() const
+{
+    for (int ItemNr=0; ItemNr<m_NUM_DEFAULT_ITEMS; ItemNr++)
+        if (IsSelected(ItemNr))
+            return true;
+
+    return false;
+}
+
+
 void ElementsListT::Notify_SelectionChanged(SubjectT* Subject, ModelElementTypeT Type, const ArrayT<unsigned int>& OldSel, const ArrayT<unsigned int>& NewSel)
 {
@@ -89 +100 @@
 
     for (unsigned long SelNr=0; SelNr<NewSel.Size(); SelNr++)
-        Select(NewSel[SelNr]);
+        Select(NewSel[SelNr] + m_NUM_DEFAULT_ITEMS);
+
+    if (NewSel.Size()==0 && m_NUM_DEFAULT_ITEMS>0)
+        Select(0);
 
     Thaw();
@@ -138 +152 @@
     // Update the list of meshes also when a skin changed, as with each
     // mesh we display the used material in the currently selected skin.
-    if (m_TYPE!=MESH) return;
+    if (m_TYPE!=SKIN && m_TYPE!=MESH) return;
 
     InitListItems();
@@ -208 +222 @@
 
         case SKIN:
-            wxASSERT(false);
+            InsertItem(0, "default");
+            SetItem(0, 1, "-1");
+            if (Sel.Size()==0) Select(0);
+
+            for (unsigned long ElemNr=0; ElemNr<m_ModelDoc->GetModel()->GetSkins().Size(); ElemNr++)
+            {
+                InsertItem(ElemNr+1, m_ModelDoc->GetModel()->GetSkins()[ElemNr].Name);
+                SetItem(ElemNr+1, 1, wxString::Format("%lu", ElemNr));
+
+                if (Sel.Find(ElemNr)!=-1) Select(ElemNr+1);
+            }
             break;
 
@@ -251 +275 @@
     wxMenu Menu;
 
-    Menu.Append(ID_MENU_INSPECT_EDIT, "Inspect / Edit\tEnter");
-    Menu.Append(ID_MENU_RENAME,       "Rename\tF2");
-
+    if (m_TYPE!=SKIN) Menu.Append(ID_MENU_INSPECT_EDIT, "Inspect / Edit\tEnter");
+    Menu.Append(ID_MENU_RENAME, "Rename\tF2");
     if (m_TYPE==GFIX) Menu.Append(ID_MENU_ADD_NEW, "Add/create new");
 
@@ -273 +296 @@
             const long SelNr=GetFirstSelected();
 
-            if (SelNr!=-1) EditLabel(SelNr);
+            // Only relabel custom elements (not the "default" ones).
+            if (SelNr>=m_NUM_DEFAULT_ITEMS) EditLabel(SelNr);
             break;
         }
@@ -279 +303 @@
         case ID_MENU_ADD_NEW:
         {
-            if (m_TYPE==GFIX)
+            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;
@@ -302 +336 @@
             const long SelNr=LE.GetIndex();
 
-            if (SelNr!=-1) EditLabel(SelNr);
+            // Only relabel custom elements (not the "default" ones).
+            if (SelNr>=m_NUM_DEFAULT_ITEMS) EditLabel(SelNr);
             break;
         }
@@ -334 +369 @@
 
     for (long SelNr=GetFirstSelected(); SelNr!=-1; SelNr=GetNextSelected(SelNr))
-        NewSel.PushBack(SelNr);
+        if (SelNr>=m_NUM_DEFAULT_ITEMS)     // Skip the "default" elements.
+            NewSel.PushBack(SelNr - m_NUM_DEFAULT_ITEMS);
 
     m_MainFrame->SubmitCommand(CommandSelectT::Set(m_ModelDoc, m_TYPE, NewSel));
@@ -344 +380 @@
 void ElementsListT::OnEndLabelEdit(wxListEvent& LE)
 {
-    const unsigned int Index=LE.GetIndex();
+    const long Index=LE.GetIndex();
 
     if (LE.IsEditCancelled()) return;
+    if (Index < m_NUM_DEFAULT_ITEMS) { LE.Veto(); return; }   // Cannot relabel the "default" elements.
 
     m_IsRecursiveSelfNotify=true;
-    m_MainFrame->SubmitCommand(new CommandRenameT(m_ModelDoc, m_TYPE, Index, LE.GetLabel()));
+    m_MainFrame->SubmitCommand(new CommandRenameT(m_ModelDoc, m_TYPE, Index - m_NUM_DEFAULT_ITEMS, LE.GetLabel()));
     m_IsRecursiveSelfNotify=false;
 }
@@ -409 +446 @@
         case ID_BUTTON_ADD:
         {
-            if (m_TYPE==GFIX)
+            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;
@@ -440 +487 @@
         case ID_BUTTON_ADD:
         {
-            UE.Enable(m_TYPE==GFIX);
+            UE.Enable(m_TYPE==SKIN || m_TYPE==GFIX);
             break;
         }
@@ -458 +505 @@
         case ID_BUTTON_DELETE:
         {
-            UE.Enable(m_ModelDoc->GetSelection(m_TYPE).Size()>0);
+            // Are some elements but not the "default" elements selected?
+            UE.Enable(m_ModelDoc->GetSelection(m_TYPE).Size()>0 && !m_List->AreDefaultItemsSelected());
             break;
         }

cafu/trunk/CaWE/ModelEditor/ElementsList.hpp

@@ -34 +34 @@
 
 
-    /// A control for displaying a list of the elements (meshes or animations) of the model.
+    /// A control for displaying a list of the elements of the model.
     class ElementsListT : public wxListView, public ObserverT
     {
@@ -44 +44 @@
         /// The destructor.
         ~ElementsListT();
+
+        /// Returns whether one or more "default" elements are selected in the list.
+        bool AreDefaultItemsSelected() const;
 
         // ObserverT implementation.
@@ -70 +73 @@
 
         const ModelElementTypeT m_TYPE;
+        const int               m_NUM_DEFAULT_ITEMS;
         ModelDocumentT*         m_ModelDoc;
         ChildFrameT*            m_MainFrame;