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

Squashed 'deps/nostalgia/' changes from 26fe266b..0de428a2

Browse Source 
0de428a2 [studio/applib] Cleanup
8a52df4f [nostalgia/gfx] More cleanup
efec6eb3 [nostalgia/gfx/studio/palette] Add RGB key shortcuts for focusing color channels
56eeb249 [nostalgia/gfx/opengl] More cleanup
ae81f6b3 [ox/std] Make Span::operator[] const
c1108301 [nostalgia/gfx] Cleanup
83fbe6ac [keel,turbine,studio] Fix some install mistakes
80b45283 [nostalgia/gfx] Cleanup
0fa39433 [nostalgia] Add release note about Mac menubar using Cmd
cae75350 [nostalgia] Fix typos in release notes
df878323 [studio] Add build date to About
d585794c [nostalgia/gfx/studio/tilesheet] Fix Insert tile command
20965854 [nostalgia/gfx/studio/tilesheet] Cleanup
02383a4a [ox/std] Cleanup
185a7628 [nostalgia] Make pkg-dmg delete bundle after archive created
b722b4f7 [nostalgia] Update release notes
459ab5aa [studio] Remove ability to re-order Editor tabs
565f621c [nostalgia/gfx/studio/tilesheet] Fix Delete Tile functionality
9589ca91 [keel] Cleanup
164db500 [keel] Cleanup
cbfb167d [nostalgia] Remove unused project directory
e7b83be8 [nostalgia] Update release notes
649da5fc [nostalgia/sample_project] Delete Scenes directory
aa095f76 [studio] Make Delete key initiate deletion of selected directory
bb99c99f [studio] Make deleting a directory close files in that directory
7f0dcdd2 [nostalgia/gfx/studio/tilesheet] Cleanup
6029ad5d [nostalgia/studio] Add command for bundling Mac app

git-subtree-dir: deps/nostalgia
git-subtree-split: 0de428a2e588d3360b98aa7e00c2498d5a54019b
This commit is contained in:
Gary Talent 2025-05-14 22:31:06 -05:00
parent 8e033b2460
commit 71b1e79d61
62 changed files with 240 additions and 997 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -17,6 +17,10 @@ PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}
pkg-gba: build pkg-gba: build
${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME_CAP} ${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME_CAP}
.PHONY: pkg-mac
pkg-mac: install
${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-dmg.py
.PHONY: generate-studio-rsrc .PHONY: generate-studio-rsrc
generate-studio-rsrc: generate-studio-rsrc:
${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/file-to-cpp.py --rsrc src/olympic/studio/applib/src/rsrc.json ${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/file-to-cpp.py --rsrc src/olympic/studio/applib/src/rsrc.json

7
deps/ox/src/ox/std/span.hpp vendored
View File

@ -146,12 +146,7 @@ class Span {
return iterator<const T&, const T*, true>(m_items, MaxValue<size_type>, m_size); return iterator<const T&, const T*, true>(m_items, MaxValue<size_type>, m_size);
} }
constexpr T &operator[](std::size_t i) noexcept { constexpr T &operator[](std::size_t i) const noexcept {
boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
return m_items[i];
}
constexpr T const&operator[](std::size_t i) const noexcept {
boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow"); boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
return m_items[i]; return m_items[i];
} }

8
deps/ox/src/ox/std/string.hpp vendored
View File

@ -213,22 +213,22 @@ class BasicString {
[[nodiscard]] [[nodiscard]]
constexpr const char *c_str() const noexcept { constexpr const char *c_str() const noexcept {
return static_cast<const char*>(m_buff.data()); return m_buff.data();
} }
[[nodiscard]] [[nodiscard]]
inline explicit operator const char*() const { constexpr explicit operator const char*() const {
return c_str(); return c_str();
} }
#if __has_include(<string>) #if __has_include(<string>)
[[nodiscard]] [[nodiscard]]
inline std::string toStdString() const { std::string toStdString() const {
return c_str(); return c_str();
} }
[[nodiscard]] [[nodiscard]]
inline explicit operator std::string() const { explicit operator std::string() const {
return c_str(); return c_str();
} }
#endif #endif

5
project/.nostalgia/type_descriptors/B.int32;0
View File

@ -1,5 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"length" : 4,
"primitiveType" : 1,
"typeName" : "B.int32"
}

5
project/.nostalgia/type_descriptors/B.int8;0
View File

@ -1,5 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"length" : 1,
"primitiveType" : 1,
"typeName" : "B.int8"
}

4
project/.nostalgia/type_descriptors/B.string;0
View File

@ -1,4 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 4,
"typeName" : "B.string"
}

4
project/.nostalgia/type_descriptors/B.uint16;0
View File

@ -1,4 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"length" : 2,
"typeName" : "B.uint16"
}

4
project/.nostalgia/type_descriptors/B.uint64;0
View File

@ -1,4 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"length" : 8,
"typeName" : "B.uint64"
}

4
project/.nostalgia/type_descriptors/B.uint8;0
View File

@ -1,4 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"length" : 1,
"typeName" : "B.uint8"
}

39
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaGraphic;1
View File

@ -1,39 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "bpp",
"typeId" : "B.int8;0"
},
{
"fieldName" : "rows",
"typeId" : "B.int32;0"
},
{
"fieldName" : "columns",
"typeId" : "B.int32;0"
},
{
"fieldName" : "defaultPalette",
"typeId" : "net.drinkingtea.ox.FileAddress;1"
},
{
"fieldName" : "pal",
"typeId" : "net.drinkingtea.nostalgia.core.Palette;1"
},
{
"fieldName" : "pixels",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "B.uint8;0"
}
],
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.NostalgiaGraphic",
"typeVersion" : 1
}

12
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette.ColorInfo;3
View File

@ -1,12 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "name",
"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
}
],
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.Palette.ColorInfo",
"typeVersion" : 3
}

23
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette.PalettePage;1
View File

@ -1,23 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "name",
"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
},
{
"fieldName" : "colors",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "net.drinkingtea.nostalgia.core.PaletteColor;1"
}
],
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.Palette.PalettePage",
"typeVersion" : 1
}

19
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;1
View File

@ -1,19 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "colors",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "B.uint16;0"
}
],
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.Palette",
"typeVersion" : 1
}

23
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;2
View File

@ -1,23 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "pages",
"subscriptLevels" : 2,
"subscriptStack" :
[
{
"subscriptType" : 4
},
{
"subscriptType" : 4
}
],
"typeId" : "B.uint16;0"
}
],
"preloadable" : true,
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.Palette",
"typeVersion" : 2
}

34
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;3
View File

@ -1,34 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "colorInfo",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "net.drinkingtea.nostalgia.core.Palette.ColorInfo;3"
},
{
"fieldName" : "pages",
"subscriptLevels" : 2,
"subscriptStack" :
[
{
"subscriptType" : 4
},
{
"subscriptType" : 4
}
],
"typeId" : "B.uint16;0"
}
],
"preloadable" : true,
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.Palette",
"typeVersion" : 3
}

31
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;4
View File

@ -1,31 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "colorNames",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
},
{
"fieldName" : "pages",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "net.drinkingtea.nostalgia.core.Palette.PalettePage;1"
}
],
"preloadable" : true,
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.Palette",
"typeVersion" : 4
}

24
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.PaletteColor;1
View File

@ -1,24 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "r",
"typeId" : "B.uint8;0"
},
{
"fieldName" : "g",
"typeId" : "B.uint8;0"
},
{
"fieldName" : "b",
"typeId" : "B.uint8;0"
},
{
"fieldName" : "a",
"typeId" : "B.uint8;0"
}
],
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.PaletteColor",
"typeVersion" : 1
}

42
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;1
View File

@ -1,42 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "name",
"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
},
{
"fieldName" : "rows",
"typeId" : "B.int32;0"
},
{
"fieldName" : "columns",
"typeId" : "B.int32;0"
},
{
"fieldName" : "subsheets",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet;1"
},
{
"fieldName" : "pixels",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "B.uint8;0"
}
],
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet",
"typeVersion" : 1
}

42
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;3
View File

@ -1,42 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "name",
"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
},
{
"fieldName" : "rows",
"typeId" : "B.int32;0"
},
{
"fieldName" : "columns",
"typeId" : "B.int32;0"
},
{
"fieldName" : "subsheets",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet;3"
},
{
"fieldName" : "pixels",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "B.uint8;0"
}
],
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet",
"typeVersion" : 3
}

46
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;4
View File

@ -1,46 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "id",
"typeId" : "B.int32;0"
},
{
"fieldName" : "name",
"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
},
{
"fieldName" : "rows",
"typeId" : "B.int32;0"
},
{
"fieldName" : "columns",
"typeId" : "B.int32;0"
},
{
"fieldName" : "subsheets",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet;4"
},
{
"fieldName" : "pixels",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "B.uint8;0"
}
],
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet",
"typeVersion" : 4
}

20
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;2
View File

@ -1,20 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "bpp",
"typeId" : "B.int8;0"
},
{
"fieldName" : "defaultPalette",
"typeId" : "net.drinkingtea.ox.FileAddress;1"
},
{
"fieldName" : "subsheet",
"typeId" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet;1"
}
],
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.TileSheet",
"typeVersion" : 2
}

