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

Merge branch 'master' of github.com:4ian/GD

Browse Source
This commit is contained in:
Florian Rival
2014-09-24 13:37:14 +02:00
parent ceb67ed7a4 6d5e701c3e
commit e506fc64dc
11 changed files with 467 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Binaries/Output/Release_Windows/Examples/Basic level editor with tile map object.gdg
View File

@@ -240,7 +240,7 @@
</hitboxes>
</tileSet>
<tileMap columns="10" rows="10">
<tiles>-1,-1,-1,-1,-1,-1,-1,-1,103,152|-1,-1,-1,68,-1,-1,-1,-1,103,152|-1,-1,-1,44,-1,-1,-1,-1,103,152|-1,-1,-1,-1,80,-1,-1,-1,103,152|-1,-1,-1,-1,-1,80,-1,-1,103,152|-1,-1,-1,-1,-1,-1,68,-1,103,152|-1,-1,-1,-1,-1,-1,56,-1,103,152|-1,-1,-1,-1,-1,-1,44,-1,103,152|-1,-1,-1,-1,-1,-1,-1,-1,103,152|-1,-1,-1,-1,-1,-1,-1,-1,103,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,-1,-1,-1,-1,-1</tiles>
<tiles>-1,-1,-1,-1,-1,-1,-1,-1,103,152|-1,-1,-1,68,-1,-1,-1,-1,103,152|-1,-1,-1,44,-1,-1,-1,-1,103,152|-1,-1,-1,-1,80,-1,-1,-1,103,152|-1,-1,0,-1,-1,80,-1,-1,103,152|-1,-1,-1,-1,-1,-1,68,-1,103,152|-1,-1,-1,-1,-1,-1,56,-1,103,152|-1,-1,-1,-1,-1,-1,44,-1,103,152|-1,-1,-1,-1,-1,-1,-1,-1,103,152|-1,-1,-1,-1,-1,-1,-1,-1,103,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,-1,-1,-1,-1,-1</tiles>
</tileMap>
</object>
<object bold="false" italic="false" name="Help" smoothed="true" type="TextObject::Text" underlined="false">

BIN
Binaries/Output/Release_Windows/locale/fr_FR/TileMapObject.mo
View File

Binary file not shown.

76
Binaries/Output/Release_Windows/locale/fr_FR/TileMapObject.po
View File

