scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance Overworld Editor and Map Properties System

Browse Source 
- Updated the DrawOverworldEntrancePopup to include new options for deleting entrances and improved UI labels for better clarity.
- Integrated new UI constants for consistent styling across the editor.
- Refactored MapPropertiesSystem to support additional toolset functionalities, including editing tools and view controls.
- Improved overlay handling in OverworldMap, consolidating vanilla and custom overlay loading logic.
- Enhanced user interaction with new buttons and streamlined layout for better usability in the editor.
This commit is contained in:
scawful
2025-09-24 21:10:37 -04:00
parent 8b669c4553
commit e8afc764a0
9 changed files with 567 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
src/app/editor/overworld/tile16_editor.cc
View File

@@ -72,44 +72,34 @@ absl::Status Tile16Editor::Update() {
}
if (BeginMenu("Edit")) {
if (MenuItem("Copy Current Tile16")) {
if (MenuItem("Copy Current Tile16", "Ctrl+C")) {
RETURN_IF_ERROR(CopyTile16ToClipboard(current_tile16_));
}
if (MenuItem("Paste to Current Tile16")) {
if (MenuItem("Paste to Current Tile16", "Ctrl+V")) {
RETURN_IF_ERROR(PasteTile16FromClipboard());
}
Separator();
if (MenuItem("Save to Scratch Space 1")) {
RETURN_IF_ERROR(SaveTile16ToScratchSpace(0));
}
if (MenuItem("Save to Scratch Space 2")) {
RETURN_IF_ERROR(SaveTile16ToScratchSpace(1));
}
if (MenuItem("Save to Scratch Space 3")) {
RETURN_IF_ERROR(SaveTile16ToScratchSpace(2));
}
if (MenuItem("Save to Scratch Space 4")) {
RETURN_IF_ERROR(SaveTile16ToScratchSpace(3));
}
Separator();
if (MenuItem("Load from Scratch Space 1")) {
RETURN_IF_ERROR(LoadTile16FromScratchSpace(0));
}
if (MenuItem("Load from Scratch Space 2")) {
RETURN_IF_ERROR(LoadTile16FromScratchSpace(1));
}
if (MenuItem("Load from Scratch Space 3")) {
RETURN_IF_ERROR(LoadTile16FromScratchSpace(2));
}
if (MenuItem("Load from Scratch Space 4")) {
RETURN_IF_ERROR(LoadTile16FromScratchSpace(3));
}
EndMenu();
}
if (BeginMenu("Help")) {
if (MenuItem("About Tile16 Editor")) {
OpenPopup("About Tile16 Editor");
if (BeginMenu("Scratch Space")) {
for (int i = 0; i < 4; i++) {
std::string slot_name = "Slot " + std::to_string(i + 1);
if (scratch_space_used_[i]) {
if (MenuItem((slot_name + " (Load)").c_str())) {
RETURN_IF_ERROR(LoadTile16FromScratchSpace(i));
}
if (MenuItem((slot_name + " (Save)").c_str())) {
RETURN_IF_ERROR(SaveTile16ToScratchSpace(i));
}
if (MenuItem((slot_name + " (Clear)").c_str())) {
RETURN_IF_ERROR(ClearScratchSpace(i));
}
} else {
if (MenuItem((slot_name + " (Save)").c_str())) {
RETURN_IF_ERROR(SaveTile16ToScratchSpace(i));
}
}
if (i < 3) Separator();
}
EndMenu();
}
@@ -350,38 +340,43 @@ absl::Status Tile16Editor::UpdateTile16Edit() {
// Actions column
TableNextColumn();
Text("Actions:");
Text("Quick Actions:");
// Clipboard actions
if (Button("Copy Current Tile16")) {
RETURN_IF_ERROR(CopyTile16ToClipboard(current_tile16_));
}
SameLine();
if (Button("Paste to Current Tile16")) {
RETURN_IF_ERROR(PasteTile16FromClipboard());
// Clipboard actions in a more compact layout
if (BeginTable("##ClipboardActions", 2, ImGuiTableFlags_SizingFixedFit)) {
TableNextColumn();
if (Button("Copy", ImVec2(60, 0))) {
RETURN_IF_ERROR(CopyTile16ToClipboard(current_tile16_));
}
TableNextColumn();
if (Button("Paste", ImVec2(60, 0))) {
RETURN_IF_ERROR(PasteTile16FromClipboard());
}
EndTable();
}
// Scratch space actions
Separator();
// Scratch space in a compact 2x2 grid
Text("Scratch Space:");
// Create a grid of 4 buttons for scratch space
for (int i = 0; i < 4; i++) {
if (i > 0) SameLine();
if (scratch_space_used_[i]) {
if (Button(("Slot " + std::to_string(i)).c_str())) {
RETURN_IF_ERROR(LoadTile16FromScratchSpace(i));
}
SameLine();
if (Button(("Clear##" + std::to_string(i)).c_str())) {
RETURN_IF_ERROR(ClearScratchSpace(i));
}
} else {
if (Button(("Empty##" + std::to_string(i)).c_str())) {
RETURN_IF_ERROR(SaveTile16ToScratchSpace(i));
if (BeginTable("##ScratchSpace", 2, ImGuiTableFlags_SizingFixedFit)) {
for (int i = 0; i < 4; i++) {
TableNextColumn();
std::string slot_name = "Slot " + std::to_string(i + 1);
if (scratch_space_used_[i]) {
if (Button((slot_name + " (Load)").c_str(), ImVec2(80, 0))) {
RETURN_IF_ERROR(LoadTile16FromScratchSpace(i));
}
SameLine();
if (Button("Clear", ImVec2(40, 0))) {
RETURN_IF_ERROR(ClearScratchSpace(i));
}
} else {
if (Button((slot_name + " (Empty)").c_str(), ImVec2(120, 0))) {
RETURN_IF_ERROR(SaveTile16ToScratchSpace(i));
}
}
}
EndTable();
}
EndTable();