Fix DungeonMap tile16 copy IDs being used, update yaze version num

This commit is contained in:
scawful
2024-01-22 20:24:44 -05:00
parent a443efc8a4
commit 9f137559c3
7 changed files with 56 additions and 30 deletions

View File

@@ -5,6 +5,7 @@
#include <cmath>
#include <string>
#include "app/editor/graphics_editor.h"
#include "app/gfx/bitmap.h"
#include "app/rom.h"
@@ -143,6 +144,17 @@ void Canvas::DrawContextMenu() {
}
ImGui::EndMenu();
}
ImGui::Separator();
if (ImGui::BeginMenu("Palette")) {
for (const auto each : editor::kPaletteGroupAddressesKeys) {
if (ImGui::BeginMenu(each)) {
// Apply the palette to the current bitmap
}
ImGui::EndMenu();
}
ImGui::EndMenu();
}
ImGui::EndPopup();
}
@@ -300,9 +312,9 @@ void Canvas::HandleTileEdits(Canvas &blockset_canvas,
gfx::Bitmap &destination, int &current_tile,
float scale, int tile_painter_size,
int tiles_per_row) {
if (!blockset_canvas.Points().empty()) {
uint16_t x = blockset_canvas.Points().front().x / 32;
uint16_t y = blockset_canvas.Points().front().y / 32;
if (!blockset_canvas.points().empty()) {
uint16_t x = blockset_canvas.points().front().x / 32;
uint16_t y = blockset_canvas.points().front().y / 32;
current_tile = x + (y * tiles_per_row);
if (DrawTilePainter(source_blockset[current_tile], tile_painter_size,
scale)) {

View File

@@ -85,7 +85,8 @@ class Canvas {
void DrawOverlay(); // last
auto Points() const { return points_; }
auto points() const { return points_; }
auto mutable_points() { return &points_; }
auto GetDrawList() const { return draw_list_; }
auto zero_point() const { return canvas_p0_; }
auto Scrolling() const { return scrolling_; }