|
51 | 51 | #endif |
52 | 52 |
|
53 | 53 | const float imguiScaleOptionToValue[4] = { 0.75f, 1.0f, 1.5f, 2.0f }; |
| 54 | +std::shared_ptr<Fast::Fast3dWindow> gsFast3dWindow; |
54 | 55 | const uint32_t defaultImGuiScale = 1; |
55 | 56 | int32_t previousImGuiScaleIndex = -1; |
56 | 57 | float previousImGuiScale = defaultImGuiScale; |
@@ -129,27 +130,32 @@ GameEngine::GameEngine() : dictionary(nullptr) { |
129 | 130 | // ShipDeviceIndexMappingManager::UpdateControllerNamesFromConfig() |
130 | 131 |
|
131 | 132 | auto controlDeck = std::make_shared<LUS::ControlDeck>(); |
| 133 | + this->context->InitControlDeck(controlDeck); |
132 | 134 |
|
133 | 135 | this->context->InitResourceManager(archiveFiles, {}, 3); |
134 | 136 | this->context->InitConsole(); |
135 | 137 |
|
136 | | - auto window = std::make_shared<Fast::Fast3dWindow>(std::vector<std::shared_ptr<Ship::GuiWindow>>({})); |
| 138 | +#if (_DEBUG) |
| 139 | + auto defaultLogLevel = spdlog::level::trace; |
| 140 | +#else |
| 141 | + auto defaultLogLevel = spdlog::level::info; |
| 142 | +#endif |
| 143 | + auto logLevel = |
| 144 | + static_cast<spdlog::level::level_enum>(CVarGetInteger(CVAR_DEVELOPER_TOOLS("LogLevel"), defaultLogLevel)); |
| 145 | + context->InitLogging(logLevel, logLevel); |
| 146 | + Ship::Context::GetInstance()->GetLogger()->set_pattern("[%H:%M:%S.%e] [%s:%#] [%l] %v"); |
137 | 147 |
|
138 | | - this->context->Init(archiveFiles, {}, 3, { 32000, 512, 1100 }, window, controlDeck); |
| 148 | + gsFast3dWindow = std::make_shared<Fast::Fast3dWindow>(std::vector<std::shared_ptr<Ship::GuiWindow>>({})); |
| 149 | + this->context->InitWindow(gsFast3dWindow); |
139 | 150 |
|
140 | | -#ifndef __SWITCH__ |
141 | | - Ship::Context::GetInstance()->GetLogger()->set_level( |
142 | | - (spdlog::level::level_enum)CVarGetInteger("gDeveloperTools.LogLevel", 1)); |
143 | | - Ship::Context::GetInstance()->GetLogger()->set_pattern("[%H:%M:%S.%e] [%s:%#] [%l] %v"); |
144 | | -#endif |
| 151 | + context->InitGfxDebugger(); |
| 152 | + context->InitFileDropMgr(); |
145 | 153 |
|
146 | | - Ship::Context::GetInstance()->GetLogger()->set_level( |
147 | | - (spdlog::level::level_enum)CVarGetInteger("gDeveloperTools.LogLevel", 1)); |
148 | | - Ship::Context::GetInstance()->GetLogger()->set_pattern("[%H:%M:%S.%e] [%s:%#] [%l] %v"); |
| 154 | + this->context->InitAudio({ .SampleRate = 32000, .SampleLength = 512, .DesiredBuffered = 1100 }); |
149 | 155 |
|
150 | | - window->SetTargetFps(60); |
151 | | - window->SetMaximumFrameLatency(1); |
152 | | - window->SetRendererUCode(ucode_f3d); |
| 156 | + gsFast3dWindow->SetTargetFps(60); |
| 157 | + gsFast3dWindow->SetMaximumFrameLatency(1); |
| 158 | + gsFast3dWindow->SetRendererUCode(ucode_f3d); |
153 | 159 |
|
154 | 160 | auto loader = context->GetResourceManager()->GetResourceLoader(); |
155 | 161 | auto blobFactory = std::make_shared<Ship::ResourceFactoryBinaryBlobV0>(); |
|
0 commit comments