AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-11 13:47:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into utf8

Browse Source 
# Conflicts:
#	DataSpec/DNAMP1/FRME.cpp
#	DataSpec/DNAMP1/MLVL.cpp
#	Runtime/CMain.cpp
#	hecl/lib/Blender/Connection.cpp
This commit is contained in:
Luke Street
2021-10-25 19:03:01 -04:00
parent a4394f2b95 cddbfc45d1
commit 32e115f4aa
28 changed files with 481 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Runtime/CMain.cpp
View File

@@ -13,6 +13,9 @@
#include "../version.h"
//#include <fenv.h>
//#pragma STDC FENV_ACCESS ON
/* Static reference to dataspec additions
* (used by MSVC to definitively link DataSpecs) */
#include "DataSpecRegistry.hpp"
@@ -461,7 +464,7 @@ public:
using delta_duration = std::chrono::duration<float, std::ratio<1>>;
realDt = std::chrono::duration_cast<delta_duration>(now - m_prevFrameTime).count();
if (m_cvarCommons.m_variableDt->toBoolean()) {
dt = std::max(realDt, 1 / 30.f);
dt = std::min(realDt, 1 / 30.f);
}
}
m_prevFrameTime = now;
@@ -576,6 +579,10 @@ static bool IsClientLoggingEnabled(int argc, char** argv) {
#if !WINDOWS_STORE
int main(int argc, char** argv) {
//TODO: This seems to fix a lot of weird issues with rounding
// but breaks animations, need to research why this is the case
// for now it's disabled
//fesetround(FE_TOWARDZERO);
if (argc > 1 && !hecl::StrCmp(argv[1], "--dlpackage")) {
fmt::print(FMT_STRING("{}\n"), METAFORCE_DLPACKAGE);
return 100;