@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Game Develop\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-09-07 17:53+0100\n"
"POT-Creation-Date: 2014-09-23 22:25+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Victor Levasseur <victorlevasseur01@orange.fr>\n"
"Language-Team: Florian \"4ian\" Rival <Florian.rival@gmail.com>\n"
@@ -268,42 +268,62 @@ msgstr "Jeu de tuiles"
msgid "The new texture name"
msgstr "Nom de la nouvelle texture"
#: Extensions/TileMapObject/TileEditor.cpp:44
#: Extensions/TileMapObject/TileEditor.cpp:48
msgid "Rectangle Shape"
msgstr "Rectangle"
#: Extensions/TileMapObject/TileEditor.cpp:46
#: Extensions/TileMapObject/TileEditor.cpp:50
msgid "Triangle Shape (top-left)"
msgstr "Triangle (en haut à gauche)"
#: Extensions/TileMapObject/TileEditor.cpp:47
#: Extensions/TileMapObject/TileEditor.cpp:51
msgid "Triangle Shape (top-right)"
msgstr "Triangle (en haut à droite)"
#: Extensions/TileMapObject/TileEditor.cpp:48
#: Extensions/TileMapObject/TileEditor.cpp:52
msgid "Triangle Shape (bottom-right)"
msgstr "Triangle (en bas à droite)"
#: Extensions/TileMapObject/TileEditor.cpp:49
#: Extensions/TileMapObject/TileEditor.cpp:53
msgid "Triangle Shape (bottom-left)"
msgstr "Triangle (en bas à gauche)"
#: Extensions/TileMapObject/TileEditor.cpp:51
#: Extensions/TileMapObject/TileEditor.cpp:55
msgid "Half-rectangle (top)"
msgstr "Demi-rectangle (haut)"
#: Extensions/TileMapObject/TileEditor.cpp:52
#: Extensions/TileMapObject/TileEditor.cpp:56
msgid "Half-rectangle (right)"
msgstr "Demi-rectangle (droite)"
#: Extensions/TileMapObject/TileEditor.cpp:53
#: Extensions/TileMapObject/TileEditor.cpp:57
msgid "Half-rectangle (bottom)"
msgstr "Demi-rectangle (bas)"
#: Extensions/TileMapObject/TileEditor.cpp:54
#: Extensions/TileMapObject/TileEditor.cpp:58
msgid "Half-rectangle (left)"
msgstr "Demi-rectangle (gauche)"
#: Extensions/TileMapObject/TileEditor.cpp:152
msgid "This polygon must be convex, it's not the case."
msgstr "Le polygon de collision doit être convexe, ce n'est pas le cas."
#: Extensions/TileMapObject/TileEditor.cpp:247
msgid "Enter the X position of the point ( regarding the tile )."
msgstr "Entrer la position X du point (par rapport à la tuile)."
#: Extensions/TileMapObject/TileEditor.cpp:247
msgid "X position"
msgstr "Position X"
#: Extensions/TileMapObject/TileEditor.cpp:248
msgid "Enter the Y position of the point ( regarding the tile )."
msgstr "Entrer la position Y du point (par rapport à la tuile)."
#: Extensions/TileMapObject/TileEditor.cpp:248
msgid "Y position"
msgstr "Position Y"
#: Extensions/TileMapObject/TileMapConfigurationEditor.cpp:59
msgid ""
"The map will be smaller after that change. You can possibly lose data.\n"
@@ -462,41 +482,33 @@ msgid "Activates the collision mask for collision detection"
msgstr "Active le masque de collision"
#: Extensions/TileMapObject/TileMapDialogs.cpp:559
msgid "Use a predefined shape"
msgstr "Utiliser une forme prédéfinie"
msgid "Predefined shape"
msgstr "Forme prédéfinie"
#: Extensions/TileMapObject/TileMapDialogs.cpp:577
#: Extensions/TileMapObject/TileMapDialogs.cpp:569
msgid "Add a point"
msgstr "Ajouter un point"
#: Extensions/TileMapObject/TileMapDialogs.cpp:577
#: Extensions/TileMapObject/TileMapDialogs.cpp:569
msgid "Add a point to the collision mask"
msgstr "Ajouter un point au masque de collision"
#: Extensions/TileMapObject/TileMapDialogs.cpp:579
#: Extensions/TileMapObject/TileMapDialogs.cpp:571
msgid "Edit point position..."
msgstr "Editer la position du point..."
#: Extensions/TileMapObject/TileMapDialogs.cpp:579
#: Extensions/TileMapObject/TileMapDialogs.cpp:571
msgid "Edit the selected point position..."
msgstr "Edite la position du point sélectionné..."
#: Extensions/TileMapObject/TileMapDialogs.cpp:581
#: Extensions/TileMapObject/TileMapDialogs.cpp:573
msgid "Remove selected point"
msgstr "Supprimer le point sélectionné"
#: Extensions/TileMapObject/TileMapDialogs.cpp:581
#: Extensions/TileMapObject/TileMapDialogs.cpp:573
msgid "Removes the selected point"
msgstr "Supprime le point sélectionné"
#: Extensions/TileMapObject/TileMapDialogs.cpp:583
msgid "Reset to the default collision mask"
msgstr "Rétablir le masque de collision par défaut"
#: Extensions/TileMapObject/TileMapDialogs.cpp:583
msgid "Reset the tile collision mask to the default one"
msgstr "Rétablit le masque de collision par défaut de la tuile"
#: Extensions/TileMapObject/TileMapObjectEditor.cpp:77
msgid "Tile editor"
msgstr "Editeur de tuile"
@@ -520,11 +532,11 @@ msgstr ""
"built_tilemap"
#: Extensions/TileMapObject/TileMapObjectEditor.cpp:211
msgid "Are you sure to clear the whole layer ?"
msgid "Are you sure you want to clear the whole layer ?"
msgstr "Etes-vous sûr(e) de vouloir vider le calque ?"
#: Extensions/TileMapObject/TileMapObjectEditor.cpp:217
msgid "Are you sure to fill the whole layer with that tile ?"
msgid "Are you sure you want to fill the whole layer with that tile ?"
msgstr "Etes vous sûr(e) de vouloir remplir le calque avec cette tuile ?"
#: Extensions/TileMapObject/TileSetConfigurationEditor.cpp:49
@@ -547,7 +559,7 @@ msgstr ""
"http://www.wiki.compilgames.net/doku.php/game_develop/documentation/manual/"
"built_tilemap/tilesetconfig"
#: Extensions/TileMapObject/TileSetPanel.cpp:134
#: Extensions/TileMapObject/TileSetPanel.cpp:133
msgid "You haven't selected a tileset yet."
msgstr "Vous n'avez pas sélectionné de jeu de tuiles."
@@ -563,6 +575,12 @@ msgstr "Configuration du jeu de tuiles"
msgid "Tilemap size configuration"
msgstr "Configuration de la taille de la carte"
#~ msgid "Reset to the default collision mask"
#~ msgstr "Rétablir le masque de collision par défaut"
#~ msgid "Reset the tile collision mask to the default one"
#~ msgstr "Rétablit le masque de collision par défaut de la tuile"
#~ msgid ""
#~ "You haven't selected a tileset yet.\n"
#~ "Click on \"Configure the tileset\" to choose one."

141
Extensions/TileMapObject/TileEditor.cpp
View File

