AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 14:24:56 +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
Download Patch File Download Diff File Expand all files Collapse all files

1
Runtime/Character/CAnimSourceReader.hpp
View File

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

5
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);
ModelData()->SetScale(zeus::CVector3f(scale));
zeus::simd_floats scaleF(modelScale.mSimd);
SpankLog.report(logvisor::Level::Warning,
"WARNING: Non-uniform scale (%.2f, %.2f, %.2f) applied to Spank Weed"
"...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();
list.Add(EMaterialTypes::Character);
@@ -320,4 +321,4 @@ void CSpankWeed::KnockBack(const zeus::CVector3f& backVec, CStateManager& mgr, c
float CSpankWeed::GetPlayerDistance(CStateManager& mgr) const {
return (mgr.GetPlayer().GetTranslation() - x5a8_lockonTarget).magSquared();
}
} // namespace urde::MP1
} // namespace urde::MP1