Changeset 442

Timestamp:

12/13/11 11:31:01 (5 months ago)

Author:

Carsten

Message:

CaWE: The horizontal and vertical subdivisions of Bezier Patches can now be set in the Properties dialog.

The same functionality used to be available in the "New Bezier Patch" tool options bar, where it however was ill-placed and has been removed.

Location:

cafu/trunk/CaWE

Files:

• DialogInsp-PrimitiveProps.cpp (modified) (16 diffs)
• DialogInsp-PrimitiveProps.hpp (modified) (2 diffs)
• ToolOptionsBars.cpp (modified) (3 diffs)
• ToolOptionsBars.hpp (modified) (1 diff)

cafu/trunk/CaWE/DialogInsp-PrimitiveProps.cpp

@@ -33 +33 @@
 #include "MapCommands/ChangePlantDescr.hpp"
 #include "MapCommands/ModifyModel.hpp"
+#include "MapCommands/SetBPSubdivs.hpp"
 
 #include "wx/notebook.h"
@@ -50 +51 @@
                       const wxString& label=wxPG_LABEL,
                       const wxString& value=wxEmptyString,
-                      MapDocumentT* MapDoc_=NULL,
-                      wxString Filter_="All files (*.*)|*.*",
-                      wxString SubDir_=wxEmptyString)
+                      MapDocumentT* MapDoc=NULL,
+                      wxString Filter="All files (*.*)|*.*",
+                      wxString SubDir=wxEmptyString)
         : wxLongStringProperty(name, label, value),
-          MapDoc(MapDoc_),
-          Filter(Filter_),
-          SubDir(SubDir_)
+          m_MapDoc(MapDoc),
+          m_Filter(Filter),
+          m_SubDir(SubDir)
     {
     }
