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

Added icons and version number, disabled 8x MSAA and set default to 2x

Browse Source
This commit is contained in:
Mr-Wiseguy 2024-03-15 19:47:29 -04:00
parent 37bc904b2a
commit 3520fdfbc5
16 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -206,6 +206,17 @@ if (WIN32)
"${CMAKE_SOURCE_DIR}/lib/rt64/src/contrib/dxc/bin/x64/dxil.dll"
"${CMAKE_SOURCE_DIR}/lib/rt64/src/contrib/dxc/bin/x64/dxcompiler.dll"
$<TARGET_FILE_DIR:Zelda64Recompiled>)
set_target_properties(
Zelda64Recompiled
PROPERTIES
LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE"
LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup"
LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup"
LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup"
)
target_sources(Zelda64Recompiled PRIVATE ${CMAKE_SOURCE_DIR}/icons/app.rc)
endif()
target_link_libraries(Zelda64Recompiled PRIVATE

2
assets/config_menu.rml
View File

@ -70,7 +70,7 @@
<div>Debug</div>
<div class="tab__indicator"></div>
</tab>
<panel class="config" data-model="debug_model" data-if="debug_enabled">
<panel class="config" data-model="debug_model">
<template src="config-menu__debug" />
</panel>
</tabset>

4
assets/config_menu/graphics.rml
View File

@ -45,8 +45,8 @@
<label class="config-option__tab-label" for="msaa_2x">2x</label>
<input type="radio" name="antialiasing" data-checked="msaa_option" value="MSAA4X" id="msaa_4x" style="nav-down:#apply_button"/>
<label class="config-option__tab-label" for="msaa_4x">4x</label>
<input type="radio" name="antialiasing" data-checked="msaa_option" value="MSAA8X" id="msaa_8x" style="nav-right:none;nav-down:#apply_button"/>
<label class="config-option__tab-label" for="msaa_8x">8x</label>
<!-- <input type="radio" name="antialiasing" data-checked="msaa_option" value="MSAA8X" id="msaa_8x" style="nav-right:none;nav-down:#apply_button"/>
<label class="config-option__tab-label" for="msaa_8x">8x</label> -->
</div>
</div>
</div>

3
assets/launcher.rml
View File

@ -57,6 +57,9 @@
</button>
</div>
</div>
<div class="bottom-left">
<label>{{version_number}}</label>
</div>
</div>
</div>
</body>

2
assets/recomp.rcss
View File

File diff suppressed because one or more lines are too long

14
assets/scss/styles/components/BottomLeft.scss Normal file
View File

@ -0,0 +1,14 @@
@use 'sass:math';
.bottom-left {
display: flex;
flex-direction: row;
position: absolute;
align-items: flex-start;
justify-content: flex-start;
height: auto;
bottom: space(4);
margin: 0 space(4);
width: 100%;
max-width: space($base-modal-max-width);
}

1
assets/scss/styles/components/_components.scss
View File

@ -9,3 +9,4 @@
@import "./MenuListItem";
@import "./SubtitleTitle";
@import "./Toggle";
@import "./BottomLeft"

BIN
icons/128.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

BIN
icons/16.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
icons/256.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
icons/32.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
icons/512.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 52 KiB

BIN
icons/64.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

6
icons/app.rc Normal file
View File

@ -0,0 +1,6 @@
1 ICON DISCARDABLE "512.ico"
2 ICON DISCARDABLE "256.ico"
3 ICON DISCARDABLE "128.ico"
4 ICON DISCARDABLE "64.ico"
5 ICON DISCARDABLE "32.ico"
6 ICON DISCARDABLE "16.ico"

2
src/game/config.cpp
View File

@ -21,7 +21,7 @@ constexpr std::u8string_view sound_filename = u8"sound.json";
constexpr auto res_default = ultramodern::Resolution::Auto;
constexpr auto wm_default = ultramodern::WindowMode::Windowed;
constexpr auto ar_default = RT64::UserConfiguration::AspectRatio::Expand;
constexpr auto msaa_default = RT64::UserConfiguration::Antialiasing::MSAA4X;
constexpr auto msaa_default = RT64::UserConfiguration::Antialiasing::MSAA2X;
constexpr auto rr_default = RT64::UserConfiguration::RefreshRate::Display;
constexpr int rr_manual_default = 60;
constexpr bool developer_mode_default = false;

3
src/ui/ui_launcher.cpp
View File

@ -6,6 +6,8 @@
#include "nfd.h"
#include <filesystem>
std::string version_number = "v0.9.0";
Rml::DataModelHandle model_handle;
bool mm_rom_valid = false;
@ -101,6 +103,7 @@ public:
Rml::DataModelConstructor constructor = context->CreateDataModel("launcher_model");
constructor.Bind("mm_rom_valid", &mm_rom_valid);
constructor.Bind("version_number", &version_number);
model_handle = constructor.GetModelHandle();
}