feat: tilesets manager

data/menubar.xml

@@ -16,6 +16,7 @@
         </menu>
         <menu name="$Export">
             <item name="$Export Minimap..." action="EXPORT_MINIMAP" help="Export minimap to an image file."/>
+            <item name="$Export Tilesets..." action="EXPORT_TILESETS" help="Export tilesets to an xml file."/>
         </menu>
         <menu name="$Reload">
             <item name="$Reload" hotkey="F5" action="RELOAD_DATA" help="Reloads all data files."/>

source/CMakeLists.txt

@@ -101,6 +101,8 @@ target_sources(${PROJECT_NAME}
 	about_window.cpp
 	action.cpp
 	actions_history_window.cpp
+	add_item_window.cpp
+	add_tileset_window.cpp
 	application.cpp
 	artprovider.cpp
 	basemap.cpp
@@ -194,6 +196,7 @@ target_sources(${PROJECT_NAME}
 	templatemapclassic.cpp
 	tile.cpp
 	tileset.cpp
+	tileset_window.cpp
 	town.cpp
 	updater.cpp
 	wall_brush.cpp

source/add_item_window.cpp

@@ -0,0 +1,152 @@
+//////////////////////////////////////////////////////////////////////
+// This file is part of Remere's Map Editor
+//////////////////////////////////////////////////////////////////////
+// Remere's Map Editor is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Remere's Map Editor is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//////////////////////////////////////////////////////////////////////
+
+#include "main.h"
+
+#include <wx/grid.h>
+
+#include "tile.h"
+#include "item.h"
+#include "complexitem.h"
+#include "town.h"
+#include "house.h"
+#include "map.h"
+#include "editor.h"
+#include "materials.h"
+#include "tileset.h"
+
+#include "gui.h"
+#include "application.h"
+#include "add_item_window.h"
+#include "container_properties_window.h"
+#include "find_item_window.h"
+
+// ============================================================================
+// Add Item Window
+
+BEGIN_EVENT_TABLE(AddItemWindow, wxDialog)
+EVT_BUTTON(wxID_OK, AddItemWindow::OnClickOK)
+EVT_BUTTON(wxID_CANCEL, AddItemWindow::OnClickCancel)
+END_EVENT_TABLE()
+
+AddItemWindow::AddItemWindow(wxWindow* win_parent, TilesetCategoryType categoryType, Tileset* tilesetItem, wxPoint pos) :
+	ObjectPropertiesWindowBase(win_parent, "Add a Item", pos),
+	item_id(0),
+	tileset_item(tilesetItem),
+	category_type(categoryType),
+	item_id_field(nullptr),
+	item_id_label(nullptr),
+	item_name_label(nullptr),
+	item_button(nullptr) {
+	wxSizer* topsizer = newd wxBoxSizer(wxVERTICAL);
+	wxString description = "Add a Item";
+
+	wxSizer* boxsizer = newd wxStaticBoxSizer(wxVERTICAL, this, description);
+
+	wxFlexGridSizer* subsizer = newd wxFlexGridSizer(2, 10, 10);
+	subsizer->AddGrowableCol(1);
+
+	uint16_t itemId = 0;
+	std::string itemName = "None";
+	item_id_label = newd wxStaticText(this, wxID_ANY, "ID " + i2ws(itemId));
+	subsizer->Add(item_id_label);
+	item_name_label = newd wxStaticText(this, wxID_ANY, "\"" + wxstr(itemName) + "\"");
+	subsizer->Add(item_name_label);
+
+	subsizer->Add(newd wxStaticText(this, wxID_ANY, "Item"), wxSizerFlags(1).CenterVertical());
+	item_button = newd DCButton(this, wxID_ANY, wxDefaultPosition, DC_BTN_TOGGLE, RENDER_SIZE_32x32, 0);
+	subsizer->Add(item_button);
+
+	subsizer->Add(newd wxStaticText(this, wxID_ANY, "Item Id"));
+	item_id_field = newd wxSpinCtrl(this, wxID_ANY, i2ws(itemId), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 100, 100000);
+	item_id_field->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler(AddItemWindow::OnChangeItemId), NULL, this);
+	subsizer->Add(item_id_field, wxSizerFlags(1).Expand());
+
+	boxsizer->Add(subsizer, wxSizerFlags(1).Expand());
+
+	topsizer->Add(boxsizer, wxSizerFlags(0).Expand().Border(wxLEFT | wxRIGHT, 20));
+
+	wxSizer* subsizer_ = newd wxBoxSizer(wxHORIZONTAL);
+	subsizer_->Add(newd wxButton(this, wxID_OK, "Add"), wxSizerFlags(1).Center().Border(wxTOP | wxBOTTOM, 10));
+	subsizer_->Add(newd wxButton(this, wxID_CANCEL, "Cancel"), wxSizerFlags(1).Center().Border(wxTOP | wxBOTTOM, 10));
+	topsizer->Add(subsizer_, wxSizerFlags(0).Center().Border(wxLEFT | wxRIGHT, 20));
+
+	SetSizerAndFit(topsizer);
+	Centre(wxBOTH);
+
+	item_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(AddItemWindow::OnItemClicked), NULL, this);
+}
+
+void AddItemWindow::OnClickOK(wxCommandEvent &WXUNUSED(event)) {
+	const ItemType &it = g_items.getItemType(item_id_field->GetValue());
+	if (it.id != 0) {
+		g_materials.addToTileset(tileset_item->name, it.id, category_type);
+		g_materials.modify();
+		g_gui.PopupDialog("Item added to Tileset", "'" + it.name + "' has been added to tileset '" + tileset_item->name + "'", wxOK);
+
+		EndModal(1);
+	} else {
+		g_gui.PopupDialog("Something went wrong", "You need to select any item", wxOK);
+	}
+}
+
+void AddItemWindow::OnClickCancel(wxCommandEvent &WXUNUSED(event)) {
+	// Just close this window
+	EndModal(0);
+}
+
+void AddItemWindow::OnChangeItemId(wxCommandEvent &WXUNUSED(event)) {
+	uint16_t itemId = item_id_field->GetValue();
+	ItemType &it = g_items[itemId];
+	if (it.id != 0) {
+		item_id_label->SetLabelText("ID " + i2ws(it.id));
+		item_name_label->SetLabelText("\"" + wxstr(it.name) + "\"");
+
+		item_button->SetSprite(it.clientID);
+	} else {
+		item_id_field->SetValue(100);
+	}
+}
+
+void AddItemWindow::OnItemClicked(wxMouseEvent &WXUNUSED(event)) {
+	FindItemDialog dialog(this, "Item");
+	if (dialog.ShowModal() == wxID_OK) {
+		uint16_t id = dialog.getResultID();
+		SetItemIdToItemButton(id);
+	}
+	dialog.Destroy();
+}
+
+void AddItemWindow::SetItemIdToItemButton(uint16_t id) {
+	if (!item_button) {
+		return;
+	}
+
+	if (id != 0) {
+		const ItemType &it = g_items.getItemType(id);
+		if (it.id != 0) {
+			item_id_field->SetValue(it.id);
+			item_id_label->SetLabelText("ID " + i2ws(it.id));
+			item_name_label->SetLabelText("\"" + wxstr(it.name) + "\"");
+
+			item_button->SetSprite(it.clientID);
+			return;
+		}
+	}
+
+	item_button->SetSprite(0);
+}