@@ -63 +64 @@
     virtual bool OnButtonClick(wxPropertyGrid* propGrid, wxString& value)
     {
-        wxString InitialDir =MapDoc->GetGameConfig()->ModDir+SubDir;
-        wxString FileNameStr=wxFileSelector("Please select a file", InitialDir, "", "", Filter, wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+        wxString InitialDir =m_MapDoc->GetGameConfig()->ModDir+m_SubDir;
+        wxString FileNameStr=wxFileSelector("Please select a file", InitialDir, "", "", m_Filter, wxFD_OPEN | wxFD_FILE_MUST_EXIST);
 
         if (FileNameStr=="") return false;
 
         wxFileName FileName(FileNameStr);
-        FileName.MakeRelativeTo(MapDoc->GetGameConfig()->ModDir);
+        FileName.MakeRelativeTo(m_MapDoc->GetGameConfig()->ModDir);
         value=FileName.GetFullPath(wxPATH_UNIX);
         return true;
@@ -77 +78 @@
     private:
 
-    MapDocumentT* MapDoc;
-    wxString      Filter;
-    wxString      SubDir;
+    MapDocumentT* m_MapDoc;
+    wxString      m_Filter;
+    wxString      m_SubDir;
 };
 
 
-BEGIN_EVENT_TABLE(InspDlgPrimitivePropsT, wxPanel)
-    EVT_PG_CHANGED(ID_PROPERTY_GRID_MAN, InspDlgPrimitivePropsT::OnPropertyGridChanged)
-END_EVENT_TABLE()
-
-
 wxSizer* InspDlgPrimitivePropsT::InspectorPrimitivePropsInit(wxWindow* parent, bool call_fit, bool set_sizer)
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    SelectionText=new wxStaticText(parent, -1, wxT("No map primitve is selected."), wxDefaultPosition, wxDefaultSize, 0);
-    item0->Add(SelectionText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2);
+    m_SelectionText=new wxStaticText(parent, -1, wxT("No map primitve is selected."), wxDefaultPosition, wxDefaultSize, 0);
+    item0->Add(m_SelectionText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2);
 
     // BEGIN CUSTOM code, not generated by wxDesigner.
 
-    PropMan=new wxPropertyGridManager(this, ID_PROPERTY_GRID_MAN, wxDefaultPosition, wxDefaultSize, wxPG_BOLD_MODIFIED | wxPG_SPLITTER_AUTO_CENTER | wxPG_TOOLBAR | wxPG_DESCRIPTION);
-    PropMan->SetExtraStyle(wxPG_EX_HELP_AS_TOOLTIPS | wxPG_EX_MODE_BUTTONS);
-
-    PropMan->AddPage("Properties");
+    m_PropMan=new wxPropertyGridManager(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxPG_BOLD_MODIFIED | wxPG_SPLITTER_AUTO_CENTER | wxPG_TOOLBAR | wxPG_DESCRIPTION);
+    m_PropMan->SetExtraStyle(wxPG_EX_HELP_AS_TOOLTIPS | wxPG_EX_MODE_BUTTONS);
+
+    m_PropMan->AddPage("Properties");
 
     // END CUSTOM code, not generated by wxDesigner.
 
-    item0->Add( PropMan, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 2 );
+    item0->Add( m_PropMan, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 2 );
 
     if (set_sizer)
@@ -117 +113 @@
 
 
-InspDlgPrimitivePropsT::InspDlgPrimitivePropsT(wxWindow* Parent_, MapDocumentT* MapDoc_)
-    : wxPanel(Parent_),
-      MapDoc(MapDoc_),
-      SelectionText(NULL),
-      IsRecursiveSelfNotify(false)
-{
+InspDlgPrimitivePropsT::InspDlgPrimitivePropsT(wxWindow* Parent, MapDocumentT* MapDoc)
+    : wxPanel(Parent),
+      m_MapDoc(MapDoc),
+      m_PropMan(NULL),
+      m_SelectionText(NULL),
+      m_IsRecursiveSelfNotify(false)
+{
+    wxPropertyGridInterface::RegisterAdditionalEditors();
+
     InspectorPrimitivePropsInit(this);
-    MapDoc->RegisterObserver(this);
+    Bind(wxEVT_PG_CHANGED, &InspDlgPrimitivePropsT::OnPropertyGridChanged, this);
+    m_MapDoc->RegisterObserver(this);
 }
 
@@ -130 +130 @@
 InspDlgPrimitivePropsT::~InspDlgPrimitivePropsT()
 {
-    PropMan->Clear();
-    if (MapDoc) MapDoc->UnregisterObserver(this);
+    m_PropMan->Clear();
+    if (m_MapDoc) m_MapDoc->UnregisterObserver(this);
 }
 
@@ -137 +137 @@
 void InspDlgPrimitivePropsT::NotifySubjectChanged_Selection(SubjectT* Subject, const ArrayT<MapElementT*>& OldSelection, const ArrayT<MapElementT*>& NewSelection)
 {
-    if (IsRecursiveSelfNotify) return;
+    if (m_IsRecursiveSelfNotify) return;
 
     UpdateGrid();
@@ -145 +145 @@
 void InspDlgPrimitivePropsT::NotifySubjectChanged_Deleted(SubjectT* Subject, const ArrayT<MapElementT*>& MapElements)
 {
-    // No need to react on deleted objects.
+    // No need to act on deleted objects.
     // If the deletion of an object changes the current selection the inspector is notified in the NotifySubjectChanged_Selection method.
 }
@@ -152 +152 @@
 void InspDlgPrimitivePropsT::NotifySubjectChanged_Modified(SubjectT* Subject, const ArrayT<MapElementT*>& MapElements, MapElemModDetailE Detail)
 {
-    if (IsRecursiveSelfNotify) return;
+    if (m_IsRecursiveSelfNotify) return;
 
     if (Detail!=MEMD_PRIMITIVE_PROPS_CHANGED && Detail!=MEMD_GENERIC) return;
@@ -169 +169 @@
 void InspDlgPrimitivePropsT::NotifySubjectChanged_Modified(SubjectT* Subject, const ArrayT<MapElementT*>& MapElements, MapElemModDetailE Detail, const ArrayT<BoundingBox3fT>& OldBounds)
 {
-    if (IsRecursiveSelfNotify) return;
+    if (m_IsRecursiveSelfNotify) return;
 
     if (Detail!=MEMD_PRIMITIVE_PROPS_CHANGED) return;
@@ -186 +186 @@
 void InspDlgPrimitivePropsT::NotifySubjectDies(SubjectT* dyingSubject)
 {
-    wxASSERT(dyingSubject==MapDoc);
-    MapDoc=NULL;
+    wxASSERT(dyingSubject==m_MapDoc);
+    m_MapDoc=NULL;
 }
 
@@ -195 +195 @@
     ArrayT<MapPrimitiveT*> SelectedPrimitives;
 
-    // Loop over the map selection in order to determine the list of selected map primitves.
-    for (unsigned long i=0; i<MapDoc->GetSelection().Size(); i++)
-    {
-        MapPrimitiveT* Prim=dynamic_cast<MapPrimitiveT*>(MapDoc->GetSelection()[i]);
+    // Find the map primitives in the selection (ignore all entities).
+    // There is no need to bother with the entities, as it's up to the selection tool
+    // to explicitly add their items/children to the selection - or not.
+    for (unsigned long i=0; i<m_MapDoc->GetSelection().Size(); i++)
+    {
+        MapPrimitiveT* Prim=dynamic_cast<MapPrimitiveT*>(m_MapDoc->GetSelection()[i]);
 
         if (Prim)
-        {
             SelectedPrimitives.PushBack(Prim);
-            continue;
-        }
-
-        MapEntityBaseT* Ent=dynamic_cast<MapEntityBaseT*>(MapDoc->GetSelection()[i]);
-
-        if (Ent)
-        {
-            SelectedPrimitives.PushBack(Ent->GetPrimitives());
-            continue;
-        }
     }
 
     // Update the selection description text.
     if (SelectedPrimitives.Size()==0)
-        SelectionText->SetLabel("No map primitive selected.");
+        m_SelectionText->SetLabel("No map primitive selected.");
     else if (SelectedPrimitives.Size()==1)
-        SelectionText->SetLabel("1 map primitive selected.");
+        m_SelectionText->SetLabel("1 map primitive selected.");
     else
-        SelectionText->SetLabel(wxString::Format("%lu map primitives selected.", SelectedPrimitives.Size()));
-
-    PropMan->ClearSelection();              // Clear the property grid.
-    PropMan->ClearPage(0);                  // At the moment we only got one page, so we only need to delete this page.
-
-    unsigned int BrushCount  =0;
-    unsigned int BPCount     =0;
-    unsigned int TerrainCount=0;
-    unsigned int PlantCount  =0;
-    unsigned int ModelCount  =0;
+        m_SelectionText->SetLabel(wxString::Format("%lu map primitives selected.", SelectedPrimitives.Size()));
+
+    m_PropMan->ClearSelection();    // Clear the property grid.
+    m_PropMan->ClearPage(0);        // At the moment we only got one page, so we only need to delete this page.
+
+    static const wxColour HEADING_COLOR("#CCCCCC");
 
     // Create a category for every selected map primitve and fill it with the primitves properties.
     for (unsigned long i=0; i<SelectedPrimitives.Size(); i++)
     {
+        const int      EntityNr=m_MapDoc->GetEntities().Find(SelectedPrimitives[i]->GetParent());
+        const int      ItemNr  =EntityNr>=0 ? m_MapDoc->GetEntities()[EntityNr]->GetPrimitives().Find(SelectedPrimitives[i]) : -1;
+        const wxString ItemStr =wxString::Format(" (item %i in entity %i)", ItemNr, EntityNr);
+
         if (dynamic_cast<MapBrushT*>(SelectedPrimitives[i])!=NULL)
         {
-            wxPGProperty* Cat=PropMan->Append(new wxStringProperty(SelectedPrimitives[i]->GetType()->ClassName+wxString::Format("%i", ++BrushCount), wxPG_LABEL, "<composed>"));
-            PropMan->DisableProperty(Cat);
+            wxPGProperty* Cat=m_PropMan->Append(new wxStringProperty("Brush" + ItemStr, wxPG_LABEL, "<composed>"));
+
+            // Must do this last, as new children pick up the color of their parent.
+            m_PropMan->SetPropertyBackgroundColour(Cat, HEADING_COLOR, 0 /*don't recurse*/);
         }
 
         if (dynamic_cast<MapBezierPatchT*>(SelectedPrimitives[i])!=NULL)
         {
-            wxPGProperty* Cat=PropMan->Append(new wxStringProperty(SelectedPrimitives[i]->GetType()->ClassName+wxString::Format("%i", ++BPCount), wxPG_LABEL, "<composed>"));
-            PropMan->DisableProperty(Cat);
+            wxPGProperty* Cat=m_PropMan->Append(new wxStringProperty("Bezier Patch" + ItemStr, wxPG_LABEL, "<composed>"));
+            MapBezierPatchT* BP=(MapBezierPatchT*)SelectedPrimitives[i];
+
+            wxPGProperty* SdHorzIntProp=new wxIntProperty("Subdivs horz", wxPG_LABEL, BP->GetSubdivsHorz());
+            m_PropMan->AppendIn(Cat, SdHorzIntProp)->SetClientData(BP);
+            m_PropMan->SetPropertyEditor(SdHorzIntProp, wxPGEditor_SpinCtrl);
+
+            wxPGProperty* SdVertIntProp=new wxIntProperty("Subdivs vert", wxPG_LABEL, BP->GetSubdivsVert());
+            m_PropMan->AppendIn(Cat, SdVertIntProp)->SetClientData(BP);
+            m_PropMan->SetPropertyEditor(SdVertIntProp, wxPGEditor_SpinCtrl);
+
+            // Must do this last, as new children pick up the color of their parent.
+            m_PropMan->SetPropertyBackgroundColour(Cat, HEADING_COLOR, 0 /*don't recurse*/);
         }
 
         if (dynamic_cast<MapTerrainT*>(SelectedPrimitives[i])!=NULL)
         {
-            wxPGProperty* Cat=PropMan->Append(new wxStringProperty(SelectedPrimitives[i]->GetType()->ClassName+wxString::Format("%i", ++TerrainCount), wxPG_LABEL, "<composed>"));
-            PropMan->DisableProperty(Cat);
+            wxPGProperty* Cat=m_PropMan->Append(new wxStringProperty("Terrain" + ItemStr, wxPG_LABEL, "<composed>"));
+
+            // Must do this last, as new children pick up the color of their parent.
+            m_PropMan->SetPropertyBackgroundColour(Cat, HEADING_COLOR, 0 /*don't recurse*/);
         }
 
         if (dynamic_cast<MapPlantT*>(SelectedPrimitives[i])!=NULL)
         {
-            wxPGProperty* Cat=PropMan->Append(new wxStringProperty(SelectedPrimitives[i]->GetType()->ClassName+wxString::Format("%i", ++PlantCount), wxPG_LABEL, "<composed>"));
-            PropMan->DisableProperty(Cat);
-
+            wxPGProperty* Cat=m_PropMan->Append(new wxStringProperty("Plant" + ItemStr, wxPG_LABEL, "<composed>"));
             MapPlantT* Plant=(MapPlantT*)SelectedPrimitives[i];
 
-            PropMan->AppendIn(Cat, new GameFilePropertyT("Plant Description", wxPG_LABEL, Plant->m_DescrFileName, MapDoc, "Plant Description Files (*.cpd)|*.cpd|All Files (*.*)|*.*", "/Plants/"))->SetClientData(Plant);
-            PropMan->AppendIn(Cat, new wxIntProperty("Random Seed", wxPG_LABEL, Plant->m_RandomSeed))->SetClientData(Plant);
+            m_PropMan->AppendIn(Cat, new GameFilePropertyT("Plant Description", wxPG_LABEL, Plant->m_DescrFileName, m_MapDoc, "Plant Description Files (*.cpd)|*.cpd|All Files (*.*)|*.*", "/Plants/"))->SetClientData(Plant);
+            m_PropMan->AppendIn(Cat, new wxIntProperty("Random Seed", wxPG_LABEL, Plant->m_RandomSeed))->SetClientData(Plant);
+
+            // Must do this last, as new children pick up the color of their parent.
+            m_PropMan->SetPropertyBackgroundColour(Cat, HEADING_COLOR, 0 /*don't recurse*/);
         }
 
         if (dynamic_cast<MapModelT*>(SelectedPrimitives[i])!=NULL)
         {
-            wxPGProperty* Cat=PropMan->Append(new wxStringProperty(SelectedPrimitives[i]->GetType()->ClassName+wxString::Format("%i", ++ModelCount), wxPG_LABEL, "<composed>"));
-            PropMan->DisableProperty(Cat);
-
+            wxPGProperty* Cat=m_PropMan->Append(new wxStringProperty("Model" + ItemStr, wxPG_LABEL, "<composed>"));
             MapModelT* Model=(MapModelT*)SelectedPrimitives[i];
 
-            PropMan->AppendIn(Cat, new GameFilePropertyT("Model",           wxPG_LABEL, Model->m_Model->GetFileName(), MapDoc, "All Files (*.*)|*.*|Model files (*.mdl)|*.mdl|Model Files (*.ase)|*.ase|Model Files (*.dlod)|*.dlod", "/Models/"))->SetClientData(Model);
-            PropMan->AppendIn(Cat, new GameFilePropertyT("Collision Model", wxPG_LABEL, Model->m_CollModelFileName, MapDoc, "Collision Model (*.cmap)|*.cmap|All Files (*.*)|*.*", "/Models/"))->SetClientData(Model);
-            PropMan->AppendIn(Cat, new wxStringProperty ("Label",           wxPG_LABEL, Model->m_Label))->SetClientData(Model);
-            PropMan->AppendIn(Cat, new wxFloatProperty  ("Scale",           wxPG_LABEL, Model->m_Scale))->SetClientData(Model);
-            PropMan->AppendIn(Cat, new wxIntProperty    ("Sequence Number", wxPG_LABEL, Model->m_SeqNumber))->SetClientData(Model);
-            PropMan->AppendIn(Cat, new wxFloatProperty  ("Frame Offset",    wxPG_LABEL, Model->m_FrameOffset))->SetClientData(Model);
-            PropMan->AppendIn(Cat, new wxFloatProperty  ("Frame Scale",     wxPG_LABEL, Model->m_FrameTimeScale))->SetClientData(Model);
-
-            wxPGProperty* AnimateProp=PropMan->AppendIn(Cat, new wxBoolProperty("Animated", wxPG_LABEL, Model->m_Animated));
+            m_PropMan->AppendIn(Cat, new GameFilePropertyT("Model",           wxPG_LABEL, Model->m_Model->GetFileName(), m_MapDoc, "All Files (*.*)|*.*|Model files (*.mdl)|*.mdl|Model Files (*.ase)|*.ase|Model Files (*.dlod)|*.dlod", "/Models/"))->SetClientData(Model);
+            m_PropMan->AppendIn(Cat, new GameFilePropertyT("Collision Model", wxPG_LABEL, Model->m_CollModelFileName, m_MapDoc, "Collision Model (*.cmap)|*.cmap|All Files (*.*)|*.*", "/Models/"))->SetClientData(Model);
+            m_PropMan->AppendIn(Cat, new wxStringProperty ("Label",           wxPG_LABEL, Model->m_Label))->SetClientData(Model);
+            m_PropMan->AppendIn(Cat, new wxFloatProperty  ("Scale",           wxPG_LABEL, Model->m_Scale))->SetClientData(Model);
+            m_PropMan->AppendIn(Cat, new wxIntProperty    ("Sequence Number", wxPG_LABEL, Model->m_SeqNumber))->SetClientData(Model);
+            m_PropMan->AppendIn(Cat, new wxFloatProperty  ("Frame Offset",    wxPG_LABEL, Model->m_FrameOffset))->SetClientData(Model);
+            m_PropMan->AppendIn(Cat, new wxFloatProperty  ("Frame Scale",     wxPG_LABEL, Model->m_FrameTimeScale))->SetClientData(Model);
+
+            wxPGProperty* AnimateProp=m_PropMan->AppendIn(Cat, new wxBoolProperty("Animated", wxPG_LABEL, Model->m_Animated));
             AnimateProp->SetClientData(Model);
-            PropMan->SetPropertyAttributeAll(wxPG_BOOL_USE_CHECKBOX, true); // Use checkbox instead of choice.
-        }
-    }
-
-    PropMan->RefreshGrid();
+            m_PropMan->SetPropertyAttributeAll(wxPG_BOOL_USE_CHECKBOX, true); // Use checkbox instead of choice.
+
+            // Must do this last, as new children pick up the color of their parent.
+            m_PropMan->SetPropertyBackgroundColour(Cat, HEADING_COLOR, 0 /*don't recurse*/);
+        }
+    }
+
+    m_PropMan->RefreshGrid();
 }
 
@@ -297 +305 @@
     if (Object->GetType()==&MapBrushT::TypeInfo)
     {
-        // Nothing yet.
+        // TODO.
     }
     else if (Object->GetType()==&MapBezierPatchT::TypeInfo)
     {
-        // Nothing yet.
+        MapBezierPatchT*    BP      =(MapBezierPatchT*)Object;
+        const wxPGProperty* Prop    =Event.GetProperty();
+        const wxString      PropName=Prop->GetName().AfterLast('.');
+        CommandT*           Command =NULL;
+
+        if (PropName=="Subdivs horz")
+            Command=new CommandSetBPSubdivsT(m_MapDoc, BP, Prop->GetValue().GetLong(), HORIZONTAL);
+        else if (PropName=="Subdivs vert")
+            Command=new CommandSetBPSubdivsT(m_MapDoc, BP, Prop->GetValue().GetLong(), VERTICAL);
+
+        if (Command)
+        {
+            m_IsRecursiveSelfNotify=true;
+            m_MapDoc->GetHistory().SubmitCommand(Command);
+            m_IsRecursiveSelfNotify=false;
+        }
     }
     else if (Object->GetType()==&MapTerrainT::TypeInfo)
     {
-        // Nothing yet.
+        // TODO.
     }
     else if (Object->GetType()==&MapPlantT::TypeInfo)
@@ -317 +340 @@
         {
             // Command to change the random seed.
-            CommandT* Command=new CommandChangePlantSeedT(*MapDoc, Plant, Event.GetProperty()->GetValue().GetLong());
-
-            IsRecursiveSelfNotify=true;
-            MapDoc->GetHistory().SubmitCommand(Command);
-            IsRecursiveSelfNotify=false;
+            CommandT* Command=new CommandChangePlantSeedT(*m_MapDoc, Plant, Event.GetProperty()->GetValue().GetLong());
+
+            m_IsRecursiveSelfNotify=true;
+            m_MapDoc->GetHistory().SubmitCommand(Command);
+            m_IsRecursiveSelfNotify=false;
         }
 
@@ -327 +350 @@
         {
             // Command to change the plant description.
-            CommandT* Command=new CommandChangePlantDescrT(*MapDoc, Plant, Event.GetProperty()->GetValueAsString());
-
-            IsRecursiveSelfNotify=true;
-            MapDoc->GetHistory().SubmitCommand(Command);
-            IsRecursiveSelfNotify=false;
+            CommandT* Command=new CommandChangePlantDescrT(*m_MapDoc, Plant, Event.GetProperty()->GetValueAsString());
+
+            m_IsRecursiveSelfNotify=true;
+            m_MapDoc->GetHistory().SubmitCommand(Command);
+            m_IsRecursiveSelfNotify=false;
         }
     }
@@ -345 +368 @@
 
         if (PropName=="Model")
-            Command=new CommandModifyModelT(*MapDoc, Model, Prop->GetValueAsString(), Model->m_CollModelFileName, Model->m_Label, Model->m_Scale, Model->m_SeqNumber, Model->m_FrameOffset, Model->m_FrameTimeScale, Model->m_Animated);
+            Command=new CommandModifyModelT(*m_MapDoc, Model, Prop->GetValueAsString(), Model->m_CollModelFileName, Model->m_Label, Model->m_Scale, Model->m_SeqNumber, Model->m_FrameOffset, Model->m_FrameTimeScale, Model->m_Animated);
         else if (PropName=="Collision Model")
-            Command=new CommandModifyModelT(*MapDoc, Model, Model->m_ModelFileName, Prop->GetValueAsString(), Model->m_Label, Model->m_Scale, Model->m_SeqNumber, Model->m_FrameOffset, Model->m_FrameTimeScale, Model->m_Animated);
+            Command=new CommandModifyModelT(*m_MapDoc, Model, Model->m_ModelFileName, Prop->GetValueAsString(), Model->m_Label, Model->m_Scale, Model->m_SeqNumber, Model->m_FrameOffset, Model->m_FrameTimeScale, Model->m_Animated);
         else if (PropName=="Label")
-            Command=new CommandModifyModelT(*MapDoc, Model, Model->m_ModelFileName, Model->m_CollModelFileName, Prop->GetValueAsString(), Model->m_Scale, Model->m_SeqNumber, Model->m_FrameOffset, Model->m_FrameTimeScale, Model->m_Animated);
+            Command=new CommandModifyModelT(*m_MapDoc, Model, Model->m_ModelFileName, Model->m_CollModelFileName, Prop->GetValueAsString(), Model->m_Scale, Model->m_SeqNumber, Model->m_FrameOffset, Model->m_FrameTimeScale, Model->m_Animated);
         else if (PropName=="Scale")
-            Command=new CommandModifyModelT(*MapDoc, Model, Model->m_ModelFileName, Model->m_CollModelFileName, Model->m_Label, PropValueF, Model->m_SeqNumber, Model->m_FrameOffset, Model->m_FrameTimeScale, Model->m_Animated);
+            Command=new CommandModifyModelT(*m_MapDoc, Model, Model->m_ModelFileName, Model->m_CollModelFileName, Model->m_Label, PropValueF, Model->m_SeqNumber, Model->m_FrameOffset, Model->m_FrameTimeScale, Model->m_Animated);
         else if (PropName=="Sequence Number")
-            Command=new CommandModifyModelT(*MapDoc, Model, Model->m_ModelFileName, Model->m_CollModelFileName, Model->m_Label, Model->m_Scale, Prop->GetValue().GetLong(), Model->m_FrameOffset, Model->m_FrameTimeScale, Model->m_Animated);
+            Command=new CommandModifyModelT(*m_MapDoc, Model, Model->m_ModelFileName, Model->m_CollModelFileName, Model->m_Label, Model->m_Scale, Prop->GetValue().GetLong(), Model->m_FrameOffset, Model->m_FrameTimeScale, Model->m_Animated);
         else if (PropName=="Frame Offset")
-            Command=new CommandModifyModelT(*MapDoc, Model, Model->m_ModelFileName, Model->m_CollModelFileName, Model->m_Label, Model->m_Scale, Model->m_SeqNumber, PropValueF, Model->m_FrameTimeScale, Model->m_Animated);
+            Command=new CommandModifyModelT(*m_MapDoc, Model, Model->m_ModelFileName, Model->m_CollModelFileName, Model->m_Label, Model->m_Scale, Model->m_SeqNumber, PropValueF, Model->m_FrameTimeScale, Model->m_Animated);
         else if (PropName=="Frame Scale")
-            Command=new CommandModifyModelT(*MapDoc, Model, Model->m_ModelFileName, Model->m_CollModelFileName, Model->m_Label, Model->m_Scale, Model->m_SeqNumber, Model->m_FrameOffset, PropValueF, Model->m_Animated);
+            Command=new CommandModifyModelT(*m_MapDoc, Model, Model->m_ModelFileName, Model->m_CollModelFileName, Model->m_Label, Model->m_Scale, Model->m_SeqNumber, Model->m_FrameOffset, PropValueF, Model->m_Animated);
         else if (PropName=="Animated")
-            Command=new CommandModifyModelT(*MapDoc, Model, Model->m_ModelFileName, Model->m_CollModelFileName, Model->m_Label, Model->m_Scale, Model->m_SeqNumber, Model->m_FrameOffset, Model->m_FrameTimeScale, Prop->GetValue().GetBool());
+            Command=new CommandModifyModelT(*m_MapDoc, Model, Model->m_ModelFileName, Model->m_CollModelFileName, Model->m_Label, Model->m_Scale, Model->m_SeqNumber, Model->m_FrameOffset, Model->m_FrameTimeScale, Prop->GetValue().GetBool());
 
         if (Command)
         {
-            IsRecursiveSelfNotify=true;
-            MapDoc->GetHistory().SubmitCommand(Command);
-            IsRecursiveSelfNotify=false;
+            m_IsRecursiveSelfNotify=true;
+            m_MapDoc->GetHistory().SubmitCommand(Command);
+            m_IsRecursiveSelfNotify=false;
         }
     }

cafu/trunk/CaWE/DialogInsp-PrimitiveProps.hpp

@@ -38 +38 @@
     public:
 
-    InspDlgPrimitivePropsT(wxWindow* Parent_, MapDocumentT* MapDoc_);
+    InspDlgPrimitivePropsT(wxWindow* Parent, MapDocumentT* MapDoc);
     ~InspDlgPrimitivePropsT();
 
@@ -52 +52 @@
 
     wxSizer* InspectorPrimitivePropsInit(wxWindow* parent, bool call_fit=true, bool set_sizer=true);
-
-    void UpdateGrid();
+    void     UpdateGrid();
 
     // Event handler methods.
     void OnPropertyGridChanged(wxPropertyGridEvent& Event);
 
-    MapDocumentT*          MapDoc;
-    wxPropertyGridManager* PropMan;
-    wxStaticText*          SelectionText;  ///< Text that is displayed above the property grid. It shows the number of selected primitives.
-
-    bool IsRecursiveSelfNotify;
-
-
-    // IDs for the controls whose events we are interested in.
-    enum
-    {
-        ID_PROPERTY_GRID_MAN=wxID_HIGHEST+1
-    };
-
-    DECLARE_EVENT_TABLE()
+    MapDocumentT*          m_MapDoc;
+    wxPropertyGridManager* m_PropMan;
+    wxStaticText*          m_SelectionText;   ///< Text that is displayed above the property grid. It shows the number of selected primitives.
+    bool                   m_IsRecursiveSelfNotify;
 };
 