@@ -29,13 +29,17 @@ freely, subject to the following restrictions:
#include <algorithm>
#include <wx/dcbuffer.h>
#include <wx/event.h>
#include "GDCore/CommonTools.h"
#include "GDCore/IDE/CommonBitmapManager.h"
TileEditor::TileEditor(wxWindow* parent) :
TileEditorBase(parent),
m_tileset(NULL),
m_currentTile(0),
m_predefinedShapesMenu(new wxMenu())
m_predefinedShapesMenu(new wxMenu()),
m_xOffset(0.f),
m_yOffset(0.f),
m_polygonHelper()
{
m_tilePreviewPanel->SetBackgroundStyle(wxBG_STYLE_PAINT);
UpdateScrollbars();
@@ -104,6 +108,14 @@ void TileEditor::UpdateScrollbars()
virtualHeight/2 - m_tilePreviewPanel->GetClientSize().GetHeight()/2);
}
wxPoint TileEditor::GetRealPosition(wxPoint absolutePos)
{
wxPoint realPoint(m_tilePreviewPanel->CalcUnscrolledPosition(absolutePos).x - m_xOffset,
m_tilePreviewPanel->CalcUnscrolledPosition(absolutePos).y - m_yOffset);
return realPoint;
}
void TileEditor::OnPreviewPaint(wxPaintEvent& event)
{
//Prepare the render
@@ -112,7 +124,7 @@ void TileEditor::OnPreviewPaint(wxPaintEvent& event)
wxPoint minPos = m_tilePreviewPanel->GetViewStart();
int width, height;
m_tilePreviewPanel->GetVirtualSize(&width, &height);
m_tilePreviewPanel->GetClientSize(&width, &height);
wxPoint maxPos = minPos + wxPoint(width, height);
//Draw the background
@@ -122,22 +134,23 @@ void TileEditor::OnPreviewPaint(wxPaintEvent& event)
if(!m_tileset || m_tileset->IsDirty()) //If no tileset, stop rendering here
return;
//Draw the tile
//Draw the tile and compute the drawing offset
wxBitmap tileBitmap = m_tileset->GetTileBitmap(m_currentTile);
dc.DrawBitmap(tileBitmap, width/2 - tileBitmap.GetWidth()/2, height/2 - tileBitmap.GetHeight()/2);
m_xOffset = width/2 - tileBitmap.GetWidth()/2;
m_yOffset = height/2 - tileBitmap.GetHeight()/2;
dc.DrawBitmap(tileBitmap, m_xOffset, m_yOffset);
//Draw the hitbox
dc.SetBrush(wxBrush(wxColour(128,128,128), wxBRUSHSTYLE_FDIAGONAL_HATCH));
dc.SetPen(wxPen(wxColour(100,100,100)));
std::vector<Polygon2d> polygonList(1, m_tileset->GetTileHitbox(m_currentTile).hitbox);
m_polygonHelper.OnPaint(polygonList, dc, wxPoint(m_xOffset, m_yOffset));
wxPointList list;
for (unsigned int i = 0; i < m_tileset->GetTileHitbox(m_currentTile).hitbox.vertices.size();++i)
//Show a warning if the polygon isn't convex
if(!m_tileset->GetTileHitbox(m_currentTile).hitbox.IsConvex())
{
list.push_back(new wxPoint(m_tileset->GetTileHitbox(m_currentTile).hitbox.vertices[i].x,
m_tileset->GetTileHitbox(m_currentTile).hitbox.vertices[i].y));
dc.DrawBitmap(wxBitmap("res/warning.png", wxBITMAP_TYPE_PNG), 5, 5);
dc.SetPen(wxPen(wxColour(0,0,0)));
dc.DrawText(_("This polygon must be convex, it's not the case."), 25, 5);
}
dc.DrawPolygon(&list, width/2 - tileBitmap.GetWidth()/2, height/2 - tileBitmap.GetHeight()/2);
}
void TileEditor::OnCollidableToolToggled(wxCommandEvent& event)
@@ -193,3 +206,107 @@ void TileEditor::OnPredefinedShapeMenuItemClicked(wxCommandEvent& event)
TileSelectionEvent tileEvent(TILE_SELECTION_CHANGED, -1, m_currentTile);
OnTileSetSelectionChanged(tileEvent);
}
void TileEditor::OnAddPointToolClicked(wxCommandEvent& event)
{
if(!m_tileset || m_tileset->IsDirty())
return;
Polygon2d &mask = m_tileset->GetTileHitbox(m_currentTile).hitbox;
int selectedPoint = m_polygonHelper.GetSelectedPoint();
if(selectedPoint >= mask.vertices.size() || selectedPoint < 0)
{
if(mask.vertices.size() <= 2)
return;
else
selectedPoint = mask.vertices.size() - 1;
}
int nextToSelectedPoint = ( (selectedPoint == (mask.vertices.size() - 1) ) ? 0 : selectedPoint + 1 );
sf::Vector2f newPoint = mask.vertices[selectedPoint] + mask.vertices[nextToSelectedPoint];
newPoint.x /= 2.f;
newPoint.y /= 2.f;
mask.vertices.insert(mask.vertices.begin() + selectedPoint + 1, newPoint);
m_tilePreviewPanel->Refresh();
}
void TileEditor::OnEditPointToolClicked(wxCommandEvent& event)
{
if(!m_tileset || m_tileset->IsDirty())
return;
Polygon2d &mask = m_tileset->GetTileHitbox(m_currentTile).hitbox;
int selectedPoint = m_polygonHelper.GetSelectedPoint();
if(selectedPoint >= mask.vertices.size() || selectedPoint < 0)
return;
std::string x_str = gd::ToString(wxGetTextFromUser(_("Enter the X position of the point ( regarding the tile )."), _("X position"),gd::ToString(mask.vertices[selectedPoint].x)));
std::string y_str = gd::ToString(wxGetTextFromUser(_("Enter the Y position of the point ( regarding the tile )."), _("Y position"),gd::ToString(mask.vertices[selectedPoint].y)));
mask.vertices[selectedPoint].x = gd::ToInt(x_str);
mask.vertices[selectedPoint].y = gd::ToInt(y_str);
m_tilePreviewPanel->Refresh();
}
void TileEditor::OnRemovePointToolClicked(wxCommandEvent& event)
{
if(!m_tileset || m_tileset->IsDirty())
return;
Polygon2d &mask = m_tileset->GetTileHitbox(m_currentTile).hitbox;
if(mask.vertices.size() <= 3)
return;
int selectedPoint = m_polygonHelper.GetSelectedPoint();
if(selectedPoint >= mask.vertices.size() || selectedPoint < 0)
return;
mask.vertices.erase(mask.vertices.begin() + selectedPoint);
m_tilePreviewPanel->Refresh();
}
void TileEditor::OnPreviewLeftDown(wxMouseEvent& event)
{
if(!m_tileset || m_tileset->IsDirty())
return;
event.SetX(m_tilePreviewPanel->CalcUnscrolledPosition(wxPoint(event.GetX(), event.GetY())).x);
event.SetY(m_tilePreviewPanel->CalcUnscrolledPosition(wxPoint(event.GetX(), event.GetY())).y);
std::vector<Polygon2d> polygonList(1, m_tileset->GetTileHitbox(m_currentTile).hitbox);
m_polygonHelper.OnMouseLeftDown(polygonList, event, wxPoint(m_xOffset, m_yOffset));
m_tileset->GetTileHitbox(m_currentTile).hitbox = polygonList[0];
m_tilePreviewPanel->Refresh();
}
void TileEditor::OnPreviewLeftUp(wxMouseEvent& event)
{
event.SetX(m_tilePreviewPanel->CalcUnscrolledPosition(wxPoint(event.GetX(), event.GetY())).x);
event.SetY(m_tilePreviewPanel->CalcUnscrolledPosition(wxPoint(event.GetX(), event.GetY())).y);
m_polygonHelper.OnMouseLeftUp(event);
m_tilePreviewPanel->Refresh();
}
void TileEditor::OnPreviewMotion(wxMouseEvent& event)
{
if(!m_tileset || m_tileset->IsDirty())
return;
event.SetX(m_tilePreviewPanel->CalcUnscrolledPosition(wxPoint(event.GetX(), event.GetY())).x);
event.SetY(m_tilePreviewPanel->CalcUnscrolledPosition(wxPoint(event.GetX(), event.GetY())).y);
std::vector<Polygon2d> polygonList(1, m_tileset->GetTileHitbox(m_currentTile).hitbox);
m_polygonHelper.OnMouseMove(polygonList, event, wxPoint(m_xOffset, m_yOffset), 0.f, 0.f, m_tileset->tileSize.x, m_tileset->tileSize.y);
m_tileset->GetTileHitbox(m_currentTile).hitbox = polygonList[0];
m_tilePreviewPanel->Refresh();
}