24
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;3
View File

@ -1,24 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "bpp",
"typeId" : "B.int8;0"
},
{
"fieldName" : "idIt",
"typeId" : "B.int32;0"
},
{
"fieldName" : "defaultPalette",
"typeId" : "net.drinkingtea.ox.FileAddress;1"
},
{
"fieldName" : "subsheet",
"typeId" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet;3"
}
],
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.TileSheet",
"typeVersion" : 3
}

24
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;4
View File

@ -1,24 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "bpp",
"typeId" : "B.int8;0"
},
{
"fieldName" : "idIt",
"typeId" : "B.int32;0"
},
{
"fieldName" : "defaultPalette",
"typeId" : "net.drinkingtea.ox.FileAddress;1"
},
{
"fieldName" : "subsheet",
"typeId" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet;4"
}
],
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.TileSheet",
"typeVersion" : 4
}

23
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.CompactPalette;1
View File

@ -1,23 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "pages",
"subscriptLevels" : 2,
"subscriptStack" :
[
{
"subscriptType" : 4
},
{
"subscriptType" : 4
}
],
"typeId" : "B.uint16;0"
}
],
"preloadable" : true,
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.gfx.CompactPalette",
"typeVersion" : 1
}

28
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.CompactTileSheet;1
View File

@ -1,28 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "bpp",
"typeId" : "B.int8;0"
},
{
"fieldName" : "defaultPalette",
"typeId" : "net.drinkingtea.ox.FileAddress;1"
},
{
"fieldName" : "pixels",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "B.uint8;0"
}
],
"preloadable" : true,
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.gfx.CompactTileSheet",
"typeVersion" : 1
}

23
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.Palette.PalettePage;2
View File

@ -1,23 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "name",
"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
},
{
"fieldName" : "colors",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "net.drinkingtea.nostalgia.gfx.PaletteColor;2"
}
],
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.gfx.Palette.PalettePage",
"typeVersion" : 2
}

31
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.Palette;5
View File

@ -1,31 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "colorNames",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
},
{
"fieldName" : "pages",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "net.drinkingtea.nostalgia.gfx.Palette.PalettePage;2"
}
],
"preloadable" : true,
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.gfx.Palette",
"typeVersion" : 5
}

24
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.PaletteColor;2
View File

@ -1,24 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "r",
"typeId" : "B.uint8;0"
},
{
"fieldName" : "g",
"typeId" : "B.uint8;0"
},
{
"fieldName" : "b",
"typeId" : "B.uint8;0"
},
{
"fieldName" : "a",
"typeId" : "B.uint8;0"
}
],
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.gfx.PaletteColor",
"typeVersion" : 2
}

46
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.TileSheet.SubSheet;5
View File

@ -1,46 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "id",
"typeId" : "B.int32;0"
},
{
"fieldName" : "name",
"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
},
{
"fieldName" : "rows",
"typeId" : "B.int32;0"
},
{
"fieldName" : "columns",
"typeId" : "B.int32;0"
},
{
"fieldName" : "subsheets",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "net.drinkingtea.nostalgia.gfx.TileSheet.SubSheet;5"
},
{
"fieldName" : "pixels",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "B.uint8;0"
}
],
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.gfx.TileSheet.SubSheet",
"typeVersion" : 5
}

24
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.TileSheet;5
View File

@ -1,24 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "bpp",
"typeId" : "B.int8;0"
},
{
"fieldName" : "idIt",
"typeId" : "B.int32;0"
},
{
"fieldName" : "defaultPalette",
"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
},
{
"fieldName" : "subsheet",
"typeId" : "net.drinkingtea.nostalgia.gfx.TileSheet.SubSheet;5"
}
],
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.gfx.TileSheet",
"typeVersion" : 5
}

41
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.scene.SceneDoc;1
View File

@ -1,41 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "tilesheet",
"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
},
{
"fieldName" : "palettes",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
},
{
"fieldName" : "tiles",
"subscriptLevels" : 3,
"subscriptStack" :
[
{
"subscriptType" : 4
},
{
"subscriptType" : 4
},
{
"subscriptType" : 4
}
],
"typeId" : "net.drinkingtea.nostalgia.scene.TileDoc;1"
}
],
"preloadable" : true,
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.scene.SceneDoc",
"typeVersion" : 1
}

88
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.scene.SceneStatic;1
View File

@ -1,88 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "tilesheet",
"typeId" : "net.drinkingtea.ox.FileAddress;1"
},
{
"fieldName" : "palettes",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "net.drinkingtea.ox.FileAddress;1"
},
{
"fieldName" : "columns",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "B.uint16;0"
},
{
"fieldName" : "rows",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"subscriptType" : 4
}
],
"typeId" : "B.uint16;0"
},
{
"fieldName" : "tileMapIdx",
"subscriptLevels" : 2,
"subscriptStack" :
[
{
"subscriptType" : 4
},
{
"subscriptType" : 4
}
],
"typeId" : "B.uint16;0"
},
{
"fieldName" : "tileType",
"subscriptLevels" : 2,
"subscriptStack" :
[
{
"subscriptType" : 4
},
{
"subscriptType" : 4
}
],
"typeId" : "B.uint8;0"
},
{
"fieldName" : "layerAttachments",
"subscriptLevels" : 2,
"subscriptStack" :
[
{
"subscriptType" : 4
},
{
"subscriptType" : 4
}
],
"typeId" : "B.uint8;0"
}
],
"preloadable" : true,
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.scene.SceneStatic",
"typeVersion" : 1
}

33
project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.scene.TileDoc;1
View File

@ -1,33 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "subsheet_id",
"typeId" : "B.int32;0"
},
{
"fieldName" : "subsheet_path",
"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
},
{
"fieldName" : "type",
"typeId" : "B.uint8;0"
},
{
"fieldName" : "layer_attachments",
"subscriptLevels" : 1,
"subscriptStack" :
[
{
"length" : 4,
"subscriptType" : 3
}
],
"typeId" : "B.uint8;0"
}
],
"preloadable" : true,
"primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.scene.TileDoc",
"typeVersion" : 1
}

9
project/.nostalgia/type_descriptors/net.drinkingtea.ox.BasicString#8#;1
View File

@ -1,9 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 4,
"typeName" : "net.drinkingtea.ox.BasicString",
"typeParams" :
[
"8"
],
"typeVersion" : 1
}

20
project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress.Data;1
View File

@ -1,20 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "path",
"typeId" : "B.string"
},
{
"fieldName" : "constPath",
"typeId" : "B.string"
},
{
"fieldName" : "inode",
"typeId" : "B.uint64;0"
}
],
"primitiveType" : 6,
"typeName" : "net.drinkingtea.ox.FileAddress.Data",
"typeVersion" : 1
}

16
project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress;1
View File

@ -1,16 +0,0 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{
"fieldList" :
[
{
"fieldName" : "type",
"typeId" : "B.int8;0"
},
{
"fieldName" : "data",
"typeId" : "net.drinkingtea.ox.FileAddress.Data"
}
],
"primitiveType" : 5,
"typeName" : "net.drinkingtea.ox.FileAddress",
"typeVersion" : 1
}

20
release-notes.md
View File

@ -1,14 +1,24 @@
# d2025.06.0
* PaletteEditor: Add RGB key shortcuts for focusing color channels
# d2025.05.0 # d2025.05.0
* Add app icon for both window and file * Add app icon for both window and file
* Change application font to Roboto Medium
* Closing application will now confirm with user if any files have unsaved * Closing application will now confirm with user if any files have unsaved
changes. changes.
* Fix selection clearing in TileSheet editor to work when clicking outside * UUID duplicates will now be reported when opening a project.
image. * Deleting a directory now closes files in that directory.
* Fix color number key range in PalettEditor. Previously, pressing A caused the * Delete key now initiates deletion of selected directory.
* Remove ability to re-order tabs. There were bugs associated with that.
* Mac: Menu bar shortcuts now say Cmd instead of Ctrl.
* TileSheetEditor: Fix selection clearing to work when clicking outside image.
* TileSheetEditor: Fix Delete Tile functionality, which was completely broken
* TileSheetEditor: Fix Insert Tile functionality, which was completely broken
* PaletteEditor: Fix color number key range. Previously, pressing A caused the
editor to jump to the last color. editor to jump to the last color.
* UUID duplicates will now be reported when opening a project * PaletteEditor: Page rename will now take effect upon pressing enter if the
* PalettEditor: page rename will now take effect upon pressing enter if the
text input has focus text input has focus
# d2025.02.1 # d2025.02.1

BIN
sample_project/Scenes/Chester.nscn
View File

Binary file not shown.

6
src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp
View File