cafu/trunk/CaWE/ToolOptionsBars.cpp

@@ -27 +27 @@
 #include "ToolClip.hpp"
 #include "ToolMorph.hpp"
-#include "MapCommands/SetBPSubdivs.hpp"
 
 #include "wx/statline.h"
@@ -234 +233 @@
 
 BEGIN_EVENT_TABLE(OptionsBar_NewBezierPatchToolT, wxPanel)
-    EVT_CHOICE  (OptionsBar_NewBezierPatchToolT::ID_PATCHTYPE,   OptionsBar_NewBezierPatchToolT::OnPatchTypeChoice)
-    EVT_SPINCTRL(OptionsBar_NewBezierPatchToolT::ID_SUBDIVSHORZ, OptionsBar_NewBezierPatchToolT::OnSubdivsSpinChangeHorz)
-    EVT_SPINCTRL(OptionsBar_NewBezierPatchToolT::ID_SUBDIVSVERT, OptionsBar_NewBezierPatchToolT::OnSubdivsSpinChangeVert)
-    EVT_TEXT    (OptionsBar_NewBezierPatchToolT::ID_SUBDIVSHORZ, OptionsBar_NewBezierPatchToolT::OnSubdivsManualChangeHorz)
-    EVT_TEXT    (OptionsBar_NewBezierPatchToolT::ID_SUBDIVSVERT, OptionsBar_NewBezierPatchToolT::OnSubdivsManualChangeVert)
+    EVT_CHOICE(OptionsBar_NewBezierPatchToolT::ID_PATCHTYPE, OptionsBar_NewBezierPatchToolT::OnPatchTypeChoice)
 END_EVENT_TABLE()
 
