AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update amuse and boo

This commit is contained in:
Jack Andersen 2017-09-19 23:26:01 -10:00
parent 5797e0c773
commit 3897a91e13
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Runtime/World/CMorphBall.cpp
View File

@ -768,9 +768,25 @@ float CMorphBall::GetSpiderBallSwingControllerMovementScalar() const
return std::max(0.f, (2.4f - x1908_swingControlTime) / 1.2f); return std::max(0.f, (2.4f - x1908_swingControlTime) / 1.2f);
} }
void CMorphBall::CreateSpiderBallParticles(const zeus::CVector3f&, const zeus::CVector3f&) void CMorphBall::CreateSpiderBallParticles(const zeus::CVector3f& ballPos, const zeus::CVector3f& trackPoint)
{ {
x19d4_spiderBallMagnetEffectGen->SetParticleEmission(true);
zeus::CVector3f ballToTrack = trackPoint - ballPos;
float ballToTrackMag = ballToTrack.magnitude();
int subCount = int(ballToTrackMag / 0.2f + 1.f);
ballToTrack = ballToTrack * (1.f / float(subCount));
int count = int(8.f * (ballToTrackMag / 2.1f));
for (int i=count ; i>=0 ; --i)
{
zeus::CVector3f translation = ballPos;
for (int j=0 ; j<subCount ; ++j)
{
x19d4_spiderBallMagnetEffectGen->SetTranslation(translation);
x19d4_spiderBallMagnetEffectGen->ForceParticleCreation(1);
translation += ballToTrack;
}
}
x19d4_spiderBallMagnetEffectGen->SetParticleEmission(false);
} }
void CMorphBall::ResetSpiderBallForces() void CMorphBall::ResetSpiderBallForces()

2
Runtime/World/CMorphBall.hpp
View File

@ -205,7 +205,7 @@ public:
void ResetSpiderBallSwingControllerMovementTimer(); void ResetSpiderBallSwingControllerMovementTimer();
void UpdateSpiderBallSwingControllerMovementTimer(float movement, float dt); void UpdateSpiderBallSwingControllerMovementTimer(float movement, float dt);
float GetSpiderBallSwingControllerMovementScalar() const; float GetSpiderBallSwingControllerMovementScalar() const;
void CreateSpiderBallParticles(const zeus::CVector3f&, const zeus::CVector3f&); void CreateSpiderBallParticles(const zeus::CVector3f& ballPos, const zeus::CVector3f& trackPoint);
void ComputeMarioMovement(const CFinalInput& input, CStateManager& mgr, float dt); void ComputeMarioMovement(const CFinalInput& input, CStateManager& mgr, float dt);
void SetSpiderBallState(ESpiderBallState state) { x187c_spiderBallState = state; } void SetSpiderBallState(ESpiderBallState state) { x187c_spiderBallState = state; }
zeus::CTransform GetSwooshToWorld() const; zeus::CTransform GetSwooshToWorld() const;

2
amuse

@ -1 +1 @@
Subproject commit c6781df90a88ffd30936a45b7336761d099d4de3 Subproject commit 4b2b86f4204c22de1bca7b005d672528a5341ba8

2
hecl

@ -1 +1 @@
Subproject commit 53a34e2bba8ff2dcf2aafdbd0e64e18b5fa50ffd Subproject commit 0270b2c253785221367af1ca414fca52f3867105