@ -223,7 +223,7 @@ bool bgStatus(Context &ctx, unsigned bg) noexcept;
void setBgStatus(Context &ctx, unsigned bg, bool status) noexcept; void setBgStatus(Context &ctx, unsigned bg, bool status) noexcept;
void setBgCbb(Context &ctx, unsigned bgIdx, unsigned cbb) noexcept; void setBgCbb(Context &ctx, unsigned bgIdx, unsigned cbbIdx) noexcept;
void setBgPriority(Context &ctx, uint_t bgIdx, uint_t priority) noexcept; void setBgPriority(Context &ctx, uint_t bgIdx, uint_t priority) noexcept;
@ -231,10 +231,10 @@ void hideSprite(Context &ctx, unsigned) noexcept;
void showSprite(Context &ctx, unsigned) noexcept; void showSprite(Context &ctx, unsigned) noexcept;
void setSprite(Context &c, uint_t idx, Sprite const&s) noexcept; void setSprite(Context &ctx, uint_t idx, Sprite const&sprite) noexcept;
[[nodiscard]] [[nodiscard]]
uint_t spriteCount(Context &ctx) noexcept; uint_t spriteCount(Context const &ctx) noexcept;
ox::Error initConsole(Context &ctx) noexcept; ox::Error initConsole(Context &ctx) noexcept;

2
src/nostalgia/modules/gfx/src/gba/context.cpp
View File

