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

Implement CActorLights::BuildAreaLightList

Browse Source
This commit is contained in:
Jack Andersen
2017-04-09 20:57:00 -10:00
parent 9cd421888d
commit 84578e9909
20 changed files with 477 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Runtime/World/ScriptLoader.cpp
View File

@@ -281,34 +281,35 @@ CLightParameters ScriptLoader::LoadLightParameters(CInputStream& in)
float d = in.readFloatBig();
float e = in.readFloatBig();
zeus::CColor col;
col.readRGBABig(in);
zeus::CColor noLightsAmbient;
noLightsAmbient.readRGBABig(in);
bool f = in.readBool();
bool makeLights = in.readBool();
CLightParameters::EWorldLightingOptions lightOpts = CLightParameters::EWorldLightingOptions(in.readUint32Big());
CLightParameters::ELightRecalculationOptions recalcOpts =
CLightParameters::ELightRecalculationOptions(in.readUint32Big());
zeus::CVector3f vec;
vec.readBig(in);
zeus::CVector3f actorPosBias;
actorPosBias.readBig(in);
s32 w1 = -1;
s32 w2 = -1;
s32 maxDynamicLights = -1;
s32 maxAreaLights = -1;
if (propCount >= 12)
{
w1 = in.readUint32Big();
w2 = in.readUint32Big();
maxDynamicLights = in.readUint32Big();
maxAreaLights = in.readUint32Big();
}
bool b1 = false;
bool ambientChannelOverflow = false;
if (propCount >= 13)
b1 = in.readBool();
ambientChannelOverflow = in.readBool();
s32 w3 = 0;
s32 layerIdx = 0;
if (propCount >= 14)
w3 = in.readUint32Big();
layerIdx = in.readUint32Big();
return CLightParameters(a, b, shadowTess, d, e, col, f, lightOpts, recalcOpts, vec, w1, w2, b1, w3);
return CLightParameters(a, b, shadowTess, d, e, noLightsAmbient, makeLights, lightOpts, recalcOpts, actorPosBias,
maxDynamicLights, maxAreaLights, ambientChannelOverflow, layerIdx);
}
return CLightParameters::None();
}