14
Extensions/TileMapObject/TileEditor.h
View File

@@ -28,6 +28,7 @@ freely, subject to the following restrictions:
#define TILEEDITOR_H
#include <wx/menu.h>
#include "GDCore/IDE/Dialogs/PolygonEditionHelper.h"
#include "TileMapDialogs.h"
#include "TileSet.h"
@@ -49,7 +50,20 @@ private:
wxMenu *m_predefinedShapesMenu;
float m_xOffset;
float m_yOffset;
gd::PolygonEditionHelper m_polygonHelper;
wxPoint GetRealPosition(wxPoint absolutePos);
protected:
virtual void OnPreviewLeftDown(wxMouseEvent& event);
virtual void OnPreviewLeftUp(wxMouseEvent& event);
virtual void OnPreviewMotion(wxMouseEvent& event);
virtual void OnAddPointToolClicked(wxCommandEvent& event);
virtual void OnEditPointToolClicked(wxCommandEvent& event);
virtual void OnRemovePointToolClicked(wxCommandEvent& event);
virtual void OnPredefinedShapeToolClicked(wxCommandEvent& event);
virtual void OnCollidableToolToggled(wxCommandEvent& event);
virtual void OnPreviewErase(wxEraseEvent& event);

34
Extensions/TileMapObject/TileMapDialogs.cpp
View File

