From 6e2c135b477fd52ce8ba8158845a81695961a108 Mon Sep 17 00:00:00 2001 From: Vulpovile Date: Mon, 3 Oct 2022 11:26:56 -0700 Subject: [PATCH 1/3] Tied physics to FPS --- src/source/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/source/Application.cpp b/src/source/Application.cpp index 2a9de34..453a062 100644 --- a/src/source/Application.cpp +++ b/src/source/Application.cpp @@ -353,7 +353,7 @@ void Application::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) { } for(int i = 0; i < 6; i++) { - _dataModel->getEngine()->step(sdt*2); + _dataModel->getEngine()->step(0.1F); } onLogic(); From a04c178ed4b0aa21c4b08d00ad0af9ced9c1c45d Mon Sep 17 00:00:00 2001 From: Vulpovile Date: Mon, 3 Oct 2022 17:19:30 -0700 Subject: [PATCH 2/3] Made crash dialog not override AVE on debug --- Dialogs.rc | 2 ++ src/source/main.cpp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Dialogs.rc b/Dialogs.rc index 882bd1c..781658b 100644 --- a/Dialogs.rc +++ b/Dialogs.rc @@ -47,5 +47,7 @@ IDI_ICON1 ICON "FatB3dIcon.ico" // // Manifest resources // +#ifndef _DEBUG LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 RT_MANIFEST ".\\Blocks3D.exe.manifest" +#endif \ No newline at end of file diff --git a/src/source/main.cpp b/src/source/main.cpp index 541355c..6eade86 100644 --- a/src/source/main.cpp +++ b/src/source/main.cpp @@ -148,7 +148,9 @@ LRESULT CALLBACK G3DProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) int main(int argc, char** argv) { +#ifndef _DEBUG try{ +#endif hresult = OleInitialize(NULL); /* IInternetSecurityManager *pSecurityMgr; @@ -214,10 +216,12 @@ int main(int argc, char** argv) { Globals::mainHwnd = hwndMain; Application app = Application(hwndMain); app.run(); +#ifndef _DEBUG } catch(...) { OnError(-1); } +#endif return 0; } From ad741b86e5eb340270acf530c2a80a605495c0fc Mon Sep 17 00:00:00 2001 From: Vulpovile Date: Mon, 3 Oct 2022 17:20:33 -0700 Subject: [PATCH 3/3] Updated gitignore to not ignore manifest --- .gitignore | 2 -- Blocks3D.exe.manifest | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 Blocks3D.exe.manifest diff --git a/.gitignore b/.gitignore index e137ba9..36a1686 100644 --- a/.gitignore +++ b/.gitignore @@ -36,8 +36,6 @@ *.user *.pdb *.idb -*.manifest -*.htm *.res *.ilk *.dep diff --git a/Blocks3D.exe.manifest b/Blocks3D.exe.manifest new file mode 100644 index 0000000..7b1b764 --- /dev/null +++ b/Blocks3D.exe.manifest @@ -0,0 +1,14 @@ + + + + + + + + + \ No newline at end of file