@ -22,7 +22,7 @@ ox::Error initGfx(Context &ctx, InitParams const&) noexcept;
ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params) noexcept { ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params) noexcept {
auto ctx = ox::make_unique<Context>(tctx); auto ctx = ox::make_unique<Context>(tctx);
OX_RETURN_ERROR(initGfx(*ctx, params)); OX_RETURN_ERROR(initGfx(*ctx, params));
return ox::UPtr<Context>(std::move(ctx)); return ctx;
} }
keel::Context &keelCtx(Context &ctx) noexcept { keel::Context &keelCtx(Context &ctx) noexcept {

39
src/nostalgia/modules/gfx/src/gba/gfx.cpp
View File

@ -36,9 +36,9 @@ ox::Error initGfx(Context&, InitParams const&) noexcept {
ox::Error loadBgPalette( ox::Error loadBgPalette(
Context&, Context&,
size_t palBank, size_t const palBank,
CompactPalette const&palette, CompactPalette const&palette,
size_t page) noexcept { size_t const page) noexcept {
if (palette.pages.empty()) { if (palette.pages.empty()) {
return {}; return {};
} }
@ -52,7 +52,7 @@ ox::Error loadBgPalette(
ox::Error loadSpritePalette( ox::Error loadSpritePalette(
Context&, Context&,
CompactPalette const&palette, CompactPalette const&palette,
size_t page) noexcept { size_t const page) noexcept {
if (palette.pages.empty()) { if (palette.pages.empty()) {
return {}; return {};
} }
@ -133,7 +133,7 @@ ox::Error loadBgTileSheet(
ox::Error loadBgTileSheet( ox::Error loadBgTileSheet(
Context &ctx, Context &ctx,
unsigned cbb, unsigned const cbb,
CompactTileSheet const&ts, CompactTileSheet const&ts,
ox::Optional<unsigned> const&paletteBank) noexcept { ox::Optional<unsigned> const&paletteBank) noexcept {
auto const cnt = (ts.pixels.size() * PixelsPerTile) / (1 + (ts.bpp == 4)); auto const cnt = (ts.pixels.size() * PixelsPerTile) / (1 + (ts.bpp == 4));
@ -184,7 +184,7 @@ static void setSpritesBpp(unsigned const bpp) noexcept {
ox::Error loadSpriteTileSheet( ox::Error loadSpriteTileSheet(
Context &ctx, Context &ctx,
CompactTileSheet const&ts, CompactTileSheet const&ts,
bool loadDefaultPalette) noexcept { bool const loadDefaultPalette) noexcept {
for (size_t i = 0; i < ts.pixels.size(); i += 2) { for (size_t i = 0; i < ts.pixels.size(); i += 2) {
uint16_t v = ts.pixels[i]; uint16_t v = ts.pixels[i];
v |= static_cast<uint16_t>(ts.pixels[i + 1] << 8); v |= static_cast<uint16_t>(ts.pixels[i + 1] << 8);
@ -206,7 +206,8 @@ ox::Error loadSpriteTileSheet(
return {}; return {};
} }
void setBgTile(Context &ctx, uint_t bgIdx, int column, int row, BgTile const&tile) noexcept { void setBgTile(
Context &ctx, uint_t const bgIdx, int const column, int const row, BgTile const&tile) noexcept {
auto const tileIdx = static_cast<std::size_t>(row * tileColumns(ctx) + column); auto const tileIdx = static_cast<std::size_t>(row * tileColumns(ctx) + column);
// see Tonc 9.3 // see Tonc 9.3
MEM_BG_MAP[bgIdx][tileIdx] = MEM_BG_MAP[bgIdx][tileIdx] =
@ -216,7 +217,7 @@ void setBgTile(Context &ctx, uint_t bgIdx, int column, int row, BgTile const&til
static_cast<uint16_t>(tile.palBank << 0xc); static_cast<uint16_t>(tile.palBank << 0xc);
} }
void clearBg(Context &ctx, uint_t bgIdx) noexcept { void clearBg(Context &ctx, uint_t const bgIdx) noexcept {
memset(MEM_BG_MAP[bgIdx].data(), 0, static_cast<size_t>(tileRows(ctx) * tileColumns(ctx))); memset(MEM_BG_MAP[bgIdx].data(), 0, static_cast<size_t>(tileRows(ctx) * tileColumns(ctx)));
} }
@ -224,39 +225,39 @@ uint8_t bgStatus(Context&) noexcept {
return (REG_DISPCTL >> 8u) & 0b1111u; return (REG_DISPCTL >> 8u) & 0b1111u;
} }
void setBgStatus(Context&, uint32_t status) noexcept { void setBgStatus(Context&, uint32_t const status) noexcept {
constexpr auto BgStatus = 8; constexpr auto BgStatus = 8;
REG_DISPCTL = (REG_DISPCTL & ~0b111100000000u) | status << BgStatus; REG_DISPCTL = (REG_DISPCTL & ~0b111100000000u) | status << BgStatus;
} }
bool bgStatus(Context&, unsigned bg) noexcept { bool bgStatus(Context&, unsigned const bg) noexcept {
return (REG_DISPCTL >> (8 + bg)) & 1; return (REG_DISPCTL >> (8 + bg)) & 1;
} }
void setBgStatus(Context&, unsigned bg, bool status) noexcept { void setBgStatus(Context&, unsigned const bg, bool const status) noexcept {
constexpr auto Bg0Status = 8; constexpr auto Bg0Status = 8;
const auto mask = static_cast<uint32_t>(status) << (Bg0Status + bg); const auto mask = static_cast<uint32_t>(status) << (Bg0Status + bg);
REG_DISPCTL = REG_DISPCTL | ((REG_DISPCTL & ~mask) | mask); REG_DISPCTL = REG_DISPCTL | ((REG_DISPCTL & ~mask) | mask);
} }
void setBgBpp(Context&, unsigned bgIdx, unsigned bpp) noexcept { void setBgBpp(Context&, unsigned const bgIdx, unsigned const bpp) noexcept {
auto &bgCtl = regBgCtl(bgIdx); auto &bgCtl = regBgCtl(bgIdx);
teagba::bgSetBpp(bgCtl, bpp); teagba::bgSetBpp(bgCtl, bpp);
} }
void setBgCbb(Context &ctx, unsigned bgIdx, unsigned cbb) noexcept { void setBgCbb(Context &ctx, unsigned const bgIdx, unsigned const cbbIdx) noexcept {
auto &bgCtl = regBgCtl(bgIdx); auto &bgCtl = regBgCtl(bgIdx);
const auto &cbbData = ctx.cbbData[cbb]; const auto &cbbData = ctx.cbbData[cbbIdx];
teagba::bgSetBpp(bgCtl, cbbData.bpp); teagba::bgSetBpp(bgCtl, cbbData.bpp);
teagba::bgSetCbb(bgCtl, cbb); teagba::bgSetCbb(bgCtl, cbbIdx);
} }
void setBgPriority(Context&, uint_t bgIdx, uint_t priority) noexcept { void setBgPriority(Context&, uint_t const bgIdx, uint_t const priority) noexcept {
auto &bgCtl = regBgCtl(bgIdx); auto &bgCtl = regBgCtl(bgIdx);
bgCtl = (bgCtl & 0b1111'1111'1111'1100u) | (priority & 0b11); bgCtl = (bgCtl & 0b1111'1111'1111'1100u) | (priority & 0b11);
} }
void hideSprite(Context&, unsigned idx) noexcept { void hideSprite(Context&, unsigned const idx) noexcept {
//oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow"); //oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow");
teagba::addSpriteUpdate({ teagba::addSpriteUpdate({
.attr0 = uint16_t{0b11 << 8}, .attr0 = uint16_t{0b11 << 8},
@ -264,7 +265,7 @@ void hideSprite(Context&, unsigned idx) noexcept {
}); });
} }
void showSprite(Context&, unsigned idx) noexcept { void showSprite(Context&, unsigned const idx) noexcept {
//oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow"); //oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow");
teagba::addSpriteUpdate({ teagba::addSpriteUpdate({
.attr0 = 0, .attr0 = 0,
@ -272,7 +273,7 @@ void showSprite(Context&, unsigned idx) noexcept {
}); });
} }
void setSprite(Context&, uint_t idx, Sprite const&s) noexcept { void setSprite(Context&, uint_t const idx, Sprite const&s) noexcept {
//oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow"); //oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow");
uint16_t const eightBpp = s.bpp == 8; uint16_t const eightBpp = s.bpp == 8;
teagba::addSpriteUpdate({ teagba::addSpriteUpdate({
@ -293,7 +294,7 @@ void setSprite(Context&, uint_t idx, Sprite const&s) noexcept {
}); });
} }
uint_t spriteCount(Context&) noexcept { uint_t spriteCount(Context const&) noexcept {
return SpriteCount; return SpriteCount;
} }

2
src/nostalgia/modules/gfx/src/opengl/context.cpp
View File

@ -26,7 +26,7 @@ Context::~Context() noexcept {
ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params) noexcept { ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params) noexcept {
auto ctx = ox::make_unique<Context>(tctx, params); auto ctx = ox::make_unique<Context>(tctx, params);
OX_RETURN_ERROR(initGfx(*ctx, params)); OX_RETURN_ERROR(initGfx(*ctx, params));
return ox::UPtr<Context>(ctx.release()); return ctx;
} }
keel::Context &keelCtx(Context &ctx) noexcept { keel::Context &keelCtx(Context &ctx) noexcept {

74
src/nostalgia/modules/gfx/src/opengl/gfx.cpp
View File

@ -28,7 +28,7 @@ static constexpr auto PriorityScale = 0.01f;
Drawer::Drawer(Context &ctx) noexcept: m_ctx(ctx) {} Drawer::Drawer(Context &ctx) noexcept: m_ctx(ctx) {}
void Drawer::draw(turbine::Context &tctx) noexcept { void Drawer::draw(turbine::Context &tctx) noexcept {
gfx::gl::draw(m_ctx, turbine::getScreenSize(tctx)); gl::draw(m_ctx, turbine::getScreenSize(tctx));
} }
static constexpr ox::CStringView bgvshadTmpl = R"glsl( static constexpr ox::CStringView bgvshadTmpl = R"glsl(
@ -106,7 +106,7 @@ static constexpr ox::CStringView spritefshadTmpl = R"glsl(
})glsl"; })glsl";
[[nodiscard]] [[nodiscard]]
static constexpr auto bgVertexRow(uint_t x, uint_t y) noexcept { static constexpr auto bgVertexRow(uint_t const x, uint_t const y) noexcept {
return y * TileRows + x; return y * TileRows + x;
} }
@ -183,7 +183,7 @@ static void setTileBufferObject(
ox::spancpy<GLuint>(ebo, elms); ox::spancpy<GLuint>(ebo, elms);
} }
static void initSpriteBufferObjects(Context &ctx, glutils::BufferSet &bs) noexcept { static void initSpriteBufferObjects(Context const &ctx, glutils::BufferSet &bs) noexcept {
for (auto i = 0u; i < ctx.spriteCount; ++i) { for (auto i = 0u; i < ctx.spriteCount; ++i) {
auto const vbo = ox::Span{bs.vertices} auto const vbo = ox::Span{bs.vertices}
+ i * static_cast<std::size_t>(SpriteVertexVboLength); + i * static_cast<std::size_t>(SpriteVertexVboLength);
@ -256,7 +256,7 @@ static void initSpritesBufferset(Context &ctx) noexcept {
} }
static void initBackgroundBufferset( static void initBackgroundBufferset(
GLuint shader, GLuint const shader,
glutils::BufferSet &bs) noexcept { glutils::BufferSet &bs) noexcept {
// vao // vao
bs.vao = glutils::generateVertexArrayObject(); bs.vao = glutils::generateVertexArrayObject();
@ -290,8 +290,8 @@ static void initBackgroundBufferset(
} }
static glutils::GLTexture createTexture( static glutils::GLTexture createTexture(
GLsizei w, GLsizei const w,
GLsizei h, GLsizei const h,
void const*pixels) noexcept { void const*pixels) noexcept {
GLuint texId = 0; GLuint texId = 0;
glGenTextures(1, &texId); glGenTextures(1, &texId);
@ -375,10 +375,10 @@ static void drawSprites(Context &ctx, ox::Size const&renderSz) noexcept {
static void loadPalette( static void loadPalette(
ox::Array<GLfloat, 1024> &palette, ox::Array<GLfloat, 1024> &palette,
size_t palOffset, size_t const palOffset,
GLuint shaderPgrm, GLuint const shaderPgrm,
CompactPalette const&pal, CompactPalette const&pal,
size_t page = 0) noexcept { size_t const page = 0) noexcept {
static constexpr std::size_t ColorCnt = 256; static constexpr std::size_t ColorCnt = 256;
for (auto i = palOffset; auto const c : pal.pages[page]) { for (auto i = palOffset; auto const c : pal.pages[page]) {
palette[i++] = redf(c); palette[i++] = redf(c);
@ -523,14 +523,18 @@ static ox::Result<TileSheetData> normalizeTileSheet(
pixels[i * 2 + 1] = ts.pixels[i] >> 4; pixels[i * 2 + 1] = ts.pixels[i] >> 4;
} }
} }
return TileSheetData{std::move(pixels), width, height}; return TileSheetData{
.pixels = std::move(pixels),
.width = width,
.height = height
};
} }
ox::Error loadBgPalette( ox::Error loadBgPalette(
Context &ctx, Context &ctx,
size_t palBank, size_t const palBank,
CompactPalette const&palette, CompactPalette const&palette,
size_t page) noexcept { size_t const page) noexcept {
renderer::loadPalette(ctx.bgPalette, palBank * 16 * 4, ctx.bgShader, palette, page); renderer::loadPalette(ctx.bgPalette, palBank * 16 * 4, ctx.bgShader, palette, page);
return {}; return {};
} }
@ -538,14 +542,14 @@ ox::Error loadBgPalette(
ox::Error loadSpritePalette( ox::Error loadSpritePalette(
Context &ctx, Context &ctx,
CompactPalette const&palette, CompactPalette const&palette,
size_t page) noexcept { size_t const page) noexcept {
ox::Array<GLfloat, 1024> pal; ox::Array<GLfloat, 1024> pal;
renderer::loadPalette(pal, 0, ctx.spriteShader, palette, page); renderer::loadPalette(pal, 0, ctx.spriteShader, palette, page);
return {}; return {};
} }
static ox::Result<TileSheetData> buildSetTsd( static ox::Result<TileSheetData> buildSetTsd(
Context &ctx, Context const &ctx,
TileSheetSet const&set) noexcept { TileSheetSet const&set) noexcept {
auto &kctx = keelCtx(ctx.turbineCtx); auto &kctx = keelCtx(ctx.turbineCtx);
TileSheetData setTsd; TileSheetData setTsd;
@ -567,7 +571,7 @@ static ox::Result<TileSheetData> buildSetTsd(
static void copyPixels( static void copyPixels(
CompactTileSheet const&ts, CompactTileSheet const&ts,
ox::Span<uint32_t> dst, ox::Span<uint32_t> const dst,
size_t const srcPxIdx, size_t const srcPxIdx,
size_t const pxlCnt) noexcept { size_t const pxlCnt) noexcept {
size_t idx{}; size_t idx{};
@ -624,7 +628,7 @@ ox::Error loadBgTileSheet(
ox::Error loadBgTileSheet( ox::Error loadBgTileSheet(
Context &ctx, Context &ctx,
uint_t cbb, uint_t const cbb,
CompactTileSheet const&ts, CompactTileSheet const&ts,
ox::Optional<unsigned> const&paletteBank) noexcept { ox::Optional<unsigned> const&paletteBank) noexcept {
auto const bytesPerTile = static_cast<uint64_t>(PixelsPerTile / (1 + (ts.bpp == 4))); auto const bytesPerTile = static_cast<uint64_t>(PixelsPerTile / (1 + (ts.bpp == 4)));
@ -638,7 +642,7 @@ ox::Error loadBgTileSheet(
ox::Error loadBgTileSheet( ox::Error loadBgTileSheet(
Context &ctx, Context &ctx,
unsigned cbb, unsigned const cbb,
TileSheetSet const&set) noexcept { TileSheetSet const&set) noexcept {
OX_REQUIRE(setTsd, buildSetTsd(ctx, set)); OX_REQUIRE(setTsd, buildSetTsd(ctx, set));
ctx.cbbs[cbb].tex = renderer::createTexture(setTsd.width, setTsd.height, setTsd.pixels.data()); ctx.cbbs[cbb].tex = renderer::createTexture(setTsd.width, setTsd.height, setTsd.pixels.data());
@ -648,7 +652,7 @@ ox::Error loadBgTileSheet(
ox::Error loadSpriteTileSheet( ox::Error loadSpriteTileSheet(
Context &ctx, Context &ctx,
CompactTileSheet const&ts, CompactTileSheet const&ts,
bool loadDefaultPalette) noexcept { bool const loadDefaultPalette) noexcept {
OX_REQUIRE(tsd, normalizeTileSheet(ts)); OX_REQUIRE(tsd, normalizeTileSheet(ts));
oxTracef("nostalgia.gfx.gl", "loadSpriteTexture: { w: {}, h: {} }", tsd.width, tsd.height); oxTracef("nostalgia.gfx.gl", "loadSpriteTexture: { w: {}, h: {} }", tsd.width, tsd.height);
ctx.spriteBlocks.tex = renderer::createTexture(tsd.width, tsd.height, tsd.pixels.data()); ctx.spriteBlocks.tex = renderer::createTexture(tsd.width, tsd.height, tsd.pixels.data());
@ -668,9 +672,9 @@ ox::Error loadSpriteTileSheet(
void setBgTile( void setBgTile(
Context &ctx, Context &ctx,
uint_t bgIdx, uint_t const bgIdx,
int column, int const column,
int row, int const row,
BgTile const&tile) noexcept { BgTile const&tile) noexcept {
oxTracef( oxTracef(
"nostalgia.gfx.setBgTile", "nostalgia.gfx.setBgTile",
@ -698,7 +702,7 @@ void setBgTile(
cbb.updated = true; cbb.updated = true;
} }
void clearBg(Context &ctx, uint_t bgIdx) noexcept { void clearBg(Context &ctx, uint_t const bgIdx) noexcept {
auto &cbb = ctx.cbbs[static_cast<std::size_t>(bgIdx)]; auto &cbb = ctx.cbbs[static_cast<std::size_t>(bgIdx)];
initBackgroundBufferObjects(cbb); initBackgroundBufferObjects(cbb);
cbb.updated = true; cbb.updated = true;
@ -714,61 +718,59 @@ uint8_t bgStatus(Context &ctx) noexcept {
return out; return out;
} }
void setBgStatus(Context &ctx, uint32_t status) noexcept { void setBgStatus(Context &ctx, uint32_t const status) noexcept {
for (uint_t i = 0; i < ctx.cbbs.size(); ++i) { for (uint_t i = 0; i < ctx.cbbs.size(); ++i) {
ctx.backgrounds[i].enabled = (status >> i) & 1; ctx.backgrounds[i].enabled = (status >> i) & 1;
} }
} }
bool bgStatus(Context &ctx, uint_t bg) noexcept { bool bgStatus(Context &ctx, uint_t const bg) noexcept {
return ctx.backgrounds[bg].enabled; return ctx.backgrounds[bg].enabled;
} }
void setBgStatus(Context&ctx, uint_t bg, bool status) noexcept { void setBgStatus(Context&ctx, uint_t const bg, bool const status) noexcept {
ctx.backgrounds[bg].enabled = status; ctx.backgrounds[bg].enabled = status;
} }
void setBgBpp(Context&, unsigned, unsigned) noexcept {} void setBgCbb(Context &ctx, uint_t const bgIdx, uint_t const cbbIdx) noexcept {
void setBgCbb(Context &ctx, uint_t bgIdx, uint_t cbbIdx) noexcept {
auto &bg = ctx.backgrounds[bgIdx]; auto &bg = ctx.backgrounds[bgIdx];
bg.cbbIdx = cbbIdx; bg.cbbIdx = cbbIdx;
} }
void setBgPriority(Context &ctx, uint_t bgIdx, uint_t priority) noexcept { void setBgPriority(Context &ctx, uint_t const bgIdx, uint_t const priority) noexcept {
auto &bg = ctx.backgrounds[bgIdx]; auto &bg = ctx.backgrounds[bgIdx];
bg.priority = static_cast<float>(priority & 0b11); bg.priority = static_cast<float>(priority & 0b11);
} }
void hideSprite(Context &ctx, uint_t idx) noexcept { void hideSprite(Context &ctx, uint_t const idx) noexcept {
auto &s = ctx.spriteStates[idx]; auto &s = ctx.spriteStates[idx];
s.enabled = false; s.enabled = false;
renderer::setSprite(ctx, idx, s); renderer::setSprite(ctx, idx, s);
} }
void showSprite(Context &ctx, uint_t idx) noexcept { void showSprite(Context &ctx, uint_t const idx) noexcept {
auto &s = ctx.spriteStates[idx]; auto &s = ctx.spriteStates[idx];
s.enabled = true; s.enabled = true;
renderer::setSprite(ctx, idx, s); renderer::setSprite(ctx, idx, s);
} }
void setSprite(Context &ctx, uint_t idx, Sprite const&sprite) noexcept { void setSprite(Context &ctx, uint_t const idx, Sprite const&sprite) noexcept {
auto &s = ctx.spriteStates[idx]; auto &s = ctx.spriteStates[idx];
s = sprite; s = sprite;
renderer::setSprite(ctx, idx, s); renderer::setSprite(ctx, idx, s);
} }
uint_t spriteCount(Context &ctx) noexcept { uint_t spriteCount(Context const &ctx) noexcept {
return ctx.spriteCount; return ctx.spriteCount;
} }
namespace gl { namespace gl {
ox::Size drawSize(int scale) noexcept { ox::Size drawSize(int const scale) noexcept {
return {240 * scale, 160 * scale}; return {240 * scale, 160 * scale};
} }
void draw(gfx::Context &ctx, ox::Size const&renderSz) noexcept { void draw(Context &ctx, ox::Size const&renderSz) noexcept {
glViewport(0, 0, renderSz.width, renderSz.height); glViewport(0, 0, renderSz.width, renderSz.height);
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
glEnable(GL_BLEND); glEnable(GL_BLEND);
@ -783,7 +785,7 @@ void draw(gfx::Context &ctx, ox::Size const&renderSz) noexcept {
glDisable(GL_BLEND); glDisable(GL_BLEND);
} }
void draw(gfx::Context &ctx, int scale) noexcept { void draw(Context &ctx, int const scale) noexcept {
draw(ctx, drawSize(scale)); draw(ctx, drawSize(scale));
} }

31
src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp
View File

@ -118,12 +118,12 @@ void PaletteEditorImGui::navigateTo(ox::StringViewCR arg) noexcept {
} }
} }
void PaletteEditorImGui::drawColumnLeftAlign(ox::CStringView txt) noexcept { void PaletteEditorImGui::drawColumnLeftAlign(ox::CStringViewCR txt) noexcept {
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("%s", txt.c_str()); ImGui::Text("%s", txt.c_str());
} }
void PaletteEditorImGui::drawColumn(ox::CStringView txt) noexcept { void PaletteEditorImGui::drawColumn(ox::CStringViewCR txt) noexcept {
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::SetCursorPosX( ImGui::SetCursorPosX(
ImGui::GetCursorPosX() + ImGui::GetColumnWidth() - ImGui::CalcTextSize(txt.data()).x); ImGui::GetCursorPosX() + ImGui::GetColumnWidth() - ImGui::CalcTextSize(txt.data()).x);
@ -143,7 +143,15 @@ void PaletteEditorImGui::numShortcuts(size_t &val, size_t const sizeRange) noexc
} }
} }
void PaletteEditorImGui::colorInput(ox::CStringView label, int &v, bool &inputFocused) noexcept { void PaletteEditorImGui::colorInput(
ox::CStringViewCR label,
int &v,
bool &inputFocused,
FocusCmd const colorChannel) noexcept {
if (colorChannel == m_focusCmd) [[unlikely]] {
ImGui::SetKeyboardFocusHere();
m_focusCmd = FocusCmd::None;
}
ImGui::InputInt(label.c_str(), &v, 1, 5); ImGui::InputInt(label.c_str(), &v, 1, 5);
inputFocused = inputFocused || ImGui::IsItemFocused(); inputFocused = inputFocused || ImGui::IsItemFocused();
v = ox::max(v, 0); v = ox::max(v, 0);
@ -296,9 +304,9 @@ void PaletteEditorImGui::drawColorEditor() noexcept {
"Name", m_pal.colorNames[m_selectedColorRow]); "Name", m_pal.colorNames[m_selectedColorRow]);
bool inputFocused = ImGui::IsItemFocused(); bool inputFocused = ImGui::IsItemFocused();
ImGui::Separator(); ImGui::Separator();
colorInput("Red", r, inputFocused); colorInput("Red", r, inputFocused, FocusCmd::Red);
colorInput("Green", g, inputFocused); colorInput("Green", g, inputFocused, FocusCmd::Green);
colorInput("Blue", b, inputFocused); colorInput("Blue", b, inputFocused, FocusCmd::Blue);
if (ig::PushButton("Apply to all pages", {-1, ig::BtnSz.y})) { if (ig::PushButton("Apply to all pages", {-1, ig::BtnSz.y})) {
std::ignore = pushCommand<ApplyColorAllPagesCommand>( std::ignore = pushCommand<ApplyColorAllPagesCommand>(
m_pal, m_page, m_selectedColorRow); m_pal, m_page, m_selectedColorRow);
@ -309,6 +317,15 @@ void PaletteEditorImGui::drawColorEditor() noexcept {
} else { } else {
numShortcuts(m_page, m_pal.pages.size()); numShortcuts(m_page, m_pal.pages.size());
} }
if (ImGui::IsKeyDown(ImGuiKey_R)) {
m_focusCmd = FocusCmd::Red;
}
if (ImGui::IsKeyDown(ImGuiKey_G)) {
m_focusCmd = FocusCmd::Green;
}
if (ImGui::IsKeyDown(ImGuiKey_B)) {
m_focusCmd = FocusCmd::Blue;
}
} }
auto const newColor = color16(r, g, b, a); auto const newColor = color16(r, g, b, a);
if (c != newColor) { if (c != newColor) {
@ -320,7 +337,7 @@ void PaletteEditorImGui::drawColorEditor() noexcept {
} }
} }
ox::Error PaletteEditorImGui::renamePage(ox::StringView name) noexcept { ox::Error PaletteEditorImGui::renamePage(ox::StringViewCR name) noexcept {
return pushCommand<RenamePageCommand>(m_pal, m_page, name); return pushCommand<RenamePageCommand>(m_pal, m_page, name);
} }

15
src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.hpp
View File

@ -36,6 +36,13 @@ class PaletteEditorImGui: public studio::Editor {
Palette m_pal; Palette m_pal;
size_t m_selectedColorRow = 0; size_t m_selectedColorRow = 0;
size_t m_page = 0; size_t m_page = 0;
enum class FocusCmd {
None,
Red,
Green,
Blue,
};
FocusCmd m_focusCmd;
public: public:
PaletteEditorImGui(studio::Context &sctx, ox::StringParam path); PaletteEditorImGui(studio::Context &sctx, ox::StringParam path);
@ -48,9 +55,9 @@ class PaletteEditorImGui: public studio::Editor {
void navigateTo(ox::StringViewCR arg) noexcept override; void navigateTo(ox::StringViewCR arg) noexcept override;
private: private:
static void drawColumnLeftAlign(ox::CStringView txt) noexcept; static void drawColumnLeftAlign(ox::CStringViewCR txt) noexcept;
static void drawColumn(ox::CStringView txt) noexcept; static void drawColumn(ox::CStringViewCR txt) noexcept;
static void drawColumn(ox::Integer_c auto i) noexcept { static void drawColumn(ox::Integer_c auto i) noexcept {
drawColumn(ox::intToStr(i)); drawColumn(ox::intToStr(i));
@ -58,7 +65,7 @@ class PaletteEditorImGui: public studio::Editor {
static void numShortcuts(size_t &val, size_t sizeRange) noexcept; static void numShortcuts(size_t &val, size_t sizeRange) noexcept;
static void colorInput(ox::CStringView label, int &v, bool &inputFocused) noexcept; void colorInput(ox::CStringViewCR label, int &v, bool &inputFocused, FocusCmd colorChannel) noexcept;
void drawColorsEditor() noexcept; void drawColorsEditor() noexcept;
@ -66,7 +73,7 @@ class PaletteEditorImGui: public studio::Editor {
void drawColorEditor() noexcept; void drawColorEditor() noexcept;
ox::Error renamePage(ox::StringView name) noexcept; ox::Error renamePage(ox::StringViewCR name) noexcept;
ox::Error handleCommand(studio::UndoCommand const*) noexcept; ox::Error handleCommand(studio::UndoCommand const*) noexcept;
}; };

25
src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/deletetilescommand.cpp
View File

@ -8,14 +8,14 @@
namespace nostalgia::gfx { namespace nostalgia::gfx {
gfx::DeleteTilesCommand::DeleteTilesCommand( DeleteTilesCommand::DeleteTilesCommand(
TileSheet &img, TileSheet &img,
TileSheet::SubSheetIdx idx, TileSheet::SubSheetIdx idx,
std::size_t tileIdx, std::size_t const tileIdx,
std::size_t tileCnt) noexcept: std::size_t const tileCnt) noexcept:
m_img(img), m_img(img),
m_idx(std::move(idx)) { m_idx(std::move(idx)) {
const unsigned bytesPerTile = m_img.bpp == 4 ? PixelsPerTile / 2 : PixelsPerTile; constexpr unsigned bytesPerTile = PixelsPerTile;
m_deletePos = tileIdx * bytesPerTile; m_deletePos = tileIdx * bytesPerTile;
m_deleteSz = tileCnt * bytesPerTile; m_deleteSz = tileCnt * bytesPerTile;
m_deletedPixels.resize(m_deleteSz); m_deletedPixels.resize(m_deleteSz);
@ -28,16 +28,20 @@ gfx::DeleteTilesCommand::DeleteTilesCommand(
} }
} }
ox::Error gfx::DeleteTilesCommand::redo() noexcept { ox::Error DeleteTilesCommand::redo() noexcept {
auto &s = getSubSheet(m_img, m_idx); auto &s = getSubSheet(m_img, m_idx);
auto &p = s.pixels; auto &p = s.pixels;
auto srcPos = m_deletePos + m_deleteSz; auto const srcPos = m_deletePos + m_deleteSz;
auto const src = &p[srcPos];
auto const dst1 = &p[m_deletePos]; auto const dst1 = &p[m_deletePos];
auto const dst2 = &p[(p.size() - m_deleteSz)]; auto const dst2 = &p[(p.size() - m_deleteSz)];
OX_ALLOW_UNSAFE_BUFFERS_BEGIN OX_ALLOW_UNSAFE_BUFFERS_BEGIN
if (srcPos < p.size()) {
auto const src = &p[srcPos];
ox::memmove(dst1, src, p.size() - srcPos); ox::memmove(dst1, src, p.size() - srcPos);
ox::memset(dst2, 0, m_deleteSz * sizeof(decltype(p[0]))); ox::memset(dst2, 0, m_deleteSz * sizeof(decltype(p[0])));
} else {
ox::memset(dst1, 0, p.size() - m_deletePos);
}
OX_ALLOW_UNSAFE_BUFFERS_END OX_ALLOW_UNSAFE_BUFFERS_END
return {}; return {};
} }
@ -46,11 +50,14 @@ ox::Error DeleteTilesCommand::undo() noexcept {
auto &s = getSubSheet(m_img, m_idx); auto &s = getSubSheet(m_img, m_idx);
auto &p = s.pixels; auto &p = s.pixels;
auto const src = &p[m_deletePos]; auto const src = &p[m_deletePos];
auto const dst1 = &p[m_deletePos + m_deleteSz];
auto const dst2 = src;
auto const sz = p.size() - m_deletePos - m_deleteSz; auto const sz = p.size() - m_deletePos - m_deleteSz;
auto const srcPos = m_deletePos + m_deleteSz;
OX_ALLOW_UNSAFE_BUFFERS_BEGIN OX_ALLOW_UNSAFE_BUFFERS_BEGIN
if (srcPos < p.size()) {
auto const dst1 = &p[m_deletePos + m_deleteSz];
ox::memmove(dst1, src, sz); ox::memmove(dst1, src, sz);
}
auto const dst2 = src;
ox::memcpy(dst2, m_deletedPixels.data(), m_deletedPixels.size()); ox::memcpy(dst2, m_deletedPixels.data(), m_deletedPixels.size());
OX_ALLOW_UNSAFE_BUFFERS_END OX_ALLOW_UNSAFE_BUFFERS_END
return {}; return {};

19
src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/inserttilescommand.cpp
View File

@ -9,20 +9,19 @@ namespace nostalgia::gfx {
InsertTilesCommand::InsertTilesCommand( InsertTilesCommand::InsertTilesCommand(
TileSheet &img, TileSheet &img,
TileSheet::SubSheetIdx idx, TileSheet::SubSheetIdx idx,
std::size_t tileIdx, std::size_t const tileIdx,
std::size_t tileCnt) noexcept: std::size_t const tileCnt) noexcept:
m_img(img), m_img{img},
m_idx(std::move(idx)) { m_idx{std::move(idx)} {
const unsigned bytesPerTile = m_img.bpp == 4 ? PixelsPerTile / 2 : PixelsPerTile; m_insertPos = tileIdx * PixelsPerTile;
m_insertPos = tileIdx * bytesPerTile; m_insertCnt = tileCnt * PixelsPerTile;
m_insertCnt = tileCnt * bytesPerTile;
m_deletedPixels.resize(m_insertCnt); m_deletedPixels.resize(m_insertCnt);
// copy pixels to be erased // copy pixels to be erased
{ {
auto &s = getSubSheet(m_img, m_idx); auto &s = getSubSheet(m_img, m_idx);
auto &p = s.pixels; auto &p = s.pixels;
auto dst = m_deletedPixels.begin(); auto const dst = m_deletedPixels.begin();
auto src = p.begin() + p.size() - m_insertCnt; auto const src = p.begin() + p.size() - m_insertCnt;
ox::copy_n(src, m_insertCnt, dst); ox::copy_n(src, m_insertCnt, dst);
} }
} }
@ -32,7 +31,7 @@ OX_ALLOW_UNSAFE_BUFFERS_BEGIN
ox::Error InsertTilesCommand::redo() noexcept { ox::Error InsertTilesCommand::redo() noexcept {
auto &s = getSubSheet(m_img, m_idx); auto &s = getSubSheet(m_img, m_idx);
auto &p = s.pixels; auto &p = s.pixels;
auto dstPos = m_insertPos + m_insertCnt; auto const dstPos = m_insertPos + m_insertCnt;
auto const src = &p[m_insertPos]; auto const src = &p[m_insertPos];
if (dstPos < p.size()) { if (dstPos < p.size()) {
auto const dst = &p[dstPos]; auto const dst = &p[dstPos];

10
src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/palettechangecommand.cpp
View File

@ -6,14 +6,14 @@
namespace nostalgia::gfx { namespace nostalgia::gfx {
gfx::PaletteChangeCommand::PaletteChangeCommand( PaletteChangeCommand::PaletteChangeCommand(
TileSheet::SubSheetIdx idx, TileSheet::SubSheetIdx idx,
TileSheet &img, TileSheet &img,
ox::StringViewCR newPalette) noexcept: ox::StringViewCR newPalette) noexcept:
m_img(img), m_img{img},
m_idx(std::move(idx)), m_idx{std::move(idx)},
m_oldPalette(m_img.defaultPalette), m_oldPalette{m_img.defaultPalette},
m_newPalette(ox::sfmt<ox::IString<43>>("uuid://{}", newPalette)) { m_newPalette{ox::sfmt<ox::IString<43>>("uuid://{}", newPalette)} {
} }
ox::Error PaletteChangeCommand::redo() noexcept { ox::Error PaletteChangeCommand::redo() noexcept {

2
src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/updatesubsheetcommand.cpp
View File

@ -6,7 +6,7 @@
namespace nostalgia::gfx { namespace nostalgia::gfx {
gfx::UpdateSubSheetCommand::UpdateSubSheetCommand( UpdateSubSheetCommand::UpdateSubSheetCommand(
TileSheet &img, TileSheet &img,
TileSheet::SubSheetIdx idx, TileSheet::SubSheetIdx idx,
ox::StringParam name, ox::StringParam name,

2
src/olympic/keel/include/keel/context.hpp
View File

@ -12,8 +12,6 @@
namespace keel { namespace keel {
class Context;
class Context { class Context {
public: public:
ox::UPtr<ox::FileSystem> rom; ox::UPtr<ox::FileSystem> rom;

9
src/olympic/keel/src/CMakeLists.txt
View File

@ -28,7 +28,7 @@ install(
DIRECTORY DIRECTORY
../include/keel ../include/keel
DESTINATION DESTINATION
include/keel include
) )
install( install(
@ -60,4 +60,11 @@ if(TURBINE_BUILD_TYPE STREQUAL "Native")
OxClaw OxClaw
OxLogConn OxLogConn
) )
install(
TARGETS
KeelPack-AppLib
DESTINATION
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
endif() endif()

2
src/olympic/keel/src/media.cpp
View File

@ -182,7 +182,7 @@ ox::Result<ox::CStringView> uuidToPath(Context &ctx, ox::UUID const&uuid) noexce
#endif #endif
} }
ox::Error reloadAsset(keel::Context &ctx, ox::StringViewCR assetId) noexcept { ox::Error reloadAsset(Context &ctx, ox::StringViewCR assetId) noexcept {
if (beginsWith(assetId, "uuid://")) { if (beginsWith(assetId, "uuid://")) {
return ctx.assetManager.reloadAsset(substr(assetId, 7)); return ctx.assetManager.reloadAsset(substr(assetId, 7));
} else { } else {

19
src/olympic/studio/applib/src/aboutpopup.cpp
View File

@ -13,20 +13,9 @@ extern ox::String appVersion;
namespace studio { namespace studio {
AboutPopup::AboutPopup(turbine::Context &ctx) noexcept { AboutPopup::AboutPopup(turbine::Context &ctx) noexcept:
m_text = ox::sfmt("{} - {}", keelCtx(ctx).appName, olympic::appVersion); Popup("About"),
} m_text{sfmt("{} - {}", keelCtx(ctx).appName, olympic::appVersion)} {
void AboutPopup::open() noexcept {
m_stage = Stage::Opening;
}
void AboutPopup::close() noexcept {
m_stage = Stage::Closed;
}
bool AboutPopup::isOpen() const noexcept {
return m_stage == Stage::Open;
} }
void AboutPopup::draw(Context &sctx) noexcept { void AboutPopup::draw(Context &sctx) noexcept {
@ -47,7 +36,7 @@ void AboutPopup::draw(Context &sctx) noexcept {
ig::centerNextWindow(sctx.tctx); ig::centerNextWindow(sctx.tctx);
auto open = true; auto open = true;
if (ImGui::BeginPopupModal("About", &open, modalFlags)) { if (ImGui::BeginPopupModal("About", &open, modalFlags)) {
ImGui::Text("%s", m_text.c_str()); ImGui::Text("%s\n\nBuild date: %s", m_text.c_str(), __DATE__);
ImGui::NewLine(); ImGui::NewLine();
ImGui::Dummy({148.0f, 0.0f}); ImGui::Dummy({148.0f, 0.0f});
ImGui::SameLine(); ImGui::SameLine();

21
src/olympic/studio/applib/src/aboutpopup.hpp
View File

@ -13,29 +13,14 @@
namespace studio { namespace studio {
class AboutPopup: public studio::Popup { class AboutPopup final: public ig::Popup {
public:
enum class Stage {
Closed,
Opening,
Open,
};
private: private:
Stage m_stage = Stage::Closed; ox::String const m_text;
ox::String m_text;
public: public:
explicit AboutPopup(turbine::Context &ctx) noexcept; explicit AboutPopup(turbine::Context &ctx) noexcept;
void open() noexcept override; void draw(Context &sctx) noexcept override;
void close() noexcept override;
[[nodiscard]]
bool isOpen() const noexcept override;
void draw(studio::Context &sctx) noexcept override;
}; };

20
src/olympic/studio/applib/src/studioui.cpp
View File

@ -65,10 +65,7 @@ OX_MODEL_END()
StudioUI::StudioUI(turbine::Context &ctx, ox::StringParam projectDataDir) noexcept: StudioUI::StudioUI(turbine::Context &ctx, ox::StringParam projectDataDir) noexcept:
m_sctx{*this, ctx}, m_sctx{*this, ctx},
m_tctx{ctx}, m_tctx{ctx},
m_projectDataDir{std::move(projectDataDir)}, m_projectDataDir{std::move(projectDataDir)} {
m_projectExplorer{keelCtx(m_tctx)},
m_newProject{m_projectDataDir},
m_aboutPopup{m_tctx} {
{ {
ImFontConfig fontCfg; ImFontConfig fontCfg;
fontCfg.FontDataOwnedByAtlas = false; fontCfg.FontDataOwnedByAtlas = false;
@ -255,7 +252,7 @@ void StudioUI::drawMenu() noexcept {
void StudioUI::drawTabBar() noexcept { void StudioUI::drawTabBar() noexcept {
auto const viewport = ImGui::GetContentRegionAvail(); auto const viewport = ImGui::GetContentRegionAvail();
ImGui::BeginChild("TabWindow##MainWindow##Studio", ImVec2(viewport.x, viewport.y)); ImGui::BeginChild("TabWindow##MainWindow##Studio", ImVec2(viewport.x, viewport.y));
constexpr auto tabBarFlags = ImGuiTabBarFlags_Reorderable | ImGuiTabBarFlags_TabListPopupButton; constexpr auto tabBarFlags = ImGuiTabBarFlags_TabListPopupButton;
if (ImGui::BeginTabBar("TabBar##TabWindow##MainWindow##Studio", tabBarFlags)) { if (ImGui::BeginTabBar("TabBar##TabWindow##MainWindow##Studio", tabBarFlags)) {
drawTabs(); drawTabs();
ImGui::EndTabBar(); ImGui::EndTabBar();
@ -478,6 +475,18 @@ ox::Error StudioUI::handleMoveFile(ox::StringViewCR oldPath, ox::StringViewCR ne
return m_projectExplorer.refreshProjectTreeModel(); return m_projectExplorer.refreshProjectTreeModel();
} }
ox::Error StudioUI::handleDeleteDir(ox::StringViewCR path) noexcept {
auto const p = sfmt("{}/", path);
for (auto &e : m_editors) {
if (beginsWith(e->itemPath(), p)) {
oxLogError(closeFile(path));
m_closeActiveTab = true;
break;
}
}
return m_projectExplorer.refreshProjectTreeModel();
}
ox::Error StudioUI::handleDeleteFile(ox::StringViewCR path) noexcept { ox::Error StudioUI::handleDeleteFile(ox::StringViewCR path) noexcept {
for (auto &e : m_editors) { for (auto &e : m_editors) {
if (path == e->itemPath()) { if (path == e->itemPath()) {
@ -523,6 +532,7 @@ ox::Error StudioUI::openProjectPath(ox::StringParam path) noexcept {
m_newDirDialog.newDir.connect(m_sctx.project, &Project::mkdir); m_newDirDialog.newDir.connect(m_sctx.project, &Project::mkdir);
m_project->dirAdded.connect(&m_projectExplorer, &ProjectExplorer::refreshProjectTreeModel); m_project->dirAdded.connect(&m_projectExplorer, &ProjectExplorer::refreshProjectTreeModel);
m_project->fileAdded.connect(&m_projectExplorer, &ProjectExplorer::refreshProjectTreeModel); m_project->fileAdded.connect(&m_projectExplorer, &ProjectExplorer::refreshProjectTreeModel);
m_project->dirDeleted.connect(this, &StudioUI::handleDeleteDir);
m_project->fileDeleted.connect(this, &StudioUI::handleDeleteFile); m_project->fileDeleted.connect(this, &StudioUI::handleDeleteFile);
m_project->fileMoved.connect(this, &StudioUI::handleMoveFile); m_project->fileMoved.connect(this, &StudioUI::handleMoveFile);
m_openFiles.clear(); m_openFiles.clear();

8
src/olympic/studio/applib/src/studioui.hpp
View File

@ -36,7 +36,7 @@ class StudioUI: public ox::SignalHandler {
TaskRunner m_taskRunner; TaskRunner m_taskRunner;
ox::Vector<ox::UPtr<BaseEditor>> m_editors; ox::Vector<ox::UPtr<BaseEditor>> m_editors;
ox::HashMap<ox::String, EditorMaker::Func> m_editorMakers; ox::HashMap<ox::String, EditorMaker::Func> m_editorMakers;
ProjectExplorer m_projectExplorer; ProjectExplorer m_projectExplorer{keelCtx(m_tctx)};
ox::Vector<ox::String> m_openFiles; ox::Vector<ox::String> m_openFiles;
BaseEditor *m_activeEditorOnLastDraw = nullptr; BaseEditor *m_activeEditorOnLastDraw = nullptr;
BaseEditor *m_activeEditor = nullptr; BaseEditor *m_activeEditor = nullptr;
@ -45,6 +45,7 @@ class StudioUI: public ox::SignalHandler {
ox::Vector<ox::Pair<ox::String>> m_queuedMoves; ox::Vector<ox::Pair<ox::String>> m_queuedMoves;
ox::Vector<ox::Pair<ox::String>> m_queuedDirMoves; ox::Vector<ox::Pair<ox::String>> m_queuedDirMoves;
NewMenu m_newMenu{keelCtx(m_tctx)}; NewMenu m_newMenu{keelCtx(m_tctx)};
AboutPopup m_aboutPopup{m_tctx};
DeleteConfirmation m_deleteConfirmation; DeleteConfirmation m_deleteConfirmation;
NewDir m_newDirDialog; NewDir m_newDirDialog;
ig::QuestionPopup m_closeFileConfirm{"Close File?", "This file has unsaved changes. Close?"}; ig::QuestionPopup m_closeFileConfirm{"Close File?", "This file has unsaved changes. Close?"};
@ -55,8 +56,7 @@ class StudioUI: public ox::SignalHandler {
ig::MessagePopup m_messagePopup{"Message", ""}; ig::MessagePopup m_messagePopup{"Message", ""};
MakeCopyPopup m_copyFilePopup; MakeCopyPopup m_copyFilePopup;
RenameFile m_renameFile; RenameFile m_renameFile;
NewProject m_newProject; NewProject m_newProject{m_projectDataDir};
AboutPopup m_aboutPopup;
ox::Array<Widget*, 10> const m_widgets { ox::Array<Widget*, 10> const m_widgets {
&m_closeFileConfirm, &m_closeFileConfirm,
&m_closeAppConfirm, &m_closeAppConfirm,
@ -126,6 +126,8 @@ class StudioUI: public ox::SignalHandler {
ox::Error handleMoveFile(ox::StringViewCR oldPath, ox::StringViewCR newPath, ox::UUID const&id) noexcept; ox::Error handleMoveFile(ox::StringViewCR oldPath, ox::StringViewCR newPath, ox::UUID const&id) noexcept;
ox::Error handleDeleteDir(ox::StringViewCR path) noexcept;
ox::Error handleDeleteFile(ox::StringViewCR path) noexcept; ox::Error handleDeleteFile(ox::StringViewCR path) noexcept;
ox::Error createOpenProject(ox::StringViewCR path) noexcept; ox::Error createOpenProject(ox::StringViewCR path) noexcept;

5
src/olympic/studio/modlib/include/studio/project.hpp
View File

@ -23,6 +23,7 @@ enum class ProjectEvent {
// FileRecognized is triggered for all matching files upon a new // FileRecognized is triggered for all matching files upon a new
// subscription to a section of the project and upon the addition of a file. // subscription to a section of the project and upon the addition of a file.
FileRecognized, FileRecognized,
DirDeleted,
FileDeleted, FileDeleted,
FileUpdated, FileUpdated,
FileMoved, FileMoved,
@ -134,6 +135,7 @@ class Project: public ox::SignalHandler {
// file. // file.
ox::Signal<ox::Error(ox::StringViewCR)> fileRecognized; ox::Signal<ox::Error(ox::StringViewCR)> fileRecognized;
ox::Signal<ox::Error(ox::StringViewCR)> fileDeleted; ox::Signal<ox::Error(ox::StringViewCR)> fileDeleted;
ox::Signal<ox::Error(ox::StringViewCR)> dirDeleted;
ox::Signal<ox::Error(ox::StringViewCR path, ox::UUID const&id)> fileUpdated; ox::Signal<ox::Error(ox::StringViewCR path, ox::UUID const&id)> fileUpdated;
ox::Signal<ox::Error(ox::StringViewCR oldPath, ox::StringViewCR newPath, ox::UUID const&id)> fileMoved; ox::Signal<ox::Error(ox::StringViewCR oldPath, ox::StringViewCR newPath, ox::UUID const&id)> fileMoved;
@ -201,6 +203,9 @@ ox::Error Project::subscribe(ProjectEvent e, ox::SignalHandler *tgt, Functor &&s
connect(this, &Project::fileRecognized, tgt, slot); connect(this, &Project::fileRecognized, tgt, slot);
break; break;
} }
case ProjectEvent::DirDeleted:
connect(this, &Project::dirDeleted, tgt, slot);
break;
case ProjectEvent::FileDeleted: case ProjectEvent::FileDeleted:
connect(this, &Project::fileDeleted, tgt, slot); connect(this, &Project::fileDeleted, tgt, slot);
break; break;

2
src/olympic/studio/modlib/src/CMakeLists.txt
View File

@ -44,5 +44,5 @@ install(
DIRECTORY DIRECTORY
../include/studio ../include/studio
DESTINATION DESTINATION
include/studio include
) )

3
src/olympic/studio/modlib/src/filetreemodel.cpp
View File

@ -93,6 +93,9 @@ void FileTreeModel::draw(turbine::Context &tctx) const noexcept {
if (ImGui::IsItemActivated() || ImGui::IsItemClicked(1)) { if (ImGui::IsItemActivated() || ImGui::IsItemClicked(1)) {
m_explorer.setSelectedNode(this); m_explorer.setSelectedNode(this);
} }
if (ImGui::IsItemFocused() && ImGui::IsKeyPressed(ImGuiKey_Delete)) {
m_explorer.fileDeleted(m_fullPath);
}
ig::IDStackItem const idStackItem{m_name}; ig::IDStackItem const idStackItem{m_name};
m_explorer.drawDirContextMenu(m_fullPath); m_explorer.drawDirContextMenu(m_fullPath);
if (m_explorer.fileDraggable()) { if (m_explorer.fileDraggable()) {

2
src/olympic/studio/modlib/src/project.cpp
View File

@ -145,7 +145,7 @@ ox::Error Project::deleteItem(ox::StringViewCR path) noexcept {
} }
auto const err = m_fs.remove(path); auto const err = m_fs.remove(path);
if (!err) { if (!err) {
fileDeleted.emit(path); dirDeleted.emit(path);
} }
return err; return err;
} else { } else {

2
src/olympic/turbine/src/CMakeLists.txt
View File

@ -38,7 +38,7 @@ install(
DIRECTORY DIRECTORY
../include/turbine ../include/turbine
DESTINATION DESTINATION
include/turbine include
) )
install( install(

37
util/scripts/pkg-dmg.py Executable file
View File

@ -0,0 +1,37 @@
#! /usr/bin/env python3
import os
import shutil
import subprocess
import sys
def rm(path: str):
file_exists = os.path.exists(path)
is_link = os.path.islink(path)
is_dir = os.path.isdir(path)
if (file_exists or is_link) and not is_dir:
os.remove(path)
elif os.path.isdir(path):
shutil.rmtree(path)
def mkdir_p(path: str):
if not os.path.exists(path):
os.mkdir(path)
def run(args: list[str]):
if subprocess.run(args).returncode != 0:
sys.exit(1)
dmg_dir = 'dist/darwin-arm64-release/NostalgiaStudio'
dmg = f'{dmg_dir}.dmg'
rm(dmg)
rm(dmg_dir)
mkdir_p(dmg_dir)
shutil.copytree('dist/darwin-arm64-release/NostalgiaStudio.app', f'{dmg_dir}/NostalgiaStudio.app')
os.symlink('/Applications', f'{dmg_dir}/Applications')
run(['hdiutil', 'create', '-srcfolder', dmg_dir, dmg])
rm(dmg_dir)