Kalakoi/GDevelop
1
0
Fork 0
mirror of https://github.com/4ian/GDevelop.git synced 2025-10-15 10:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added layer moving, layer hiding.

Browse Source
This commit is contained in:
victorlevasseur
2014-08-13 18:25:09 +02:00
parent e330c4499f
commit c14b45c31e
10 changed files with 599 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
Extensions/TileMapObject/TileMapObjectEditor.cpp
View File

@@ -52,15 +52,15 @@ game(game_),
mainFrameWrapper(mainFrameWrapper_),
object(object_)
{
m_tileSetPanel->Connect(TILE_SELECTION_CHANGED, TileSelectionEventHandler(TileMapObjectEditor::OnTileSetSelectionChanged), NULL, this);
m_tileSetPanel->Connect(TILE_SELECTION_CHANGED, TileSelectionEventHandler(TileMapObjectEditor::OnTileSetSelectionChanged), NULL, this);
UpdateLayerChoice();
UpdateLayerChoice();
}
TileMapObjectEditor::~TileMapObjectEditor()
{
if(tileSetBitmap)
delete tileSetBitmap;
if(tileSetBitmap)
delete tileSetBitmap;
}
void TileMapObjectEditor::OnTileSetPanelErase(wxEraseEvent& event)
@@ -70,87 +70,124 @@ void TileMapObjectEditor::OnTileSetPanelErase(wxEraseEvent& event)
void TileMapObjectEditor::OnTileSetPanelPaint(wxPaintEvent& event)
{
m_tileSetPanel->SetBackgroundStyle( wxBG_STYLE_PAINT );
m_tileSetPanel->SetBackgroundStyle( wxBG_STYLE_PAINT );
wxBufferedPaintDC dc( m_tileSetPanel );
if(tileSetBitmap != NULL)
{
dc.DrawBitmap(*tileSetBitmap, 0, 0);
dc.DrawBitmap(*tileSetBitmap, 0, 0);
}
}
void TileMapObjectEditor::OnUpdateClicked(wxCommandEvent& event)
{
std::string imageName = ToString(m_imageNameTextCtrl->GetValue());
SetTileSet(imageName);
std::string imageName = ToString(m_imageNameTextCtrl->GetValue());
SetTileSet(imageName);
m_tileSetPanel->SetTileCount(m_tileColumnsSpin->GetValue(), m_tileRowsSpin->GetValue());
m_tileSetPanel->SetTileSize(wxSize(m_tileWidthSpin->GetValue(), m_tileHeightSpin->GetValue()));
m_tileSetPanel->SetTileMargins(wxSize(m_horizontalMarginsSpin->GetValue(), m_verticalMarginsSpin->GetValue()));
m_tileSetPanel->SetTileCount(m_tileColumnsSpin->GetValue(), m_tileRowsSpin->GetValue());
m_tileSetPanel->SetTileSize(wxSize(m_tileWidthSpin->GetValue(), m_tileHeightSpin->GetValue()));
m_tileSetPanel->SetTileMargins(wxSize(m_horizontalMarginsSpin->GetValue(), m_verticalMarginsSpin->GetValue()));
m_tileMapPanel->SetTileSetCount(m_tileColumnsSpin->GetValue(), m_tileRowsSpin->GetValue());
m_tileMapPanel->SetTileSetSize(wxSize(m_tileWidthSpin->GetValue(), m_tileHeightSpin->GetValue()));
m_tileMapPanel->SetTileSetMargins(wxSize(m_horizontalMarginsSpin->GetValue(), m_verticalMarginsSpin->GetValue()));
m_tileMapPanel->SetTileSetCount(m_tileColumnsSpin->GetValue(), m_tileRowsSpin->GetValue());
m_tileMapPanel->SetTileSetSize(wxSize(m_tileWidthSpin->GetValue(), m_tileHeightSpin->GetValue()));
m_tileMapPanel->SetTileSetMargins(wxSize(m_horizontalMarginsSpin->GetValue(), m_verticalMarginsSpin->GetValue()));
m_tileSetPanel->Update();
m_tileMapPanel->Update();
m_tileSetPanel->Update();
m_tileMapPanel->Update();
}
void TileMapObjectEditor::OnMapUpdateButtonClicked(wxCommandEvent& event)
{
m_tileMapPanel->SetMapSize(m_mapWidthSpin->GetValue(), m_mapHeightSpin->GetValue());
m_tileMapPanel->SetMapSize(m_mapWidthSpin->GetValue(), m_mapHeightSpin->GetValue());
}
void TileMapObjectEditor::OnLayerAddButtonClicked(wxCommandEvent& event)
{
m_tileMapPanel->AddLayer(m_tileMapPanel->GetCurrentLayer() + 1);
m_tileMapPanel->SetCurrentLayer(m_tileMapPanel->GetCurrentLayer() + 1);
UpdateLayerChoice();
m_tileMapPanel->AddLayer(m_tileMapPanel->GetCurrentLayer() + 1);
m_tileMapPanel->SetCurrentLayer(m_tileMapPanel->GetCurrentLayer() + 1);
UpdateLayerChoice();
}
void TileMapObjectEditor::OnLayerChoiceChanged(wxCommandEvent& event)
{
m_tileMapPanel->SetCurrentLayer(m_layerChoice->GetSelection());
m_tileMapPanel->SetCurrentLayer(m_layerChoice->GetSelection());
}
void TileMapObjectEditor::OnLayerDeleteButtonClicked(wxCommandEvent& event)
{
if(m_tileMapPanel->GetLayersCount() > 1)
m_tileMapPanel->RemoveLayer(m_tileMapPanel->GetCurrentLayer());
if(m_tileMapPanel->GetCurrentLayer() >= m_tileMapPanel->GetLayersCount())
m_tileMapPanel->SetCurrentLayer(m_tileMapPanel->GetLayersCount() - 1);
UpdateLayerChoice();
}
void TileMapObjectEditor::OnLayerDownButtonClicked(wxCommandEvent& event)
{
if(m_tileMapPanel->GetCurrentLayer() + 1 < m_tileMapPanel->GetLayersCount())
{
//Move the layer down
m_tileMapPanel->AddLayer(m_tileMapPanel->GetCurrentLayer() + 2, m_tileMapPanel->GetCurrentLayer());
m_tileMapPanel->RemoveLayer(m_tileMapPanel->GetCurrentLayer());
m_tileMapPanel->SetCurrentLayer(m_tileMapPanel->GetCurrentLayer() + 1);
}
UpdateLayerChoice();
}
void TileMapObjectEditor::OnLayerUpButtonClicked(wxCommandEvent& event)
{
if(m_tileMapPanel->GetCurrentLayer() > 0)
{
//Move the layer down
m_tileMapPanel->AddLayer(m_tileMapPanel->GetCurrentLayer() - 1, m_tileMapPanel->GetCurrentLayer());
m_tileMapPanel->RemoveLayer(m_tileMapPanel->GetCurrentLayer() + 1);
m_tileMapPanel->SetCurrentLayer(m_tileMapPanel->GetCurrentLayer() - 1);
}
UpdateLayerChoice();
}
void TileMapObjectEditor::OnHideUpperLayerChecked(wxCommandEvent& event)
{
m_tileMapPanel->HideUpperLayers(m_hideUpperLayerCheck->GetValue());
}
void TileMapObjectEditor::OnTileSetSelectionChanged(TileSelectionEvent &event)
{
m_tileMapPanel->OnTileSetSelectionChanged(event);
m_tileMapPanel->OnTileSetSelectionChanged(event);
}
void TileMapObjectEditor::SetTileSet(const std::string &tileSetName)
{
if(tileSetBitmap != NULL)
{
delete tileSetBitmap;
tileSetBitmap = NULL;
}
if(tileSetBitmap != NULL)
{
delete tileSetBitmap;
tileSetBitmap = NULL;
}
if(game.GetResourcesManager().HasResource(tileSetName))
{
tileSetBitmap = new wxBitmap(GetwxBitmapFromImageResource(game.GetResourcesManager().GetResource(tileSetName)));
m_tileSetPanel->SetTileSet(tileSetBitmap);
m_tileMapPanel->SetTileSet(tileSetBitmap);
}
else
{
tileSetBitmap = NULL;
}
if(game.GetResourcesManager().HasResource(tileSetName))
{
tileSetBitmap = new wxBitmap(GetwxBitmapFromImageResource(game.GetResourcesManager().GetResource(tileSetName)));
m_tileSetPanel->SetTileSet(tileSetBitmap);
m_tileMapPanel->SetTileSet(tileSetBitmap);
}
else
{
tileSetBitmap = NULL;
}
}
void TileMapObjectEditor::UpdateLayerChoice()
{
m_layerChoice->Clear();
for(int layerId = 0; layerId < m_tileMapPanel->GetLayersCount(); layerId++)
{
m_layerChoice->Append(wxString::FromDouble(layerId, 0));
}
m_layerChoice->SetSelection(m_tileMapPanel->GetCurrentLayer());
m_layerChoice->Clear();
for(int layerId = 0; layerId < m_tileMapPanel->GetLayersCount(); layerId++)
{
m_layerChoice->Append(wxString::FromDouble(layerId, 0));
}
m_layerChoice->SetSelection(m_tileMapPanel->GetCurrentLayer());
}
wxBitmap TileMapObjectEditor::GetwxBitmapFromImageResource(gd::Resource & resource)

