mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-12 05:28:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into 26-04-04-config

Browse Source
This commit is contained in:
PJB3005
2026-04-05 00:12:17 +02:00
parent ae42e75e1b c0f553cb12
commit 4235a5fddc
50 changed files with 1094 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/m_Do/m_Do_main.cpp
+10 -2
View File
@@ -48,6 +48,7 @@
#include "dusk/logging.h"
#include "dusk/time.h"
#include "dusk/main.h"
#include "dusk/imgui/ImGuiEngine.hpp"
#include <aurora/aurora.h>
#include <aurora/event.h>
@@ -57,7 +58,6 @@
#include "cxxopts.hpp"
#include "dusk/config.hpp"
#include "dusk/settings.hpp"
// --- GLOBALS ---
s8 mDoMain::developmentMode = -1;
@@ -158,6 +158,9 @@ void main01(void) {
case AURORA_WINDOW_RESIZED:
mDoGph_gInf_c::setWindowSize(event->windowSize);
break;
case AURORA_DISPLAY_SCALE_CHANGED:
dusk::ImGuiEngine_Initialize(event->windowSize.scale);
break;
case AURORA_EXIT:
goto exit;
}
@@ -227,6 +230,10 @@ static AuroraBackend ParseAuroraBackend(const std::string& value) {
exit(1);
}
static void aurora_imgui_init_callback(const AuroraWindowSize* size) {
dusk::ImGuiEngine_Initialize(size->scale);
}
static void ApplyCVarOverrides(const cxxopts::OptionValue& option) {
if (option.count() == 0) {
return;
@@ -261,6 +268,7 @@ static void ApplyCVarOverrides(const cxxopts::OptionValue& option) {
// =========================================================================
int game_main(int argc, char* argv[]) {
dusk::settings::Register();
dusk::config::FinishRegistration();
cxxopts::ParseResult parsed_arg_options;
@@ -301,12 +309,12 @@ int game_main(int argc, char* argv[]) {
config.windowWidth = 608 * 2;
config.windowHeight = 448 * 2;
config.desiredBackend = ParseAuroraBackend(parsed_arg_options["backend"].as<std::string>());
config.configPath = ".";
config.logCallback = &aurora_log_callback;
config.logLevel = (AuroraLogLevel)parsed_arg_options["log-level"].as<uint8_t>();
config.mem1Size = 256 * 1024 * 1024;
config.mem2Size = 24 * 1024 * 1024;
config.allowJoystickBackgroundEvents = true;
config.imGuiInitCallback = &aurora_imgui_init_callback;
auroraInfo = aurora_initialize(argc, argv, &config);