PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to match CVector3f::Slerp 

Former-commit-id: 710a2dc991
This commit is contained in:
Phillip Stephens 2022-10-05 17:11:50 -07:00
parent 96236df954
commit 7f30b385b2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Kyoto/Math/CVector3f.cpp
View File

@ -1,8 +1,8 @@
#include "Kyoto/Math/CVector3f.hpp" #include "Kyoto/Math/CVector3f.hpp"
#include "Kyoto/Math/CloseEnough.hpp"
#include "Kyoto/Math/CMath.hpp" #include "Kyoto/Math/CMath.hpp"
#include "Kyoto/Math/CRelAngle.hpp" #include "Kyoto/Math/CRelAngle.hpp"
#include "Kyoto/Math/CloseEnough.hpp"
#include "Kyoto/Streams/CInputStream.hpp" #include "Kyoto/Streams/CInputStream.hpp"
#include "Kyoto/Streams/COutputStream.hpp" #include "Kyoto/Streams/COutputStream.hpp"
#include "types.h" #include "types.h"
@ -25,7 +25,13 @@ void CVector3f::PutTo(COutputStream& out) const {
out.WriteReal32(mZ); out.WriteReal32(mZ);
} }
CVector3f CVector3f::Slerp(const CVector3f& a, const CVector3f& b, const CRelAngle& angle) {} CVector3f CVector3f::Slerp(const CVector3f& a, const CVector3f& b, const CRelAngle& angle) {
CVector3f ab = CVector3f::Cross(a, b);
CVector3f vec = CVector3f::Cross(ab.AsNormalized(), a);
float sinAngle = sin(angle.AsRadians());
float cosAngle = cos(angle.AsRadians());
return cosAngle * a + vec * sinAngle;
}
CVector3f& CVector3f::Normalize() { CVector3f& CVector3f::Normalize() {
float mag = 1.f / Magnitude(); float mag = 1.f / Magnitude();