@@ -544,7 +544,7 @@ TileEditorBase::TileEditorBase(wxWindow* parent, wxWindowID id, const wxPoint& p
wxFlexGridSizer* flexGridSizer416 = new wxFlexGridSizer(1, 2, 0, 0);
flexGridSizer416->SetFlexibleDirection( wxBOTH );
flexGridSizer416->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer416->AddGrowableCol(0);
flexGridSizer416->AddGrowableCol(1);
flexGridSizer416->AddGrowableRow(0);
flexGridSizer398->Add(flexGridSizer416, 1, wxALL|wxEXPAND, 0);
@@ -556,31 +556,21 @@ TileEditorBase::TileEditorBase(wxWindow* parent, wxWindowID id, const wxPoint& p
m_mainToolbar->AddTool(COLLIDABLE_TOOL_ID, _("Collidable"), wxXmlResource::Get()->LoadBitmap(wxT("pathfindingobstacleicon16")), wxNullBitmap, wxITEM_CHECK, _("Activates the collision mask for collision detection"), wxT(""), NULL);
m_mainToolbar->AddTool(PREDEFINED_SHAPE_TOOL_ID, _("Use a predefined shape"), wxXmlResource::Get()->LoadBitmap(wxT("tilemasktrianglebr16")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL);
m_mainToolbar->AddTool(PREDEFINED_SHAPE_TOOL_ID, _("Predefined shape"), wxXmlResource::Get()->LoadBitmap(wxT("tilemasktrianglebr16")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL);
m_mainToolbar->AddSeparator();
m_mainToolbar->Realize();
m_justToHideToolbar = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_justToHideToolbar->Hide();
flexGridSizer416->Add(m_justToHideToolbar, 0, wxALL, 5);
wxFlexGridSizer* flexGridSizer436 = new wxFlexGridSizer(0, 2, 0, 0);
flexGridSizer436->SetFlexibleDirection( wxBOTH );
flexGridSizer436->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_justToHideToolbar->SetSizer(flexGridSizer436);
m_toolbar418 = new wxToolBar(m_justToHideToolbar, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTB_NODIVIDER|wxTB_FLAT);
m_toolbar418 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTB_NODIVIDER|wxTB_FLAT);
m_toolbar418->SetToolBitmapSize(wxSize(16,16));
flexGridSizer436->Add(m_toolbar418, 0, wxALL, 5);
flexGridSizer416->Add(m_toolbar418, 0, wxALL, 0);
m_toolbar418->AddTool(ADD_POINT_TOOL_ID, _("Add a point"), wxXmlResource::Get()->LoadBitmap(wxT("add16")), wxNullBitmap, wxITEM_NORMAL, _("Add a point to the collision mask"), wxT(""), NULL);
m_toolbar418->AddTool(EDIT_POINT_TOOL_ID, _("Edit point position..."), wxXmlResource::Get()->LoadBitmap(wxT("edit16")), wxNullBitmap, wxITEM_NORMAL, _("Edit the selected point position..."), wxT(""), NULL);
m_toolbar418->AddTool(REMOVE_POINT_TOOL_ID, _("Remove selected point"), wxXmlResource::Get()->LoadBitmap(wxT("remove16")), wxNullBitmap, wxITEM_NORMAL, _("Removes the selected point"), wxT(""), NULL);
m_toolbar418->AddTool(RESET_MASK_TOOL_ID, _("Reset to the default collision mask"), wxXmlResource::Get()->LoadBitmap(wxT("undo16")), wxNullBitmap, wxITEM_NORMAL, _("Reset the tile collision mask to the default one"), wxT(""), NULL);
m_toolbar418->Realize();
m_tilePreviewPanel = new wxScrolledWindow(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxFULL_REPAINT_ON_RESIZE|wxHSCROLL|wxVSCROLL);
@@ -598,8 +588,14 @@ TileEditorBase::TileEditorBase(wxWindow* parent, wxWindowID id, const wxPoint& p
// Connect events
this->Connect(COLLIDABLE_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileEditorBase::OnCollidableToolToggled), NULL, this);
this->Connect(PREDEFINED_SHAPE_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileEditorBase::OnPredefinedShapeToolClicked), NULL, this);
this->Connect(ADD_POINT_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileEditorBase::OnAddPointToolClicked), NULL, this);
this->Connect(EDIT_POINT_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileEditorBase::OnEditPointToolClicked), NULL, this);
this->Connect(REMOVE_POINT_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileEditorBase::OnRemovePointToolClicked), NULL, this);
m_tilePreviewPanel->Connect(wxEVT_PAINT, wxPaintEventHandler(TileEditorBase::OnPreviewPaint), NULL, this);
m_tilePreviewPanel->Connect(wxEVT_ERASE_BACKGROUND, wxEraseEventHandler(TileEditorBase::OnPreviewErase), NULL, this);
m_tilePreviewPanel->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TileEditorBase::OnPreviewLeftDown), NULL, this);
m_tilePreviewPanel->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(TileEditorBase::OnPreviewLeftUp), NULL, this);
m_tilePreviewPanel->Connect(wxEVT_MOTION, wxMouseEventHandler(TileEditorBase::OnPreviewMotion), NULL, this);
}
@@ -607,7 +603,13 @@ TileEditorBase::~TileEditorBase()
{
this->Disconnect(COLLIDABLE_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileEditorBase::OnCollidableToolToggled), NULL, this);
this->Disconnect(PREDEFINED_SHAPE_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileEditorBase::OnPredefinedShapeToolClicked), NULL, this);
this->Disconnect(ADD_POINT_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileEditorBase::OnAddPointToolClicked), NULL, this);
this->Disconnect(EDIT_POINT_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileEditorBase::OnEditPointToolClicked), NULL, this);
this->Disconnect(REMOVE_POINT_TOOL_ID, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(TileEditorBase::OnRemovePointToolClicked), NULL, this);
m_tilePreviewPanel->Disconnect(wxEVT_PAINT, wxPaintEventHandler(TileEditorBase::OnPreviewPaint), NULL, this);
m_tilePreviewPanel->Disconnect(wxEVT_ERASE_BACKGROUND, wxEraseEventHandler(TileEditorBase::OnPreviewErase), NULL, this);
m_tilePreviewPanel->Disconnect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TileEditorBase::OnPreviewLeftDown), NULL, this);
m_tilePreviewPanel->Disconnect(wxEVT_LEFT_UP, wxMouseEventHandler(TileEditorBase::OnPreviewLeftUp), NULL, this);
m_tilePreviewPanel->Disconnect(wxEVT_MOTION, wxMouseEventHandler(TileEditorBase::OnPreviewMotion), NULL, this);
}