source/add_item_window.h

@@ -0,0 +1,53 @@
+//////////////////////////////////////////////////////////////////////
+// This file is part of Remere's Map Editor
+//////////////////////////////////////////////////////////////////////
+// Remere's Map Editor is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Remere's Map Editor is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//////////////////////////////////////////////////////////////////////
+
+#ifndef RME_ADD_ITEM_WINDOW_H_
+#define RME_ADD_ITEM_WINDOW_H_
+
+#include "main.h"
+
+#include "common_windows.h"
+
+class ContainerItemButton;
+class ContainerItemPopupMenu;
+
+class AddItemWindow : public ObjectPropertiesWindowBase {
+public:
+	AddItemWindow(wxWindow* parent, TilesetCategoryType categoryType, Tileset* tilesetItem, wxPoint = wxDefaultPosition);
+
+	void OnItemClicked(wxMouseEvent &event);
+	void SetItemIdToItemButton(uint16_t id);
+	void OnChangeItemId(wxCommandEvent &WXUNUSED(event));
+
+	void OnClickOK(wxCommandEvent &);
+	void OnClickCancel(wxCommandEvent &);
+
+protected:
+	int item_id;
+
+	wxSpinCtrl* item_id_field;
+	wxStaticText* item_id_label;
+	wxStaticText* item_name_label;
+	DCButton* item_button;
+
+	TilesetCategoryType category_type;
+	Tileset* tileset_item;
+
+	DECLARE_EVENT_TABLE();
+};
+
+#endif

