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

Match and link CGameCubeDoll 

Former-commit-id: 496b8b4b40fe6173a5f72dc0e08bc962e8f35bd5
This commit is contained in:
Phillip Stephens 2023-10-12 18:47:31 -07:00
parent b344eead7a
commit bc5d1ac55f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -630,7 +630,7 @@ config.libs = [
Object(NonMatching, "MetroidPrime/CArtifactDoll.cpp"), Object(NonMatching, "MetroidPrime/CArtifactDoll.cpp"),
Object(NonMatching, "MetroidPrime/CProjectedShadow.cpp"), Object(NonMatching, "MetroidPrime/CProjectedShadow.cpp"),
Object(Matching, "MetroidPrime/CPreFrontEnd.cpp"), Object(Matching, "MetroidPrime/CPreFrontEnd.cpp"),
Object(NonMatching, "MetroidPrime/CGameCubeDoll.cpp"), Object(Matching, "MetroidPrime/CGameCubeDoll.cpp"),
Object( Object(
NonMatching, "MetroidPrime/ScriptObjects/CScriptProjectedShadow.cpp" NonMatching, "MetroidPrime/ScriptObjects/CScriptProjectedShadow.cpp"
), ),

12
src/MetroidPrime/CGameCubeDoll.cpp
View File

@ -12,10 +12,11 @@
#include "rstl/math.hpp" #include "rstl/math.hpp"
CGameCubeDoll::CGameCubeDoll() CGameCubeDoll::CGameCubeDoll()
: x0_model(gpSimplePool->GetObj("CMDL_GameCube")) : x0_model(gpSimplePool->GetObj("CMDL_GameCube"))
, x8_lights(1, CLight::BuildDirectional(CVector3f::Forward(), CColor(0xFFFFFFFF)), rstl::rmemory_allocator()) , x8_lights(1, CLight::BuildDirectional(CVector3f::Forward(), CColor(0xFFFFFFFF)), rstl::rmemory_allocator())
, x18_actorLights(rs_new CActorLights(8, CVector3f::Zero(), 4, 4, 0.1f, false, false, false)) , x18_actorLights(rs_new CActorLights(8, CVector3f::Zero(), 4, 4, CActorLights::kDefaultPositionUpdateThreshold, false, false, false))
, x1c_fader(0.0f) , x1c_fader(0.0f)
, x20_24_loaded(false) { , x20_24_loaded(false) {
x0_model.Lock(); x0_model.Lock();
@ -51,10 +52,13 @@ void CGameCubeDoll::Touch() {
TToken< CModel >(x0_model)->Touch(0); TToken< CModel >(x0_model)->Touch(0);
} }
/* TODO: This is in CEnergyBall, need to figure out what it is and name it appropriately */
extern float lbl_805A85E8;
void CGameCubeDoll::Update(float dt) { void CGameCubeDoll::Update(float dt) {
if (!CheckLoadComplete()) if (!CheckLoadComplete())
return; return;
x1c_fader = rstl::min_val(1.f, 2.f * dt + x1c_fader); x1c_fader = rstl::min_val(lbl_805A85E8, (dt * 2.f) + x1c_fader);
UpdateActorLights(); UpdateActorLights();
} }
@ -70,8 +74,8 @@ void CGameCubeDoll::Draw(float alpha) {
CGraphics::SetViewPointMatrix(CTransform4f::Translate(0.f, -2.f, 0.f)); CGraphics::SetViewPointMatrix(CTransform4f::Translate(0.f, -2.f, 0.f));
x18_actorLights->ActivateLights(); x18_actorLights->ActivateLights();
float f = CGraphics::GetSecondsMod900() * 360.f; float f = (CGraphics::GetSecondsMod900() * 360.f) * 0.25f;
CGraphics::SetModelMatrix(CTransform4f::RotateZ(CRelAngle::FromDegrees(-(f * 0.25f))) * CGraphics::SetModelMatrix(CTransform4f::RotateZ(CRelAngle::FromDegrees(-f)) *
CTransform4f::Scale(0.2f)); CTransform4f::Scale(0.2f));
TToken< CModel > model(x0_model); TToken< CModel > model(x0_model);