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

Merge branch 'master' of https://github.com/AxioDL/urde

Browse Source
This commit is contained in:
Jack Andersen
2017-08-12 22:19:33 -10:00
parent e25d2a423d 11d4aad746
commit 02f8f77b57
177 changed files with 830 additions and 729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
Runtime/World/ScriptLoader.cpp
View File

@@ -198,10 +198,10 @@ CActorParameters ScriptLoader::LoadActorParameters(CInputStream& in)
if (propCount > 5)
sParams = LoadScannableParameters(in);
ResId xrayModel = in.readUint32Big();
ResId xraySkin = in.readUint32Big();
ResId infraModel = in.readUint32Big();
ResId infraSkin = in.readUint32Big();
CAssetId xrayModel = in.readUint32Big();
CAssetId xraySkin = in.readUint32Big();
CAssetId infraModel = in.readUint32Big();
CAssetId infraSkin = in.readUint32Big();
bool b1 = true;
if (propCount > 7)
@@ -235,11 +235,11 @@ CActorParameters ScriptLoader::LoadActorParameters(CInputStream& in)
if (propCount > 13)
f3 = in.readFloatBig();
std::pair<ResId, ResId> xray = {};
std::pair<CAssetId, CAssetId> xray = {};
if (g_ResFactory->GetResourceTypeById(xrayModel))
xray = {xrayModel, xraySkin};
std::pair<ResId, ResId> infra = {};
std::pair<CAssetId, CAssetId> infra = {};
if (g_ResFactory->GetResourceTypeById(infraModel))
infra = {infraModel, infraSkin};
@@ -319,7 +319,7 @@ CLightParameters ScriptLoader::LoadLightParameters(CInputStream& in)
CAnimationParameters ScriptLoader::LoadAnimationParameters(CInputStream& in)
{
ResId ancs = in.readUint32Big();
CAssetId ancs = in.readUint32Big();
s32 charIdx = in.readUint32Big();
u32 defaultAnim = in.readUint32Big();
return CAnimationParameters(ancs, charIdx, defaultAnim);
@@ -388,7 +388,7 @@ CEntity* ScriptLoader::LoadActor(CStateManager& mgr, CInputStream& in, int propC
CDamageVulnerability dVuln(in);
ResId staticId = in.readUint32Big();
CAssetId staticId = in.readUint32Big();
CAnimationParameters aParms = LoadAnimationParameters(in);
CActorParameters actParms = LoadActorParameters(in);
@@ -567,8 +567,8 @@ CEntity* ScriptLoader::LoadEffect(CStateManager& mgr, CInputStream& in, int prop
SScaledActorHead head = LoadScaledActorHead(in, mgr);
ResId partId = in.readUint32Big();
ResId elscId = in.readUint32Big();
CAssetId partId = in.readUint32Big();
CAssetId elscId = in.readUint32Big();
bool b1 = in.readBool();
bool b2 = in.readBool();
bool b3 = in.readBool();
@@ -613,14 +613,14 @@ CEntity* ScriptLoader::LoadPlatform(CStateManager& mgr, CInputStream& in, int pr
zeus::CVector3f centroid;
centroid.readBig(in);
ResId staticId = in.readUint32Big();
CAssetId staticId = in.readUint32Big();
CAnimationParameters aParms = LoadAnimationParameters(in);
CActorParameters actParms = LoadActorParameters(in);
float f1 = in.readFloatBig();
bool b1 = in.readBool();
ResId dclnId = in.readUint32Big();
CAssetId dclnId = in.readUint32Big();
CHealthInfo hInfo(in);
@@ -897,7 +897,7 @@ CEntity* ScriptLoader::LoadPickup(CStateManager& mgr, CInputStream& in, int prop
float f1 = in.readFloatBig();
float f2 = in.readFloatBig();
float f3 = in.readFloatBig();
ResId staticModel = in.readUint32Big();
CAssetId staticModel = in.readUint32Big();
CAnimationParameters animParms = LoadAnimationParameters(in);
CActorParameters actorParms = LoadActorParameters(in);
bool active = in.readBool();
@@ -985,7 +985,7 @@ CEntity* ScriptLoader::LoadBeetle(CStateManager& mgr, CInputStream& in, int prop
float f1 = in.readFloatBig();
CDamageVulnerability dVuln1(in);
CDamageVulnerability dVuln2(in);
ResId abdomen = in.readUint32Big();
CAssetId abdomen = in.readUint32Big();
MP1::CBeetle::EEntranceType entrance = MP1::CBeetle::EEntranceType(in.readUint32Big());
float f2 = in.readFloatBig();
float f3 = in.readFloatBig();
@@ -1014,7 +1014,7 @@ CEntity* ScriptLoader::LoadHUDMemo(CStateManager& mgr, CInputStream& in, int pro
CScriptHUDMemo::EDisplayType displayType = CScriptHUDMemo::EDisplayType::MessageBox;
if (propCount == 6)
displayType = CScriptHUDMemo::EDisplayType(in.readUint32Big());
ResId message = in.readUint32Big();
CAssetId message = in.readUint32Big();
bool active = in.readBool();
return new CScriptHUDMemo(mgr.AllocateUniqueId(), name, info, hParms, displayType, message, active);
@@ -1035,7 +1035,7 @@ CEntity* ScriptLoader::LoadCameraFilterKeyframe(CStateManager& mgr, CInputStream
color.readRGBABig(in);
float timeIn = in.readFloatBig();
float timeOut = in.readFloatBig();
ResId txtr = in.readUint32Big();
CAssetId txtr = in.readUint32Big();
return new CScriptCameraFilterKeyframe(mgr.AllocateUniqueId(), name, info, type, shape, filterIdx, unk,
color, timeIn, timeOut, txtr, active);
@@ -1111,9 +1111,9 @@ CEntity* ScriptLoader::LoadDamageableTrigger(CStateManager& mgr, CInputStream& i
CDamageVulnerability dVuln(in);
u32 triggerFlags = in.readUint32Big();
triggerFlags = TransformDamagableTriggerFlags(mgr, info.GetAreaId(), triggerFlags);
ResId w1 = in.readUint32Big();
ResId w2 = in.readUint32Big();
ResId w3 = in.readUint32Big();
CAssetId w1 = in.readUint32Big();
CAssetId w2 = in.readUint32Big();
CAssetId w3 = in.readUint32Big();
CScriptDamageableTrigger::ECanOrbit canOrbit = CScriptDamageableTrigger::ECanOrbit(in.readBool());
bool active = in.readBool();
CVisorParameters vParms = LoadVisorParameters(in);
@@ -1136,9 +1136,9 @@ CEntity* ScriptLoader::LoadDebris(CStateManager& mgr, CInputStream& in, int prop
float f4 = in.readFloatBig();
CScriptDebris::EScaleType scaleType = CScriptDebris::EScaleType(in.readUint32Big());
bool b1 = in.readBool();
ResId model = in.readUint32Big();
CAssetId model = in.readUint32Big();
CActorParameters aParams = LoadActorParameters(in);
ResId w3 = in.readUint32Big();
CAssetId w3 = in.readUint32Big();
zeus::CVector3f v2 = zeus::CVector3f::ReadBig(in);
bool b2 = in.readBool();
bool b3 = in.readBool();
@@ -1201,12 +1201,12 @@ CEntity* ScriptLoader::LoadWater(CStateManager& mgr, CInputStream& in, int propC
ETriggerFlags::DetectProjectiles6 | ETriggerFlags::DetectProjectiles7;
bool thermalCold = in.readBool();
bool displaySurface = in.readBool();
ResId patternMap1 = in.readUint32Big();
ResId patternMap2 = in.readUint32Big();
ResId colorMap = in.readUint32Big();
ResId bumpMap = in.readUint32Big();
ResId _envMap = in.readUint32Big();
ResId _envBumpMap = in.readUint32Big();
CAssetId patternMap1 = in.readUint32Big();
CAssetId patternMap2 = in.readUint32Big();
CAssetId colorMap = in.readUint32Big();
CAssetId bumpMap = in.readUint32Big();
CAssetId _envMap = in.readUint32Big();
CAssetId _envBumpMap = in.readUint32Big();
zeus::CVector3f _bumpLightDir;
_bumpLightDir.readBig(in);
@@ -1235,11 +1235,11 @@ CEntity* ScriptLoader::LoadWater(CStateManager& mgr, CInputStream& in, int propC
splashColor.readRGBABig(in);
zeus::CColor unkColor;
unkColor.readRGBABig(in);
ResId splashParticle1 = in.readUint32Big();
ResId splashParticle2 = in.readUint32Big();
ResId splashParticle3 = in.readUint32Big();
ResId particle4 = in.readUint32Big();
ResId particle5 = in.readUint32Big();
CAssetId splashParticle1 = in.readUint32Big();
CAssetId splashParticle2 = in.readUint32Big();
CAssetId splashParticle3 = in.readUint32Big();
CAssetId particle4 = in.readUint32Big();
CAssetId particle5 = in.readUint32Big();
u32 unkSfx = in.readUint32Big();
u32 visorRunoffSfx = in.readUint32Big();
u32 splashSfx1 = in.readUint32Big();
@@ -1257,7 +1257,7 @@ CEntity* ScriptLoader::LoadWater(CStateManager& mgr, CInputStream& in, int propC
float fogSpeed = in.readFloatBig();
zeus::CColor fogColor;
fogColor.readRGBABig(in);
ResId lightmap = in.readUint32Big();
CAssetId lightmap = in.readUint32Big();
float unitsPerLightmapTexel = in.readFloatBig();
float alphaInTime = in.readFloatBig();
float alphaOutTime = in.readFloatBig();
@@ -1280,17 +1280,17 @@ CEntity* ScriptLoader::LoadWater(CStateManager& mgr, CInputStream& in, int propC
zeus::CAABox box(-extent * 0.5f, extent * 0.5f);
ResId envBumpMap = -1;
CAssetId envBumpMap;
if (bumpMap == -1)
envBumpMap = _envBumpMap;
ResId envMap = -1;
CAssetId envMap;
if (bumpMap == -1)
envMap = _envMap;
return new CScriptWater(
mgr, mgr.AllocateUniqueId(), name, info, position, box, dInfo, orientedForce, triggerFlags, thermalCold,
displaySurface, patternMap1, patternMap2, colorMap, bumpMap, envMap, envBumpMap, -1, bumpLightDir, bumpScale,
displaySurface, patternMap1, patternMap2, colorMap, bumpMap, envMap, envBumpMap, {}, bumpLightDir, bumpScale,
morphInTime, morphOutTime, active, fluidType, b4, alpha, uvMotion, turbSpeed, turbDistance, turbFreqMax,
turbFreqMin, turbPhaseMax, turbPhaseMin, turbAmplitudeMax, turbAmplitudeMin, splashColor, unkColor,
splashParticle1, splashParticle2, splashParticle3, particle4, particle5, unkSfx, visorRunoffSfx, splashSfx1,
@@ -1318,9 +1318,9 @@ CEntity* ScriptLoader::LoadWarWasp(CStateManager& mgr, CInputStream& in, int pro
CActorParameters actorParms = LoadActorParameters(in);
CPatterned::EColliderType collider = CPatterned::EColliderType(in.readBool());
CDamageInfo damageInfo1(in);
ResId weaponDesc = in.readUint32Big();
CAssetId weaponDesc = in.readUint32Big();
CDamageInfo damageInfo2(in);
ResId particle = in.readUint32Big();
CAssetId particle = in.readUint32Big();
u32 w1 = in.readUint32Big();
const CAnimationParameters& aParms = pInfo.GetAnimationParameters();
@@ -1648,23 +1648,23 @@ CEntity* ScriptLoader::LoadDebrisExtended(CStateManager& mgr, CInputStream& in,
zeus::CVector3f v2 = zeus::CVector3f::ReadBig(in);
ResId model = in.readUint32Big();
CAssetId model = in.readUint32Big();
CActorParameters aParam = LoadActorParameters(in);
ResId particle1 = in.readUint32Big();
CAssetId particle1 = in.readUint32Big();
zeus::CVector3f particle1Scale = zeus::CVector3f::ReadBig(in);
bool particle1B1 = in.readBool();
bool particle1B2 = in.readBool();
CScriptDebris::EOrientationType particle1W = CScriptDebris::EOrientationType(in.readUint32Big());
ResId particle2 = in.readUint32Big();
CAssetId particle2 = in.readUint32Big();
zeus::CVector3f particle2Scale = zeus::CVector3f::ReadBig(in);
bool particle2B1 = in.readBool();
bool particle2B2 = in.readBool();
CScriptDebris::EOrientationType particle2W = CScriptDebris::EOrientationType(in.readUint32Big());
ResId particle3 = in.readUint32Big();
CAssetId particle3 = in.readUint32Big();
zeus::CVector3f particle3Scale = zeus::CVector3f::ReadBig(in);
CScriptDebris::EOrientationType particle3W = CScriptDebris::EOrientationType(in.readUint32Big());
@@ -1801,7 +1801,7 @@ CEntity* ScriptLoader::LoadAreaAttributes(CStateManager& mgr, CInputStream& in,
float thermalHeat = in.readFloatBig();
float xrayFogDistance = in.readFloatBig();
float worldLightingLevel = in.readFloatBig();
ResId skybox = in.readUint32Big();
CAssetId skybox = in.readUint32Big();
EPhazonType phazonType = EPhazonType(in.readUint32Big());
return new CScriptAreaAttributes(mgr.AllocateUniqueId(), info, showSkybox, fxType, envFxDensity, thermalHeat,
@@ -1852,17 +1852,17 @@ CEntity* ScriptLoader::LoadWorldTeleporter(CStateManager& mgr, CInputStream& in,
std::string name = mgr.HashInstanceName(in);
bool active = in.readBool();
ResId worldId = in.readUint32Big();
ResId areaId = in.readUint32Big();
CAssetId worldId = in.readUint32Big();
CAssetId areaId = in.readUint32Big();
if (propCount == 4)
return new CScriptWorldTeleporter(mgr.AllocateUniqueId(), name, info, active, worldId, areaId);
CAnimationParameters animParms = LoadAnimationParameters(in);
zeus::CVector3f playerScale = zeus::CVector3f::ReadBig(in);
ResId platformModel = in.readUint32Big();
CAssetId platformModel = in.readUint32Big();
zeus::CVector3f platformScale = zeus::CVector3f::ReadBig(in);
ResId backgroundModel = in.readUint32Big();
CAssetId backgroundModel = in.readUint32Big();
zeus::CVector3f backgroundScale = zeus::CVector3f::ReadBig(in);
bool upElevator = in.readBool();
@@ -1870,8 +1870,8 @@ CEntity* ScriptLoader::LoadWorldTeleporter(CStateManager& mgr, CInputStream& in,
u8 volume = (propCount < 13 ? u8(127) : u8(in.readUint32Big()));
u8 panning = (propCount < 14 ? u8(64) : u8(in.readUint32Big()));
bool showText = (propCount < 15 ? false : in.readBool());
ResId fontId = (propCount < 16 ? kInvalidResId : in.readUint32Big());
ResId stringId = (propCount < 17 ? kInvalidResId : in.readUint32Big());
CAssetId fontId = (propCount < 16 ? CAssetId() : in.readUint32Big());
CAssetId stringId = (propCount < 17 ? CAssetId() : in.readUint32Big());
bool fadeWhite = (propCount < 18 ? false : in.readBool());
float charFadeInTime = (propCount < 19 ? 0.1f : in.readFloatBig());
float charsPerSecond = (propCount < 20 ? 16.f : in.readFloatBig());
@@ -2234,7 +2234,7 @@ CEntity* ScriptLoader::LoadActorContraption(CStateManager& mgr, CInputStream& in
CDamageVulnerability dVuln(in);
CAnimationParameters animParams(in);
CActorParameters actParams = LoadActorParameters(in);
ResId flameFxId = in.readUint32Big();
CAssetId flameFxId = in.readUint32Big();
CDamageInfo dInfo(in);
bool active = in.readBool();