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

[nostalgia/core] Rename core::Color to core::Color16 and add core::Color32

Browse Source
This commit is contained in:
Gary Talent 2019-11-27 13:53:41 -06:00
parent 1b08d0f851
commit a9f55ebd02
9 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nostalgia/core/gba/gfx.cpp
View File

@ -40,7 +40,7 @@ struct GbaTileMapTarget {
template<typename T>
ox::Error modelRead(T *io, GbaPaletteTarget *t) {
io->setTypeInfo("nostalgia::core::NostalgiaPalette", NostalgiaPalette::Fields);
oxReturnError(io->template field<Color>("colors", [t](auto i, Color *c) {
oxReturnError(io->template field<Color16>("colors", [t](auto i, Color16 *c) {
t->palette[i] = *c;
return OxError(0);
}));

10
src/nostalgia/core/gfx.cpp
View File

@ -11,7 +11,7 @@
namespace nostalgia::core {
// map ASCII values to the nostalgia charset
char charMap[128] = {
static char charMap[128] = {
0,
0,
0,
@ -141,6 +141,14 @@ char charMap[128] = {
0, // ~
};
Color32 toColor32(Color16 nc) {
auto r = ((nc & 0b0000000000011111) >> 0) * 8;
auto g = ((nc & 0b0000001111100000) >> 5) * 8;
auto b = ((nc & 0b0111110000000000) >> 10) * 8;
auto a = 255;
return a | (b << 8) | (g << 16) | (r << 24);
}
void puts(Context *ctx, int column, int row, const char *str) {
for (int i = 0; str[i]; i++) {
setTile(ctx, 0, column + i, row, charMap[static_cast<int>(str[i])]);

12
src/nostalgia/core/gfx.hpp
View File

@ -20,11 +20,17 @@ enum class TileSheetSpace {
Sprite
};
using Color = uint16_t;
using Color16 = uint16_t;
/**
* Nostalgia Core logically uses 16 bit colors, but must translate that to 32
* bit colors in some implementations.
*/
using Color32 = uint32_t;
struct NostalgiaPalette {
static constexpr auto Fields = 1;
ox::Vector<Color> colors;
ox::Vector<Color16> colors;
};
struct NostalgiaGraphic {
@ -63,7 +69,7 @@ ox::Error model(T *io, NostalgiaGraphic *ng) {
*/
[[nodiscard]] ox::Error loadTileSheet(Context *ctx, TileSheetSpace tss, int section, ox::FileAddress tilesheet, ox::FileAddress palette = nullptr);
ox::Error loadTileSheet(Context *ctx, ox::FileAddress file);
[[nodiscard]] Color32 toColor32(Color16 nc);
void puts(Context *ctx, int column, int row, const char *str);

2
src/nostalgia/core/sdl/gfx.cpp
View File

@ -62,7 +62,7 @@ ox::Error initConsole(Context *ctx) {
return loadTileSheet(ctx, TileSheetSpace::Background, 0, TilesheetAddr, PaletteAddr);
}
SDL_Color createSDL_Color(Color nc) {
SDL_Color createSDL_Color(Color16 nc) {
SDL_Color c;
// extract the color chanels and scale them up for a 24 bit color
c.r = ((nc & 0b0000000000011111) >> 0) * 8;

1
src/nostalgia/core/studio/CMakeLists.txt
View File

@ -14,6 +14,7 @@ target_link_libraries(
Qt5::Widgets
Qt5::QuickWidgets
NostalgiaStudio
NostalgiaCore
OxFS
OxStd
)

2
src/nostalgia/core/studio/TileSheetEditor.qml
View File

@ -14,7 +14,7 @@ Rectangle {
anchors.horizontalCenter: tileSheetEditor.horizontalCenter
anchors.verticalCenter: tileSheetEditor.verticalCenter
rows: 2
columns: 3
columns: 2
Repeater {
model: tileGrid.rows * tileGrid.columns
Tile {

2
src/nostalgia/core/studio/plugin.cpp
View File

@ -16,7 +16,7 @@ using namespace nostalgia::studio;
namespace nostalgia::core {
QVector<studio::WizardMaker> Plugin::newWizards(const Context *ctx) {
QVector<studio::WizardMaker> Plugin::newWizards(const studio::Context *ctx) {
return {
{
tr("Tile Sheet"),

20
src/nostalgia/core/studio/tilesheeteditor.cpp
View File

@ -12,29 +12,19 @@
#include <QSplitter>
#include <QVBoxLayout>
#include <nostalgia/core/gfx.hpp>
#include "consts.hpp"
#include "tilesheeteditor.hpp"
namespace nostalgia::core {
uint32_t toColor32(Color nc) {
auto r = ((nc & 0b0000000000011111) >> 0) * 8;
auto g = ((nc & 0b0000001111100000) >> 5) * 8;
auto b = ((nc & 0b0111110000000000) >> 10) * 8;
auto a = 255;
return a | (b << 8) | (g << 16) | (r << 24);
}
[[nodiscard]]
QVector<uint32_t> toPixels(const NostalgiaGraphic *ng, const NostalgiaPalette *npal) {
QVector<Color32> toPixels(const NostalgiaGraphic *ng, const NostalgiaPalette *npal) {
if (!npal) {
npal = &ng->pal;
}
QVector<uint32_t> out;
out.reserve(ng->tiles.size() * sizeof(Color));
QVector<Color32> out;
out.reserve(ng->tiles.size() * sizeof(Color16));
if (ng->bpp == 8) {
for (std::size_t i = 0; i < ng->tiles.size(); i++) {
@ -59,7 +49,7 @@ QVector<uint32_t> toPixels(const NostalgiaGraphic *ng, const NostalgiaPalette *n
}
[[nodiscard]]
QVector<uint32_t> toPixels(const studio::Context *ctx, QString ngPath, QString palPath = "") {
QVector<Color32> toPixels(const studio::Context *ctx, QString ngPath, QString palPath = "") {
auto ng = ctx->project->loadObj<NostalgiaGraphic>(ngPath);
std::unique_ptr<NostalgiaPalette> npal;
if (palPath == "" && ng->defaultPalette.type() == ox::FileAddressType::Path) {
@ -124,7 +114,7 @@ void TileSheetEditor::saveState() {
void TileSheetEditor::restoreState() {
QSettings settings(m_ctx->orgName, PluginName);
settings.beginGroup("TileSheetEditor/state");
m_splitter->restoreState(settings.value("m_splitter/state").toByteArray());
m_splitter->restoreState(settings.value("m_splitter/state", m_splitter->saveState()).toByteArray());
settings.endGroup();
}

3
src/nostalgia/core/studio/tilesheeteditor.hpp
View File

@ -13,6 +13,7 @@
#include <QTableWidget>
#include <QWidget>
#include <nostalgia/core/gfx.hpp>
#include <nostalgia/studio/studio.hpp>
namespace nostalgia::core {
@ -21,7 +22,7 @@ class SheetData: public QObject {
Q_OBJECT
private:
QVector<uint32_t> m_pixels;
QVector<Color32> m_pixels;
public:
Q_INVOKABLE QString pixel(int index);