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

Initial CCollisionActor imps, minor cleanup

Browse Source
This commit is contained in:
Phillip Stephens
2017-02-20 19:29:28 -08:00
parent 50fe6d34ab
commit fc51cd38aa
17 changed files with 444 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Runtime/World/CActorParameters.hpp
View File

@@ -11,7 +11,7 @@ namespace urde
class CActorParameters
{
friend class ScriptLoader;
CLightParameters x4_lightParms;
CLightParameters x0_lightParms;
CScannableParameters x40_scanParms;
std::pair<ResId, ResId> x44_xrayAssets = {};
std::pair<ResId, ResId> x4c_thermalAssets = {};
@@ -23,15 +23,23 @@ class CActorParameters
float x5c_;
float x60_;
float x64_;
public:
CActorParameters()
: b1(true), b2(false), b3(false), b4(false) {}
CActorParameters() : b1(true), b2(false), b3(false), b4(false) {}
CActorParameters(const CLightParameters& lightParms, const CScannableParameters& scanParms,
const std::pair<ResId, ResId>& xrayAssets, const std::pair<ResId, ResId>& thermalAssets,
const CVisorParameters& visorParms, bool a, bool b, bool c, bool d)
: x4_lightParms(lightParms), x40_scanParms(scanParms),
x44_xrayAssets(xrayAssets), x4c_thermalAssets(thermalAssets),
x54_visorParms(visorParms), b1(a), b2(b), b3(c), b4(d) {}
: x0_lightParms(lightParms)
, x40_scanParms(scanParms)
, x44_xrayAssets(xrayAssets)
, x4c_thermalAssets(thermalAssets)
, x54_visorParms(visorParms)
, b1(a)
, b2(b)
, b3(c)
, b4(d)
{
}
CActorParameters Scannable(const CScannableParameters& sParms) const
{
CActorParameters aParms = *this;
@@ -39,12 +47,12 @@ public:
return aParms;
}
static CActorParameters None() {return CActorParameters();}
static CActorParameters None() { return CActorParameters(); }
void SetVisorParameters(const CVisorParameters& vParams) { x54_visorParms = vParams; }
CVisorParameters GetVisorParameters() const { return x54_visorParms; }
const CVisorParameters& GetVisorParameters() const { return x54_visorParms; }
const CLightParameters& GetLightParameters() const { return x0_lightParms; }
};
}
#endif // __URDE_CACTORPARAMETERS_HPP__