AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-15 02:46:10 +00:00
Code Issues Projects Releases Wiki Activity

Runtime: Windows compile fixes

Browse Source
This commit is contained in:
Luke Street
2022-05-03 20:27:19 -04:00
parent b9376280aa
commit 21f54ca09d
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Character/CSkinRules.cpp
View File

@@ -102,7 +102,7 @@ void CVirtualBone::BuildAccumulatedTransform(const CPoseAsTransforms& pose, cons
x50_rotation = pose.GetRotation(x0_weights[0].x0_id);
}
static constexpr zeus::CMatrix3f WeightedMatrix(const zeus::CMatrix3f& m1, float w1, const zeus::CMatrix3f& m2, float w2) {
static inline zeus::CMatrix3f WeightedMatrix(const zeus::CMatrix3f& m1, float w1, const zeus::CMatrix3f& m2, float w2) {
return {
m1[0] * w1 + m2[0] * w2,
m1[1] * w1 + m2[1] * w2,
@@ -110,7 +110,7 @@ static constexpr zeus::CMatrix3f WeightedMatrix(const zeus::CMatrix3f& m1, float
};
}
static constexpr zeus::CVector3f WeightedVector(const zeus::CVector3f& v1, float w1, const zeus::CVector3f& v2, float w2) {
static inline zeus::CVector3f WeightedVector(const zeus::CVector3f& v1, float w1, const zeus::CVector3f& v2, float w2) {
return v1 * w1 + v2 * w2;
}