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

Merge commit '4e94c925686cdda4b1ac777045dd7a17c7dc0329'

Browse Source
This commit is contained in:
Gary Talent
2025-02-20 20:11:03 -06:00
parent b6826f4aa4 4e94c92568
commit 7a890653ee
28 changed files with 269 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
deps/nostalgia/src/nostalgia/modules/gfx/include/nostalgia/gfx/tilesheet.hpp vendored
View File

@@ -449,7 +449,7 @@ TileSheet::SubSheet &getSubSheet(
std::size_t idxIt,
TileSheet::SubSheet &pSubsheet) noexcept;
#if defined(__GNUC__) && __GNUC__ >= 14
#if defined(__GNUC__) && __GNUC__ >= 13
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdangling-reference"
#endif
@@ -458,7 +458,7 @@ TileSheet::SubSheet const&getSubSheet(TileSheet const&ts, ox::SpanView<uint32_t>
[[nodiscard]]
TileSheet::SubSheet &getSubSheet(TileSheet &ts, ox::SpanView<uint32_t> const &idx) noexcept;
#if defined(__GNUC__) && __GNUC__ >= 14
#if defined(__GNUC__) && __GNUC__ >= 13
#pragma GCC diagnostic pop
#endif

8
deps/nostalgia/src/nostalgia/modules/gfx/src/CMakeLists.txt vendored
View File

@@ -1,5 +1,5 @@
add_library(
NostalgiaCore
NostalgiaGfx
gfx.cpp
tilesheet.cpp
)
@@ -10,12 +10,12 @@ if(NOT BUILDCORE_TARGET STREQUAL "gba")
endif()
target_include_directories(
NostalgiaCore PUBLIC
NostalgiaGfx PUBLIC
../include
)
target_link_libraries(
NostalgiaCore PUBLIC
NostalgiaGfx PUBLIC
Turbine
)
@@ -26,7 +26,7 @@ endif()
install(
TARGETS
NostalgiaCore
NostalgiaGfx
DESTINATION
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib

8
deps/nostalgia/src/nostalgia/modules/gfx/src/gba/CMakeLists.txt vendored
View File

@@ -1,15 +1,15 @@
add_library(
NostalgiaCore-GBA OBJECT
NostalgiaGfx-GBA OBJECT
context.cpp
gfx.cpp
panic.cpp
)
target_include_directories(
NostalgiaCore-GBA PUBLIC
NostalgiaGfx-GBA PUBLIC
../../include
)
target_link_libraries(
NostalgiaCore-GBA PUBLIC
NostalgiaGfx-GBA PUBLIC
TeaGBA
Keel
Turbine
@@ -17,5 +17,5 @@ target_link_libraries(
if(BUILDCORE_TARGET STREQUAL "gba")
set_source_files_properties(gfx.cpp PROPERTIES COMPILE_FLAGS -marm)
target_link_libraries(NostalgiaCore PUBLIC NostalgiaCore-GBA)
target_link_libraries(NostalgiaGfx PUBLIC NostalgiaGfx-GBA)
endif()

8
deps/nostalgia/src/nostalgia/modules/gfx/src/keel/CMakeLists.txt vendored
View File

@@ -1,18 +1,18 @@
add_library(
NostalgiaCore-Keel
NostalgiaGfx-Keel
keelmodule.cpp
typeconv.cpp
)
target_link_libraries(
NostalgiaCore-Keel PUBLIC
NostalgiaGfx-Keel PUBLIC
Keel
NostalgiaCore
NostalgiaGfx
)
install(
TARGETS
NostalgiaCore-Keel
NostalgiaGfx-Keel
DESTINATION
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib

4
deps/nostalgia/src/nostalgia/modules/gfx/src/opengl/CMakeLists.txt vendored
View File

@@ -1,9 +1,9 @@
target_sources(
NostalgiaCore PRIVATE
NostalgiaGfx PRIVATE
context.cpp
gfx.cpp
)
target_link_libraries(
NostalgiaCore PUBLIC
NostalgiaGfx PUBLIC
GlUtils
)

16
deps/nostalgia/src/nostalgia/modules/gfx/src/studio/CMakeLists.txt vendored
View File

@@ -1,25 +1,25 @@
add_library(NostalgiaCore-Studio)
add_library(NostalgiaGfx-Studio)
add_library(
NostalgiaCore-Studio-ImGui
NostalgiaGfx-Studio-ImGui
studiomodule.cpp
)
target_link_libraries(
NostalgiaCore-Studio PUBLIC
NostalgiaCore
NostalgiaGfx-Studio PUBLIC
NostalgiaGfx
Studio
)
target_link_libraries(
NostalgiaCore-Studio-ImGui PUBLIC
NostalgiaCore-Studio
NostalgiaGfx-Studio-ImGui PUBLIC
NostalgiaGfx-Studio
)
install(
TARGETS
NostalgiaCore-Studio-ImGui
NostalgiaCore-Studio
NostalgiaGfx-Studio-ImGui
NostalgiaGfx-Studio
LIBRARY DESTINATION
${NOSTALGIA_DIST_MODULE}
)

2
deps/nostalgia/src/nostalgia/modules/gfx/src/studio/paletteeditor/CMakeLists.txt vendored
View File

@@ -1,5 +1,5 @@
target_sources(
NostalgiaCore-Studio-ImGui PRIVATE
NostalgiaGfx-Studio-ImGui PRIVATE
paletteeditor-imgui.cpp
)

2
deps/nostalgia/src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/CMakeLists.txt vendored
View File

@@ -1,6 +1,6 @@
target_sources(
NostalgiaCore-Studio PRIVATE
NostalgiaGfx-Studio PRIVATE
addcolorcommand.cpp
addpagecommand.cpp
applycolorallpagescommand.cpp

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

@@ -1,5 +1,5 @@
target_sources(
NostalgiaCore-Studio PRIVATE
NostalgiaGfx-Studio PRIVATE
tilesheeteditorview.cpp
tilesheeteditormodel.cpp
tilesheetpixelgrid.cpp
@@ -7,12 +7,12 @@ target_sources(
)
target_sources(
NostalgiaCore-Studio-ImGui PRIVATE
NostalgiaGfx-Studio-ImGui PRIVATE
tilesheeteditor-imgui.cpp
)
target_link_libraries(
NostalgiaCore-Studio-ImGui PUBLIC
NostalgiaGfx-Studio-ImGui PUBLIC
lodepng
)

2
deps/nostalgia/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/CMakeLists.txt vendored
View File

@@ -1,5 +1,5 @@
target_sources(
NostalgiaCore-Studio PRIVATE
NostalgiaGfx-Studio PRIVATE
addsubsheetcommand.cpp
cutpastecommand.cpp
deletetilescommand.cpp

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

@@ -18,14 +18,13 @@
#include "commands/drawcommand.hpp"
#include "commands/flipcommand.hpp"
#include "commands/inserttilescommand.hpp"
#include "commands/movesubsheetcommand.hpp"
#include "commands/palettechangecommand.hpp"
#include "commands/rmsubsheetcommand.hpp"
#include "commands/rotatecommand.hpp"
#include "commands/updatesubsheetcommand.hpp"
#include "tilesheeteditormodel.hpp"
#include "commands/movesubsheetcommand.hpp"
#include "commands/rotatecommand.hpp"
namespace nostalgia::gfx {
// delete pixels of all non-leaf nodes

8
deps/nostalgia/src/nostalgia/modules/gfx/src/tilesheet.cpp vendored
View File

@@ -187,7 +187,7 @@ TileSheet::SubSheetIdx validateSubSheetIdx(TileSheet const&ts, TileSheet::SubShe
return validateSubSheetIdx(std::move(idx), 0, ts.subsheet);
}
#if defined(__GNUC__) && __GNUC__ >= 14
#if defined(__GNUC__) && __GNUC__ >= 13
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdangling-reference"
#endif
@@ -204,7 +204,7 @@ static TileSheet::SubSheet const&getSubSheet(
}
return getSubSheet(idx, idxIt + 1, pSubsheet.subsheets[currentIdx]);
}
#if defined(__GNUC__) && __GNUC__ >= 14
#if defined(__GNUC__) && __GNUC__ >= 13
#pragma GCC diagnostic pop
#endif
@@ -218,7 +218,7 @@ TileSheet::SubSheet &getSubSheet(
return getSubSheet(idx, idxIt + 1, pSubsheet.subsheets[idx[idxIt]]);
}
#if defined(__GNUC__) && __GNUC__ >= 14
#if defined(__GNUC__) && __GNUC__ >= 13
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdangling-reference"
#endif
@@ -229,7 +229,7 @@ TileSheet::SubSheet const&getSubSheet(TileSheet const &ts, ox::SpanView<uint32_t
TileSheet::SubSheet &getSubSheet(TileSheet &ts, ox::SpanView<uint32_t> const &idx) noexcept {
return gfx::getSubSheet(idx, 0, ts.subsheet);
}
#if defined(__GNUC__) && __GNUC__ >= 14
#if defined(__GNUC__) && __GNUC__ >= 13
#pragma GCC diagnostic pop
#endif

8
deps/nostalgia/src/nostalgia/modules/gfx/test/CMakeLists.txt vendored
View File

@@ -1,11 +1,11 @@
add_executable(
NostalgiaCoreTest
NostalgiaGfxTest
tests.cpp
)
target_link_libraries(
NostalgiaCoreTest
NostalgiaCore
NostalgiaGfxTest
NostalgiaGfx
)
add_test("[NostalgiaCore] readWriteTileSheet" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/NostalgiaCoreTest readWriteTileSheet)
add_test("[NostalgiaGfx] readWriteTileSheet" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/NostalgiaGfxTest readWriteTileSheet)