diff --git a/Nuake/src/Core/Physics/DynamicWorld.cpp b/Nuake/src/Core/Physics/DynamicWorld.cpp index a46deb53..4f05b26b 100644 --- a/Nuake/src/Core/Physics/DynamicWorld.cpp +++ b/Nuake/src/Core/Physics/DynamicWorld.cpp @@ -496,6 +496,11 @@ namespace Nuake void DynamicWorld::StepSimulation(Timestep ts) { + if (ts > 0.1f) + { + ts = 0.08f; + } + // Next step ++_stepCount; diff --git a/Nuake/src/Resource/Prefab.cpp b/Nuake/src/Resource/Prefab.cpp index 4f5ae5bb..a3836704 100644 --- a/Nuake/src/Resource/Prefab.cpp +++ b/Nuake/src/Resource/Prefab.cpp @@ -20,7 +20,9 @@ namespace Nuake if (FileSystem::FileExists(path, false)) { std::string prefabTextContent = FileSystem::ReadFile(path); - newPrefab->Deserialize(json::parse(prefabTextContent)); + + if(!prefabTextContent.empty()) + newPrefab->Deserialize(json::parse(prefabTextContent)); } return newPrefab; diff --git a/Nuake/src/Scene/Lighting/Environment.h b/Nuake/src/Scene/Lighting/Environment.h index d841a305..330b9c0c 100644 --- a/Nuake/src/Scene/Lighting/Environment.h +++ b/Nuake/src/Scene/Lighting/Environment.h @@ -35,14 +35,14 @@ namespace Nuake float Exposure = 3.5f; float Gamma = 1.1f; - bool BloomEnabled = false; + bool BloomEnabled = true; Scope mBloom; Scope mVolumetric; bool SSAOEnabled = true; Scope mSSAO; - bool SSREnabled = false; + bool SSREnabled = true; bool DOFEnabled = false; diff --git a/Nuake/src/Scene/Systems/WadConverter.cpp b/Nuake/src/Scene/Systems/WadConverter.cpp index f2d99a4b..e66281f4 100644 --- a/Nuake/src/Scene/Systems/WadConverter.cpp +++ b/Nuake/src/Scene/Systems/WadConverter.cpp @@ -316,7 +316,9 @@ namespace Nuake unsigned char pix = pixels[y * width + x]; if (pix >= 256 - 32) + { fullbright = true; + } textureData[y * width + x] = COL_ReadPalette(pix); } diff --git a/Runtime/Runtime.cpp b/Runtime/Runtime.cpp index 81d769ae..92a6294a 100644 --- a/Runtime/Runtime.cpp +++ b/Runtime/Runtime.cpp @@ -80,11 +80,6 @@ int ApplicationMain(int argc, char* argv[]) int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hInstPrev, LPSTR cdmline, int cmdshow) { - BOOL USE_DARK_MODE = true; - BOOL SET_IMMERSIVE_DARK_MODE_SUCCESS = SUCCEEDED(DwmSetWindowAttribute( - WINhWnd, DWMWINDOWATTRIBUTE::DWMWA_USE_IMMERSIVE_DARK_MODE, - &USE_DARK_MODE, sizeof(USE_DARK_MODE))); - return ApplicationMain(__argc, __argv); }