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

Squashed 'deps/nostalgia/' changes from e7a66390..a0c81463

Browse Source 
a0c81463 [nostalgia/core/studio] East const some function args
d5b232f5 [olympic/studio] Fix array bounds issue
c79fe3be [buildcore] Make CMake configure failure trigger failed return code
1df4e780 [olympic/studio] Add new project menu, make file creation open file
ffbdb09c [olympic/turbine/glfw] Add shift key support
b35a956e [olympic/studio] Cleanup unused expression
d3847caa [olympic/studio] Make Project::writeObj only write descriptor if it does not already exist or if debug build
ae066a91 [olympic/studio] Fix Project::writeObj to ensure parent directory of file exists
67543af8 [ox/oc] Remove some unnecessary code
6b774ec2 [ox/oc] Fix array writing to write all values
4b9758f4 [nostalgia/core] Move most TileSheet member functions out of class
bf12b15f [nostalgia/sample_project] Update some tilesheets to version 4 format
a7328eb5 [nostalgia/core/studio] Reduce indent for Subsheet editor
b52124a0 [nostalgia/core/studio] Revert new subsheet index increment to happen after index assignment
eae9972f [nostalgia/sample_project] Add missing type descriptors
d83e3929 [nostalgia/core] Cleanup, revert CompactTileSheet version to 1
e2d0a784 [olympic/keel] Cleanup
f0882142 [nostalgia/core/studio] Change TileSheets to back to MC
6a2954f8 [nostalgia/core] Remove id from TileSheetV3::Subsheet, add TileSheetV4
9c19655c [nostalgia/core] Fix build, add SubSheet ID to SubSheet Editor view
087c834b [nostalgia/core/studio] Fix Add SubSheet to increment idIt before using it
79bdbf2e [nostalgia/core] Add id to TileSheetV3::SubSheet model
2bdc3def [nostalgia/core/opengl] Implement flip X and flip Y for BG tiles

git-subtree-dir: deps/nostalgia
git-subtree-split: a0c8146396a9e9c0dc48a2564f4e9870a212ed59
This commit is contained in:
Gary Talent
2023-12-29 00:37:47 -06:00
parent cf0d078a1e
commit 9caa925f20
43 changed files with 864 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nostalgia/player/app.cpp
View File

@@ -82,7 +82,8 @@ static ox::Error runTest(turbine::Context &tctx) {
[[maybe_unused]]
static ox::Error runTileSheetSetTest(turbine::Context &tctx) {
// this should make the screen display 'ABCDB'
// this should make the screen display 'ABCDB', with the A being upside down
// and the first B being backwards
constexpr ox::FileAddress PaletteAddr = ox::StringLiteral("/Palettes/Charset.npal");
oxRequireM(cctx, core::init(tctx));
turbine::setApplicationData(tctx, cctx.get());
@@ -103,9 +104,9 @@ static ox::Error runTileSheetSetTest(turbine::Context &tctx) {
oxReturnError(core::loadBgPalette(*cctx, 0, ox::StringLiteral("/Palettes/Chester.npal")));
oxReturnError(core::loadSpritePalette(*cctx, PaletteAddr));
core::setBgStatus(*cctx, 0, true);
core::setBgTile(*cctx, 0, 10, 9, 1, bgPalBank);
core::setBgTile(*cctx, 0, 11, 9, 2, bgPalBank);
core::setBgTile(*cctx, 0, 13, 9, 4, bgPalBank);
core::setBgTile(*cctx, 0, 10, 9, { .tileIdx = 1, .palBank = bgPalBank, .flipX = 0, .flipY = 1 });
core::setBgTile(*cctx, 0, 11, 9, { .tileIdx = 2, .palBank = bgPalBank, .flipX = 1, .flipY = 0 });
core::setBgTile(*cctx, 0, 13, 9, { .tileIdx = 4, .palBank = bgPalBank, .flipX = 0, .flipY = 0 });
core::setSprite(*cctx, 16, {
.enabled = true,
.x = 12 * 8,