43
Extensions/TileMapObject/TileMapObjectEditor.h
View File

@@ -40,31 +40,34 @@ class ResourcesEditor;
class TileMapObjectEditor: public TileMapObjectEditorBase
{
public:
public:
TileMapObjectEditor( wxWindow* parent, gd::Project & game_, TileMapObject & object_, gd::MainFrameWrapper & mainFrameWrapper_ );
virtual ~TileMapObjectEditor();
TileMapObjectEditor( wxWindow* parent, gd::Project & game_, TileMapObject & object_, gd::MainFrameWrapper & mainFrameWrapper_ );
virtual ~TileMapObjectEditor();
protected:
virtual void OnTileSetPanelErase(wxEraseEvent& event);
virtual void OnTileSetPanelPaint(wxPaintEvent& event);
virtual void OnUpdateClicked(wxCommandEvent& event);
virtual void OnMapUpdateButtonClicked(wxCommandEvent& event);
virtual void OnLayerAddButtonClicked(wxCommandEvent& event);
virtual void OnLayerChoiceChanged(wxCommandEvent& event);
virtual void OnLayerDeleteButtonClicked(wxCommandEvent& event);
void OnTileSetSelectionChanged(TileSelectionEvent &event);
protected:
virtual void OnTileSetPanelErase(wxEraseEvent& event);
virtual void OnTileSetPanelPaint(wxPaintEvent& event);
virtual void OnUpdateClicked(wxCommandEvent& event);
virtual void OnMapUpdateButtonClicked(wxCommandEvent& event);
virtual void OnLayerAddButtonClicked(wxCommandEvent& event);
virtual void OnLayerChoiceChanged(wxCommandEvent& event);
virtual void OnLayerDeleteButtonClicked(wxCommandEvent& event);
virtual void OnLayerDownButtonClicked(wxCommandEvent& event);
virtual void OnLayerUpButtonClicked(wxCommandEvent& event);
virtual void OnHideUpperLayerChecked(wxCommandEvent& event);
void OnTileSetSelectionChanged(TileSelectionEvent &event);
private:
void SetTileSet(const std::string &tileSetName);
void UpdateLayerChoice();
wxBitmap GetwxBitmapFromImageResource(gd::Resource & resource);
private:
void SetTileSet(const std::string &tileSetName);
void UpdateLayerChoice();
wxBitmap GetwxBitmapFromImageResource(gd::Resource & resource);
wxBitmap *tileSetBitmap;
wxBitmap *tileSetBitmap;
gd::Project & game;
gd::MainFrameWrapper & mainFrameWrapper;
TileMapObject & object;
gd::Project & game;
gd::MainFrameWrapper & mainFrameWrapper;
TileMapObject & object;
};
#endif

