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

Add sheet_offset parameter to ComposeTile16 and update sheet ID validation

Browse Source
This commit is contained in:
scawful
2024-11-10 11:28:51 -05:00
parent 89a8e47e9c
commit 03da9d4eaa
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/gfx/tilesheet.cc
View File

@@ -63,7 +63,8 @@ void Tilesheet::ComposeTile16(const std::vector<uint8_t>& graphics_buffer,
const TileInfo& top_left, const TileInfo& top_left,
const TileInfo& top_right, const TileInfo& top_right,
const TileInfo& bottom_left, const TileInfo& bottom_left,
const TileInfo& bottom_right) { const TileInfo& bottom_right, int sheet_offset) {
sheet_offset_ = sheet_offset;
// Calculate the base position for this Tile16 in the full-size bitmap // Calculate the base position for this Tile16 in the full-size bitmap
int tiles_per_row = bitmap_->width() / tile_width_; int tiles_per_row = bitmap_->width() / tile_width_;
int tile16_row = num_tiles_ / tiles_per_row; int tile16_row = num_tiles_ / tiles_per_row;
@@ -123,13 +124,13 @@ std::vector<uint8_t> Tilesheet::FetchTileDataFromGraphicsBuffer(
// Calculate the position in the graphics_buffer_ based on tile_id // Calculate the position in the graphics_buffer_ based on tile_id
std::vector<uint8_t> tile_data(0x40, 0x00); std::vector<uint8_t> tile_data(0x40, 0x00);
int sheet = (tile_id / tiles_per_sheet) % 4 + 212; int sheet = (tile_id / tiles_per_sheet) % 4 + sheet_offset_;
int position_in_sheet = tile_id % tiles_per_sheet; int position_in_sheet = tile_id % tiles_per_sheet;
int row_in_sheet = position_in_sheet / tiles_per_row; int row_in_sheet = position_in_sheet / tiles_per_row;
int column_in_sheet = position_in_sheet % tiles_per_row; int column_in_sheet = position_in_sheet % tiles_per_row;
// Ensure that the sheet ID is between 212 and 215 // Ensure that the sheet ID is between 212 and 215 if using full gfx buffer
assert(sheet >= 212 && sheet <= 215); assert(sheet >= sheet_offset_ && sheet <= sheet_offset_ + 3);
// Copy the tile data from the graphics_buffer_ to tile_data // Copy the tile data from the graphics_buffer_ to tile_data
for (int y = 0; y < 8; ++y) { for (int y = 0; y < 8; ++y) {

11
src/app/gfx/tilesheet.h
View File

@@ -37,7 +37,8 @@ class Tilesheet {
void ComposeTile16(const std::vector<uint8_t>& graphics_buffer, void ComposeTile16(const std::vector<uint8_t>& graphics_buffer,
const TileInfo& top_left, const TileInfo& top_right, const TileInfo& top_left, const TileInfo& top_right,
const TileInfo& bottom_left, const TileInfo& bottom_right); const TileInfo& bottom_left, const TileInfo& bottom_right,
int sheet_offset = 0);
void ComposeAndPlaceTilePart(const std::vector<uint8_t>& graphics_buffer, void ComposeAndPlaceTilePart(const std::vector<uint8_t>& graphics_buffer,
const TileInfo& tile_info, int baseX, int baseY); const TileInfo& tile_info, int baseX, int baseY);
@@ -84,6 +85,13 @@ class Tilesheet {
auto tile_type() const { return tile_type_; } auto tile_type() const { return tile_type_; }
auto tile_info() const { return tile_info_; } auto tile_info() const { return tile_info_; }
auto mutable_tile_info() { return tile_info_; } auto mutable_tile_info() { return tile_info_; }
void clear() {
palette_.clear();
internal_data_.clear();
tile_info_.clear();
bitmap_.reset();
num_tiles_ = 0;
}
private: private:
int CalculateTileIndex(int x, int y) { int CalculateTileIndex(int x, int y) {
@@ -115,6 +123,7 @@ class Tilesheet {
int num_tiles_ = 0; int num_tiles_ = 0;
int tile_width_ = 0; int tile_width_ = 0;
int tile_height_ = 0; int tile_height_ = 0;
int sheet_offset_ = 0;
TileType tile_type_; TileType tile_type_;
}; };