Changeset 392

Timestamp:

09/23/11 10:30:21 (8 months ago)

Author:

Carsten

Message:

Model Editor: Prepare for merging class SkinsListT back into ElementsListT.

Location:

cafu/trunk/CaWE/ModelEditor

Files:

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

cafu/trunk/CaWE/ModelEditor/ChildFrame.cpp

@@ -245 +245 @@
                          Right().Position(1));
 
-    m_SkinsList=new SkinsPanelT(this, wxSize(230, 150));
+    m_SkinsList=new SkinsPanelT(this, wxSize(230, 150), SKIN);
     m_AUIManager.AddPane(m_SkinsList, wxAuiPaneInfo().
                          Name("SkinsList").Caption("Skins List").

cafu/trunk/CaWE/ModelEditor/ElementsList.cpp

@@ -395 +395 @@
     item0->Add( item7, 0, wxEXPAND | wxTOP | wxBOTTOM, 3 );
 
-    m_List=new ElementsListT(MainFrame, this, /*ID_LISTVIEW,*/ wxDefaultSize, Type);
+    m_List=new ElementsListT(MainFrame, this, /*ID_LISTVIEW,*/ wxDefaultSize, m_TYPE);
     item0->Add(m_List, 1, wxEXPAND, 0 );
 

cafu/trunk/CaWE/ModelEditor/SkinsList.cpp

@@ -46 +46 @@
 
 
-SkinsListT::SkinsListT(ChildFrameT* MainFrame, wxWindow* Parent, const wxSize& Size)
+SkinsListT::SkinsListT(ChildFrameT* MainFrame, wxWindow* Parent, const wxSize& Size, ModelElementTypeT Type)
     : wxListView(Parent, wxID_ANY, wxDefaultPosition, Size, wxLC_REPORT | wxLC_EDIT_LABELS),
+      m_TYPE(Type),
       m_ModelDoc(MainFrame->GetModelDoc()),
       m_MainFrame(MainFrame),
@@ -74 +75 @@
 {
     if (m_IsRecursiveSelfNotify) return;
-    if (Type!=SKIN) return;
+    if (Type!=m_TYPE) return;
 
     m_IsRecursiveSelfNotify=true;
@@ -96 +97 @@
 {
     if (m_IsRecursiveSelfNotify) return;
-    if (Type!=SKIN) return;
+    if (Type!=m_TYPE) return;
 
     InitListItems();
@@ -105 +106 @@
 {
     if (m_IsRecursiveSelfNotify) return;
-    if (Type!=SKIN) return;
+    if (Type!=m_TYPE) return;
 
     InitListItems();
@@ -131 +132 @@
 void SkinsListT::InitListItems()
 {
-    const ArrayT<unsigned int>& SkinSel=m_ModelDoc->GetSelection(SKIN);
+    const ArrayT<unsigned int>& Sel=m_ModelDoc->GetSelection(m_TYPE);
 
     Freeze();
     DeleteAllItems();
 
-    InsertItem(0, "default");
-    SetItem(0, 1, "-1");
-    if (SkinSel.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 (SkinSel.Find(ElemNr)!=-1) Select(ElemNr+1);
+    switch (m_TYPE)
+    {
+        case SKIN:
+            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;
     }
 
@@ -159 +166 @@
 void SkinsListT::OnFocus(wxFocusEvent& FE)
 {
-    m_MainFrame->SetLastUsedType(SKIN);
+    m_MainFrame->SetLastUsedType(m_TYPE);
     FE.Skip();
 }
@@ -192 +199 @@
         case ID_MENU_ADD_NEW:
         {
-            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));
+            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));
+            }
             break;
         }
@@ -252 +262 @@
             NewSel.PushBack(SelNr-1);
 
-    m_MainFrame->SubmitCommand(CommandSelectT::Set(m_ModelDoc, SKIN, NewSel));
+    m_MainFrame->SubmitCommand(CommandSelectT::Set(m_ModelDoc, m_TYPE, NewSel));
 
     m_IsRecursiveSelfNotify=false;
@@ -280 +290 @@
 
 
-SkinsPanelT::SkinsPanelT(ChildFrameT* MainFrame, const wxSize& Size)
+SkinsPanelT::SkinsPanelT(ChildFrameT* MainFrame, const wxSize& Size, ModelElementTypeT Type)
     : wxPanel(MainFrame, -1, wxDefaultPosition, Size),
+      m_TYPE(Type),
       m_ModelDoc(MainFrame->GetModelDoc()),
       m_MainFrame(MainFrame),
@@ -311 +322 @@
     item0->Add( item7, 0, wxEXPAND | wxTOP | wxBOTTOM, 3 );
 
-    m_List=new SkinsListT(MainFrame, this, /*ID_LISTVIEW,*/ wxDefaultSize);
+    m_List=new SkinsListT(MainFrame, this, /*ID_LISTVIEW,*/ wxDefaultSize, m_TYPE);
     item0->Add(m_List, 1, wxEXPAND, 0 );
 
@@ -325 +336 @@
         case ID_BUTTON_ADD:
         {
-            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));
+            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));
+            }
             break;
         }
@@ -337 +351 @@
         case ID_BUTTON_DELETE:
         {
-            CommandDeleteT* DelCmd=new CommandDeleteT(m_ModelDoc, SKIN, m_ModelDoc->GetSelection(SKIN));
+            CommandDeleteT* DelCmd=new CommandDeleteT(m_ModelDoc, m_TYPE, m_ModelDoc->GetSelection(m_TYPE));
             bool            Result=DelCmd->Do();
 
@@ -354 +368 @@
         case ID_BUTTON_ADD:
         {
-            UE.Enable(true);
+            UE.Enable(m_TYPE==SKIN || m_TYPE==GFIX);
             break;
         }

cafu/trunk/CaWE/ModelEditor/SkinsList.hpp

@@ -40 +40 @@
 
         /// The constructor.
-        SkinsListT(ChildFrameT* MainFrame, wxWindow* Parent, const wxSize& Size);
+        SkinsListT(ChildFrameT* MainFrame, wxWindow* Parent, const wxSize& Size, ModelElementTypeT Type);
 
         /// The destructor.
@@ -66 +66 @@
         DECLARE_EVENT_TABLE()
 
-        ModelDocumentT* m_ModelDoc;
-        ChildFrameT*    m_MainFrame;
-        bool            m_IsRecursiveSelfNotify;
+        const ModelElementTypeT m_TYPE;
+        ModelDocumentT*         m_ModelDoc;
+        ChildFrameT*            m_MainFrame;
+        bool                    m_IsRecursiveSelfNotify;
     };
 
@@ -76 +77 @@
         public:
 
-        SkinsPanelT(ChildFrameT* MainFrame, const wxSize& Size);
+        SkinsPanelT(ChildFrameT* MainFrame, const wxSize& Size, ModelElementTypeT Type);
 
 
@@ -94 +95 @@
         void OnButtonUpdate(wxUpdateUIEvent& UE);
 
-        ModelDocumentT* m_ModelDoc;
-        ChildFrameT*    m_MainFrame;
-        SkinsListT*     m_List;
+        const ModelElementTypeT m_TYPE;
+        ModelDocumentT*         m_ModelDoc;
+        ChildFrameT*            m_MainFrame;
+        SkinsListT*             m_List;
 
         DECLARE_EVENT_TABLE()