24
Extensions/TileMapObject/TileMapPanel.cpp
View File

@@ -6,6 +6,7 @@ TileMapPanel::TileMapPanel(wxWindow* parent, wxWindowID id, const wxPoint &pos,
wxScrolledWindow(parent, id, pos, size, style),
m_tileSetInfo(),
m_tileToBeInserted(-1, -1),
m_hideUpperLayers(false),
m_map(),
m_mapCurrentLayer(),
m_bitmapCache()
@@ -50,9 +51,21 @@ void TileMapPanel::SetMapSize(int columns, int rows)
UpdateMapSize();
}
void TileMapPanel::HideUpperLayers(bool enable)
{
m_hideUpperLayers = enable;
Refresh();
}
bool TileMapPanel::AreUpperLayersHidden() const
{
return m_hideUpperLayers;
}
void TileMapPanel::SetCurrentLayer(int currentLayer)
{
m_mapCurrentLayer = currentLayer;
Refresh();
}
int TileMapPanel::GetLayersCount() const
@@ -74,6 +87,15 @@ void TileMapPanel::AddLayer(int pos, int asCopyOf)
}
UpdateMapSize();
Refresh();
}
void TileMapPanel::RemoveLayer(int pos)
{
m_map.erase(m_map.begin() + pos);
UpdateMapSize();
Refresh();
}
void TileMapPanel::Update()
@@ -101,7 +123,7 @@ void TileMapPanel::OnDraw(wxDC& dc)
dc.SetPen(wxPen(wxColor(128, 128, 128, 128), 1));
//Draw the tiles
for(int layer = 0; layer < m_map.size(); layer++)
for(int layer = 0; m_hideUpperLayers ? layer <= GetCurrentLayer() : layer < m_map.size(); layer++)
{
for(int col = 0; col < m_map[layer].tiles.size(); col++)
{

10
Extensions/TileMapObject/TileMapPanel.h
View File

@@ -32,6 +32,7 @@ class TileMapPanel : public wxScrolledWindow
//Tile to be inserted
std::pair<int, int> m_tileToBeInserted;
bool m_hideUpperLayers;
//Info about the TileMap (the level map)
// m_map[layer][column][row]
@@ -72,6 +73,9 @@ public:
*/
void SetMapSize(int columns, int rows);
void HideUpperLayers(bool enable);
bool AreUpperLayersHidden() const;
/**
* Get the current layer
*/
@@ -94,6 +98,12 @@ public:
*/
void AddLayer(int pos, int asCopyOf = -1);
/**
* Remove a layer
* \param pos The layer to delete
*/
void RemoveLayer(int pos);
/**
* Refresh and recreate tile cache.
*/

43
Extensions/TileMapObject/wxsmith/TileMapObjectEditor.cpp
View File

@@ -147,24 +147,37 @@ TileMapObjectEditorBase::TileMapObjectEditorBase(wxWindow* parent, wxWindowID id
m_staticText105 = new wxStaticText(this, wxID_ANY, _("Current layer:"), wxDefaultPosition, wxSize(-1,-1), 0);
flexGridSizer103->Add(m_staticText105, 0, wxALL, 5);
flexGridSizer103->Add(m_staticText105, 0, wxALL|wxALIGN_CENTER, 5);
wxArrayString m_layerChoiceArr;
m_layerChoice = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), m_layerChoiceArr, 0);
flexGridSizer103->Add(m_layerChoice, 0, wxALL, 5);
m_bmpButton111 = new wxBitmapButton(this, wxID_ANY, wxXmlResource::Get()->LoadBitmap(wxT("addicon")), wxDefaultPosition, wxSize(-1,-1), wxBU_AUTODRAW);
m_bmpButton111->SetToolTip(_("Add a layer after the current one"));
m_layerAddButton = new wxBitmapButton(this, wxID_ANY, wxXmlResource::Get()->LoadBitmap(wxT("add16")), wxDefaultPosition, wxSize(-1,-1), wxBU_AUTODRAW);
m_layerAddButton->SetToolTip(_("Add a layer after the current one"));
flexGridSizer103->Add(m_bmpButton111, 0, wxALL, 5);
flexGridSizer103->Add(m_layerAddButton, 0, wxALL, 5);
m_bmpButton115 = new wxBitmapButton(this, wxID_ANY, wxXmlResource::Get()->LoadBitmap(wxT("deleteicon")), wxDefaultPosition, wxSize(-1,-1), wxBU_AUTODRAW);
m_bmpButton115->SetToolTip(_("Delete current layer"));
m_layerDeleteButton = new wxBitmapButton(this, wxID_ANY, wxXmlResource::Get()->LoadBitmap(wxT("remove16")), wxDefaultPosition, wxSize(-1,-1), wxBU_AUTODRAW);
m_layerDeleteButton->SetToolTip(_("Delete current layer"));
flexGridSizer103->Add(m_bmpButton115, 0, wxALL, 5);
flexGridSizer103->Add(m_layerDeleteButton, 0, wxALL, 5);
m_tileMapPanel = new TileMapPanel(this, wxID_ANY, wxDefaultPosition, wxSize(400, 550), wxHSCROLL|wxVSCROLL);
m_layerUpButton = new wxBitmapButton(this, wxID_ANY, wxXmlResource::Get()->LoadBitmap(wxT("up16")), wxDefaultPosition, wxSize(-1,-1), wxBU_AUTODRAW);
flexGridSizer103->Add(m_layerUpButton, 0, wxALL, 5);
m_layerDownButton = new wxBitmapButton(this, wxID_ANY, wxXmlResource::Get()->LoadBitmap(wxT("down16")), wxDefaultPosition, wxSize(-1,-1), wxBU_AUTODRAW);
flexGridSizer103->Add(m_layerDownButton, 0, wxALL, 5);
m_hideUpperLayerCheck = new wxCheckBox(this, wxID_ANY, _("Hide upper layers"), wxDefaultPosition, wxSize(-1,-1), 0);
m_hideUpperLayerCheck->SetValue(false);
flexGridSizer103->Add(m_hideUpperLayerCheck, 0, wxALL|wxEXPAND, 5);
m_tileMapPanel = new TileMapPanel(this, wxID_ANY, wxDefaultPosition, wxSize(500, 550), wxHSCROLL|wxVSCROLL);
m_tileMapPanel->SetScrollRate(5, 5);
flexGridSizer7->Add(m_tileMapPanel, 0, wxALL|wxEXPAND, 5);
@@ -224,8 +237,11 @@ TileMapObjectEditorBase::TileMapObjectEditorBase(wxWindow* parent, wxWindowID id
// Connect events
m_updateButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnUpdateClicked), NULL, this);
m_layerChoice->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TileMapObjectEditorBase::OnLayerChoiceChanged), NULL, this);
m_bmpButton111->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnLayerAddButtonClicked), NULL, this);
m_bmpButton115->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnLayerDeleteButtonClicked), NULL, this);
m_layerAddButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnLayerAddButtonClicked), NULL, this);
m_layerDeleteButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnLayerDeleteButtonClicked), NULL, this);
m_layerUpButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnLayerUpButtonClicked), NULL, this);
m_layerDownButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnLayerDownButtonClicked), NULL, this);
m_hideUpperLayerCheck->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnHideUpperLayerChecked), NULL, this);
m_mapUpdateButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnMapUpdateButtonClicked), NULL, this);
}
@@ -234,8 +250,11 @@ TileMapObjectEditorBase::~TileMapObjectEditorBase()
{
m_updateButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnUpdateClicked), NULL, this);
m_layerChoice->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TileMapObjectEditorBase::OnLayerChoiceChanged), NULL, this);
m_bmpButton111->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnLayerAddButtonClicked), NULL, this);
m_bmpButton115->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnLayerDeleteButtonClicked), NULL, this);
m_layerAddButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnLayerAddButtonClicked), NULL, this);
m_layerDeleteButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnLayerDeleteButtonClicked), NULL, this);
m_layerUpButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnLayerUpButtonClicked), NULL, this);
m_layerDownButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnLayerDownButtonClicked), NULL, this);
m_hideUpperLayerCheck->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnHideUpperLayerChecked), NULL, this);
m_mapUpdateButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapObjectEditorBase::OnMapUpdateButtonClicked), NULL, this);
}