7
Extensions/TileMapObject/TileMapDialogs.h
View File

@@ -143,15 +143,20 @@ class TileEditorBase : public wxPanel
{
protected:
wxToolBar* m_mainToolbar;
wxPanel* m_justToHideToolbar;
wxToolBar* m_toolbar418;
wxScrolledWindow* m_tilePreviewPanel;
protected:
virtual void OnCollidableToolToggled(wxCommandEvent& event) { event.Skip(); }
virtual void OnPredefinedShapeToolClicked(wxCommandEvent& event) { event.Skip(); }
virtual void OnAddPointToolClicked(wxCommandEvent& event) { event.Skip(); }
virtual void OnEditPointToolClicked(wxCommandEvent& event) { event.Skip(); }
virtual void OnRemovePointToolClicked(wxCommandEvent& event) { event.Skip(); }
virtual void OnPreviewPaint(wxPaintEvent& event) { event.Skip(); }
virtual void OnPreviewErase(wxEraseEvent& event) { event.Skip(); }
virtual void OnPreviewLeftDown(wxMouseEvent& event) { event.Skip(); }
virtual void OnPreviewLeftUp(wxMouseEvent& event) { event.Skip(); }
virtual void OnPreviewMotion(wxMouseEvent& event) { event.Skip(); }
public:
TileEditorBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(500,300), long style = wxTAB_TRAVERSAL);

510
Extensions/TileMapObject/TileMapDialogs.wxcp
View File