@@ -399 +394 @@
 
 
-void OptionsBar_NewBezierPatchToolT::OnSubdivsSpinChangeHorz(wxSpinEvent& Event)
-{
-    // If more objects or no BP is selected, do nothing.
-    if (m_MapDoc.GetSelection().Size()!=1) return;
-
-    // If one object is selected and this object is a bezier patch, update the BP.
-    MapBezierPatchT* selectedBP=dynamic_cast<MapBezierPatchT*>(m_MapDoc.GetSelection()[0]);
-
-    if (selectedBP!=NULL)
-        m_MapDoc.GetHistory().SubmitCommand(new CommandSetBPSubdivsT(&m_MapDoc, selectedBP, m_SpinCtrlSubdivsHorz->GetValue(), HORIZONTAL));
-}
-
-
-void OptionsBar_NewBezierPatchToolT::OnSubdivsSpinChangeVert(wxSpinEvent& Event)
-{
-    // If more objects or no BP is selected, do nothing.
-    if (m_MapDoc.GetSelection().Size()!=1) return;
-
-    // If one object is selected and this object is a bezier patch, update the BP.
-    MapBezierPatchT* selectedBP=dynamic_cast<MapBezierPatchT*>(m_MapDoc.GetSelection()[0]);
-
-    if (selectedBP!=NULL)
-        m_MapDoc.GetHistory().SubmitCommand(new CommandSetBPSubdivsT(&m_MapDoc, selectedBP, m_SpinCtrlSubdivsVert->GetValue(), VERTICAL));
-}
-
-
-void OptionsBar_NewBezierPatchToolT::OnSubdivsManualChangeHorz(wxCommandEvent& Event)
-{
-    // SpinCtrl handles manual inputs aumatically and maps them to it's own value range, so nothing to do here except
-    // call the spinchange method to update the selected BP.
-    wxSpinEvent tmpEvent;
-    OnSubdivsSpinChangeHorz(tmpEvent);
-}
-
-
-void OptionsBar_NewBezierPatchToolT::OnSubdivsManualChangeVert(wxCommandEvent& Event)
-{
-    // SpinCtrl handles manual inputs aumatically and maps them to it's own value range, so nothing to do here except
-    // call the spinchange method to update the selected BP.
-    wxSpinEvent tmpEvent;
-    OnSubdivsSpinChangeVert(tmpEvent);
-}
-
-
 BEGIN_EVENT_TABLE(OptionsBar_NewTerrainToolT, wxPanel)
     EVT_BUTTON(OptionsBar_NewTerrainToolT::ID_BUTTON_BROWSE, OptionsBar_NewTerrainToolT::OnButtonBrowse)

cafu/trunk/CaWE/ToolOptionsBars.hpp

@@ -150 +150 @@
     wxCheckBox*   m_CheckConcave;
 
-    void OnPatchTypeChoice(wxCommandEvent& Event);         ///< Handles events that occur, when a patch type is choosen from the patch type choice box.
-    void OnSubdivsSpinChangeHorz(wxSpinEvent& Event);      ///< Handles events that occur, when the content of the horizontal Subdivs SpinCtrl is changed using the +/- buttons.
-    void OnSubdivsSpinChangeVert(wxSpinEvent& Event);      ///< Handles events that occur, when the content of the vertical Subdivs SpinCtrl is changed using the +/- buttons.
-    void OnSubdivsManualChangeHorz(wxCommandEvent& Event); ///< Handles events that occur, when the content of the horizontal Subdivs SpinCtrl is changed entering values manually.
-    void OnSubdivsManualChangeVert(wxCommandEvent& Event); ///< Handles events that occur, when the content of the vertical Subdivs SpinCtrl is changed entering values manually.
+    void OnPatchTypeChoice(wxCommandEvent& Event);      ///< Handles events that occur when a patch type is choosen from the patch type choice box.
 
     /// IDs for the controls whose events we are interested in.