The-Homebrew-Cloud/Zelda64Recomp
2
0
Fork 0
mirror of https://github.com/Mr-Wiseguy/Zelda64Recomp.git synced 2024-11-22 04:59:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add lunasvg and enable SVG support in RmlUi, fix color endianness for RmlUi generated images

Browse Source
This commit is contained in:
Mr-Wiseguy 2024-01-09 19:55:15 -05:00
parent 6e771ba1bf
commit d6e9d2e94d
5 changed files with 126 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -13,3 +13,6 @@
[submodule "lib/mm-decomp"] [submodule "lib/mm-decomp"]
path = lib/mm-decomp path = lib/mm-decomp
url = https://github.com/zeldaret/mm url = https://github.com/zeldaret/mm
[submodule "lib/lunasvg"]
path = lib/lunasvg
url = https://github.com/sammycage/lunasvg

8
CMakeLists.txt
View File

@ -16,6 +16,13 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/lib/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/lib/")
add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RT64-HLE ${CMAKE_BINARY_DIR}/rt64) add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RT64-HLE ${CMAKE_BINARY_DIR}/rt64)
# set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}")
set(BUILD_SHARED_LIBS OFF)
SET(LUNASVG_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
add_subdirectory(${CMAKE_SOURCE_DIR}/lib/lunasvg)
# set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}")
SET(ENABLE_SVG_PLUGIN ON CACHE BOOL "" FORCE)
add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RmlUi) add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RmlUi)
add_subdirectory(${CMAKE_SOURCE_DIR}/lib/nativefiledialog-extended) add_subdirectory(${CMAKE_SOURCE_DIR}/lib/nativefiledialog-extended)
@ -157,6 +164,7 @@ target_link_libraries(MMRecomp PRIVATE
RmlCore RmlCore
RmlDebugger RmlDebugger
nfd nfd
lunasvg
) )
# TODO fix the RT64 CMake script so that this doesn't need to be duplicated here # TODO fix the RT64 CMake script so that this doesn't need to be duplicated here

103
assets/mask.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 46 KiB

1
lib/lunasvg Submodule

@ -0,0 +1 @@
Subproject commit 73cc40b482d0adad226ad101bff40d8ffa69ffeb

15
src/ui/ui_renderer.cpp
View File

@ -97,8 +97,10 @@ class RmlRenderInterface_RT64 : public Rml::RenderInterface {
static constexpr uint32_t initial_upload_buffer_size = 1024 * 1024; static constexpr uint32_t initial_upload_buffer_size = 1024 * 1024;
static constexpr uint32_t initial_vertex_buffer_size = 512 * sizeof(Rml::Vertex); static constexpr uint32_t initial_vertex_buffer_size = 512 * sizeof(Rml::Vertex);
static constexpr uint32_t initial_index_buffer_size = 1024 * sizeof(int); static constexpr uint32_t initial_index_buffer_size = 1024 * sizeof(int);
static constexpr RT64::RenderFormat RmlTextureFormat = RT64::RenderFormat::B8G8R8A8_UNORM; static constexpr RT64::RenderFormat RmlTextureFormat = RT64::RenderFormat::R8G8B8A8_UNORM;
static constexpr RT64::RenderFormat RmlTextureFormatBgra = RT64::RenderFormat::B8G8R8A8_UNORM;
static constexpr uint32_t RmlTextureFormatBytesPerPixel = RenderFormatSize(RmlTextureFormat); static constexpr uint32_t RmlTextureFormatBytesPerPixel = RenderFormatSize(RmlTextureFormat);
static_assert(RenderFormatSize(RmlTextureFormatBgra) == RmlTextureFormatBytesPerPixel);
struct UIRenderContext* render_context_; struct UIRenderContext* render_context_;
int scissor_x_ = 0; int scissor_x_ = 0;
int scissor_y_ = 0; int scissor_y_ = 0;
@ -433,7 +435,7 @@ public:
texture_dimensions.y = size_y; texture_dimensions.y = size_y;
texture_handle = texture_count_++; texture_handle = texture_count_++;
create_texture(texture_handle, reinterpret_cast<const Rml::byte*>(file_data.data() + 18), texture_dimensions, true); create_texture(texture_handle, reinterpret_cast<const Rml::byte*>(file_data.data() + 18), texture_dimensions, true, true);
return true; return true;
} }
@ -442,13 +444,18 @@ public:
} }
bool GenerateTexture(Rml::TextureHandle& texture_handle, const Rml::byte* source, const Rml::Vector2i& source_dimensions) override { bool GenerateTexture(Rml::TextureHandle& texture_handle, const Rml::byte* source, const Rml::Vector2i& source_dimensions) override {
if (source_dimensions.x == 0 || source_dimensions.y == 0) {
texture_handle = 0;
return true;
}
texture_handle = texture_count_++; texture_handle = texture_count_++;
return create_texture(texture_handle, source, source_dimensions); return create_texture(texture_handle, source, source_dimensions);
} }
bool create_texture(Rml::TextureHandle texture_handle, const Rml::byte* source, const Rml::Vector2i& source_dimensions, bool flip_y = false) { bool create_texture(Rml::TextureHandle texture_handle, const Rml::byte* source, const Rml::Vector2i& source_dimensions, bool flip_y = false, bool bgra = false) {
std::unique_ptr<RT64::RenderTexture> texture = std::unique_ptr<RT64::RenderTexture> texture =
render_context_->device->createTexture(RT64::RenderTextureDesc::Texture2D(source_dimensions.x, source_dimensions.y, 1, RmlTextureFormat)); render_context_->device->createTexture(RT64::RenderTextureDesc::Texture2D(source_dimensions.x, source_dimensions.y, 1, bgra ? RmlTextureFormatBgra : RmlTextureFormat));
if (texture != nullptr) { if (texture != nullptr) {
uint32_t image_size_bytes = source_dimensions.x * source_dimensions.y * RmlTextureFormatBytesPerPixel; uint32_t image_size_bytes = source_dimensions.x * source_dimensions.y * RmlTextureFormatBytesPerPixel;