11
Extensions/TileMapObject/wxsmith/TileMapObjectEditor.h
View File

@@ -24,6 +24,7 @@
#include <wx/choice.h>
#include <wx/arrstr.h>
#include <wx/bmpbuttn.h>
#include <wx/checkbox.h>
#include "../TileMapPanel.h"
class TileMapObjectEditorBase : public wxDialog
@@ -46,8 +47,11 @@ protected:
wxButton* m_updateButton;
wxStaticText* m_staticText105;
wxChoice* m_layerChoice;
wxBitmapButton* m_bmpButton111;
wxBitmapButton* m_bmpButton115;
wxBitmapButton* m_layerAddButton;
wxBitmapButton* m_layerDeleteButton;
wxBitmapButton* m_layerUpButton;
wxBitmapButton* m_layerDownButton;
wxCheckBox* m_hideUpperLayerCheck;
TileMapPanel* m_tileMapPanel;
wxStaticText* m_staticText93;
wxSpinCtrl* m_mapWidthSpin;
@@ -64,6 +68,9 @@ protected:
virtual void OnLayerChoiceChanged(wxCommandEvent& event) { event.Skip(); }
virtual void OnLayerAddButtonClicked(wxCommandEvent& event) { event.Skip(); }
virtual void OnLayerDeleteButtonClicked(wxCommandEvent& event) { event.Skip(); }
virtual void OnLayerUpButtonClicked(wxCommandEvent& event) { event.Skip(); }
virtual void OnLayerDownButtonClicked(wxCommandEvent& event) { event.Skip(); }
virtual void OnHideUpperLayerChecked(wxCommandEvent& event) { event.Skip(); }
virtual void OnMapUpdateButtonClicked(wxCommandEvent& event) { event.Skip(); }
public:

260
Extensions/TileMapObject/wxsmith/TileMapObjectEditor.wxcp
View File

