AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-06-06 06:33:37 +00:00
Code Issues Projects Releases Wiki Activity

Windows fixes

Browse Source
This commit is contained in:
Jack Andersen 2018-12-07 20:46:17 -10:00
parent 636c82a568
commit 14747e39e1
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -65,7 +65,7 @@ if(MSVC)
add_definitions(-DUNICODE=1 -D_UNICODE=1 -D__SSE__=1 add_definitions(-DUNICODE=1 -D_UNICODE=1 -D__SSE__=1
-D_CRT_SECURE_NO_WARNINGS=1 -DD_SCL_SECURE_NO_WARNINGS=1 -D_CRT_SECURE_NO_WARNINGS=1 -DD_SCL_SECURE_NO_WARNINGS=1
-D_SCL_SECURE_NO_DEPRECATE=1 -D_CRT_NONSTDC_NO_WARNINGS=1 -D_SCL_SECURE_NO_DEPRECATE=1 -D_CRT_NONSTDC_NO_WARNINGS=1
/IGNORE:4221 /wd4018 /wd4800 /wd4005 /wd4311 /IGNORE:4221 /wd4018 /wd4800 /wd4005 /wd4311 /wd4068
/wd4267 /wd4244 /wd4200 /wd4305 /wd4067 /wd4146 /wd4309 /wd4805 /wd4267 /wd4244 /wd4200 /wd4305 /wd4067 /wd4146 /wd4309 /wd4805
-D_ENABLE_EXTENDED_ALIGNED_STORAGE=1 ${VS_DEFINES}) -D_ENABLE_EXTENDED_ALIGNED_STORAGE=1 ${VS_DEFINES})

1
Runtime/Character/CAnimSourceReader.hpp
View File

@ -4,6 +4,7 @@
#include "CToken.hpp" #include "CToken.hpp"
#include "CAnimSource.hpp" #include "CAnimSource.hpp"
#include "CParticleData.hpp" #include "CParticleData.hpp"
#include <set>
namespace urde { namespace urde {

3
Runtime/MP1/World/CSpankWeed.cpp
View File

@ -26,10 +26,11 @@ CSpankWeed::CSpankWeed(TUniqueId uid, std::string_view name, const CEntityInfo&
float scale = modelScale.magnitude() / std::sqrt(3.f); float scale = modelScale.magnitude() / std::sqrt(3.f);
ModelData()->SetScale(zeus::CVector3f(scale)); ModelData()->SetScale(zeus::CVector3f(scale));
zeus::simd_floats scaleF(modelScale.mSimd);
SpankLog.report(logvisor::Level::Warning, SpankLog.report(logvisor::Level::Warning,
"WARNING: Non-uniform scale (%.2f, %.2f, %.2f) applied to Spank Weed" "WARNING: Non-uniform scale (%.2f, %.2f, %.2f) applied to Spank Weed"
"...changing scale to (%.2f, %.2f, %.2f)\n", "...changing scale to (%.2f, %.2f, %.2f)\n",
modelScale.x(), modelScale.y(), modelScale.z(), scale, scale, scale); scaleF[0], scaleF[1], scaleF[2], scale, scale, scale);
} }
CMaterialList list = GetMaterialFilter().GetExcludeList(); CMaterialList list = GetMaterialFilter().GetExcludeList();
list.Add(EMaterialTypes::Character); list.Add(EMaterialTypes::Character);

2
amuse

@ -1 +1 @@
Subproject commit a7a408cc66aedc85802469ef89a72b8b7a70eb54 Subproject commit c1c47c51eb3c8ec4378520bfe872407e50c2038b

2
hecl

@ -1 +1 @@
Subproject commit 6013faad970e35c2fa990bb870bf704e55336b5d Subproject commit 82a7890e99da98fcc9770fb21c73f7837f285f66

2
specter

@ -1 +1 @@
Subproject commit 96c8824a43af0e2b65af7758d3e12d9bff146036 Subproject commit a3a3f90d8ce1d7f4c73c70c690f9bce4da69c50a