source/add_tileset_window.cpp

@@ -0,0 +1,157 @@
+//////////////////////////////////////////////////////////////////////
+// This file is part of Remere's Map Editor
+//////////////////////////////////////////////////////////////////////
+// Remere's Map Editor is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Remere's Map Editor is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//////////////////////////////////////////////////////////////////////
+
+#include "main.h"
+
+#include <wx/grid.h>
+
+#include "tile.h"
+#include "item.h"
+#include "complexitem.h"
+#include "town.h"
+#include "house.h"
+#include "map.h"
+#include "editor.h"
+#include "materials.h"
+#include "tileset.h"
+
+#include "gui.h"
+#include "application.h"
+#include "add_tileset_window.h"
+#include "container_properties_window.h"
+#include "find_item_window.h"
+
+// ============================================================================
+// Add Tileset Window
+
+BEGIN_EVENT_TABLE(AddTilesetWindow, wxDialog)
+EVT_BUTTON(wxID_OK, AddTilesetWindow::OnClickOK)
+EVT_BUTTON(wxID_CANCEL, AddTilesetWindow::OnClickCancel)
+END_EVENT_TABLE()
+
+AddTilesetWindow::AddTilesetWindow(wxWindow* win_parent, TilesetCategoryType categoryType, wxPoint pos) :
+	ObjectPropertiesWindowBase(win_parent, "Add a Tileset", pos),
+	category_type(categoryType),
+	item_id_label(nullptr),
+	item_name_label(nullptr),
+	tileset_name_field(nullptr),
+	item_id_field(nullptr),
+	item_button(nullptr) {
+	wxSizer* topsizer = newd wxBoxSizer(wxVERTICAL);
+	wxString description = "Add a Tileset";
+
+	wxSizer* boxsizer = newd wxStaticBoxSizer(wxVERTICAL, this, description);
+
+	wxFlexGridSizer* subsizer = newd wxFlexGridSizer(2, 10, 10);
+	subsizer->AddGrowableCol(1);
+
+	uint16_t itemId = 0;
+	std::string itemName = "None";
+	item_id_label = newd wxStaticText(this, wxID_ANY, "ID " + i2ws(itemId));
+	subsizer->Add(item_id_label);
+	item_name_label = newd wxStaticText(this, wxID_ANY, "\"" + wxstr(itemName) + "\"");
+	subsizer->Add(item_name_label);
+
+	subsizer->Add(newd wxStaticText(this, wxID_ANY, "Item"), wxSizerFlags(1).CenterVertical());
+	item_button = newd DCButton(this, wxID_ANY, wxDefaultPosition, DC_BTN_TOGGLE, RENDER_SIZE_32x32, 0);
+	subsizer->Add(item_button);
+
+	subsizer->Add(newd wxStaticText(this, wxID_ANY, "Item Id of First Item"));
+	item_id_field = newd wxSpinCtrl(this, wxID_ANY, i2ws(itemId), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 100, 100000);
+	subsizer->Add(item_id_field, wxSizerFlags(1).Expand());
+
+	subsizer->Add(newd wxStaticText(this, wxID_ANY, "Tileset Name"));
+	tileset_name_field = newd wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
+	subsizer->Add(tileset_name_field);
+
+	boxsizer->Add(subsizer, wxSizerFlags(1).Expand());
+
+	topsizer->Add(boxsizer, wxSizerFlags(0).Expand().Border(wxLEFT | wxRIGHT, 20));
+
+	wxSizer* subsizer_ = newd wxBoxSizer(wxHORIZONTAL);
+	subsizer_->Add(newd wxButton(this, wxID_OK, "Add"), wxSizerFlags(1).Center().Border(wxTOP | wxBOTTOM, 10));
+	subsizer_->Add(newd wxButton(this, wxID_CANCEL, "Cancel"), wxSizerFlags(1).Center().Border(wxTOP | wxBOTTOM, 10));
+	topsizer->Add(subsizer_, wxSizerFlags(0).Center().Border(wxLEFT | wxRIGHT, 20));
+
+	SetSizerAndFit(topsizer);
+	Centre(wxBOTH);
+
+	item_id_field->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler(AddTilesetWindow::OnChangeItemId), NULL, this);
+	item_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(AddTilesetWindow::OnItemClicked), NULL, this);
+}
+
+void AddTilesetWindow::OnChangeItemId(wxCommandEvent &WXUNUSED(event)) {
+	uint16_t itemId = item_id_field->GetValue();
+	ItemType &it = g_items[itemId];
+	if (it.id != 0) {
+		item_id_label->SetLabelText("ID " + i2ws(it.id));
+		item_name_label->SetLabelText("\"" + wxstr(it.name) + "\"");
+
+		item_button->SetSprite(it.clientID);
+	} else {
+		item_id_field->SetValue(100);
+	}
+}
+
+void AddTilesetWindow::OnItemClicked(wxMouseEvent &WXUNUSED(event)) {
+	FindItemDialog dialog(this, "Item");
+	if (dialog.ShowModal() == wxID_OK) {
+		uint16_t id = dialog.getResultID();
+		SetItemIdToItemButton(id);
+	}
+	dialog.Destroy();
+}
+
+void AddTilesetWindow::SetItemIdToItemButton(uint16_t id) {
+	if (!item_button) {
+		return;
+	}
+
+	if (id != 0) {
+		const ItemType &it = g_items.getItemType(id);
+		if (it.id != 0) {
+			item_id_field->SetValue(it.id);
+			item_id_label->SetLabelText("ID " + i2ws(it.id));
+			item_name_label->SetLabelText("\"" + wxstr(it.name) + "\"");
+
+			item_button->SetSprite(it.clientID);
+			return;
+		}
+	}
+
+	item_button->SetSprite(0);
+}
+
+void AddTilesetWindow::OnClickOK(wxCommandEvent &WXUNUSED(event)) {
+	uint16_t itemId = item_id_field->GetValue();
+	ItemType &it = g_items[itemId];
+	if (it.id != 0) {
+		std::string tilesetName = std::string(tileset_name_field->GetValue().mb_str());
+		g_materials.addToTileset(tilesetName, it.id, category_type);
+		g_materials.modify();
+		g_gui.PopupDialog("Added Tileset", "'" + it.name + "' has been added to new tileset '" + tilesetName + "'", wxOK);
+
+		EndModal(1);
+	} else {
+		g_gui.PopupDialog(this, "Error", "Item does not exist.", wxOK);
+	}
+}
+
+void AddTilesetWindow::OnClickCancel(wxCommandEvent &WXUNUSED(event)) {
+	// Just close this window
+	EndModal(0);
+}