@@ -1,7 +1,7 @@
{
"metadata": {
"m_generatedFilesDir": ".",
"m_objCounter": 508,
"m_objCounter": 512,
"m_includeFiles": ["TileMapDialogsIds.h"],
"m_bitmapFunction": "wxCF6DCInitBitmapResources",
"m_bitmapsFile": "TileMapDialogs_wxsmith_bitmaps.cpp",
@@ -5179,7 +5179,7 @@
}, {
"type": "string",
"m_label": "Growable columns:",
"m_value": "0"
"m_value": "1"
}, {
"type": "string",
"m_label": "Growable rows:",
@@ -5310,7 +5310,7 @@
}, {
"type": "string",
"m_label": "Label:",
"m_value": "Use a predefined shape"
"m_value": "Predefined shape"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
@@ -5346,14 +5346,34 @@
"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_tbSeparator512"
}, {
"type": "choice",
"m_label": "Kind:",
"m_selection": 0,
"m_options": ["separator"]
}],
"m_events": [],
"m_children": []
}]
}, {
"m_type": 4408,
"m_type": 4461,
"proportion": 0,
"border": 5,
"border": 0,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": ["wxTAB_TRAVERSAL"],
"m_styles": ["wxTB_NODIVIDER", "wxTB_FLAT"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_properties": [{
"type": "winid",
@@ -5365,332 +5385,195 @@
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
"m_label": "Name:",
"m_value": "m_toolbar418"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_justToHideToolbar"
}, {
"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": true
}, {
"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": ""
"m_label": "Separator Size:",
"m_value": "5"
}],
"m_events": [],
"m_children": [{
"m_type": 4403,
"proportion": 1,
"m_type": 4462,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_sizerFlags": [],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
"m_winid": "ADD_POINT_TOOL_ID"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "flexGridSizer436"
"m_value": "m_toolbarItem420"
}, {
"type": "string",
"m_label": "Style:",
"m_label": "Label:",
"m_value": "Add a point"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": "Add a point to the collision mask"
}, {
"type": "string",
"m_label": "Help String:",
"m_value": ""
}, {
"type": "string",
"m_label": "# Columns:",
"m_value": "2"
"type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../Binaries/Output/Release_Windows/res/icons_default/add16.png"
}, {
"type": "string",
"m_label": "# Rows:",
"m_value": "0"
"type": "filePicker",
"m_label": "Disabled-Bitmap File",
"m_path": ""
}, {
"type": "string",
"m_label": "Growable columns:",
"m_value": ""
"type": "choice",
"m_label": "Kind:",
"m_selection": 0,
"m_options": ["normal", "checkable", "radio", "separator", "dropdown"]
}, {
"type": "string",
"m_label": "Growable rows:",
"m_value": ""
}, {
"type": "string",
"m_label": "Horizontal gap:",
"m_value": "0"
}, {
"type": "string",
"m_label": "Vertical gap:",
"m_value": "0"
"type": "bool",
"m_label": "Construct the Dropdown Menu:",
"m_value": true
}],
"m_events": [],
"m_children": [{
"m_type": 4461,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": ["wxTB_NODIVIDER", "wxTB_FLAT"],
"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": "Name:",
"m_value": "m_toolbar418"
}, {
"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": "Padding:",
"m_value": "1"
}, {
"type": "string",
"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": "ADD_POINT_TOOL_ID"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_toolbarItem420"
}, {
"type": "string",
"m_label": "Label:",
"m_value": "Add a point"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": "Add a point to the collision mask"
}, {
"type": "string",
"m_label": "Help String:",
"m_value": ""
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../Binaries/Output/Release_Windows/res/icons_default/add16.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": "EDIT_POINT_TOOL_ID"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_toolbarItem422"
}, {
"type": "string",
"m_label": "Label:",
"m_value": "Edit point position..."
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": "Edit the selected point position..."
}, {
"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": 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": "REMOVE_POINT_TOOL_ID"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_toolbarItem426"
}, {
"type": "string",
"m_label": "Label:",
"m_value": "Remove selected point"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": "Removes the selected point"
}, {
"type": "string",
"m_label": "Help String:",
"m_value": ""
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../Binaries/Output/Release_Windows/res/icons_default/remove16.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": "RESET_MASK_TOOL_ID"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_toolbarItem432"
}, {
"type": "string",
"m_label": "Label:",
"m_value": "Reset to the default collision mask"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": "Reset the tile collision mask to the default one"
}, {
"type": "string",
"m_label": "Help String:",
"m_value": ""
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../Binaries/Output/Release_Windows/res/icons_default/undo16.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_events": [{
"m_eventName": "wxEVT_COMMAND_TOOL_CLICKED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnAddPointToolClicked(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": "EDIT_POINT_TOOL_ID"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_toolbarItem422"
}, {
"type": "string",
"m_label": "Label:",
"m_value": "Edit point position..."
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": "Edit the selected point position..."
}, {
"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": 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": "OnEditPointToolClicked(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": "REMOVE_POINT_TOOL_ID"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_toolbarItem426"
}, {
"type": "string",
"m_label": "Label:",
"m_value": "Remove selected point"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": "Removes the selected point"
}, {
"type": "string",
"m_label": "Help String:",
"m_value": ""
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../Binaries/Output/Release_Windows/res/icons_default/remove16.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": "OnRemovePointToolClicked(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": []
}]
}]
}, {
@@ -5780,6 +5663,27 @@
"m_functionNameAndSignature": "OnPreviewErase(wxEraseEvent& event)",
"m_description": "Process a wxEVT_ERASE_BACKGROUND event.",
"m_noBody": false
}, {
"m_eventName": "wxEVT_LEFT_DOWN",
"m_eventClass": "wxMouseEvent",
"m_eventHandler": "wxMouseEventHandler",
"m_functionNameAndSignature": "OnPreviewLeftDown(wxMouseEvent& event)",
"m_description": "Process a wxEVT_LEFT_DOWN event. The handler of this event should normally call event.Skip() to allow the default processing to take place as otherwise the window under mouse wouldn't get the focus.",
"m_noBody": false
}, {
"m_eventName": "wxEVT_LEFT_UP",
"m_eventClass": "wxMouseEvent",
"m_eventHandler": "wxMouseEventHandler",
"m_functionNameAndSignature": "OnPreviewLeftUp(wxMouseEvent& event)",
"m_description": "Process a wxEVT_LEFT_UP event.",
"m_noBody": false
}, {
"m_eventName": "wxEVT_MOTION",
"m_eventClass": "wxMouseEvent",
"m_eventHandler": "wxMouseEventHandler",
"m_functionNameAndSignature": "OnPreviewMotion(wxMouseEvent& event)",
"m_description": "Process a wxEVT_MOTION event",
"m_noBody": false
}],
"m_children": []
}]

110
Extensions/TileMapObject/TileMapDialogs.xrc
View File

