Add a new insertion mode (can now insert tiles in a rectangle)

This commit is contained in:
victorlevasseur
2014-09-04 18:54:40 +02:00
parent b0e02ca6a6
commit b09bfe9816
13 changed files with 1234 additions and 439 deletions
@@ -62,7 +62,7 @@
<objectsGroups />
<variables />
<layouts>
<layout b="209" disableInputWhenNotFocused="true" mangledName="Nouvelle_32sc__4524ne" name="Nouvelle scène" oglFOV="90.000000" oglZFar="500.000000" oglZNear="1.000000" r="209" standardSortMethod="true" stopSoundsOnStartup="true" title="" v="209">
<layout b="255" disableInputWhenNotFocused="true" mangledName="Nouvelle_32sc__4524ne" name="Nouvelle scène" oglFOV="90.000000" oglZFar="500.000000" oglZNear="1.000000" r="106" standardSortMethod="false" stopSoundsOnStartup="true" title="" v="181">
<uiSettings associatedLayout="" grid="false" gridB="255" gridG="180" gridHeight="32" gridR="158" gridWidth="32" snap="true" windowMask="false" zoomFactor="1.000000" />
<objectsGroups />
<variables />
@@ -251,7 +251,7 @@
</tileSet>
<tileMap columns="65" rows="13">
<tiles>
<layer0>-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152,152|-1,-1,-1,-1,-1,-1,-1,40,103,152,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,104,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,24,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,72,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,96,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,40,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,132,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,132,132,103,152,152,152|-1,-1,-1,-1,-1,-1,132,132,132,103,152,152,152|-1,-1,-1,-1,-1,132,132,132,132,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,132,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,132,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,132,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,132,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,132,132,103,152,152,152|-1,-1,-1,-1,-1,-1,132,132,132,103,152,152,152|-1,-1,-1,-1,-1,132,132,132,132,103,152,152,152|-1,-1,-1,-1,-1,-1,132,132,132,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,132,132,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,132,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,33,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,33,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,21,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1</layer0>
<layer0>-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152,152|-1,-1,-1,-1,-1,-1,-1,40,103,152,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,104,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,24,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,72,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,96,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,40,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,132,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,132,132,103,152,152,152|-1,-1,-1,-1,-1,-1,132,132,132,103,152,152,152|-1,-1,-1,-1,-1,132,132,132,132,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,132,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,132,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,132,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,132,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,132,132,103,152,152,152|-1,-1,-1,-1,-1,-1,132,132,132,103,152,152,152|-1,-1,-1,-1,-1,132,132,132,132,103,152,152,152|-1,-1,-1,-1,-1,-1,132,132,132,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,132,132,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,132,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,33,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,33,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,21,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152|-1,-1,-1,-1,-1,-1,-1,-1,-1,103,152,152,152</layer0>
<layer1>-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1</layer1>
<layer2>-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1|-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1</layer2>
</tiles>
Binary file not shown.

After

Width:  |  Height:  |  Size: 559 B

