drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[nostalgia/core/studio] Fix magic numbers in imgconv and make it figure out tile sheet dimensions

Browse Source
This commit is contained in:
Gary Talent 2020-03-30 20:49:02 -05:00
parent e7ae031ce7
commit 267f8eca67
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/nostalgia/core/studio/imgconv.cpp
View File

@ -14,7 +14,7 @@
#include "imgconv.hpp" #include "imgconv.hpp"
namespace nostalgia { namespace nostalgia::core {
namespace { namespace {
@ -22,16 +22,17 @@ namespace {
const auto r = static_cast<uint32_t>(c.red()) >> 3; const auto r = static_cast<uint32_t>(c.red()) >> 3;
const auto g = static_cast<uint32_t>(c.green()) >> 3; const auto g = static_cast<uint32_t>(c.green()) >> 3;
const auto b = static_cast<uint32_t>(c.blue()) >> 3; const auto b = static_cast<uint32_t>(c.blue()) >> 3;
return (r << 10) | (g << 5) | (b << 0); const auto a = static_cast<uint32_t>(c.alpha()) > 128 ? 1 : 0;
return (a << 15) | (r << 10) | (g << 5) | (b << 0);
} }
[[nodiscard]] int pointToIdx(int w, int x, int y) { [[nodiscard]] int pointToIdx(int w, int x, int y) {
constexpr auto colLength = 64; constexpr auto colLength = PixelsPerTile;
const auto rowLength = (w / 8) * colLength; const auto rowLength = (w / TileWidth) * colLength;
const auto colStart = colLength * (x / 8); const auto colStart = colLength * (x / TileWidth);
const auto rowStart = rowLength * (y / 8); const auto rowStart = rowLength * (y / TileHeight);
const auto colOffset = x % 8; const auto colOffset = x % TileWidth;
const auto rowOffset = (y % 8) * 8; const auto rowOffset = (y % TileHeight) * TileHeight;
return colStart + colOffset + rowStart + rowOffset; return colStart + colOffset + rowStart + rowOffset;
} }
@ -43,7 +44,7 @@ namespace {
for (int x = 0; x < img.width(); x++) { for (int x = 0; x < img.width(); x++) {
for (int y = 0; y < img.height(); y++) { for (int y = 0; y < img.height(); y++) {
auto destI = pointToIdx(img.width(), x, y); auto destI = pointToIdx(img.width(), x, y);
if (destI <= argTiles * 64) { if (destI <= argTiles * PixelsPerTile) {
auto c = img.pixel(x, y); auto c = img.pixel(x, y);
// assign color a color id for the palette // assign color a color id for the palette
if (!colors.contains(c)) { if (!colors.contains(c)) {
@ -56,7 +57,7 @@ namespace {
} }
[[nodiscard]] std::unique_ptr<core::NostalgiaGraphic> imgToNg(QString argSrc, int argTiles, int argBpp) { [[nodiscard]] std::unique_ptr<core::NostalgiaGraphic> imgToNg(QString argSrc, int argTiles, int argBpp) {
constexpr auto TilePixels = 64; constexpr auto TilePixels = PixelsPerTile;
QImage src(argSrc); QImage src(argSrc);
if (src.isNull()) { if (src.isNull()) {
@ -65,7 +66,7 @@ namespace {
const auto Pixels = argTiles ? argTiles * TilePixels : src.width() * src.height(); const auto Pixels = argTiles ? argTiles * TilePixels : src.width() * src.height();
if (argTiles == 0) { if (argTiles == 0) {
argTiles = Pixels / 64; argTiles = Pixels / PixelsPerTile;
} }
const auto Colors = countColors(src, argTiles); const auto Colors = countColors(src, argTiles);
if (argBpp != 4 && argBpp != 8) { if (argBpp != 4 && argBpp != 8) {
@ -81,13 +82,15 @@ namespace {
ng->tiles.resize(Pixels); ng->tiles.resize(Pixels);
} }
ng->bpp = argBpp; ng->bpp = argBpp;
ng->columns = src.width() / TileWidth;
ng->rows = src.height() / TileHeight;
int colorIdx = 0; int colorIdx = 0;
// copy pixels as color ids // copy pixels as color ids
for (int x = 0; x < src.width(); x++) { for (int x = 0; x < src.width(); x++) {
for (int y = 0; y < src.height(); y++) { for (int y = 0; y < src.height(); y++) {
auto destI = pointToIdx(src.width(), x, y); auto destI = pointToIdx(src.width(), x, y);
if (destI < argTiles * 64) { if (destI < argTiles * PixelsPerTile) {
const auto c = src.pixel(x, y); const auto c = src.pixel(x, y);
// assign color a color id for the palette // assign color a color id for the palette
if (!colors.contains(c)) { if (!colors.contains(c)) {

2
src/nostalgia/core/studio/imgconv.hpp
View File

@ -15,7 +15,7 @@
#include <nostalgia/core/gfx.hpp> #include <nostalgia/core/gfx.hpp>
namespace nostalgia { namespace nostalgia::core {
template<typename T> template<typename T>
[[nodiscard]] ox::ValErr<std::vector<uint8_t>> toBuffer(T *data, std::size_t buffSize = ox::units::MB) { [[nodiscard]] ox::ValErr<std::vector<uint8_t>> toBuffer(T *data, std::size_t buffSize = ox::units::MB) {