drinkingtea/jasper
drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

Merge commit '09b4a705a9251d54e797eb75db1f3d4687829a24'

Browse Source
This commit is contained in:
Gary Talent 2025-04-16 19:48:37 -05:00
commit 1e875f8dd7
32 changed files with 3065 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deps/nostalgia/Makefile vendored
View File

@ -15,7 +15,11 @@ PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}
.PHONY: pkg-gba .PHONY: pkg-gba
pkg-gba: build pkg-gba: build
${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME} ${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME_CAP}
.PHONY: generate-studio-rsrc
generate-studio-rsrc:
${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/file-to-cpp.py --rsrc src/nostalgia/studio/rsrc.json
.PHONY: build-player .PHONY: build-player
build-player: build-player:
@ -28,10 +32,10 @@ run-studio: build
${PROJECT_STUDIO} ${PROJECT_STUDIO}
.PHONY: gba-run .PHONY: gba-run
gba-run: pkg-gba gba-run: pkg-gba
${MGBA} ${BC_VAR_PROJECT_NAME}.gba ${MGBA} ${BC_VAR_PROJECT_NAME_CAP}.gba
.PHONY: debug .PHONY: debug
debug: build debug: build
${BC_CMD_HOST_DEBUGGER} ./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project ${BC_CMD_HOST_DEBUGGER} ${PROJECT_PLAYER} sample_project
.PHONY: debug-studio .PHONY: debug-studio
debug-studio: build debug-studio: build
${BC_CMD_HOST_DEBUGGER} ${PROJECT_STUDIO} ${BC_CMD_HOST_DEBUGGER} ${PROJECT_STUDIO}

30
deps/nostalgia/deps/buildcore/scripts/file-to-cpp.py vendored
View File

@ -1,30 +0,0 @@
#! /usr/bin/env python3
#
# Copyright 2016 - 2025 gary@drinkingtea.net
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
import argparse
import sys
def main() -> int:
parser = argparse.ArgumentParser()
parser.add_argument('--file', help='path to file')
parser.add_argument('--out-cpp', help='path to output cpp file')
parser.add_argument('--out-hpp', help='path to output hpp file')
parser.add_argument('--namespace', help='path to output hpp file')
args = parser.parse_args()
return 0
if __name__ == '__main__':
try:
err = main()
sys.exit(err)
except KeyboardInterrupt:
sys.exit(1)

6
deps/nostalgia/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp vendored
View File

@ -433,14 +433,14 @@ Error FileStoreTemplate<size_t>::resize() {
template<typename size_t> template<typename size_t>
Error FileStoreTemplate<size_t>::resize(std::size_t size, void *newBuff) { Error FileStoreTemplate<size_t>::resize(std::size_t size, void *newBuff) {
if (m_buffer->size() > size) { if (m_buffer->size() > size) {
return ox::Error(1); return ox::Error{1, "new buffer is too small for existing data"};
} }
m_buffSize = static_cast<size_t>(size); m_buffSize = static_cast<size_t>(size);
if (newBuff) { if (newBuff) {
m_buffer = reinterpret_cast<Buffer*>(newBuff); m_buffer = static_cast<Buffer*>(newBuff);
OX_RETURN_ERROR(m_buffer->setSize(static_cast<size_t>(size))); OX_RETURN_ERROR(m_buffer->setSize(static_cast<size_t>(size)));
} }
return ox::Error(0); return {};
} }
template<typename size_t> template<typename size_t>

27
deps/nostalgia/deps/ox/src/ox/fs/filesystem/filesystem.hpp vendored
View File

@ -20,7 +20,7 @@
namespace ox { namespace ox {
namespace detail { namespace detail {
static inline void fsBuffFree(char *buff) noexcept { inline void fsBuffFree(char *buff) noexcept {
safeDelete(buff); safeDelete(buff);
} }
} }
@ -49,11 +49,11 @@ class FileSystem {
Result<Buffer> read(StringViewCR path) noexcept; Result<Buffer> read(StringViewCR path) noexcept;
inline Error read(StringViewCR path, void *buffer, std::size_t buffSize) noexcept { Error read(StringViewCR path, void *buffer, std::size_t buffSize) noexcept {
return readFilePath(path, buffer, buffSize); return readFilePath(path, buffer, buffSize);
} }
inline Error read(uint64_t inode, void *buffer, std::size_t buffSize) noexcept { Error read(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
return readFileInode(inode, buffer, buffSize); return readFileInode(inode, buffer, buffSize);
} }
@ -69,8 +69,7 @@ class FileSystem {
* @param path * @param path
* @param readStart * @param readStart
* @param readSize * @param readSize
* @param buffer * @param buff
* @param size
* @return error or number of bytes read * @return error or number of bytes read
*/ */
Result<size_t> read( Result<size_t> read(
@ -102,36 +101,36 @@ class FileSystem {
Error write(const FileAddress &addr, const void *buffer, uint64_t size, FileType fileType = FileType::NormalFile) noexcept; Error write(const FileAddress &addr, const void *buffer, uint64_t size, FileType fileType = FileType::NormalFile) noexcept;
inline Error write(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept { Error write(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept {
return writeFilePath(path, buffer, size, fileType); return writeFilePath(path, buffer, size, fileType);
} }
inline Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept { Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
return writeFileInode(inode, buffer, size, fileType); return writeFileInode(inode, buffer, size, fileType);
} }
inline Result<FileStat> stat(uint64_t inode) const noexcept { Result<FileStat> stat(uint64_t inode) const noexcept {
return statInode(inode); return statInode(inode);
} }
inline Result<FileStat> stat(StringViewCR path) const noexcept { Result<FileStat> stat(StringViewCR path) const noexcept {
return statPath(path); return statPath(path);
} }
Result<FileStat> stat(const FileAddress &addr) const noexcept; Result<FileStat> stat(const FileAddress &addr) const noexcept;
[[nodiscard]] [[nodiscard]]
inline bool exists(uint64_t inode) const noexcept { bool exists(uint64_t inode) const noexcept {
return statInode(inode).ok(); return statInode(inode).ok();
} }
[[nodiscard]] [[nodiscard]]
inline bool exists(ox::StringView path) const noexcept { bool exists(ox::StringView path) const noexcept {
return statPath(path).ok(); return statPath(path).ok();
} }
[[nodiscard]] [[nodiscard]]
inline bool exists(FileAddress const&addr) const noexcept { bool exists(FileAddress const&addr) const noexcept {
return stat(addr).ok(); return stat(addr).ok();
} }
@ -178,11 +177,11 @@ class MemFS: public FileSystem {
public: public:
Result<const char*> directAccess(const FileAddress &addr) const noexcept; Result<const char*> directAccess(const FileAddress &addr) const noexcept;
inline Result<const char*> directAccess(StringViewCR path) const noexcept { Result<const char*> directAccess(StringViewCR path) const noexcept {
return directAccessPath(path); return directAccessPath(path);
} }
inline Result<const char*> directAccess(uint64_t inode) const noexcept { Result<const char*> directAccess(uint64_t inode) const noexcept {
return directAccessInode(inode); return directAccessInode(inode);
} }

12
deps/nostalgia/release-notes.md vendored
View File

@ -1,4 +1,14 @@
# d2025.02 # d2025.04.0
* Add app icon for both window and file
* Fix selection clearing in TileSheet editor to work when clicking outside
image.
# d2025.02.1
* Fix closing tab with unsaved changes (a44c5acc4b)
# d2025.02.0
* Rename core namespace to gfx. * Rename core namespace to gfx.
* Add PaletteV5 to accommodate namespace change. * Add PaletteV5 to accommodate namespace change.

269
deps/nostalgia/sample_project/TileSheets/NS_Logo16.nts vendored Normal file
View File

@ -0,0 +1,269 @@
K1;e7ae945e-d6c5-4444-5738-be95b4e5937a;O1;net.drinkingtea.nostalgia.gfx.TileSheet;5;{
"bpp" : 4,
"defaultPalette" : "uuid://c79f21e2-f74f-4ad9-90ed-32b0ef7da6ed",
"subsheet" :
{
"columns" : 2,
"name" : "Root",
"pixels" :
[
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
1,
1,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
3,
3,
0,
0,
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
1,
1,
0,
0,
2,
3,
0,
0,
0,
0,
1,
0,
0,
1,
0,
0,
0,
0,
3,
2,
0,
0,
1,
1,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
0,
0,
0,
0,
3,
3,
0,
0,
0,
0,
1,
0,
0,
0,
0,
0,
1,
1,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0
],
"rows" : 2
}
}

1039
deps/nostalgia/sample_project/TileSheets/NS_Logo32.nts vendored Normal file
View File

File diff suppressed because it is too large Load Diff

4
deps/nostalgia/src/nostalgia/modules/gfx/src/keel/typeconv.cpp vendored
View File

@ -183,8 +183,8 @@ ox::Error TileSheetV4ToTileSheetV5Converter::convert(
keel::Context&, keel::Context&,
TileSheetV4 &src, TileSheetV4 &src,
TileSheetV5 &dst) const noexcept { TileSheetV5 &dst) const noexcept {
dst.bpp = src.bpp; dst.bpp = src.bpp;
dst.idIt = src.idIt; dst.idIt = src.idIt;
OX_RETURN_ERROR(src.defaultPalette.getPath().moveTo(dst.defaultPalette)); OX_RETURN_ERROR(src.defaultPalette.getPath().moveTo(dst.defaultPalette));
convertSubsheet(dst.bpp, src.subsheet, dst.subsheet); convertSubsheet(dst.bpp, src.subsheet, dst.subsheet);
return {}; return {};

4
deps/nostalgia/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp vendored
View File

@ -96,7 +96,7 @@ TileSheetEditorImGui::TileSheetEditorImGui(studio::StudioContext &sctx, ox::Stri
m_model{m_view.model()} { m_model{m_view.model()} {
// connect signal/slots // connect signal/slots
m_subsheetEditor.inputSubmitted.connect(this, &TileSheetEditorImGui::updateActiveSubsheet); m_subsheetEditor.inputSubmitted.connect(this, &TileSheetEditorImGui::updateActiveSubsheet);
m_exportMenu.inputSubmitted.connect(this, &TileSheetEditorImGui::exportSubhseetToPng); m_exportMenu.inputSubmitted.connect(this, &TileSheetEditorImGui::exportSubsheetToPng);
// load config // load config
auto const&config = studio::readConfig<TileSheetEditorConfig>( auto const&config = studio::readConfig<TileSheetEditorConfig>(
keelCtx(m_sctx), itemPath()); keelCtx(m_sctx), itemPath());
@ -397,7 +397,7 @@ void TileSheetEditorImGui::showSubsheetEditor() noexcept {
} }
} }
ox::Error TileSheetEditorImGui::exportSubhseetToPng(int const scale) const noexcept { ox::Error TileSheetEditorImGui::exportSubsheetToPng(int const scale) const noexcept {
OX_REQUIRE(path, studio::saveFile({{"PNG", "png"}})); OX_REQUIRE(path, studio::saveFile({{"PNG", "png"}}));
// subsheet to png // subsheet to png
auto const&s = m_model.activeSubSheet(); auto const&s = m_model.activeSubSheet();

5
deps/nostalgia/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp vendored
View File

@ -10,7 +10,6 @@
#include <studio/editor.hpp> #include <studio/editor.hpp>
#include <studio/filepickerpopup.hpp> #include <studio/filepickerpopup.hpp>
#include "tilesheetpixelgrid.hpp"
#include "tilesheetpixels.hpp" #include "tilesheetpixels.hpp"
#include "tilesheeteditorview.hpp" #include "tilesheeteditorview.hpp"
@ -91,7 +90,7 @@ class TileSheetEditorImGui: public studio::Editor {
private: private:
void showSubsheetEditor() noexcept; void showSubsheetEditor() noexcept;
ox::Error exportSubhseetToPng(int scale) const noexcept; ox::Error exportSubsheetToPng(int scale) const noexcept;
void drawTileSheet(ox::Vec2 const&fbSize) noexcept; void drawTileSheet(ox::Vec2 const&fbSize) noexcept;
@ -99,8 +98,6 @@ class TileSheetEditorImGui: public studio::Editor {
ox::Error updateActiveSubsheet(ox::StringView const&name, int cols, int rows) noexcept; ox::Error updateActiveSubsheet(ox::StringView const&name, int cols, int rows) noexcept;
// slots
private:
void setActiveSubsheet(TileSheet::SubSheetIdx path) noexcept; void setActiveSubsheet(TileSheet::SubSheetIdx path) noexcept;
}; };

10
deps/nostalgia/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditormodel.cpp vendored
View File

@ -120,7 +120,7 @@ bool TileSheetEditorModel::acceptsClipboardPayload() const noexcept {
return cb.ok(); return cb.ok();
} }
ox::StringView TileSheetEditorModel::palPath() const noexcept { ox::String const &TileSheetEditorModel::palPath() const & noexcept {
return m_palPath; return m_palPath;
} }
@ -263,7 +263,13 @@ ox::Error TileSheetEditorModel::rotateRight() noexcept {
} }
void TileSheetEditorModel::setSelection(studio::Selection const&sel) noexcept { void TileSheetEditorModel::setSelection(studio::Selection const&sel) noexcept {
m_selection.emplace(sel); auto const &ss = activeSubSheet();
if (sel.a.x < ss.columns * TileWidth && sel.a.y < ss.rows * TileHeight) {
m_selection.emplace(sel);
} else {
m_selTracker.finishSelection();
m_selection.reset();
}
m_updated = true; m_updated = true;
} }

2
deps/nostalgia/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditormodel.hpp vendored
View File

@ -62,7 +62,7 @@ class TileSheetEditorModel: public ox::SignalHandler {
constexpr Palette const&pal() const noexcept; constexpr Palette const&pal() const noexcept;
[[nodiscard]] [[nodiscard]]
ox::StringView palPath() const noexcept; ox::String const &palPath() const & noexcept;
ox::Error setPalette(ox::StringViewCR path) noexcept; ox::Error setPalette(ox::StringViewCR path) noexcept;

8
deps/nostalgia/src/nostalgia/player/app.cpp vendored
View File

@ -64,13 +64,10 @@ static void testKeyEventHandler(turbine::Context &tctx, turbine::Key key, bool d
[[maybe_unused]] [[maybe_unused]]
static ox::Error runTest(turbine::Context &tctx) { static ox::Error runTest(turbine::Context &tctx) {
constexpr ox::StringView TileSheetAddr{"/TileSheets/Charset.nts"};
constexpr ox::StringView PaletteAddr{"/Palettes/Chester.npal"};
OX_REQUIRE_M(cctx, gfx::init(tctx)); OX_REQUIRE_M(cctx, gfx::init(tctx));
turbine::setApplicationData(tctx, cctx.get()); turbine::setApplicationData(tctx, cctx.get());
OX_REQUIRE(tsStat, turbine::rom(tctx)->stat(PaletteAddr)); OX_RETURN_ERROR(gfx::loadSpriteTileSheet(*cctx, "/TileSheets/Charset.nts"));
OX_RETURN_ERROR(gfx::loadSpriteTileSheet(*cctx, TileSheetAddr)); OX_RETURN_ERROR(gfx::loadSpritePalette(*cctx, "/Palettes/Chester.npal"));
OX_RETURN_ERROR(gfx::loadSpritePalette(*cctx, PaletteAddr));
OX_RETURN_ERROR(gfx::initConsole(*cctx)); OX_RETURN_ERROR(gfx::initConsole(*cctx));
gfx::puts(*cctx, 10, 9, "DOPENESS!!!"); gfx::puts(*cctx, 10, 9, "DOPENESS!!!");
turbine::setUpdateHandler(tctx, testUpdateHandler); turbine::setUpdateHandler(tctx, testUpdateHandler);
@ -86,7 +83,6 @@ static ox::Error runTileSheetSetTest(turbine::Context &tctx) {
constexpr ox::StringView PaletteAddr{"/Palettes/Charset.npal"}; constexpr ox::StringView PaletteAddr{"/Palettes/Charset.npal"};
OX_REQUIRE_M(cctx, gfx::init(tctx)); OX_REQUIRE_M(cctx, gfx::init(tctx));
turbine::setApplicationData(tctx, cctx.get()); turbine::setApplicationData(tctx, cctx.get());
OX_REQUIRE(tsStat, turbine::rom(tctx)->stat(PaletteAddr));
gfx::TileSheetSet const set{ gfx::TileSheetSet const set{
.bpp = 4, .bpp = 4,
.entries = { .entries = {

6
deps/nostalgia/src/nostalgia/studio/CMakeLists.txt vendored
View File

@ -1,4 +1,8 @@
add_executable(NostalgiaStudio WIN32 MACOSX_BUNDLE) add_executable(
NostalgiaStudio WIN32 MACOSX_BUNDLE
ns.rc
icondata.cpp
)
target_link_libraries( target_link_libraries(
NostalgiaStudio NostalgiaStudio

1495
deps/nostalgia/src/nostalgia/studio/icondata.cpp vendored Normal file
View File

File diff suppressed because it is too large Load Diff

1
deps/nostalgia/src/nostalgia/studio/ns.rc vendored Normal file
View File

@ -0,0 +1 @@
IDI_ICON1 ICON DISCARDABLE "ns_logo.ico"

BIN
deps/nostalgia/src/nostalgia/studio/ns_logo.ico vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 162 KiB

BIN
deps/nostalgia/src/nostalgia/studio/ns_logo1080.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 851 B

BIN
deps/nostalgia/src/nostalgia/studio/ns_logo16.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 134 B

BIN
deps/nostalgia/src/nostalgia/studio/ns_logo24.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 149 B

BIN
deps/nostalgia/src/nostalgia/studio/ns_logo264.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 275 B

BIN
deps/nostalgia/src/nostalgia/studio/ns_logo32.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
deps/nostalgia/src/nostalgia/studio/ns_logo40.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 334 B

BIN
deps/nostalgia/src/nostalgia/studio/ns_logo48.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 163 B

39
deps/nostalgia/src/nostalgia/studio/rsrc.json vendored Normal file
View File

@ -0,0 +1,39 @@
{
"cpp": "icondata.cpp",
"namespace": "studio",
"all_files": "WindowIcons",
"files": [
{
"path": "ns_logo16.png",
"cpp_name": "WindowIcon16"
},
{
"path": "ns_logo24.png",
"cpp_name": "WindowIcon24"
},
{
"path": "ns_logo32.png",
"cpp_name": "WindowIcon32"
},
{
"path": "ns_logo40.png",
"cpp_name": "WindowIcon40"
},
{
"path": "ns_logo48.png",
"cpp_name": "WindowIcon48"
},
{
"path": "ns_logo128.png",
"cpp_name": "WindowIcon128"
},
{
"path": "ns_logo264.png",
"cpp_name": "WindowIcon264"
},
{
"path": "ns_logo1080.png",
"cpp_name": "WindowIcon1080"
}
]
}

4
deps/nostalgia/src/olympic/studio/applib/src/app.cpp vendored
View File

@ -32,11 +32,15 @@ static void keyEventHandler(turbine::Context &ctx, turbine::Key key, bool down)
sctx->ui.handleKeyEvent(key, down); sctx->ui.handleKeyEvent(key, down);
} }
[[nodiscard]]
ox::Vector<ox::SpanView<uint8_t>> WindowIcons() noexcept;
static ox::Error runApp( static ox::Error runApp(
ox::StringViewCR appName, ox::StringViewCR appName,
ox::StringViewCR projectDataDir, ox::StringViewCR projectDataDir,
ox::UPtr<ox::FileSystem> &&fs) noexcept { ox::UPtr<ox::FileSystem> &&fs) noexcept {
OX_REQUIRE_M(ctx, turbine::init(std::move(fs), appName)); OX_REQUIRE_M(ctx, turbine::init(std::move(fs), appName));
oxLogError(turbine::setWindowIcon(*ctx, WindowIcons()));
turbine::setWindowTitle(*ctx, keelCtx(*ctx).appName); turbine::setWindowTitle(*ctx, keelCtx(*ctx).appName);
turbine::setKeyEventHandler(*ctx, keyEventHandler); turbine::setKeyEventHandler(*ctx, keyEventHandler);
turbine::setRefreshWithin(*ctx, 0); turbine::setRefreshWithin(*ctx, 0);

6
deps/nostalgia/src/olympic/studio/modlib/include/studio/selectiontracker.hpp vendored
View File

@ -71,12 +71,6 @@ class SelectionTracker {
return m_selectionOngoing; return m_selectionOngoing;
} }
constexpr void startSelection(ox::Point cursor) noexcept {
m_pointA = cursor;
m_pointB = cursor;
m_selectionOngoing = true;
}
/** /**
* *
* @param cursor * @param cursor

10
deps/nostalgia/src/olympic/turbine/include/turbine/gfx.hpp vendored
View File

@ -26,20 +26,22 @@ void removeDrawer(Context &ctx, Drawer *cd) noexcept;
ox::Error initGfx(Context &ctx) noexcept; ox::Error initGfx(Context &ctx) noexcept;
ox::Error setWindowIcon(Context &ctx, ox::SpanView<ox::SpanView<uint8_t>> const &iconPngs) noexcept;
void setWindowTitle(Context &ctx, ox::StringViewCR title) noexcept; void setWindowTitle(Context &ctx, ox::StringViewCR title) noexcept;
void focusWindow(Context &ctx) noexcept; void focusWindow(Context &ctx) noexcept;
[[nodiscard]] [[nodiscard]]
int getScreenWidth(Context &ctx) noexcept; int getScreenWidth(Context const &ctx) noexcept;
[[nodiscard]] [[nodiscard]]
int getScreenHeight(Context &ctx) noexcept; int getScreenHeight(Context const &ctx) noexcept;
[[nodiscard]] [[nodiscard]]
ox::Size getScreenSize(Context &ctx) noexcept; ox::Size getScreenSize(Context const &ctx) noexcept;
ox::Bounds getWindowBounds(Context &ctx) noexcept; ox::Bounds getWindowBounds(Context const &ctx) noexcept;
ox::Error setWindowBounds(Context &ctx, ox::Bounds const&bnds) noexcept; ox::Error setWindowBounds(Context &ctx, ox::Bounds const&bnds) noexcept;

8
deps/nostalgia/src/olympic/turbine/src/gba/gfx.cpp vendored
View File

@ -27,19 +27,19 @@ ox::Error initGfx(Context&) noexcept {
void setWindowTitle(Context&, ox::StringViewCR) noexcept { void setWindowTitle(Context&, ox::StringViewCR) noexcept {
} }
int getScreenWidth(Context&) noexcept { int getScreenWidth(Context const&) noexcept {
return 240; return 240;
} }
int getScreenHeight(Context&) noexcept { int getScreenHeight(Context const&) noexcept {
return 160; return 160;
} }
ox::Size getScreenSize(Context&) noexcept { ox::Size getScreenSize(Context const&) noexcept {
return {240, 160}; return {240, 160};
} }
ox::Bounds getWindowBounds(Context&) noexcept { ox::Bounds getWindowBounds(Context const&) noexcept {
return {0, 0, 240, 160}; return {0, 0, 240, 160};
} }

1
deps/nostalgia/src/olympic/turbine/src/glfw/CMakeLists.txt vendored
View File

@ -21,4 +21,5 @@ target_link_libraries(
glad glad
glfw glfw
imgui imgui
lodepng
) )

42
deps/nostalgia/src/olympic/turbine/src/glfw/gfx.cpp vendored
View File

@ -4,6 +4,7 @@
#include <glad/glad.h> #include <glad/glad.h>
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include <lodepng.h>
#if TURBINE_USE_IMGUI #if TURBINE_USE_IMGUI
#include <imgui_impl_glfw.h> #include <imgui_impl_glfw.h>
#include <imgui_impl_opengl3.h> #include <imgui_impl_opengl3.h>
@ -228,6 +229,39 @@ ox::Error initGfx(Context &ctx) noexcept {
return {}; return {};
} }
struct IconData {
std::vector<uint8_t> pixels;
int w{}, h{};
};
[[nodiscard]]
static ox::Result<IconData> toGlfwImgPixels(ox::SpanView<uint8_t> const &iconPng) noexcept {
ox::Result<IconData> out;
unsigned w{}, h{};
if (lodepng::decode(out.value.pixels, w, h, iconPng.data(), iconPng.size())) {
return ox::Error{1, "unable to decode window icon PNG data"};
}
out.value.w = static_cast<int>(w);
out.value.h = static_cast<int>(h);
return out;
}
ox::Error setWindowIcon(Context &ctx, ox::SpanView<ox::SpanView<uint8_t>> const &iconPngs) noexcept {
ox::Vector<IconData, 8> src;
ox::Vector<GLFWimage, 8> imgs;
for (auto const &iconPng : iconPngs) {
OX_RETURN_ERROR(toGlfwImgPixels(iconPng).moveTo(src.emplace_back()));
auto &icon = *src.back().unwrap();
imgs.emplace_back(GLFWimage{
.width = icon.w,
.height = icon.h,
.pixels = icon.pixels.data(),
});
}
glfwSetWindowIcon(ctx.window, static_cast<int>(imgs.size()), imgs.data());
return {};
}
void setWindowTitle(Context &ctx, ox::StringViewCR title) noexcept { void setWindowTitle(Context &ctx, ox::StringViewCR title) noexcept {
auto cstr = ox_malloca(title.bytes() + 1, char); auto cstr = ox_malloca(title.bytes() + 1, char);
ox::strncpy(cstr.get(), title.data(), title.bytes()); ox::strncpy(cstr.get(), title.data(), title.bytes());
@ -238,25 +272,25 @@ void focusWindow(Context &ctx) noexcept {
glfwFocusWindow(ctx.window); glfwFocusWindow(ctx.window);
} }
int getScreenWidth(Context &ctx) noexcept { int getScreenWidth(Context const &ctx) noexcept {
int w = 0, h = 0; int w = 0, h = 0;
glfwGetFramebufferSize(ctx.window, &w, &h); glfwGetFramebufferSize(ctx.window, &w, &h);
return w; return w;
} }
int getScreenHeight(Context &ctx) noexcept { int getScreenHeight(Context const &ctx) noexcept {
int w = 0, h = 0; int w = 0, h = 0;
glfwGetFramebufferSize(ctx.window, &w, &h); glfwGetFramebufferSize(ctx.window, &w, &h);
return h; return h;
} }
ox::Size getScreenSize(Context &ctx) noexcept { ox::Size getScreenSize(Context const &ctx) noexcept {
int w = 0, h = 0; int w = 0, h = 0;
glfwGetFramebufferSize(ctx.window, &w, &h); glfwGetFramebufferSize(ctx.window, &w, &h);
return {w, h}; return {w, h};
} }
ox::Bounds getWindowBounds(Context &ctx) noexcept { ox::Bounds getWindowBounds(Context const &ctx) noexcept {
ox::Bounds bnds; ox::Bounds bnds;
glfwGetWindowPos(ctx.window, &bnds.x, &bnds.y); glfwGetWindowPos(ctx.window, &bnds.x, &bnds.y);
glfwGetWindowSize(ctx.window, &bnds.width, &bnds.height); glfwGetWindowSize(ctx.window, &bnds.width, &bnds.height);

114
deps/nostalgia/util/scripts/file-to-cpp.py vendored Executable file
View File

@ -0,0 +1,114 @@
#! /usr/bin/env python3
#
# Copyright 2016 - 2025 gary@drinkingtea.net
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
import argparse
import os
import json
import pathlib
import sys
def write_txt_file(path: str, txt: str):
with open(path, "w") as f:
f.write(txt)
print(f'Wrote {path}')
def file_to_hex(path: str, line_prefix: str) -> tuple[str, int]:
with open(path, 'rb') as f:
out = line_prefix
data = f.read()
i = 1
for b in data:
out += f"{b:#0{4}x},"
if i % 10 == 0:
out += '\n\t'
else:
out += ' '
i += 1
return out[:-1], len(data)
def file_to_cpp(path: str, cpp_name: str) -> tuple[str, str]:
cpp = ''
hpp = ''
data, data_len = file_to_hex(path, "\t")
cpp += f'\nstatic constexpr ox::Array<uint8_t, {data_len}> {cpp_name}Data {{\n{data}\n}};\n'
cpp += f'\nox::SpanView<uint8_t> {cpp_name}() noexcept {{ return {cpp_name}Data; }}\n'
hpp += f'\n[[nodiscard]]\nox::SpanView<uint8_t> {cpp_name}() noexcept;\n'
return cpp, hpp
def proc_rsrc_file(rsrc_path: str):# Open and read the JSON file
with open(rsrc_path, 'r') as file:
data = json.load(file)
base_path = pathlib.Path(rsrc_path).parent.absolute()
if 'all_files' in data:
all_files = data['all_files']
else:
all_files = None
if 'namespace' in data:
namespace = data['namespace']
else:
namespace = ''
if len(namespace) > 0:
push_ns = f'namespace {namespace} {{\n'
pop_ns = '\n}\n'
else:
push_ns = ''
pop_ns = ''
cpp = '// Generated\n\n#include <ox/std/array.hpp>\n'
cpp += '#include <ox/std/span.hpp>\n\n'
hpp = '// Generated\n\n#include <ox/std/span.hpp>\n\n'
cpp += push_ns
hpp += push_ns
all_files_func_decl = ''
all_files_func = ''
if all_files is not None:
all_files_func_decl += f'\n[[nodiscard]]\nox::Vector<ox::SpanView<uint8_t>> {all_files}() noexcept;\n'
all_files_func += f'\nox::Vector<ox::SpanView<uint8_t>> {all_files}() noexcept {{\n\treturn {{\n'
for f in data['files']:
if 'path' not in f:
print('src file path missing', file=sys.stderr)
sys.exit(1)
path = f['path']
if 'cpp_name' not in f:
print('var name missing', file=sys.stderr)
sys.exit(1)
cpp_name = f['cpp_name']
c, h = file_to_cpp(os.path.join(base_path, path), cpp_name)
cpp += c
if len(h) > 0:
hpp += h
if all_files is not None:
all_files_func += f'\t\t{cpp_name}(),\n'
cpp += all_files_func + '\t};\n}\n'
hpp += all_files_func_decl
cpp += pop_ns
hpp += pop_ns
write_txt_file(os.path.join(base_path, data['cpp']), cpp)
if 'hpp' in data:
write_txt_file(os.path.join(base_path, data['hpp']), hpp)
def main() -> int:
parser = argparse.ArgumentParser()
parser.add_argument('--rsrc', help='path to file', required=True)
args = parser.parse_args()
proc_rsrc_file(args.rsrc)
return 0
if __name__ == '__main__':
try:
err = main()
sys.exit(err)
except KeyboardInterrupt:
sys.exit(1)