2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-11 08:27:43 +00:00

Initial CCollisionActor imps, minor cleanup

This commit is contained in:
2017-02-20 19:29:28 -08:00
parent 50fe6d34ab
commit fc51cd38aa
17 changed files with 444 additions and 26 deletions

View File

@@ -5,6 +5,7 @@
#include "Audio/CSfxManager.hpp"
#include "TCastTo.hpp"
#include "Character/IAnimReader.hpp"
#include "Character/CActorLights.hpp"
namespace urde
{
@@ -12,9 +13,9 @@ static CMaterialList MakeActorMaterialList(const CMaterialList& materialList, co
{
CMaterialList ret = materialList;
if (params.GetVisorParameters().x0_28_b3)
ret.Add(EMaterialTypes::Mud);
ret.Add(EMaterialTypes::Unknown46);
if (params.GetVisorParameters().x0_29_b4)
ret.Add(EMaterialTypes::Glass);
ret.Add(EMaterialTypes::ScanPassthrough);
return ret;
}
@@ -305,4 +306,10 @@ SAdvancementDeltas CActor::UpdateAnimation(float, CStateManager&, bool)
{
return {};
}
void CActor::SetActorLights(std::unique_ptr<CActorLights> lights)
{
x90_actorLights = std::move(lights);
xe4_31_lightsDirty = true;
}
}