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

Use ECameraFilterStage

This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-17 20:52:49 +03:00
parent 45aa20e25e
commit 4f7c5ec7e2
No known key found for this signature in database
GPG Key ID: E224F951761145F8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/MetroidPrime/CStateManager.hpp
View File

@ -149,10 +149,6 @@ public:
CEnvFxManager* EnvFxManager() { return x880_envFxManager; }
const CEnvFxManager* GetEnvFxManager() const { return x880_envFxManager; }
CRumbleManager* GetRumbleManager() { return x88c_rumbleManager; }
CCameraFilterPass& CameraFilterPass(int idx) { return xb84_camFilterPasses[idx]; }
const CCameraFilterPass& GetCameraFilterPass(int idx) const { return xb84_camFilterPasses[idx]; }
CCameraBlurPass& CameraBlurPass(int idx) { return xd14_camBlurPasses[idx]; }
const CCameraBlurPass& GetCameraBlurPass(int idx) const { return xd14_camBlurPasses[idx]; }
CRandom16* GetActiveRandom() const { return x900_random; }
@ -165,6 +161,10 @@ public:
return xb84_camFilterPasses[size_t(stage)];
}
CCameraBlurPass& CameraBlurPass(ECameraFilterStage idx) { return xd14_camBlurPasses[idx]; }
const CCameraBlurPass& GetCameraBlurPass(ECameraFilterStage idx) const { return xd14_camBlurPasses[idx]; }
float GetThermalColdScale1() const { return xf24_thermColdScale1; }
float GetThermalColdScale2() const { return xf28_thermColdScale2; }

4
src/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.cpp
View File

@ -23,12 +23,12 @@ void CScriptCameraBlurKeyframe::AcceptScriptMsg(EScriptObjectMessage msg, TUniqu
switch (msg) {
case kSM_Increment:
if (GetActive()) {
stateMgr.CameraBlurPass(3).SetBlur(x34_type, x38_amount, x40_timeIn, false);
stateMgr.CameraBlurPass(CStateManager::kCFS_Three).SetBlur(x34_type, x38_amount, x40_timeIn, false);
}
break;
case kSM_Decrement:
if (GetActive()) {
stateMgr.CameraBlurPass(3).DisableBlur(x44_timeOut);
stateMgr.CameraBlurPass(CStateManager::kCFS_Three).DisableBlur(x44_timeOut);
}
break;
default: