mirror of
https://github.com/gbdev/rgbds.git
synced 2025-11-20 18:22:07 +00:00
Rename convert to process
More consistent with its "main" function's name
This commit is contained in:
2
Makefile
2
Makefile
@@ -105,10 +105,10 @@ rgbfix_obj := \
|
||||
src/error.o
|
||||
|
||||
rgbgfx_obj := \
|
||||
src/gfx/convert.o \
|
||||
src/gfx/main.o \
|
||||
src/gfx/pal_packing.o \
|
||||
src/gfx/pal_sorting.o \
|
||||
src/gfx/process.o \
|
||||
src/gfx/proto_palette.o \
|
||||
src/gfx/rgba.o \
|
||||
src/extern/getopt.o \
|
||||
|
||||
@@ -70,10 +70,10 @@ set(rgbfix_src
|
||||
)
|
||||
|
||||
set(rgbgfx_src
|
||||
"gfx/convert.cpp"
|
||||
"gfx/main.cpp"
|
||||
"gfx/pal_packing.cpp"
|
||||
"gfx/pal_sorting.cpp"
|
||||
"gfx/process.cpp"
|
||||
"gfx/proto_palette.cpp"
|
||||
"gfx/rgba.cpp"
|
||||
"extern/getopt.c"
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#include "platform.h"
|
||||
#include "version.h"
|
||||
|
||||
#include "gfx/convert.hpp"
|
||||
#include "gfx/process.hpp"
|
||||
|
||||
using namespace std::literals::string_view_literals;
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
|
||||
#include "helpers.h"
|
||||
|
||||
#include "gfx/convert.hpp"
|
||||
#include "gfx/main.hpp"
|
||||
#include "gfx/process.hpp"
|
||||
|
||||
namespace sorting {
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* SPDX-License-Identifier: MIT
|
||||
*/
|
||||
|
||||
#include "gfx/convert.hpp"
|
||||
#include "gfx/process.hpp"
|
||||
|
||||
#include <algorithm>
|
||||
#include <assert.h>
|
||||
@@ -687,7 +687,8 @@ static void outputTileData(Png const &png, DefaultInitVec<AttrmapEntry> const &a
|
||||
for (auto tile : png.visitAsTiles(options.columnMajor)) {
|
||||
size_t protoPaletteID = iter->protoPaletteID;
|
||||
// If the tile is fully transparent, default to palette 0
|
||||
Palette const &palette = palettes[protoPaletteID != AttrmapEntry::transparent ? mappings[protoPaletteID] : 0];
|
||||
Palette const &palette =
|
||||
palettes[protoPaletteID != AttrmapEntry::transparent ? mappings[protoPaletteID] : 0];
|
||||
for (uint32_t y = 0; y < 8; ++y) {
|
||||
uint16_t bitplanes = TileData::rowBitplanes(tile, palette, y);
|
||||
output.sputc(bitplanes & 0xFF);
|
||||
Reference in New Issue
Block a user