AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 04:27:42 +00:00
Code Issues Projects Releases Wiki Activity

Various bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2017-11-29 15:22:46 -10:00
parent 7951cb1ee0
commit 7cd3e8f502
9 changed files with 125 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Runtime/Character/CActorLights.cpp
View File

@@ -36,7 +36,7 @@ CActorLights::CActorLights(u32 areaUpdateFramePeriod, const zeus::CVector3f& act
void CActorLights::BuildConstantAmbientLighting()
{
x299_26_ = true;
x299_26_ambientOnly = true;
x298_24_dirty = true;
x29c_shadowLightArrIdx = -1;
x2a0_shadowLightIdx = -1;
@@ -44,7 +44,7 @@ void CActorLights::BuildConstantAmbientLighting()
void CActorLights::BuildConstantAmbientLighting(const zeus::CColor& color)
{
x299_26_ = false;
x299_26_ambientOnly = false;
x288_ambientColor = color;
x294_aid = kInvalidAreaId;
x298_24_dirty = true;
@@ -454,7 +454,7 @@ bool CActorLights::BuildAreaLightList(const CStateManager& mgr, const CGameArea&
void CActorLights::BuildDynamicLightList(const CStateManager& mgr, const zeus::CAABox& aabb)
{
UpdateBrightLight();
x299_26_ = false;
x299_26_ambientOnly = false;
x144_dynamicLights.clear();
if (!x29a_findNearestDynamicLights)
@@ -506,7 +506,10 @@ void CActorLights::BuildDynamicLightList(const CStateManager& mgr, const zeus::C
std::vector<CLight> CActorLights::BuildLightVector() const
{
std::vector<CLight> lights;
lights.push_back(CLight::BuildLocalAmbient(zeus::CVector3f::skZero, x288_ambientColor));
zeus::CColor ambColor = x288_ambientColor;
ambColor.a = 1.f;
lights.push_back(CLight::BuildLocalAmbient(zeus::CVector3f::skZero, ambColor));
if (x0_areaLights.size())
{
@@ -543,9 +546,10 @@ void CActorLights::ActivateLights(CBooModel& model) const
if (x298_28_inArea)
{
if (!x298_26_hasAreaLights || !x299_26_)
if (!x298_26_hasAreaLights || x299_26_ambientOnly)
{
g_Renderer->SetAmbientColor(zeus::CColor::skWhite);
//g_Renderer->SetAmbientColor(zeus::CColor::skWhite);
lights.push_back(CLight::BuildLocalAmbient(zeus::CVector3f::skZero, zeus::CColor::skWhite));
model.ActivateLights(lights);
return;
}

2
Runtime/Character/CActorLights.hpp
View File

@@ -35,7 +35,7 @@ class CActorLights
bool x298_31_disableWorldLights : 1;
bool x299_24_inBrightLight : 1;
bool x299_25_useBrightLightLag : 1;
bool x299_26_ : 1;
bool x299_26_ambientOnly : 1;
};
u16 _dummy = 0;
};