+31 -1
View File
@@ -67,10 +67,36 @@ TileMapObjectEditorBase::TileMapObjectEditorBase(wxWindow* parent, wxWindowID id
flexGridSizer200->AddGrowableRow(1);
m_mainPanel->SetSizer(flexGridSizer200);
wxFlexGridSizer* flexGridSizer490 = new wxFlexGridSizer(0, 2, 0, 0);
flexGridSizer490->SetFlexibleDirection( wxBOTH );
flexGridSizer490->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer490->AddGrowableCol(1);
flexGridSizer490->AddGrowableRow(0);
flexGridSizer200->Add(flexGridSizer490, 1, wxALL|wxEXPAND, 0);
m_toolbar492 = new wxToolBar(m_mainPanel, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTB_NODIVIDER|wxTB_FLAT);
m_toolbar492->SetToolBitmapSize(wxSize(16,16));
flexGridSizer490->Add(m_toolbar492, 0, wxALL|wxEXPAND|wxALIGN_TOP, 0);
m_toolbar492->AddTool(MODE_SINGLE_TILE_TOOL_ID, _("Pencil mode"), wxXmlResource::Get()->LoadBitmap(wxT("edit16")), wxNullBitmap, wxITEM_RADIO, _("Pencil mode\nAdd tiles only where the mouse goes."), wxT(""), NULL);
m_toolbar492->AddTool(MODE_RECTANGLE_TILE_TOOL_ID, _("Rectangle mode"), wxXmlResource::Get()->LoadBitmap(wxT("rectangle")), wxNullBitmap, wxITEM_RADIO, _("Rectangle mode\nAdd tile in a rectangle from the position where the mouse was pressed to the position the mouse was released."), wxT(""), NULL);
m_toolbar492->AddSeparator();
m_toolbar492->AddTool(FILL_WITH_TILE_TOOL_ID, _("Fill layer"), wxXmlResource::Get()->LoadBitmap(wxT("fill16")), wxNullBitmap, wxITEM_NORMAL, _("Fill the whole layer with the selected tile."), wxT(""), NULL);
m_toolbar492->AddTool(ERASE_ALL_TILES_TOOL_ID, _("Erase all the layer"), wxXmlResource::Get()->LoadBitmap(wxT("delete16")), wxNullBitmap, wxITEM_NORMAL, _("Delete all the tiles from the current layer."), wxT(""), NULL);
m_toolbar492->AddSeparator();
m_toolbar492->Realize();
m_mainPanelToolbar = new wxToolBar(m_mainPanel, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTB_HORZ_TEXT|wxTB_NODIVIDER|wxTB_FLAT);
m_mainPanelToolbar->SetToolBitmapSize(wxSize(16,16));
flexGridSizer200->Add(m_mainPanelToolbar, 0, wxALL|wxEXPAND, 0);
flexGridSizer490->Add(m_mainPanelToolbar, 0, wxALL|wxEXPAND, 0);
m_mainPanelToolbar->AddTool(CHANGE_MAP_SIZE_TOOL_ID, _("Change map size"), wxXmlResource::Get()->LoadBitmap(wxT("options16")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL);
@@ -149,6 +175,8 @@ TileMapObjectEditorBase::TileMapObjectEditorBase(wxWindow* parent, wxWindowID id
this->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(TileMapObjectEditorBase::OnCloseButtonClicked), NULL, this);
this->Connect(CONFIGURE_TILESET_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnTileSetConfigureButtonClicked), NULL, this);
this->Connect(EDIT_TILE_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnTileEditToolClicked), NULL, this);
this->Connect(MODE_SINGLE_TILE_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnTileInsertionModeChanged), NULL, this);
this->Connect(MODE_RECTANGLE_TILE_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnTileInsertionModeChanged), NULL, this);
this->Connect(CHANGE_MAP_SIZE_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnChangeMapSizeButtonClicked), NULL, this);
m_layerChoice->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TileMapObjectEditorBase::OnLayerChoiceChanged), NULL, this);
this->Connect(HIDE_UPPER_LAYERS_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnHideUpperLayerChecked), NULL, this);
@@ -163,6 +191,8 @@ TileMapObjectEditorBase::~TileMapObjectEditorBase()
this->Disconnect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(TileMapObjectEditorBase::OnCloseButtonClicked), NULL, this);
this->Disconnect(CONFIGURE_TILESET_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnTileSetConfigureButtonClicked), NULL, this);
this->Disconnect(EDIT_TILE_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnTileEditToolClicked), NULL, this);
this->Disconnect(MODE_SINGLE_TILE_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnTileInsertionModeChanged), NULL, this);
this->Disconnect(MODE_RECTANGLE_TILE_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnTileInsertionModeChanged), NULL, this);
this->Disconnect(CHANGE_MAP_SIZE_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnChangeMapSizeButtonClicked), NULL, this);
m_layerChoice->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TileMapObjectEditorBase::OnLayerChoiceChanged), NULL, this);
this->Disconnect(HIDE_UPPER_LAYERS_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnHideUpperLayerChecked), NULL, this);
@@ -40,6 +40,7 @@ protected:
wxToolBar* m_tileSetToolBar;
TileSetPanel* m_tileSetPanel;
wxPanel* m_mainPanel;
wxToolBar* m_toolbar492;
wxToolBar* m_mainPanelToolbar;
wxStaticText* m_staticText355;
wxChoice* m_layerChoice;
@@ -55,6 +56,7 @@ protected:
virtual void OnCloseButtonClicked(wxCloseEvent& event) { event.Skip(); }
virtual void OnTileSetConfigureButtonClicked(wxCommandEvent& event) { event.Skip(); }
virtual void OnTileEditToolClicked(wxCommandEvent& event) { event.Skip(); }
virtual void OnTileInsertionModeChanged(wxCommandEvent& event) { event.Skip(); }
virtual void OnChangeMapSizeButtonClicked(wxCommandEvent& event) { event.Skip(); }
virtual void OnLayerChoiceChanged(wxCommandEvent& event) { event.Skip(); }
virtual void OnHideUpperLayerChecked(wxCommandEvent& event) { event.Skip(); }
+607 -275
View File
@@ -1,7 +1,7 @@
{
"metadata": {
"m_generatedFilesDir": ".",
"m_objCounter": 478,
"m_objCounter": 508,
"m_includeFiles": ["TileMapDialogsIds.h"],
"m_bitmapFunction": "wxCF6DCInitBitmapResources",
"m_bitmapsFile": "TileMapDialogs_wxsmith_bitmaps.cpp",
@@ -667,130 +667,55 @@
}],
"m_events": [],
"m_children": [{
"m_type": 4461,
"proportion": 0,
"m_type": 4403,
"proportion": 1,
"border": 0,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": ["wxTB_HORZ_TEXT", "wxTB_NODIVIDER", "wxTB_FLAT"],
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
"m_winid": "wxID_ANY"
}, {
"type": "string",
"m_label": "Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_mainPanelToolbar"
"m_value": "flexGridSizer490"
}, {
"type": "string",
"m_label": "Tooltip:",
"m_label": "Style:",
"m_value": ""
}, {
"type": "string",
"m_label": "Bitmap Size:",
"m_value": "16,16"
"m_label": "# Columns:",
"m_value": "2"
}, {
"type": "string",
"m_label": "Margins:",
"m_value": "-1,-1"
"m_label": "# Rows:",
"m_value": "0"
}, {
"type": "string",
"m_label": "Padding:",
"m_label": "Growable columns:",
"m_value": "1"
}, {
"type": "string",
"m_label": "Separator Size:",
"m_value": "5"
"m_label": "Growable rows:",
"m_value": "0"
}, {
"type": "string",
"m_label": "Horizontal gap:",
"m_value": "0"
}, {
"type": "string",
"m_label": "Vertical gap:",
"m_value": "0"
}],
"m_events": [],
"m_children": [{
"m_type": 4462,
"m_type": 4461,
"proportion": 0,
"border": 5,
"border": 0,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": [],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
"m_winid": "CHANGE_MAP_SIZE_TOOL_ID"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_changeMapSizeTool"
}, {
"type": "string",
"m_label": "Label:",
"m_value": "Change map size"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "string",
"m_label": "Help String:",
"m_value": ""
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../Binaries/Output/Release_Windows/res/icons_default/options16.png"
}, {
"type": "filePicker",
"m_label": "Disabled-Bitmap File",
"m_path": ""
}, {
"type": "choice",
"m_label": "Kind:",
"m_selection": 0,
"m_options": ["normal", "checkable", "radio", "separator", "dropdown"]
}, {
"type": "bool",
"m_label": "Construct the Dropdown Menu:",
"m_value": true
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_TOOL_CLICKED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnChangeMapSizeButtonClicked(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_TOOL_CLICKED event (a synonym for wxEVT_COMMAND_MENU_SELECTED). Pass the id of the tool",
"m_noBody": false
}],
"m_children": []
}, {
"m_type": 4504,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": [],
"m_properties": [{
"type": "string",
"m_label": "Name:",
"m_value": "m_tbSeparator351"
}, {
"type": "choice",
"m_label": "Kind:",
"m_selection": 0,
"m_options": ["separator"]
}],
"m_events": [],
"m_children": []
}, {
"m_type": 4405,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_styles": ["wxTB_NODIVIDER", "wxTB_FLAT"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_TOP"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
@@ -801,71 +726,285 @@
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
"m_label": "Name:",
"m_value": "m_toolbar492"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_staticText355"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "colour",
"m_label": "Bg Colour:",
"colour": "<Default>"
}, {
"type": "colour",
"m_label": "Fg Colour:",
"colour": "<Default>"
}, {
"type": "font",
"m_label": "Font:",
"m_value": ""
}, {
"type": "bool",
"m_label": "Hidden",
"m_value": false
}, {
"type": "bool",
"m_label": "Disabled",
"m_value": false
}, {
"type": "bool",
"m_label": "Focused",
"m_value": false
"type": "string",
"m_label": "Bitmap Size:",
"m_value": "16,16"
}, {
"type": "string",
"m_label": "Class Name:",
"m_value": ""
"m_label": "Margins:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Include File:",
"m_value": ""
"m_label": "Padding:",
"m_value": "1"
}, {
"type": "string",
"m_label": "Style:",
"m_value": ""
}, {
"type": "multi-string",
"m_label": "Label:",
"m_value": "Current layer:"
}, {
"type": "string",
"m_label": "Wrap:",
"m_value": "-1"
"m_label": "Separator Size:",
"m_value": "5"
}],
"m_events": [],
"m_children": []
"m_children": [{
"m_type": 4462,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": [],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
"m_winid": "MODE_SINGLE_TILE_TOOL_ID"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_toolbarItem494"
}, {
"type": "string",
"m_label": "Label:",
"m_value": "Pencil mode"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": "Pencil mode\\nAdd tiles only where the mouse goes."
}, {
"type": "string",
"m_label": "Help String:",
"m_value": ""
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../Binaries/Output/Release_Windows/res/icons_default/edit16.png"
}, {
"type": "filePicker",
"m_label": "Disabled-Bitmap File",
"m_path": ""
}, {
"type": "choice",
"m_label": "Kind:",
"m_selection": 2,
"m_options": ["normal", "checkable", "radio", "separator", "dropdown"]
}, {
"type": "bool",
"m_label": "Construct the Dropdown Menu:",
"m_value": true
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_TOOL_CLICKED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnTileInsertionModeChanged(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_TOOL_CLICKED event (a synonym for wxEVT_COMMAND_MENU_SELECTED). Pass the id of the tool",
"m_noBody": false
}],
"m_children": []
}, {
"m_type": 4462,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": [],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
"m_winid": "MODE_RECTANGLE_TILE_TOOL_ID"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_toolbarItem500"
}, {
"type": "string",
"m_label": "Label:",
"m_value": "Rectangle mode"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": "Rectangle mode\\nAdd tile in a rectangle from the position where the mouse was pressed to the position the mouse was released."
}, {
"type": "string",
"m_label": "Help String:",
"m_value": ""
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../Binaries/Output/Release_Windows/res/conditions/rectangle.png"
}, {
"type": "filePicker",
"m_label": "Disabled-Bitmap File",
"m_path": ""
}, {
"type": "choice",
"m_label": "Kind:",
"m_selection": 2,
"m_options": ["normal", "checkable", "radio", "separator", "dropdown"]
}, {
"type": "bool",
"m_label": "Construct the Dropdown Menu:",
"m_value": true
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_TOOL_CLICKED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnTileInsertionModeChanged(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_TOOL_CLICKED event (a synonym for wxEVT_COMMAND_MENU_SELECTED). Pass the id of the tool",
"m_noBody": false
}],
"m_children": []
}, {
"m_type": 4504,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": [],
"m_properties": [{
"type": "string",
"m_label": "Name:",
"m_value": "m_tbSeparator498"
}, {
"type": "choice",
"m_label": "Kind:",
"m_selection": 0,
"m_options": ["separator"]
}],
"m_events": [],
"m_children": []
}, {
"m_type": 4462,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": [],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
"m_winid": "FILL_WITH_TILE_TOOL_ID"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_toolbarItem502"
}, {
"type": "string",
"m_label": "Label:",
"m_value": "Fill layer"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": "Fill the whole layer with the selected tile."
}, {
"type": "string",
"m_label": "Help String:",
"m_value": ""
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../Binaries/Output/Release_Windows/res/fill16.png"
}, {
"type": "filePicker",
"m_label": "Disabled-Bitmap File",
"m_path": ""
}, {
"type": "choice",
"m_label": "Kind:",
"m_selection": 0,
"m_options": ["normal", "checkable", "radio", "separator", "dropdown"]
}, {
"type": "bool",
"m_label": "Construct the Dropdown Menu:",
"m_value": true
}],
"m_events": [],
"m_children": []
}, {
"m_type": 4462,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": [],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
"m_winid": "ERASE_ALL_TILES_TOOL_ID"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_toolbarItem504"
}, {
"type": "string",
"m_label": "Label:",
"m_value": "Erase all the layer"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": "Delete all the tiles from the current layer."
}, {
"type": "string",
"m_label": "Help String:",
"m_value": ""
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../Binaries/Output/Release_Windows/res/icons_default/delete16.png"
}, {
"type": "filePicker",
"m_label": "Disabled-Bitmap File",
"m_path": ""
}, {
"type": "choice",
"m_label": "Kind:",
"m_selection": 0,
"m_options": ["normal", "checkable", "radio", "separator", "dropdown"]
}, {
"type": "bool",
"m_label": "Construct the Dropdown Menu:",
"m_value": true
}],
"m_events": [],
"m_children": []
}, {
"m_type": 4504,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": [],
"m_properties": [{
"type": "string",
"m_label": "Name:",
"m_value": "m_tbSeparator508"
}, {
"type": "choice",
"m_label": "Kind:",
"m_selection": 0,
"m_options": ["separator"]
}],
"m_events": [],
"m_children": []
}]
}, {
"m_type": 4411,
"m_type": 4461,
"proportion": 0,
"border": 5,
"border": 0,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_styles": ["wxTB_HORZ_TEXT", "wxTB_NODIVIDER", "wxTB_FLAT"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
@@ -876,145 +1015,338 @@
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
"m_label": "Name:",
"m_value": "m_mainPanelToolbar"
}, {
"type": "string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "string",
"m_label": "Bitmap Size:",
"m_value": "16,16"
}, {
"type": "string",
"m_label": "Margins:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_layerChoice"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "colour",
"m_label": "Bg Colour:",
"colour": "<Default>"
}, {
"type": "colour",
"m_label": "Fg Colour:",
"colour": "<Default>"
}, {
"type": "font",
"m_label": "Font:",
"m_value": ""
}, {
"type": "bool",
"m_label": "Hidden",
"m_value": false
}, {
"type": "bool",
"m_label": "Disabled",
"m_value": false
}, {
"type": "bool",
"m_label": "Focused",
"m_value": false
"m_label": "Padding:",
"m_value": "1"
}, {
"type": "string",
"m_label": "Class Name:",
"m_value": ""
}, {
"type": "string",
"m_label": "Include File:",
"m_value": ""
}, {
"type": "string",
"m_label": "Style:",
"m_value": ""
}, {
"type": "multi-string",
"m_label": "Choices:",
"m_value": "Back;Middle;Top"
}, {
"type": "string",
"m_label": "Selection:",
"m_value": "0"
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_CHOICE_SELECTED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnLayerChoiceChanged(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_CHOICE_SELECTED event, when an item on the list is selected.",
"m_noBody": false
}],
"m_children": []
}, {
"m_type": 4504,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": [],
"m_properties": [{
"type": "string",
"m_label": "Name:",
"m_value": "m_tbSeparator363"
}, {
"type": "choice",
"m_label": "Kind:",
"m_selection": 0,
"m_options": ["separator"]
"m_label": "Separator Size:",
"m_value": "5"
}],
"m_events": [],
"m_children": []
}, {
"m_type": 4462,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": [],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
"m_winid": "HIDE_UPPER_LAYERS_TOOL_ID"
"m_children": [{
"m_type": 4462,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": [],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
"m_winid": "CHANGE_MAP_SIZE_TOOL_ID"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_changeMapSizeTool"
}, {
"type": "string",
"m_label": "Label:",
"m_value": "Change map size"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "string",
"m_label": "Help String:",
"m_value": ""
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../Binaries/Output/Release_Windows/res/icons_default/options16.png"
}, {
"type": "filePicker",
"m_label": "Disabled-Bitmap File",
"m_path": ""
}, {
"type": "choice",
"m_label": "Kind:",
"m_selection": 0,
"m_options": ["normal", "checkable", "radio", "separator", "dropdown"]
}, {
"type": "bool",
"m_label": "Construct the Dropdown Menu:",
"m_value": true
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_TOOL_CLICKED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnChangeMapSizeButtonClicked(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_TOOL_CLICKED event (a synonym for wxEVT_COMMAND_MENU_SELECTED). Pass the id of the tool",
"m_noBody": false
}],
"m_children": []
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_hideUpperLayerCheck"
"m_type": 4504,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": [],
"m_properties": [{
"type": "string",
"m_label": "Name:",
"m_value": "m_tbSeparator351"
}, {
"type": "choice",
"m_label": "Kind:",
"m_selection": 0,
"m_options": ["separator"]
}],
"m_events": [],
"m_children": []
}, {
"type": "string",
"m_label": "Label:",
"m_value": "Hide upper layers"
"m_type": 4405,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
"m_winid": "wxID_ANY"
}, {
"type": "string",
"m_label": "Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_staticText355"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "colour",
"m_label": "Bg Colour:",
"colour": "<Default>"
}, {
"type": "colour",
"m_label": "Fg Colour:",
"colour": "<Default>"
}, {
"type": "font",
"m_label": "Font:",
"m_value": ""
}, {
"type": "bool",
"m_label": "Hidden",
"m_value": false
}, {
"type": "bool",
"m_label": "Disabled",
"m_value": false
}, {
"type": "bool",
"m_label": "Focused",
"m_value": false
}, {
"type": "string",
"m_label": "Class Name:",
"m_value": ""
}, {
"type": "string",
"m_label": "Include File:",
"m_value": ""
}, {
"type": "string",
"m_label": "Style:",
"m_value": ""
}, {
"type": "multi-string",
"m_label": "Label:",
"m_value": "Current layer:"
}, {
"type": "string",
"m_label": "Wrap:",
"m_value": "-1"
}],
"m_events": [],
"m_children": []
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
"m_type": 4411,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
"m_winid": "wxID_ANY"
}, {
"type": "string",
"m_label": "Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_layerChoice"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "colour",
"m_label": "Bg Colour:",
"colour": "<Default>"
}, {
"type": "colour",
"m_label": "Fg Colour:",
"colour": "<Default>"
}, {
"type": "font",
"m_label": "Font:",
"m_value": ""
}, {
"type": "bool",
"m_label": "Hidden",
"m_value": false
}, {
"type": "bool",
"m_label": "Disabled",
"m_value": false
}, {
"type": "bool",
"m_label": "Focused",
"m_value": false
}, {
"type": "string",
"m_label": "Class Name:",
"m_value": ""
}, {
"type": "string",
"m_label": "Include File:",
"m_value": ""
}, {
"type": "string",
"m_label": "Style:",
"m_value": ""
}, {
"type": "multi-string",
"m_label": "Choices:",
"m_value": "Back;Middle;Top"
}, {
"type": "string",
"m_label": "Selection:",
"m_value": "0"
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_CHOICE_SELECTED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnLayerChoiceChanged(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_CHOICE_SELECTED event, when an item on the list is selected.",
"m_noBody": false
}],
"m_children": []
}, {
"type": "string",
"m_label": "Help String:",
"m_value": ""
"m_type": 4504,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": [],
"m_properties": [{
"type": "string",
"m_label": "Name:",
"m_value": "m_tbSeparator363"
}, {
"type": "choice",
"m_label": "Kind:",
"m_selection": 0,
"m_options": ["separator"]
}],
"m_events": [],
"m_children": []
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../Binaries/Output/Release_Windows/res/icons_default/layer16.png"
}, {
"type": "filePicker",
"m_label": "Disabled-Bitmap File",
"m_path": ""
}, {
"type": "choice",
"m_label": "Kind:",
"m_selection": 1,
"m_options": ["normal", "checkable", "radio", "separator", "dropdown"]
}, {
"type": "bool",
"m_label": "Construct the Dropdown Menu:",
"m_value": true
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_TOOL_CLICKED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnHideUpperLayerChecked(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_TOOL_CLICKED event (a synonym for wxEVT_COMMAND_MENU_SELECTED). Pass the id of the tool",
"m_noBody": false
}],
"m_children": []
"m_type": 4462,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": [],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
"m_winid": "HIDE_UPPER_LAYERS_TOOL_ID"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_hideUpperLayerCheck"
}, {
"type": "string",
"m_label": "Label:",
"m_value": "Hide upper layers"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "string",
"m_label": "Help String:",
"m_value": ""
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../Binaries/Output/Release_Windows/res/icons_default/layer16.png"
}, {
"type": "filePicker",
"m_label": "Disabled-Bitmap File",
"m_path": ""
}, {
"type": "choice",
"m_label": "Kind:",
"m_selection": 1,
"m_options": ["normal", "checkable", "radio", "separator", "dropdown"]
}, {
"type": "bool",
"m_label": "Construct the Dropdown Menu:",
"m_value": true
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_TOOL_CLICKED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnHideUpperLayerChecked(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_TOOL_CLICKED event (a synonym for wxEVT_COMMAND_MENU_SELECTED). Pass the id of the tool",
"m_noBody": false
}],
"m_children": []
}]
}]
}, {
"m_type": 4403,
+117 -46
View File
@@ -117,54 +117,125 @@
<hgap>0</hgap>
<growablecols>0</growablecols>
<growablerows>1</growablerows>
<object class="sizeritem">
<object class="sizeritem" name="flexGridSizer490">
<flag>wxALL|wxEXPAND</flag>
<object class="wxToolBar" name="m_mainPanelToolbar">
<style>wxTB_HORZ_TEXT|wxTB_NODIVIDER|wxTB_FLAT</style>
<bitmapsize>16,16</bitmapsize>
<object class="tool" name="m_changeMapSizeTool">
<label>
<![CDATA[Change map size]]>
</label>
<longhelp>
<![CDATA[]]>
</longhelp>
<bitmap>../../Binaries/Output/Release_Windows/res/icons_default/options16.png</bitmap>
<option>1</option>
<object class="wxFlexGridSizer">
<cols>2</cols>
<rows>0</rows>
<vgap>0</vgap>
<hgap>0</hgap>
<growablecols>1</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxALL|wxEXPAND|wxALIGN_TOP</flag>
<object class="wxToolBar" name="m_toolbar492">
<style>wxTB_NODIVIDER|wxTB_FLAT</style>
<bitmapsize>16,16</bitmapsize>
<object class="tool" name="m_toolbarItem494">
<radio>1</radio>
<label>
<![CDATA[Pencil mode]]>
</label>
<tooltip>
<![CDATA[Pencil mode\nAdd tiles only where the mouse goes.]]>
</tooltip>
<longhelp>
<![CDATA[]]>
</longhelp>
<bitmap>../../Binaries/Output/Release_Windows/res/icons_default/edit16.png</bitmap>
</object>
<object class="tool" name="m_toolbarItem500">
<radio>1</radio>
<label>
<![CDATA[Rectangle mode]]>
</label>
<tooltip>
<![CDATA[Rectangle mode\nAdd tile in a rectangle from the position where the mouse was pressed to the position the mouse was released.]]>
</tooltip>
<longhelp>
<![CDATA[]]>
</longhelp>
<bitmap>../../Binaries/Output/Release_Windows/res/conditions/rectangle.png</bitmap>
</object>
<object class="separator"/>
<object class="tool" name="m_toolbarItem502">
<label>
<![CDATA[Fill layer]]>
</label>
<tooltip>
<![CDATA[Fill the whole layer with the selected tile.]]>
</tooltip>
<longhelp>
<![CDATA[]]>
</longhelp>
<bitmap>../../Binaries/Output/Release_Windows/res/fill16.png</bitmap>
</object>
<object class="tool" name="m_toolbarItem504">
<label>
<![CDATA[Erase all the layer]]>
</label>
<tooltip>
<![CDATA[Delete all the tiles from the current layer.]]>
</tooltip>
<longhelp>
<![CDATA[]]>
</longhelp>
<bitmap>../../Binaries/Output/Release_Windows/res/icons_default/delete16.png</bitmap>
</object>
<object class="separator"/>
</object>
</object>
<object class="separator"/>
<object class="wxStaticText" name="m_staticText355">
<label>
<![CDATA[Current layer:]]>
</label>
<style/>
</object>
<object class="wxChoice" name="m_layerChoice">
<style/>
<content>
<item>
<![CDATA[Back]]>
</item>
<item>
<![CDATA[Middle]]>
</item>
<item>
<![CDATA[Top]]>
</item>
</content>
<selection>
<![CDATA[0]]>
</selection>
</object>
<object class="separator"/>
<object class="tool" name="m_hideUpperLayerCheck">
<toggle>1</toggle>
<label>
<![CDATA[Hide upper layers]]>
</label>
<longhelp>
<![CDATA[]]>
</longhelp>
<bitmap>../../Binaries/Output/Release_Windows/res/icons_default/layer16.png</bitmap>
<object class="sizeritem">
<flag>wxALL|wxEXPAND</flag>
<object class="wxToolBar" name="m_mainPanelToolbar">
<style>wxTB_HORZ_TEXT|wxTB_NODIVIDER|wxTB_FLAT</style>
<bitmapsize>16,16</bitmapsize>
<object class="tool" name="m_changeMapSizeTool">
<label>
<![CDATA[Change map size]]>
</label>
<longhelp>
<![CDATA[]]>
</longhelp>
<bitmap>../../Binaries/Output/Release_Windows/res/icons_default/options16.png</bitmap>
</object>
<object class="separator"/>
<object class="wxStaticText" name="m_staticText355">
<label>
<![CDATA[Current layer:]]>
</label>
<style/>
</object>
<object class="wxChoice" name="m_layerChoice">
<style/>
<content>
<item>
<![CDATA[Back]]>
</item>
<item>
<![CDATA[Middle]]>
</item>
<item>
<![CDATA[Top]]>
</item>
</content>
<selection>
<![CDATA[0]]>
</selection>
</object>
<object class="separator"/>
<object class="tool" name="m_hideUpperLayerCheck">
<toggle>1</toggle>
<label>
<![CDATA[Hide upper layers]]>
</label>
<longhelp>
<![CDATA[]]>
</longhelp>
<bitmap>../../Binaries/Output/Release_Windows/res/icons_default/layer16.png</bitmap>
</object>
</object>
</object>
</object>
</object>
+6 -1
View File
@@ -29,13 +29,18 @@ freely, subject to the following restrictions:
enum
{
//TileMapObjectEditor IDs
//TileMapObjectEditor IDs
CHANGE_MAP_SIZE_TOOL_ID = 1001,
CONFIGURE_TILESET_TOOL_ID = 1002,
EDIT_TILE_TOOL_ID = 1003,
HIDE_UPPER_LAYERS_TOOL_ID = 1004,
ID_MAINPANEL = 1005,
ID_TILESETPANEL = 1006,
MODE_SINGLE_TILE_TOOL_ID = 1007,
MODE_RECTANGLE_TILE_TOOL_ID = 1008,
FILL_WITH_TILE_TOOL_ID = 1009,
ERASE_ALL_TILES_TOOL_ID = 1010,
//TileEditor IDs
ADD_POINT_TOOL_ID = 1101,
@@ -57,9 +57,39 @@ static unsigned char xml_res_file_0[] = {
93,197,153,127,112,166,138,243,222,212,64,29,206,191,1,250,100,14,188,126,
190,102,171,0,0,0,0,73,69,78,68,174,66,96,130};
static size_t xml_res_size_1 = 429;
static size_t xml_res_size_1 = 551;
static unsigned char xml_res_file_1[] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
0,31,243,255,97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,1,222,73,
68,65,84,56,141,165,147,207,107,19,65,20,199,191,51,59,59,89,106,154,31,
219,31,32,57,72,145,16,40,72,80,66,16,234,161,151,8,57,152,156,60,232,161,
94,91,196,67,254,146,8,69,154,107,123,208,131,183,150,178,208,92,122,176,
151,18,10,9,164,176,45,181,20,41,84,155,172,214,104,140,155,221,29,15,146,
49,155,184,30,234,187,205,227,205,103,190,223,247,230,17,33,4,254,39,216,
104,226,209,230,121,206,19,40,81,130,252,112,222,19,48,40,65,121,171,144,
168,14,231,201,176,130,194,230,249,90,239,234,219,178,179,111,194,57,187,
132,176,157,223,69,156,129,221,154,1,203,166,160,68,194,111,140,98,226,
233,24,224,238,122,227,181,214,117,159,168,198,129,188,56,26,132,51,104,
133,251,80,103,98,149,237,98,98,69,2,22,55,234,185,15,173,206,142,242,118,
15,209,208,13,104,154,26,232,153,112,6,237,241,3,132,162,225,135,91,133,
68,149,2,128,229,162,68,107,38,132,237,226,75,231,43,122,189,126,32,64,
216,14,156,125,19,158,64,73,54,177,235,137,60,61,109,225,206,109,29,243,
201,89,0,64,52,26,67,136,243,49,64,243,232,2,135,103,151,24,52,153,253,
33,187,152,79,206,226,249,139,5,89,172,79,233,224,170,223,206,234,203,119,
104,190,111,203,51,13,212,10,192,106,91,176,251,193,118,124,10,8,87,112,
120,252,9,175,86,247,198,138,134,237,52,143,46,64,56,243,3,38,40,49,126,
204,77,231,27,230,71,52,78,172,191,190,20,155,140,200,233,168,201,155,240,
4,12,105,65,87,80,246,50,41,16,174,4,74,29,76,135,112,6,150,77,129,18,148,
37,96,119,41,93,141,199,195,21,81,204,254,19,114,245,243,59,250,249,123,
80,35,225,202,224,75,251,190,114,102,189,190,246,185,221,89,166,53,19,228,
180,5,97,187,178,63,98,110,26,94,38,133,248,212,100,165,246,44,189,34,123,
55,186,141,139,27,245,156,229,162,212,245,132,111,153,38,40,49,116,5,229,
221,165,116,240,50,93,39,126,1,157,215,183,111,35,213,143,230,0,0,0,0,73,
69,78,68,174,66,96,130};
static size_t xml_res_size_2 = 429;
static unsigned char xml_res_file_2[] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
0,31,243,255,97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,1,100,73,
68,65,84,56,141,165,147,191,75,2,97,28,198,159,43,79,109,201,6,137,3,205,
23,156,173,8,36,236,224,104,235,134,19,90,66,58,7,107,42,26,162,177,191,
@@ -80,8 +110,38 @@ static unsigned char xml_res_file_1[] = {
97,66,68,1,11,196,163,181,251,186,226,10,3,30,254,130,219,124,1,35,61,168,
36,95,254,94,55,0,0,0,0,73,69,78,68,174,66,96,130};
static size_t xml_res_size_2 = 603;
static unsigned char xml_res_file_2[] = {
static size_t xml_res_size_3 = 559;
static unsigned char xml_res_file_3[] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
0,31,243,255,97,0,0,0,1,115,82,71,66,0,174,206,28,233,0,0,0,4,103,65,77,
65,0,0,177,143,11,252,97,5,0,0,0,9,112,72,89,115,0,0,14,195,0,0,14,195,
1,199,111,168,100,0,0,0,24,116,69,88,116,83,111,102,116,119,97,114,101,
0,112,97,105,110,116,46,110,101,116,32,52,46,48,46,51,140,230,151,80,0,
0,1,160,73,68,65,84,56,79,149,210,49,72,2,81,24,7,240,35,10,28,10,36,26,
26,154,36,26,14,45,48,26,106,83,16,140,22,113,16,206,193,85,16,49,4,183,
104,105,18,135,112,16,228,22,71,113,10,113,17,135,35,92,196,134,50,9,193,
40,72,50,72,19,75,43,237,212,224,223,189,199,157,41,106,230,31,62,56,30,
239,253,238,125,239,61,102,90,236,246,39,184,221,85,164,82,95,144,135,254,
159,157,157,107,40,57,60,124,153,29,96,217,12,56,174,140,68,162,13,167,
179,50,27,96,48,20,161,209,8,40,22,123,20,153,9,208,106,179,200,231,187,
20,136,197,90,40,20,186,253,157,200,83,38,103,125,253,28,225,112,27,94,
111,141,2,129,64,131,34,185,220,20,100,117,179,13,189,254,74,90,44,194,
108,46,227,224,160,68,1,114,11,10,146,205,118,198,35,203,27,34,88,125,9,
241,120,15,86,107,21,38,211,19,88,246,18,193,96,19,187,187,55,240,249,106,
125,36,157,22,135,145,85,93,11,139,107,159,176,217,30,33,8,223,112,185,
26,20,217,222,46,66,173,14,193,104,188,163,237,12,34,130,48,128,168,86,
94,65,234,236,172,77,145,84,170,215,71,200,78,72,59,14,71,101,34,194,204,
47,61,131,20,217,141,130,196,227,221,169,72,50,249,133,253,253,123,48,115,
170,7,144,162,253,72,81,144,104,180,51,17,57,61,109,74,173,221,74,7,254,
14,102,203,208,4,179,80,24,58,85,178,69,139,165,132,72,68,28,65,60,158,
58,200,19,15,133,164,197,74,216,189,183,33,128,132,231,63,64,94,35,207,
255,34,28,87,163,87,237,247,55,70,230,143,13,233,85,167,187,160,200,241,
241,167,116,181,25,156,156,140,254,236,207,28,29,213,233,131,34,69,190,
229,97,57,12,243,3,195,148,153,246,224,78,44,245,0,0,0,0,73,69,78,68,174,
66,96,130};
static size_t xml_res_size_4 = 603;
static unsigned char xml_res_file_4[] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
0,31,243,255,97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,2,18,73,
68,65,84,56,141,165,147,77,104,19,81,16,199,255,187,228,163,49,194,150,
@@ -112,8 +172,8 @@ static unsigned char xml_res_file_2[] = {
150,201,235,146,75,94,175,156,174,173,37,29,203,212,7,248,87,249,13,137,
45,22,202,33,129,14,207,0,0,0,0,73,69,78,68,174,66,96,130};
static size_t xml_res_size_3 = 387;
static unsigned char xml_res_file_3[] = {
static size_t xml_res_size_5 = 387;
static unsigned char xml_res_file_5[] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
0,31,243,255,97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,1,58,73,
68,65,84,56,141,165,147,63,75,195,64,24,198,159,212,40,93,250,7,71,43,34,
@@ -134,8 +194,8 @@ static unsigned char xml_res_file_3[] = {
126,231,111,152,235,231,188,105,150,156,225,0,0,0,0,73,69,78,68,174,66,
96,130};
static size_t xml_res_size_4 = 270;
static unsigned char xml_res_file_4[] = {
static size_t xml_res_size_6 = 270;
static unsigned char xml_res_file_6[] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
0,31,243,255,97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,197,73,
68,65,84,56,141,99,252,255,255,63,3,37,128,5,155,160,173,199,76,162,76,
@@ -150,8 +210,8 @@ static unsigned char xml_res_file_4[] = {
72,105,118,6,0,253,131,77,130,231,153,199,49,0,0,0,0,73,69,78,68,174,66,
96,130};
static size_t xml_res_size_5 = 473;
static unsigned char xml_res_file_5[] = {
static size_t xml_res_size_7 = 473;
static unsigned char xml_res_file_7[] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
0,31,243,255,97,0,0,0,4,103,65,77,65,0,0,177,143,11,252,97,5,0,0,0,9,112,
72,89,115,0,0,14,194,0,0,14,194,1,21,40,74,128,0,0,0,25,116,69,88,116,83,
@@ -176,8 +236,8 @@ static unsigned char xml_res_file_5[] = {
219,206,200,200,40,138,75,49,0,21,160,182,41,121,99,156,29,0,0,0,0,73,69,
78,68,174,66,96,130};
static size_t xml_res_size_6 = 393;
static unsigned char xml_res_file_6[] = {
static size_t xml_res_size_8 = 393;
static unsigned char xml_res_file_8[] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
0,31,243,255,97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,1,64,73,
68,65,84,56,141,165,211,207,75,2,65,24,198,241,239,186,187,186,153,228,
@@ -198,8 +258,8 @@ static unsigned char xml_res_file_6[] = {
3,126,18,126,119,39,110,2,160,140,186,206,63,206,165,153,93,101,233,50,
226,0,0,0,0,73,69,78,68,174,66,96,130};
static size_t xml_res_size_7 = 335;
static unsigned char xml_res_file_7[] = {
static size_t xml_res_size_9 = 335;
static unsigned char xml_res_file_9[] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
0,31,243,255,97,0,0,0,4,103,65,77,65,0,0,177,143,11,252,97,5,0,0,0,9,112,
72,89,115,0,0,14,192,0,0,14,192,1,106,214,137,9,0,0,0,22,116,69,88,116,
@@ -217,8 +277,157 @@ static unsigned char xml_res_file_7[] = {
192,174,255,246,29,124,79,8,119,209,17,42,12,47,58,150,232,0,0,0,0,73,69,
78,68,174,66,96,130};
static size_t xml_res_size_8 = 551;
static unsigned char xml_res_file_8[] = {
static size_t xml_res_size_10 = 3005;
static unsigned char xml_res_file_10[] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
0,31,243,255,97,0,0,0,9,112,72,89,115,0,0,11,19,0,0,11,19,1,0,154,156,24,
0,0,10,79,105,67,67,80,80,104,111,116,111,115,104,111,112,32,73,67,67,32,
112,114,111,102,105,108,101,0,0,120,218,157,83,103,84,83,233,22,61,247,
222,244,66,75,136,128,148,75,111,82,21,8,32,82,66,139,128,20,145,38,42,
33,9,16,74,136,33,161,217,21,81,193,17,69,69,4,27,200,160,136,3,142,142,
128,140,21,81,44,12,138,10,216,7,228,33,162,142,131,163,136,138,202,251,
225,123,163,107,214,188,247,230,205,254,181,215,62,231,172,243,157,179,
207,7,192,8,12,150,72,51,81,53,128,12,169,66,30,17,224,131,199,196,198,
225,228,46,64,129,10,36,112,0,16,8,179,100,33,115,253,35,1,0,248,126,60,
60,43,34,192,7,190,0,1,120,211,11,8,0,192,77,155,192,48,28,135,255,15,234,
66,153,92,1,128,132,1,192,116,145,56,75,8,128,20,0,64,122,142,66,166,0,
64,70,1,128,157,152,38,83,0,160,4,0,96,203,99,98,227,0,80,45,0,96,39,127,
230,211,0,128,157,248,153,123,1,0,91,148,33,21,1,160,145,0,32,19,101,136,
68,0,104,59,0,172,207,86,138,69,0,88,48,0,20,102,75,196,57,0,216,45,0,48,
73,87,102,72,0,176,183,0,192,206,16,11,178,0,8,12,0,48,81,136,133,41,0,
4,123,0,96,200,35,35,120,0,132,153,0,20,70,242,87,60,241,43,174,16,231,
42,0,0,120,153,178,60,185,36,57,69,129,91,8,45,113,7,87,87,46,30,40,206,
73,23,43,20,54,97,2,97,154,64,46,194,121,153,25,50,129,52,15,224,243,204,
0,0,160,145,21,17,224,131,243,253,120,206,14,174,206,206,54,142,182,14,
95,45,234,191,6,255,34,98,98,227,254,229,207,171,112,64,0,0,225,116,126,
209,254,44,47,179,26,128,59,6,128,109,254,162,37,238,4,104,94,11,160,117,
247,139,102,178,15,64,181,0,160,233,218,87,243,112,248,126,60,60,69,161,
144,185,217,217,229,228,228,216,74,196,66,91,97,202,87,125,254,103,194,
95,192,87,253,108,249,126,60,252,247,245,224,190,226,36,129,50,93,129,71,
4,248,224,194,204,244,76,165,28,207,146,9,132,98,220,230,143,71,252,183,
11,255,252,29,211,34,196,73,98,185,88,42,20,227,81,18,113,142,68,154,140,
243,50,165,34,137,66,146,41,197,37,210,255,100,226,223,44,251,3,62,223,
53,0,176,106,62,1,123,145,45,168,93,99,3,246,75,39,16,88,116,192,226,247,
0,0,242,187,111,193,212,40,8,3,128,104,131,225,207,119,255,239,63,253,71,
160,37,0,128,102,73,146,113,0,0,94,68,36,46,84,202,179,63,199,8,0,0,68,
160,129,42,176,65,27,244,193,24,44,192,6,28,193,5,220,193,11,252,96,54,
132,66,36,196,194,66,16,66,10,100,128,28,114,96,41,172,130,66,40,134,205,
176,29,42,96,47,212,64,29,52,192,81,104,134,147,112,14,46,194,85,184,14,
61,112,15,250,97,8,158,193,40,188,129,9,4,65,200,8,19,97,33,218,136,1,98,
138,88,35,142,8,23,153,133,248,33,193,72,4,18,139,36,32,201,136,20,81,34,
75,145,53,72,49,82,138,84,32,85,72,29,242,61,114,2,57,135,92,70,186,145,
59,200,0,50,130,252,134,188,71,49,148,129,178,81,61,212,12,181,67,185,168,
55,26,132,70,162,11,208,100,116,49,154,143,22,160,155,208,114,180,26,61,
140,54,161,231,208,171,104,15,218,143,62,67,199,48,192,232,24,7,51,196,
108,48,46,198,195,66,177,56,44,9,147,99,203,177,34,172,12,171,198,26,176,
86,172,3,187,137,245,99,207,177,119,4,18,129,69,192,9,54,4,119,66,32,97,
30,65,72,88,76,88,78,216,72,168,32,28,36,52,17,218,9,55,9,3,132,81,194,
39,34,147,168,75,180,38,186,17,249,196,24,98,50,49,135,88,72,44,35,214,
18,143,19,47,16,123,136,67,196,55,36,18,137,67,50,39,185,144,2,73,177,164,
84,210,18,210,70,210,110,82,35,233,44,169,155,52,72,26,35,147,201,218,100,
107,178,7,57,148,44,32,43,200,133,228,157,228,195,228,51,228,27,228,33,
242,91,10,157,98,64,113,164,248,83,226,40,82,202,106,74,25,229,16,229,52,
229,6,101,152,50,65,85,163,154,82,221,168,161,84,17,53,143,90,66,173,161,
182,82,175,81,135,168,19,52,117,154,57,205,131,22,73,75,165,173,162,149,
211,26,104,23,104,247,105,175,232,116,186,17,221,149,30,78,151,208,87,210,
203,233,71,232,151,232,3,244,119,12,13,134,21,131,199,136,103,40,25,155,
24,7,24,103,25,119,24,175,152,76,166,25,211,139,25,199,84,48,55,49,235,
152,231,153,15,153,111,85,88,42,182,42,124,21,145,202,10,149,74,149,38,
149,27,42,47,84,169,170,166,170,222,170,11,85,243,85,203,84,143,169,94,
83,125,174,70,85,51,83,227,169,9,212,150,171,85,170,157,80,235,83,27,83,
103,169,59,168,135,170,103,168,111,84,63,164,126,89,253,137,6,89,195,76,
195,79,67,164,81,160,177,95,227,188,198,32,11,99,25,179,120,44,33,107,13,
171,134,117,129,53,196,38,177,205,217,124,118,42,187,152,253,29,187,139,
61,170,169,161,57,67,51,74,51,87,179,82,243,148,102,63,7,227,152,113,248,
156,116,78,9,231,40,167,151,243,126,138,222,20,239,41,226,41,27,166,52,
76,185,49,101,92,107,170,150,151,150,88,171,72,171,81,171,71,235,189,54,
174,237,167,157,166,189,69,187,89,251,129,14,65,199,74,39,92,39,71,103,
143,206,5,157,231,83,217,83,221,167,10,167,22,77,61,58,245,174,46,170,107,
165,27,161,187,68,119,191,110,167,238,152,158,190,94,128,158,76,111,167,
222,121,189,231,250,28,125,47,253,84,253,109,250,167,245,71,12,88,6,179,
12,36,6,219,12,206,24,60,197,53,113,111,60,29,47,199,219,241,81,67,93,195,
64,67,165,97,149,97,151,225,132,145,185,209,60,163,213,70,141,70,15,140,
105,198,92,227,36,227,109,198,109,198,163,38,6,38,33,38,75,77,234,77,238,
154,82,77,185,166,41,166,59,76,59,76,199,205,204,205,162,205,214,153,53,
155,61,49,215,50,231,155,231,155,215,155,223,183,96,90,120,90,44,182,168,
182,184,101,73,178,228,90,166,89,238,182,188,110,133,90,57,89,165,88,85,
90,93,179,70,173,157,173,37,214,187,173,187,167,17,167,185,78,147,78,171,
158,214,103,195,176,241,182,201,182,169,183,25,176,229,216,6,219,174,182,
109,182,125,97,103,98,23,103,183,197,174,195,238,147,189,147,125,186,125,
141,253,61,7,13,135,217,14,171,29,90,29,126,115,180,114,20,58,86,58,222,
154,206,156,238,63,125,197,244,150,233,47,103,88,207,16,207,216,51,227,
182,19,203,41,196,105,157,83,155,211,71,103,23,103,185,115,131,243,136,
139,137,75,130,203,46,151,62,46,155,27,198,221,200,189,228,74,116,245,113,
93,225,122,210,245,157,155,179,155,194,237,168,219,175,238,54,238,105,238,
135,220,159,204,52,159,41,158,89,51,115,208,195,200,67,224,81,229,209,63,
11,159,149,48,107,223,172,126,79,67,79,129,103,181,231,35,47,99,47,145,
87,173,215,176,183,165,119,170,247,97,239,23,62,246,62,114,159,227,62,227,
60,55,222,50,222,89,95,204,55,192,183,200,183,203,79,195,111,158,95,133,
223,67,127,35,255,100,255,122,255,209,0,167,128,37,1,103,3,137,129,65,129,
91,2,251,248,122,124,33,191,142,63,58,219,101,246,178,217,237,65,140,160,
185,65,21,65,143,130,173,130,229,193,173,33,104,200,236,144,173,33,247,
231,152,206,145,206,105,14,133,80,126,232,214,208,7,97,230,97,139,195,126,
12,39,133,135,133,87,134,63,142,112,136,88,26,209,49,151,53,119,209,220,
67,115,223,68,250,68,150,68,222,155,103,49,79,57,175,45,74,53,42,62,170,
46,106,60,218,55,186,52,186,63,198,46,102,89,204,213,88,157,88,73,108,75,
28,57,46,42,174,54,110,108,190,223,252,237,243,135,226,157,226,11,227,123,
23,152,47,200,93,112,121,161,206,194,244,133,167,22,169,46,18,44,58,150,
64,76,136,78,56,148,240,65,16,42,168,22,140,37,242,19,119,37,142,10,121,
194,29,194,103,34,47,209,54,209,136,216,67,92,42,30,78,242,72,42,77,122,
146,236,145,188,53,121,36,197,51,165,44,229,185,132,39,169,144,188,76,13,
76,221,155,58,158,22,154,118,32,109,50,61,58,189,49,131,146,145,144,113,
66,170,33,77,147,182,103,234,103,230,102,118,203,172,101,133,178,254,197,
110,139,183,47,30,149,7,201,107,179,144,172,5,89,45,10,182,66,166,232,84,
90,40,215,42,7,178,103,101,87,102,191,205,137,202,57,150,171,158,43,205,
237,204,179,202,219,144,55,156,239,159,255,237,18,194,18,225,146,182,165,
134,75,87,45,29,88,230,189,172,106,57,178,60,113,121,219,10,227,21,5,43,
134,86,6,172,60,184,138,182,42,109,213,79,171,237,87,151,174,126,189,38,
122,77,107,129,94,193,202,130,193,181,1,107,235,11,85,10,229,133,125,235,
220,215,237,93,79,88,47,89,223,181,97,250,134,157,27,62,21,137,138,174,
20,219,23,151,21,127,216,40,220,120,229,27,135,111,202,191,153,220,148,
180,169,171,196,185,100,207,102,210,102,233,230,222,45,158,91,14,150,170,
151,230,151,14,110,13,217,218,180,13,223,86,180,237,245,246,69,219,47,151,
205,40,219,187,131,182,67,185,163,191,60,184,188,101,167,201,206,205,59,
63,84,164,84,244,84,250,84,54,238,210,221,181,97,215,248,110,209,238,27,
123,188,246,52,236,213,219,91,188,247,253,62,201,190,219,85,1,85,77,213,
102,213,101,251,73,251,179,247,63,174,137,170,233,248,150,251,109,93,173,
78,109,113,237,199,3,210,3,253,7,35,14,182,215,185,212,213,29,210,61,84,
82,143,214,43,235,71,14,199,31,190,254,157,239,119,45,13,54,13,85,141,156,
198,226,35,112,68,121,228,233,247,9,223,247,30,13,58,218,118,140,123,172,
225,7,211,31,118,29,103,29,47,106,66,154,242,154,70,155,83,154,251,91,98,
91,186,79,204,62,209,214,234,222,122,252,71,219,31,15,156,52,60,89,121,
74,243,84,201,105,218,233,130,211,147,103,242,207,140,157,149,157,125,126,
46,249,220,96,219,162,182,123,231,99,206,223,106,15,111,239,186,16,116,
225,210,69,255,139,231,59,188,59,206,92,242,184,116,242,178,219,229,19,
87,184,87,154,175,58,95,109,234,116,234,60,254,147,211,79,199,187,156,187,
154,174,185,92,107,185,238,122,189,181,123,102,247,233,27,158,55,206,221,
244,189,121,241,22,255,214,213,158,57,61,221,189,243,122,111,247,197,247,
245,223,22,221,126,114,39,253,206,203,187,217,119,39,238,173,188,79,188,
95,244,64,237,65,217,67,221,135,213,63,91,254,220,216,239,220,127,106,192,
119,160,243,209,220,71,247,6,133,131,207,254,145,245,143,15,67,5,143,153,
143,203,134,13,134,235,158,56,62,57,57,226,63,114,253,233,252,167,67,207,
100,207,38,158,23,254,162,254,203,174,23,22,47,126,248,213,235,215,206,
209,152,209,161,151,242,151,147,191,109,124,165,253,234,192,235,25,175,
219,198,194,198,30,190,201,120,51,49,94,244,86,251,237,193,119,220,119,
29,239,163,223,15,79,228,124,32,127,40,255,104,249,177,245,83,208,167,251,
147,25,147,147,255,4,3,152,243,252,99,51,45,219,0,0,0,4,103,65,77,65,0,
0,177,142,124,251,81,147,0,0,0,32,99,72,82,77,0,0,122,37,0,0,128,131,0,
0,249,255,0,0,128,233,0,0,117,48,0,0,234,96,0,0,58,152,0,0,23,111,146,95,
197,70,0,0,0,216,73,68,65,84,120,218,164,147,189,85,3,49,16,132,191,209,
201,230,145,83,6,13,144,184,15,82,135,118,61,16,146,210,7,9,13,80,6,13,
56,26,7,43,221,233,184,159,247,142,155,104,245,222,238,204,206,72,146,109,
246,32,3,188,190,125,253,139,229,243,122,82,174,135,247,243,203,166,225,
203,199,247,176,65,197,207,239,141,176,36,4,24,64,244,181,74,223,243,211,
195,216,66,69,151,0,18,178,241,64,81,160,229,12,250,131,170,92,52,75,26,
73,219,83,162,17,193,161,107,6,84,138,118,137,84,73,86,54,144,104,182,48,
72,88,32,194,150,214,44,28,59,176,133,112,168,33,132,34,88,213,96,87,44,
228,148,66,201,169,168,151,248,172,112,246,199,209,12,65,92,160,155,228,
122,189,153,72,166,33,166,162,132,6,10,71,160,115,254,39,4,143,89,11,239,
78,235,127,161,125,154,91,161,189,191,49,177,19,247,1,0,33,249,65,89,209,
111,194,228,0,0,0,0,73,69,78,68,174,66,96,130};
static size_t xml_res_size_11 = 551;
static unsigned char xml_res_file_11[] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
0,31,243,255,97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,1,222,73,
68,65,84,56,141,165,147,207,107,19,65,20,199,191,51,59,59,89,106,154,31,
@@ -247,8 +456,8 @@ static unsigned char xml_res_file_8[] = {
221,165,116,240,50,93,39,126,1,157,215,183,111,35,213,143,230,0,0,0,0,73,
69,78,68,174,66,96,130};
static size_t xml_res_size_9 = 242;
static unsigned char xml_res_file_9[] = {
static size_t xml_res_size_12 = 242;
static unsigned char xml_res_file_12[] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
0,31,243,255,97,0,0,0,1,115,82,71,66,0,174,206,28,233,0,0,0,4,103,65,77,
65,0,0,177,143,11,252,97,5,0,0,0,9,112,72,89,115,0,0,14,195,0,0,14,195,
@@ -261,8 +470,8 @@ static unsigned char xml_res_file_9[] = {
148,152,61,0,53,102,23,224,196,108,7,120,252,165,188,1,223,94,27,87,47,
146,220,102,0,0,0,0,73,69,78,68,174,66,96,130};
static size_t xml_res_size_10 = 278;
static unsigned char xml_res_file_10[] = {
static size_t xml_res_size_13 = 278;
static unsigned char xml_res_file_13[] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
0,31,243,255,97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,205,73,
68,65,84,56,141,99,252,255,255,63,3,37,128,9,155,160,247,198,167,203,200,
@@ -277,8 +486,8 @@ static unsigned char xml_res_file_10[] = {
39,11,219,184,205,88,246,255,255,127,212,104,36,7,0,0,132,192,138,139,110,
249,27,234,0,0,0,0,73,69,78,68,174,66,96,130};
static size_t xml_res_size_11 = 1854;
static unsigned char xml_res_file_11[] = {
static size_t xml_res_size_14 = 2303;
static unsigned char xml_res_file_14[] = {
60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58,
@@ -293,85 +502,107 @@ static unsigned char xml_res_file_11[] = {
95,105,99,111,110,115,95,100,101,102,97,117,108,116,95,97,100,100,49,54,
46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111,98,106,101,
99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,97,112,34,32,110,
97,109,101,61,34,101,100,105,116,49,54,34,62,84,105,108,101,77,97,112,68,
105,97,108,111,103,115,95,119,120,115,109,105,116,104,95,98,105,116,109,
97,112,115,46,99,112,112,36,46,46,95,46,46,95,66,105,110,97,114,105,101,
115,95,79,117,116,112,117,116,95,82,101,108,101,97,115,101,95,87,105,110,
100,111,119,115,95,114,101,115,95,105,99,111,110,115,95,100,101,102,97,
117,108,116,95,101,100,105,116,49,54,46,112,110,103,60,47,111,98,106,101,
99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,
119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,104,101,108,112,
49,54,34,62,84,105,108,101,77,97,112,68,105,97,108,111,103,115,95,119,120,
115,109,105,116,104,95,98,105,116,109,97,112,115,46,99,112,112,36,46,46,
95,46,46,95,66,105,110,97,114,105,101,115,95,79,117,116,112,117,116,95,
82,101,108,101,97,115,101,95,87,105,110,100,111,119,115,95,114,101,115,
95,105,99,111,110,115,95,100,101,102,97,117,108,116,95,104,101,108,112,
49,54,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111,98,
106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,97,112,
34,32,110,97,109,101,61,34,105,109,97,103,101,49,54,34,62,84,105,108,101,
77,97,112,68,105,97,108,111,103,115,95,119,120,115,109,105,116,104,95,98,
105,116,109,97,112,115,46,99,112,112,36,46,46,95,46,46,95,66,105,110,97,
114,105,101,115,95,79,117,116,112,117,116,95,82,101,108,101,97,115,101,
95,87,105,110,100,111,119,115,95,114,101,115,95,105,99,111,110,115,95,100,
101,102,97,117,108,116,95,105,109,97,103,101,49,54,46,112,110,103,60,47,
97,109,101,61,34,100,101,108,101,116,101,49,54,34,62,84,105,108,101,77,
97,112,68,105,97,108,111,103,115,95,119,120,115,109,105,116,104,95,98,105,
116,109,97,112,115,46,99,112,112,36,46,46,95,46,46,95,66,105,110,97,114,
105,101,115,95,79,117,116,112,117,116,95,82,101,108,101,97,115,101,95,87,
105,110,100,111,119,115,95,114,101,115,95,105,99,111,110,115,95,100,101,
102,97,117,108,116,95,100,101,108,101,116,101,49,54,46,112,110,103,60,47,
111,98,106,101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,
115,115,61,34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,
108,97,121,101,114,49,54,34,62,84,105,108,101,77,97,112,68,105,97,108,111,
101,100,105,116,49,54,34,62,84,105,108,101,77,97,112,68,105,97,108,111,
103,115,95,119,120,115,109,105,116,104,95,98,105,116,109,97,112,115,46,
99,112,112,36,46,46,95,46,46,95,66,105,110,97,114,105,101,115,95,79,117,
116,112,117,116,95,82,101,108,101,97,115,101,95,87,105,110,100,111,119,
115,95,114,101,115,95,105,99,111,110,115,95,100,101,102,97,117,108,116,
95,108,97,121,101,114,49,54,46,112,110,103,60,47,111,98,106,101,99,116,
62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,
66,105,116,109,97,112,34,32,110,97,109,101,61,34,109,97,115,107,69,100,
105,116,49,54,34,62,84,105,108,101,77,97,112,68,105,97,108,111,103,115,
95,119,120,115,109,105,116,104,95,98,105,116,109,97,112,115,46,99,112,112,
36,46,46,95,46,46,95,66,105,110,97,114,105,101,115,95,79,117,116,112,117,
116,95,82,101,108,101,97,115,101,95,87,105,110,100,111,119,115,95,114,101,
115,95,109,97,115,107,69,100,105,116,49,54,46,112,110,103,60,47,111,98,
106,101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,
61,34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,111,112,
116,105,111,110,115,49,54,34,62,84,105,108,101,77,97,112,68,105,97,108,
95,101,100,105,116,49,54,46,112,110,103,60,47,111,98,106,101,99,116,62,
10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,
105,116,109,97,112,34,32,110,97,109,101,61,34,102,105,108,108,49,54,34,
62,84,105,108,101,77,97,112,68,105,97,108,111,103,115,95,119,120,115,109,
105,116,104,95,98,105,116,109,97,112,115,46,99,112,112,36,46,46,95,46,46,
95,66,105,110,97,114,105,101,115,95,79,117,116,112,117,116,95,82,101,108,
101,97,115,101,95,87,105,110,100,111,119,115,95,114,101,115,95,102,105,
108,108,49,54,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,
111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,
97,112,34,32,110,97,109,101,61,34,104,101,108,112,49,54,34,62,84,105,108,
101,77,97,112,68,105,97,108,111,103,115,95,119,120,115,109,105,116,104,
95,98,105,116,109,97,112,115,46,99,112,112,36,46,46,95,46,46,95,66,105,
110,97,114,105,101,115,95,79,117,116,112,117,116,95,82,101,108,101,97,115,
101,95,87,105,110,100,111,119,115,95,114,101,115,95,105,99,111,110,115,
95,100,101,102,97,117,108,116,95,104,101,108,112,49,54,46,112,110,103,60,
47,111,98,106,101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,
97,115,115,61,34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,
34,105,109,97,103,101,49,54,34,62,84,105,108,101,77,97,112,68,105,97,108,
111,103,115,95,119,120,115,109,105,116,104,95,98,105,116,109,97,112,115,
46,99,112,112,36,46,46,95,46,46,95,66,105,110,97,114,105,101,115,95,79,
117,116,112,117,116,95,82,101,108,101,97,115,101,95,87,105,110,100,111,
119,115,95,114,101,115,95,105,99,111,110,115,95,100,101,102,97,117,108,
116,95,111,112,116,105,111,110,115,49,54,46,112,110,103,60,47,111,98,106,
101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,
34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,112,97,116,
104,102,105,110,100,105,110,103,111,98,115,116,97,99,108,101,105,99,111,
110,49,54,34,62,84,105,108,101,77,97,112,68,105,97,108,111,103,115,95,119,
120,115,109,105,116,104,95,98,105,116,109,97,112,115,46,99,112,112,36,46,
46,95,46,46,95,66,105,110,97,114,105,101,115,95,79,117,116,112,117,116,
95,82,101,108,101,97,115,101,95,87,105,110,100,111,119,115,95,67,112,112,
80,108,97,116,102,111,114,109,95,69,120,116,101,110,115,105,111,110,115,
95,112,97,116,104,102,105,110,100,105,110,103,111,98,115,116,97,99,108,
101,105,99,111,110,49,54,46,112,110,103,60,47,111,98,106,101,99,116,62,
10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,
105,116,109,97,112,34,32,110,97,109,101,61,34,114,101,109,111,118,101,49,
54,34,62,84,105,108,101,77,97,112,68,105,97,108,111,103,115,95,119,120,
116,95,105,109,97,103,101,49,54,46,112,110,103,60,47,111,98,106,101,99,
116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,
120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,108,97,121,101,114,
49,54,34,62,84,105,108,101,77,97,112,68,105,97,108,111,103,115,95,119,120,
115,109,105,116,104,95,98,105,116,109,97,112,115,46,99,112,112,36,46,46,
95,46,46,95,66,105,110,97,114,105,101,115,95,79,117,116,112,117,116,95,
82,101,108,101,97,115,101,95,87,105,110,100,111,119,115,95,114,101,115,
95,105,99,111,110,115,95,100,101,102,97,117,108,116,95,114,101,109,111,
118,101,49,54,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,
95,105,99,111,110,115,95,100,101,102,97,117,108,116,95,108,97,121,101,114,
49,54,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111,98,
106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,97,112,
34,32,110,97,109,101,61,34,109,97,115,107,69,100,105,116,49,54,34,62,84,
105,108,101,77,97,112,68,105,97,108,111,103,115,95,119,120,115,109,105,
116,104,95,98,105,116,109,97,112,115,46,99,112,112,36,46,46,95,46,46,95,
66,105,110,97,114,105,101,115,95,79,117,116,112,117,116,95,82,101,108,101,
97,115,101,95,87,105,110,100,111,119,115,95,114,101,115,95,109,97,115,107,
69,100,105,116,49,54,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,
32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,
109,97,112,34,32,110,97,109,101,61,34,111,112,116,105,111,110,115,49,54,
34,62,84,105,108,101,77,97,112,68,105,97,108,111,103,115,95,119,120,115,
109,105,116,104,95,98,105,116,109,97,112,115,46,99,112,112,36,46,46,95,
46,46,95,66,105,110,97,114,105,101,115,95,79,117,116,112,117,116,95,82,
101,108,101,97,115,101,95,87,105,110,100,111,119,115,95,114,101,115,95,
105,99,111,110,115,95,100,101,102,97,117,108,116,95,111,112,116,105,111,
110,115,49,54,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,
111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,
97,112,34,32,110,97,109,101,61,34,116,105,108,101,109,97,115,107,116,114,
105,97,110,103,108,101,98,114,49,54,34,62,84,105,108,101,77,97,112,68,105,
97,112,34,32,110,97,109,101,61,34,112,97,116,104,102,105,110,100,105,110,
103,111,98,115,116,97,99,108,101,105,99,111,110,49,54,34,62,84,105,108,
101,77,97,112,68,105,97,108,111,103,115,95,119,120,115,109,105,116,104,
95,98,105,116,109,97,112,115,46,99,112,112,36,46,46,95,46,46,95,66,105,
110,97,114,105,101,115,95,79,117,116,112,117,116,95,82,101,108,101,97,115,
101,95,87,105,110,100,111,119,115,95,67,112,112,80,108,97,116,102,111,114,
109,95,69,120,116,101,110,115,105,111,110,115,95,112,97,116,104,102,105,
110,100,105,110,103,111,98,115,116,97,99,108,101,105,99,111,110,49,54,46,
112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111,98,106,101,99,
116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,97,112,34,32,110,
97,109,101,61,34,114,101,99,116,97,110,103,108,101,34,62,84,105,108,101,
77,97,112,68,105,97,108,111,103,115,95,119,120,115,109,105,116,104,95,98,
105,116,109,97,112,115,46,99,112,112,36,46,46,95,46,46,95,66,105,110,97,
114,105,101,115,95,79,117,116,112,117,116,95,82,101,108,101,97,115,101,
95,87,105,110,100,111,119,115,95,114,101,115,95,99,111,110,100,105,116,
105,111,110,115,95,114,101,99,116,97,110,103,108,101,46,112,110,103,60,
47,111,98,106,101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,
97,115,115,61,34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,
34,114,101,109,111,118,101,49,54,34,62,84,105,108,101,77,97,112,68,105,
97,108,111,103,115,95,119,120,115,109,105,116,104,95,98,105,116,109,97,
112,115,46,99,112,112,36,46,46,95,46,46,95,66,105,110,97,114,105,101,115,
95,79,117,116,112,117,116,95,82,101,108,101,97,115,101,95,87,105,110,100,
111,119,115,95,114,101,115,95,116,105,108,101,109,97,115,107,116,114,105,
97,110,103,108,101,98,114,49,54,46,112,110,103,60,47,111,98,106,101,99,
116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,
120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,117,110,100,111,49,
54,34,62,84,105,108,101,77,97,112,68,105,97,108,111,103,115,95,119,120,
115,109,105,116,104,95,98,105,116,109,97,112,115,46,99,112,112,36,46,46,
95,46,46,95,66,105,110,97,114,105,101,115,95,79,117,116,112,117,116,95,
82,101,108,101,97,115,101,95,87,105,110,100,111,119,115,95,114,101,115,
95,105,99,111,110,115,95,100,101,102,97,117,108,116,95,117,110,100,111,
49,54,46,112,110,103,60,47,111,98,106,101,99,116,62,10,60,47,114,101,115,
111,117,114,99,101,62,10};
111,119,115,95,114,101,115,95,105,99,111,110,115,95,100,101,102,97,117,
108,116,95,114,101,109,111,118,101,49,54,46,112,110,103,60,47,111,98,106,
101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,
34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,116,105,108,
101,109,97,115,107,116,114,105,97,110,103,108,101,98,114,49,54,34,62,84,
105,108,101,77,97,112,68,105,97,108,111,103,115,95,119,120,115,109,105,
116,104,95,98,105,116,109,97,112,115,46,99,112,112,36,46,46,95,46,46,95,
66,105,110,97,114,105,101,115,95,79,117,116,112,117,116,95,82,101,108,101,
97,115,101,95,87,105,110,100,111,119,115,95,114,101,115,95,116,105,108,
101,109,97,115,107,116,114,105,97,110,103,108,101,98,114,49,54,46,112,110,
103,60,47,111,98,106,101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,
99,108,97,115,115,61,34,119,120,66,105,116,109,97,112,34,32,110,97,109,
101,61,34,117,110,100,111,49,54,34,62,84,105,108,101,77,97,112,68,105,97,
108,111,103,115,95,119,120,115,109,105,116,104,95,98,105,116,109,97,112,
115,46,99,112,112,36,46,46,95,46,46,95,66,105,110,97,114,105,101,115,95,
79,117,116,112,117,116,95,82,101,108,101,97,115,101,95,87,105,110,100,111,
119,115,95,114,101,115,95,105,99,111,110,115,95,100,101,102,97,117,108,
116,95,117,110,100,111,49,54,46,112,110,103,60,47,111,98,106,101,99,116,
62,10,60,47,114,101,115,111,117,114,99,101,62,10};
void wxCF6DCInitBitmapResources()
{
@@ -387,16 +618,19 @@ void wxCF6DCInitBitmapResources()
}
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_add16.png"), xml_res_file_0, xml_res_size_0, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_edit16.png"), xml_res_file_1, xml_res_size_1, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_help16.png"), xml_res_file_2, xml_res_size_2, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_image16.png"), xml_res_file_3, xml_res_size_3, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_layer16.png"), xml_res_file_4, xml_res_size_4, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_maskEdit16.png"), xml_res_file_5, xml_res_size_5, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_options16.png"), xml_res_file_6, xml_res_size_6, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_CppPlatform_Extensions_pathfindingobstacleicon16.png"), xml_res_file_7, xml_res_size_7, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_remove16.png"), xml_res_file_8, xml_res_size_8, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_tilemasktrianglebr16.png"), xml_res_file_9, xml_res_size_9, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_undo16.png"), xml_res_file_10, xml_res_size_10, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$E__Developpement_GD_Extensions_TileMapObject_TileMapDialogs_wxsmith_bitmaps.xrc"), xml_res_file_11, xml_res_size_11, wxT("text/xml"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_delete16.png"), xml_res_file_1, xml_res_size_1, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_edit16.png"), xml_res_file_2, xml_res_size_2, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_fill16.png"), xml_res_file_3, xml_res_size_3, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_help16.png"), xml_res_file_4, xml_res_size_4, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_image16.png"), xml_res_file_5, xml_res_size_5, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_layer16.png"), xml_res_file_6, xml_res_size_6, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_maskEdit16.png"), xml_res_file_7, xml_res_size_7, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_options16.png"), xml_res_file_8, xml_res_size_8, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_CppPlatform_Extensions_pathfindingobstacleicon16.png"), xml_res_file_9, xml_res_size_9, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_conditions_rectangle.png"), xml_res_file_10, xml_res_size_10, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_remove16.png"), xml_res_file_11, xml_res_size_11, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_tilemasktrianglebr16.png"), xml_res_file_12, xml_res_size_12, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_undo16.png"), xml_res_file_13, xml_res_size_13, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$E__Developpement_GD_Extensions_TileMapObject_TileMapDialogs_wxsmith_bitmaps.xrc"), xml_res_file_14, xml_res_size_14, wxT("text/xml"));
wxXmlResource::Get()->Load(wxT("memory:XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$E__Developpement_GD_Extensions_TileMapObject_TileMapDialogs_wxsmith_bitmaps.xrc"));
}
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
<object class="wxBitmap" name="add16">..\..\Binaries\Output\Release_Windows\res\icons_default\add16.png</object>
<object class="wxBitmap" name="delete16">..\..\Binaries\Output\Release_Windows\res\icons_default\delete16.png</object>
<object class="wxBitmap" name="edit16">..\..\Binaries\Output\Release_Windows\res\icons_default\edit16.png</object>
<object class="wxBitmap" name="fill16">..\..\Binaries\Output\Release_Windows\res\fill16.png</object>
<object class="wxBitmap" name="help16">..\..\Binaries\Output\Release_Windows\res\icons_default\help16.png</object>
<object class="wxBitmap" name="image16">..\..\Binaries\Output\Release_Windows\res\icons_default\image16.png</object>
<object class="wxBitmap" name="layer16">..\..\Binaries\Output\Release_Windows\res\icons_default\layer16.png</object>
<object class="wxBitmap" name="maskEdit16">..\..\Binaries\Output\Release_Windows\res\maskEdit16.png</object>
<object class="wxBitmap" name="options16">..\..\Binaries\Output\Release_Windows\res\icons_default\options16.png</object>
<object class="wxBitmap" name="pathfindingobstacleicon16">..\..\Binaries\Output\Release_Windows\CppPlatform\Extensions\pathfindingobstacleicon16.png</object>
<object class="wxBitmap" name="rectangle">..\..\Binaries\Output\Release_Windows\res\conditions\rectangle.png</object>
<object class="wxBitmap" name="remove16">..\..\Binaries\Output\Release_Windows\res\icons_default\remove16.png</object>
<object class="wxBitmap" name="tilemasktrianglebr16">..\..\Binaries\Output\Release_Windows\res\tilemasktrianglebr16.png</object>
<object class="wxBitmap" name="undo16">..\..\Binaries\Output\Release_Windows\res\icons_default\undo16.png</object>
@@ -194,4 +194,16 @@ void TileMapObjectEditor::OnCloseButtonClicked(wxCloseEvent& event)
EndModal(0);
}
void TileMapObjectEditor::OnTileInsertionModeChanged(wxCommandEvent& event)
{
if(event.GetId() == MODE_SINGLE_TILE_TOOL_ID)
{
m_tileMapPanel->SetInsertionMode(TileMapPanel::PencilMode);
}
else if(event.GetId() == MODE_RECTANGLE_TILE_TOOL_ID)
{
m_tileMapPanel->SetInsertionMode(TileMapPanel::RectangleMode);
}
}
#endif
@@ -49,9 +49,10 @@ class TileMapObjectEditor: public TileMapObjectEditorBase
virtual ~TileMapObjectEditor();
protected:
virtual void OnCloseButtonClicked(wxCloseEvent& event);
virtual void OnHelpButtonClicked(wxHyperlinkEvent& event);
virtual void OnTileEditToolClicked(wxCommandEvent& event);
virtual void OnTileInsertionModeChanged(wxCommandEvent& event);
virtual void OnCloseButtonClicked(wxCloseEvent& event);
virtual void OnHelpButtonClicked(wxHyperlinkEvent& event);
virtual void OnTileEditToolClicked(wxCommandEvent& event);
virtual void OnChangeMapSizeButtonClicked(wxCommandEvent& event);
virtual void OnTileSetConfigureButtonClicked(wxCommandEvent& event);
virtual void OnLayerChoiceChanged(wxCommandEvent& event);
+93 -9
View File
@@ -37,13 +37,17 @@ TileMapPanel::TileMapPanel(wxWindow* parent, wxWindowID id, const wxPoint &pos,
m_hideUpperLayers(false),
m_tileset(NULL),
m_tilemap(NULL),
m_mapCurrentLayer(0)
m_mapCurrentLayer(0),
m_insertionMode(PencilMode),
m_isDrawingRectangle(false)
{
SetBackgroundStyle(wxBG_STYLE_PAINT);
Connect(wxEVT_PAINT, wxPaintEventHandler(TileMapPanel::OnPaint), NULL, this);
Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TileMapPanel::OnMouseEvent), NULL, this);
Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TileMapPanel::OnMouseEvent), NULL, this);
Connect(wxEVT_LEFT_UP, wxMouseEventHandler(TileMapPanel::OnMouseEvent), NULL, this);
Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(TileMapPanel::OnMouseEvent), NULL, this);
Connect(wxEVT_MOTION, wxMouseEventHandler(TileMapPanel::OnMouseEvent), NULL, this);
}
@@ -90,6 +94,12 @@ void TileMapPanel::Update()
Refresh();
}
void TileMapPanel::SetInsertionMode(InsertionMode newInsertionMode)
{
m_insertionMode = newInsertionMode;
Update();
}
void TileMapPanel::OnTileSetSelectionChanged(TileSelectionEvent &event)
{
m_tileToBeInserted = event.GetSelectedTile();
@@ -134,6 +144,25 @@ void TileMapPanel::OnPaint(wxPaintEvent& event)
}
}
//Draw the rectangle (when the mode is RectangleMode)
if(m_insertionMode == RectangleMode && m_isDrawingRectangle)
{
dc.SetBrush(wxBrush(wxColour(128, 128, 255, 128)));
dc.SetPen(wxPen(wxColor(128, 128, 255, 255), 1));
wxPoint topLeftPos(GetPositionOfTile(std::min(m_beginCol, m_endCol),
std::min(m_beginRow, m_endRow)));
wxPoint bottomRightPos(GetPositionOfTile(std::max(m_beginCol + 1, m_endCol + 1),
std::max(m_beginRow + 1, m_endRow + 1)));
wxSize rectSize(bottomRightPos.x - topLeftPos.x, bottomRightPos.y - topLeftPos.y);
dc.DrawRectangle(topLeftPos, rectSize);
}
dc.SetPen(wxPen(wxColor(128, 128, 128, 255), 1));
//Draw the grid
for(int col = firstCol; col < lastCol; col++)
{
@@ -178,17 +207,72 @@ void TileMapPanel::OnMouseEvent(wxMouseEvent &event)
if(currentColumn >= m_tilemap->GetColumnsCount() || currentRow >= m_tilemap->GetRowsCount())
return; //Stop if the position is out of range
if(event.LeftIsDown()) //Left mouse button pressed
if(m_insertionMode == PencilMode)
{
//Add a tile to the current position
m_tilemap->SetTile(m_mapCurrentLayer, currentColumn, currentRow, m_tileToBeInserted);
Refresh();
if(event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_RIGHT_DOWN || event.GetEventType() == wxEVT_MOTION)
{
if(event.LeftIsDown()) //Left mouse button pressed
{
//Add a tile to the current position
m_tilemap->SetTile(m_mapCurrentLayer, currentColumn, currentRow, m_tileToBeInserted);
Refresh();
}
else if(event.RightIsDown())
{
//Remove the tile
m_tilemap->SetTile(m_mapCurrentLayer, currentColumn, currentRow, -1);
Refresh();
}
}
}
else if(event.RightIsDown())
else if(m_insertionMode == RectangleMode)
{
//Remove the tile
m_tilemap->SetTile(m_mapCurrentLayer, currentColumn, currentRow, -1);
Refresh();
if(event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_RIGHT_DOWN)
{
m_isDrawingRectangle = true;
m_beginCol = m_endCol = currentColumn;
m_beginRow = m_endRow = currentRow;
Update();
}
else if(event.GetEventType() == wxEVT_MOTION)
{
m_endCol = currentColumn;
m_endRow = currentRow;
Update();
}
else if(event.GetEventType() == wxEVT_LEFT_UP)
{
m_endCol = currentColumn;
m_endRow = currentRow;
m_isDrawingRectangle = false;
for(int col = std::min(m_beginCol, m_endCol); col <= std::max(m_beginCol, m_endCol); col++)
{
for(int row = std::min(m_beginRow, m_endRow); row <= std::max(m_beginRow, m_endRow); row++)
{
m_tilemap->SetTile(m_mapCurrentLayer, col, row, m_tileToBeInserted);
}
}
Update();
}
else if(event.GetEventType() == wxEVT_RIGHT_UP)
{
m_endCol = currentColumn;
m_endRow = currentRow;
m_isDrawingRectangle = false;
for(int col = std::min(m_beginCol, m_endCol); col <= std::max(m_beginCol, m_endCol); col++)
{
for(int row = std::min(m_beginRow, m_endRow); row <= std::max(m_beginRow, m_endRow); row++)
{
m_tilemap->SetTile(m_mapCurrentLayer, col, row, -1);
}
}
Update();
}
}
}
+29 -8
View File
@@ -39,15 +39,13 @@ freely, subject to the following restrictions:
class TileMapPanel : public wxScrolledWindow
{
//Tile to be inserted
int m_tileToBeInserted;
bool m_hideUpperLayers;
TileSet *m_tileset;
TileMap *m_tilemap;
int m_mapCurrentLayer;
public:
enum InsertionMode
{
PencilMode,
RectangleMode
};
TileMapPanel(wxWindow* parent, wxWindowID id, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=wxHSCROLL|wxVSCROLL);
~TileMapPanel();
@@ -79,6 +77,11 @@ public:
*/
void Update();
/**
* Change the insertion mode
*/
void SetInsertionMode(InsertionMode newInsertionMode);
void OnTileSetSelectionChanged(TileSelectionEvent &event);
protected:
@@ -88,6 +91,24 @@ protected:
private:
wxPoint GetPositionOfTile(int column, int row);
void GetTileAt(wxPoint position, int &tileCol, int &tileRow);
//Tile to be inserted
int m_tileToBeInserted;
bool m_hideUpperLayers;
TileSet *m_tileset;
TileMap *m_tilemap;
int m_mapCurrentLayer;
InsertionMode m_insertionMode;
//Some parameters for the Rectangle Mode
bool m_isDrawingRectangle;
int m_beginCol;
int m_beginRow;
int m_endCol;
int m_endRow;
};
#endif