@@ -1,7 +1,7 @@
{
"metadata": {
"m_generatedFilesDir": ".",
"m_objCounter": 117,
"m_objCounter": 129,
"m_includeFiles": [],
"m_bitmapFunction": "wxCF6DCInitBitmapResources",
"m_bitmapsFile": "TileMapObjectEditor_wxsmith_bitmaps.cpp",
@@ -1580,7 +1580,7 @@
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
@@ -1753,7 +1753,7 @@
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_bmpButton111"
"m_value": "m_layerAddButton"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
@@ -1797,7 +1797,7 @@
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../../Binaries/Output/Release_Windows/res/addicon.png"
"m_path": "../../../Binaries/Output/Release_Windows/res/icons_default/add16.png"
}, {
"type": "bool",
"m_label": "Default Button",
@@ -1835,7 +1835,7 @@
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_bmpButton115"
"m_value": "m_layerDeleteButton"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
@@ -1879,7 +1879,7 @@
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../../Binaries/Output/Release_Windows/res/deleteicon.png"
"m_path": "../../../Binaries/Output/Release_Windows/res/icons_default/remove16.png"
}, {
"type": "bool",
"m_label": "Default Button",
@@ -1894,6 +1894,252 @@
"m_noBody": false
}],
"m_children": []
}, {
"m_type": 4404,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": ["wxBU_AUTODRAW"],
"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_layerUpButton"
}, {
"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": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../../Binaries/Output/Release_Windows/res/icons_default/up16.png"
}, {
"type": "bool",
"m_label": "Default Button",
"m_value": false
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnLayerUpButtonClicked(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
"m_noBody": false
}],
"m_children": []
}, {
"m_type": 4404,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": ["wxBU_AUTODRAW"],
"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_layerDownButton"
}, {
"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": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../../Binaries/Output/Release_Windows/res/icons_default/down16.png"
}, {
"type": "bool",
"m_label": "Default Button",
"m_value": false
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnLayerDownButtonClicked(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
"m_noBody": false
}],
"m_children": []
}, {
"m_type": 4415,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"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": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_hideUpperLayerCheck"
}, {
"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": "string",
"m_label": "Label:",
"m_value": "Hide upper layers"
}, {
"type": "bool",
"m_label": "Value:",
"m_value": false
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_CHECKBOX_CLICKED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnHideUpperLayerChecked(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_CHECKBOX_CLICKED event, when the checkbox is clicked.",
"m_noBody": false
}],
"m_children": []
}]
}, {
"m_type": 4440,
@@ -1910,7 +2156,7 @@
}, {
"type": "string",
"m_label": "Size:",
"m_value": "400, 550"
"m_value": "500, 550"
}, {
"type": "string",
"m_label": "Minimum Size:",

41
Extensions/TileMapObject/wxsmith/TileMapObjectEditor.xrc
View File

@@ -240,7 +240,7 @@
<growablecols/>
<growablerows/>
<object class="sizeritem">
<flag>wxALL</flag>
<flag>wxALL|wxALIGN_CENTER</flag>
<border>5</border>
<object class="wxStaticText" name="m_staticText105">
<label>
@@ -263,8 +263,8 @@
<object class="sizeritem">
<flag>wxALL</flag>
<border>5</border>
<object class="wxBitmapButton" name="m_bmpButton111">
<bitmap>../../../Binaries/Output/Release_Windows/res/addicon.png</bitmap>
<object class="wxBitmapButton" name="m_layerAddButton">
<bitmap>../../../Binaries/Output/Release_Windows/res/icons_default/add16.png</bitmap>
<style>wxBU_AUTODRAW</style>
<tooltip>
<![CDATA[Add a layer after the current one]]>
@@ -275,8 +275,8 @@
<object class="sizeritem">
<flag>wxALL</flag>
<border>5</border>
<object class="wxBitmapButton" name="m_bmpButton115">
<bitmap>../../../Binaries/Output/Release_Windows/res/deleteicon.png</bitmap>
<object class="wxBitmapButton" name="m_layerDeleteButton">
<bitmap>../../../Binaries/Output/Release_Windows/res/icons_default/remove16.png</bitmap>
<style>wxBU_AUTODRAW</style>
<tooltip>
<![CDATA[Delete current layer]]>
@@ -284,6 +284,35 @@
<default>0</default>
</object>
</object>
<object class="sizeritem">
<flag>wxALL</flag>
<border>5</border>
<object class="wxBitmapButton" name="m_layerUpButton">
<bitmap>../../../Binaries/Output/Release_Windows/res/icons_default/up16.png</bitmap>
<style>wxBU_AUTODRAW</style>
<default>0</default>
</object>
</object>
<object class="sizeritem">
<flag>wxALL</flag>
<border>5</border>
<object class="wxBitmapButton" name="m_layerDownButton">
<bitmap>../../../Binaries/Output/Release_Windows/res/icons_default/down16.png</bitmap>
<style>wxBU_AUTODRAW</style>
<default>0</default>
</object>
</object>
<object class="sizeritem">
<flag>wxALL|wxEXPAND</flag>
<border>5</border>
<object class="wxCheckBox" name="m_hideUpperLayerCheck">
<style/>
<label>
<![CDATA[Hide upper layers]]>
</label>
<checked>0</checked>
</object>
</object>
</object>
</object>
<object class="sizeritem">
@@ -291,7 +320,7 @@
<border>5</border>
<object class="wxScrolledWindow" name="m_tileMapPanel" subclass="TileMapPanel">
<style>wxHSCROLL|wxVSCROLL</style>
<size>400, 550</size>
<size>500, 550</size>
<scrollrate>5,5</scrollrate>
</object>
</object>

219
Extensions/TileMapObject/wxsmith/TileMapObjectEditor_wxsmith_bitmaps.cpp
View File

@@ -21,84 +21,108 @@
wxMemoryFSHandler::AddFile(name, data, size)
#endif
static size_t xml_res_size_0 = 774;
static size_t xml_res_size_0 = 683;
static unsigned char xml_res_file_0[] = {
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,25,116,69,88,116,83,111,102,116,119,97,114,101,
0,80,97,105,110,116,46,78,69,84,32,118,51,46,53,46,53,73,138,252,224,0,
0,2,118,73,68,65,84,56,79,149,147,95,72,83,81,28,199,15,244,98,84,228,52,
133,162,164,182,135,244,52,205,57,231,189,187,119,187,247,46,87,138,204,
165,83,151,54,115,254,217,230,220,31,83,9,113,25,37,86,70,15,65,6,22,5,
153,132,155,189,100,26,90,96,98,4,129,245,18,196,254,244,18,189,20,145,
4,245,148,16,115,124,187,218,235,30,230,15,190,112,248,158,195,135,195,
247,124,15,33,105,134,235,55,170,196,208,137,248,169,171,85,209,170,209,
154,168,20,170,140,111,122,233,206,166,245,216,32,175,174,189,93,11,247,
98,7,252,179,94,216,110,217,192,244,114,234,140,1,229,30,150,58,95,180,
226,202,250,0,174,127,190,4,119,196,5,109,15,67,183,5,104,91,58,135,208,
70,16,125,95,186,209,58,237,128,206,199,110,7,192,168,92,203,237,24,195,
16,252,63,156,104,158,105,66,133,151,75,159,1,223,47,40,249,128,168,230,
220,2,213,121,244,84,235,97,104,113,139,198,210,185,232,76,141,224,2,58,
214,108,168,15,215,165,180,157,172,165,194,175,167,58,159,158,150,203,183,
97,228,156,228,96,149,68,127,145,75,232,39,116,56,185,98,132,99,197,142,
224,171,30,244,44,120,224,253,222,150,108,95,183,194,154,16,209,178,96,
75,54,220,171,131,99,234,12,156,143,91,225,14,119,110,5,43,133,76,9,162,
25,214,196,14,76,229,32,239,27,129,49,117,20,242,22,250,208,14,251,95,51,
140,159,142,131,159,47,65,213,156,1,245,171,102,56,62,90,209,21,181,163,
47,209,133,179,225,38,84,94,174,140,145,210,65,77,44,251,198,46,236,152,
32,200,153,35,200,125,39,235,131,188,126,75,80,16,217,139,146,240,97,240,
239,75,96,249,106,68,243,90,13,156,63,235,224,250,221,8,219,188,5,210,168,
20,35,204,32,155,40,26,45,196,193,59,121,56,116,95,214,163,125,40,152,204,
71,238,244,158,100,214,24,129,226,37,129,225,181,38,105,141,212,162,225,
233,105,52,206,214,195,254,204,134,234,241,106,8,33,49,65,12,3,162,210,
120,222,164,150,2,102,42,249,205,84,244,153,169,217,85,109,41,29,47,77,
237,126,66,144,31,35,208,69,138,83,122,167,96,97,188,28,149,95,99,75,108,
208,240,63,196,116,35,4,76,42,250,128,34,123,153,224,200,175,157,16,158,
51,224,187,197,204,171,44,248,76,148,62,164,80,172,18,20,254,81,192,180,
200,129,243,8,153,23,105,11,48,89,4,197,27,2,229,70,22,164,37,70,6,136,
153,3,12,189,162,90,123,83,139,253,51,10,28,91,42,128,225,46,11,62,32,100,
254,153,228,118,170,244,67,92,188,108,164,44,170,187,86,30,229,134,249,
248,166,151,46,175,127,93,158,32,5,122,248,57,69,0,0,0,0,73,69,78,68,174,
66,96,130};
0,31,243,255,97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112,
72,89,115,0,0,15,209,0,0,15,209,1,86,48,26,164,0,0,0,25,116,69,88,116,83,
111,102,116,119,97,114,101,0,119,119,119,46,105,110,107,115,99,97,112,101,
46,111,114,103,155,238,60,26,0,0,2,40,73,68,65,84,56,141,141,147,49,76,
83,81,20,134,191,243,250,2,175,22,74,106,33,5,139,233,0,152,48,152,20,136,
147,10,147,194,128,97,48,113,146,205,132,201,17,28,155,38,46,66,226,226,
68,100,195,201,141,196,1,101,2,49,33,34,165,145,24,98,208,152,70,42,212,
250,130,62,3,173,77,95,143,67,227,179,117,40,158,233,222,156,123,255,252,
39,231,255,68,85,169,173,225,165,195,126,196,157,172,8,131,2,113,0,133,
180,161,164,80,223,226,218,68,231,110,237,123,249,35,32,32,151,159,101,
167,69,73,74,38,103,201,193,17,98,59,0,104,56,136,118,133,208,88,164,168,
66,226,213,120,116,78,65,61,1,1,137,63,253,176,220,234,114,221,88,221,65,
178,54,29,237,1,252,150,9,64,161,88,38,255,237,24,141,134,169,140,92,68,
91,252,43,235,55,162,163,10,42,170,74,239,194,214,140,56,39,15,66,43,239,
8,152,213,79,179,201,49,46,13,118,3,176,153,218,103,38,177,92,245,220,108,
226,222,188,66,165,213,127,111,125,60,58,107,244,205,111,247,83,209,164,
177,186,131,147,207,115,124,82,160,97,253,42,99,172,238,32,74,114,120,233,
176,223,64,220,73,201,228,44,201,218,0,56,63,190,159,42,34,89,27,201,228,
44,215,231,222,54,43,48,232,59,56,162,163,61,192,244,221,171,222,163,216,
249,160,119,190,208,219,206,108,114,204,187,207,61,122,73,238,224,8,137,
69,134,76,129,184,216,14,126,203,244,102,6,112,203,199,148,74,22,77,77,
77,180,5,173,186,158,223,50,17,219,65,32,110,52,178,106,219,54,165,82,169,
225,56,166,66,90,195,193,209,194,151,175,108,166,246,235,108,183,5,45,108,
219,198,103,6,200,124,118,188,94,161,88,70,207,157,69,33,109,26,144,210,
174,208,104,254,237,167,191,171,162,126,141,27,175,223,115,255,225,6,129,
51,126,175,175,67,33,84,216,50,80,223,162,198,34,69,141,134,27,90,173,221,
142,70,195,104,44,82,244,185,190,39,198,222,212,192,46,134,36,42,35,23,
161,217,60,93,164,92,174,166,81,72,172,77,116,238,122,81,238,121,252,230,
185,252,44,92,251,159,40,183,116,119,189,72,223,234,29,243,162,12,85,152,
122,22,182,166,169,104,67,152,48,36,241,241,206,80,61,76,181,213,55,191,
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 = 668;
static size_t xml_res_size_1 = 295;
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,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,32,99,72,82,77,0,0,122,38,0,0,128,132,
0,0,250,0,0,0,128,232,0,0,117,48,0,0,234,96,0,0,58,152,0,0,23,112,156,186,
81,60,0,0,0,24,116,69,88,116,83,111,102,116,119,97,114,101,0,80,97,105,
110,116,46,78,69,84,32,118,51,46,51,49,55,131,119,134,0,0,1,246,73,68,65,
84,56,79,149,147,205,111,76,97,20,198,127,231,189,87,88,144,88,9,241,7,
136,21,107,43,43,54,108,108,36,22,18,137,133,144,16,34,193,134,133,68,108,
8,41,241,81,36,42,168,175,196,16,25,209,241,209,33,58,62,102,90,145,26,
19,17,116,105,70,211,250,104,211,153,142,235,121,103,238,149,98,90,188,
201,47,55,247,158,247,57,239,121,159,115,46,39,204,22,229,195,176,239,117,
24,86,115,97,152,57,108,54,159,255,89,249,32,120,89,14,130,40,161,16,4,
47,246,194,172,127,206,81,116,174,150,136,43,206,69,131,162,199,185,244,
86,8,39,75,178,30,92,202,108,231,117,179,77,228,156,203,38,194,33,137,63,
155,69,95,69,183,217,177,86,9,118,195,236,140,89,186,8,81,55,12,115,0,22,
20,205,6,18,225,168,196,99,194,63,239,192,246,137,73,218,96,97,22,74,189,
18,63,130,239,231,96,109,35,190,7,230,22,160,199,11,107,10,142,139,49,241,
17,234,87,97,149,223,115,22,86,60,132,161,199,250,126,87,156,7,89,53,97,
109,128,233,202,222,49,162,224,151,166,56,250,32,116,218,183,107,112,68,
177,250,61,189,223,106,138,59,215,128,181,244,40,5,59,222,192,184,136,222,
138,146,120,46,110,11,85,19,117,168,210,45,48,99,202,46,157,134,149,50,
105,184,44,65,69,124,138,43,234,130,119,186,238,156,191,182,248,12,44,149,
39,229,247,241,53,252,85,6,196,3,184,47,87,167,77,153,160,19,54,170,228,
106,191,4,158,87,49,190,109,158,155,112,170,101,2,13,71,120,5,78,122,151,
159,136,167,49,57,181,75,162,172,127,207,139,103,226,18,236,250,35,137,
156,61,148,137,91,228,221,78,184,8,7,253,102,153,183,89,237,171,169,27,
62,86,87,91,87,255,146,228,50,84,110,40,232,209,137,13,46,64,106,157,198,
54,217,120,20,150,169,75,131,233,102,124,228,56,44,249,153,68,25,123,37,
136,116,98,3,157,88,144,97,51,127,47,117,159,38,87,251,74,154,13,63,15,
42,58,94,251,97,113,59,244,201,161,170,158,93,154,249,121,147,185,189,77,
255,131,90,221,174,159,101,249,15,98,37,239,78,177,85,239,150,0,0,0,0,73,
0,31,243,255,97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,222,73,
68,65,84,56,141,99,252,255,255,63,3,37,128,9,155,160,173,251,204,101,232,
98,14,19,78,223,35,218,0,6,70,134,72,100,67,28,38,156,190,199,171,36,165,
136,77,41,11,78,183,65,12,97,96,246,52,178,192,165,25,191,1,80,67,120,149,
164,240,42,193,234,133,31,63,126,227,213,68,208,128,15,159,63,17,109,8,
246,64,36,193,16,156,6,192,12,249,248,11,191,33,140,176,132,164,99,209,
185,236,231,239,191,145,232,10,254,103,121,49,72,241,11,48,240,179,177,
194,197,62,223,123,118,255,64,129,169,18,138,11,174,156,40,143,98,103,101,
94,142,205,150,103,31,63,192,93,130,172,25,195,11,132,12,121,117,243,33,
138,102,12,3,240,25,194,241,236,237,253,147,165,86,74,232,226,88,3,17,221,
16,142,103,111,239,95,169,117,198,208,204,192,192,192,192,240,255,255,127,
156,88,219,188,99,153,118,211,158,123,248,212,48,82,154,157,1,167,234,139,
75,70,228,147,104,0,0,0,0,73,69,78,68,174,66,96,130};
static size_t xml_res_size_2 = 551;
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,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 = 421;
static unsigned char xml_res_file_2[] = {
static size_t xml_res_size_3 = 293;
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,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,220,73,
68,65,84,56,141,99,252,255,255,63,3,37,128,9,159,164,85,226,170,123,222,
27,159,46,35,203,0,171,196,85,247,152,159,191,87,100,98,100,136,196,103,
8,86,3,96,154,225,138,240,24,130,97,128,81,204,18,20,205,132,12,65,49,64,
53,100,206,189,207,215,31,41,254,248,241,27,187,115,177,24,2,55,64,53,100,
206,61,134,251,175,20,25,24,24,24,62,124,254,196,64,172,33,140,216,162,
81,213,184,237,63,3,3,3,131,0,47,31,131,68,81,32,92,124,179,159,52,35,94,
47,160,131,15,159,63,49,124,252,133,221,37,68,25,192,192,192,192,240,236,
227,7,188,134,16,52,128,144,33,68,25,0,51,132,116,3,20,197,238,243,50,51,
46,199,167,132,5,159,230,219,107,82,148,24,24,24,24,12,23,92,100,248,252,
247,127,36,86,117,255,255,255,199,192,42,193,179,239,161,139,25,204,191,
176,12,155,90,172,233,128,20,0,0,51,248,137,124,211,129,183,253,0,0,0,0,
73,69,78,68,174,66,96,130};
static size_t xml_res_size_4 = 757;
static unsigned char xml_res_file_4[] = {
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,
@@ -106,20 +130,37 @@ static unsigned char xml_res_file_2[] = {
47,119,120,120,114,99,34,32,118,101,114,115,105,111,110,61,34,50,46,51,
46,48,46,49,34,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,97,100,100,
105,99,111,110,34,62,84,105,108,101,77,97,112,79,98,106,101,99,116,69,100,
105,116,111,114,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,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,97,100,100,105,99,111,110,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,100,101,108,101,116,101,105,99,111,110,34,62,84,105,108,101,77,
97,112,79,98,106,101,99,116,69,100,105,116,111,114,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,
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,
100,101,108,101,116,101,105,99,111,110,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};
49,54,34,62,84,105,108,101,77,97,112,79,98,106,101,99,116,69,100,105,116,
111,114,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,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,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,100,111,119,110,49,54,
34,62,84,105,108,101,77,97,112,79,98,106,101,99,116,69,100,105,116,111,
114,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,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,111,119,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,79,98,106,101,99,116,69,100,105,116,111,
114,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,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,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,112,49,54,34,62,
84,105,108,101,77,97,112,79,98,106,101,99,116,69,100,105,116,111,114,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,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,
112,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()
{
@@ -134,8 +175,10 @@ void wxCF6DCInitBitmapResources()
else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase);
}
XRC_ADD_FILE(wxT("XRC_resource/TileMapObjectEditor_wxsmith_bitmaps.cpp$.._.._.._Binaries_Output_Release_Windows_res_addicon.png"), xml_res_file_0, xml_res_size_0, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapObjectEditor_wxsmith_bitmaps.cpp$.._.._.._Binaries_Output_Release_Windows_res_deleteicon.png"), xml_res_file_1, xml_res_size_1, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapObjectEditor_wxsmith_bitmaps.cpp$E__Developpement_GD_Extensions_TileMapObject_wxsmith_TileMapObjectEditor_wxsmith_bitmaps.xrc"), xml_res_file_2, xml_res_size_2, wxT("text/xml"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapObjectEditor_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/TileMapObjectEditor_wxsmith_bitmaps.cpp$.._.._.._Binaries_Output_Release_Windows_res_icons_default_down16.png"), xml_res_file_1, xml_res_size_1, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapObjectEditor_wxsmith_bitmaps.cpp$.._.._.._Binaries_Output_Release_Windows_res_icons_default_remove16.png"), xml_res_file_2, xml_res_size_2, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapObjectEditor_wxsmith_bitmaps.cpp$.._.._.._Binaries_Output_Release_Windows_res_icons_default_up16.png"), xml_res_file_3, xml_res_size_3, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapObjectEditor_wxsmith_bitmaps.cpp$E__Developpement_GD_Extensions_TileMapObject_wxsmith_TileMapObjectEditor_wxsmith_bitmaps.xrc"), xml_res_file_4, xml_res_size_4, wxT("text/xml"));
wxXmlResource::Get()->Load(wxT("memory:XRC_resource/TileMapObjectEditor_wxsmith_bitmaps.cpp$E__Developpement_GD_Extensions_TileMapObject_wxsmith_TileMapObjectEditor_wxsmith_bitmaps.xrc"));
}

6
Extensions/TileMapObject/wxsmith/TileMapObjectEditor_wxsmith_bitmaps.xrc
View File

@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
<object class="wxBitmap" name="addicon">..\..\..\Binaries\Output\Release_Windows\res\addicon.png</object>
<object class="wxBitmap" name="deleteicon">..\..\..\Binaries\Output\Release_Windows\res\deleteicon.png</object>
<object class="wxBitmap" name="add16">..\..\..\Binaries\Output\Release_Windows\res\icons_default\add16.png</object>
<object class="wxBitmap" name="down16">..\..\..\Binaries\Output\Release_Windows\res\icons_default\down16.png</object>
<object class="wxBitmap" name="remove16">..\..\..\Binaries\Output\Release_Windows\res\icons_default\remove16.png</object>
<object class="wxBitmap" name="up16">..\..\..\Binaries\Output\Release_Windows\res\icons_default\up16.png</object>
</resource>