@@ -837,7 +837,7 @@
<rows>1</rows>
<vgap>0</vgap>
<hgap>0</hgap>
<growablecols>0</growablecols>
<growablecols>1</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxALL|wxEXPAND</flag>
@@ -859,84 +859,56 @@
</object>
<object class="tool" name="m_toolbarItem444">
<label>
<![CDATA[Use a predefined shape]]>
<![CDATA[Predefined shape]]>
</label>
<longhelp>
<![CDATA[]]>
</longhelp>
<bitmap>../../Binaries/Output/Release_Windows/res/tilemasktrianglebr16.png</bitmap>
</object>
<object class="separator"/>
</object>
</object>
<object class="sizeritem">
<flag>wxALL</flag>
<border>5</border>
<object class="wxPanel" name="m_justToHideToolbar">
<style>wxTAB_TRAVERSAL</style>
<hidden>1</hidden>
<object class="wxFlexGridSizer">
<cols>2</cols>
<rows>0</rows>
<vgap>0</vgap>
<hgap>0</hgap>
<growablecols/>
<growablerows/>
<object class="sizeritem">
<flag>wxALL</flag>
<border>5</border>
<object class="wxToolBar" name="m_toolbar418">
<style>wxTB_NODIVIDER|wxTB_FLAT</style>
<bitmapsize>16,16</bitmapsize>
<object class="tool" name="m_toolbarItem420">
<label>
<![CDATA[Add a point]]>
</label>
<tooltip>
<![CDATA[Add a point to the collision mask]]>
</tooltip>
<longhelp>
<![CDATA[]]>
</longhelp>
<bitmap>../../Binaries/Output/Release_Windows/res/icons_default/add16.png</bitmap>
</object>
<object class="tool" name="m_toolbarItem422">
<label>
<![CDATA[Edit point position...]]>
</label>
<tooltip>
<![CDATA[Edit the selected point position...]]>
</tooltip>
<longhelp>
<![CDATA[]]>
</longhelp>
<bitmap>../../Binaries/Output/Release_Windows/res/icons_default/edit16.png</bitmap>
</object>
<object class="tool" name="m_toolbarItem426">
<label>
<![CDATA[Remove selected point]]>
</label>
<tooltip>
<![CDATA[Removes the selected point]]>
</tooltip>
<longhelp>
<![CDATA[]]>
</longhelp>
<bitmap>../../Binaries/Output/Release_Windows/res/icons_default/remove16.png</bitmap>
</object>
<object class="tool" name="m_toolbarItem432">
<label>
<![CDATA[Reset to the default collision mask]]>
</label>
<tooltip>
<![CDATA[Reset the tile collision mask to the default one]]>
</tooltip>
<longhelp>
<![CDATA[]]>
</longhelp>
<bitmap>../../Binaries/Output/Release_Windows/res/icons_default/undo16.png</bitmap>
</object>
</object>
</object>
<object class="wxToolBar" name="m_toolbar418">
<style>wxTB_NODIVIDER|wxTB_FLAT</style>
<bitmapsize>16,16</bitmapsize>
<object class="tool" name="m_toolbarItem420">
<label>
<![CDATA[Add a point]]>
</label>
<tooltip>
<![CDATA[Add a point to the collision mask]]>
</tooltip>
<longhelp>
<![CDATA[]]>
</longhelp>
<bitmap>../../Binaries/Output/Release_Windows/res/icons_default/add16.png</bitmap>
</object>
<object class="tool" name="m_toolbarItem422">
<label>
<![CDATA[Edit point position...]]>
</label>
<tooltip>
<![CDATA[Edit the selected point position...]]>
</tooltip>
<longhelp>
<![CDATA[]]>
</longhelp>
<bitmap>../../Binaries/Output/Release_Windows/res/icons_default/edit16.png</bitmap>
</object>
<object class="tool" name="m_toolbarItem426">
<label>
<![CDATA[Remove selected point]]>
</label>
<tooltip>
<![CDATA[Removes the selected point]]>
</tooltip>
<longhelp>
<![CDATA[]]>
</longhelp>
<bitmap>../../Binaries/Output/Release_Windows/res/icons_default/remove16.png</bitmap>
</object>
</object>
</object>

32
Extensions/TileMapObject/TileMapDialogs_wxsmith_bitmaps.cpp
View File

@@ -470,24 +470,8 @@ static unsigned char xml_res_file_12[] = {
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_13 = 278;
static size_t xml_res_size_13 = 2151;
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,
54,192,123,227,211,101,76,140,12,145,100,25,224,184,250,46,73,154,25,24,
24,24,24,97,97,96,184,224,226,178,207,127,255,71,74,241,11,48,240,179,177,
98,85,252,249,222,179,251,7,10,76,149,48,92,0,211,204,192,192,192,240,236,
227,7,134,143,191,126,99,53,128,87,73,74,209,97,194,233,123,56,189,0,3,
164,24,194,196,192,192,192,112,62,65,63,138,151,153,113,57,57,134,48,34,
167,3,100,175,220,73,54,96,68,215,104,235,49,19,37,209,28,222,145,206,136,
226,5,108,46,33,4,48,194,128,84,67,176,6,226,249,4,253,40,172,170,255,51,
96,24,140,213,0,92,224,240,206,244,40,116,67,72,50,0,171,33,255,255,255,
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_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,
@@ -594,15 +578,8 @@ static unsigned char xml_res_file_14[] = {
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};
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()
{
@@ -630,7 +607,6 @@ void wxCF6DCInitBitmapResources()
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"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$E__Developpement_GD_Extensions_TileMapObject_TileMapDialogs_wxsmith_bitmaps.xrc"), xml_res_file_13, xml_res_size_13, wxT("text/xml"));
wxXmlResource::Get()->Load(wxT("memory:XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$E__Developpement_GD_Extensions_TileMapObject_TileMapDialogs_wxsmith_bitmaps.xrc"));
}

1
Extensions/TileMapObject/TileMapDialogs_wxsmith_bitmaps.xrc
View File

@@ -13,5 +13,4 @@
<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>
</resource>