AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 13:44:56 +00:00
Code Issues Projects Releases Wiki Activity

Windows fixes

Browse Source
This commit is contained in:
Jack Andersen
2019-01-28 22:28:35 -10:00
parent 4dd40f519e
commit ad2681f857
178 changed files with 303 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Particle/CDecalManager.cpp
View File

@@ -21,7 +21,7 @@ void CDecalManager::Initialize() {
m_DecalPool.clear();
for (int i = 0; i < 64; ++i)
m_DecalPool.emplace_back(std::experimental::optional<CDecal>{}, 0, i - 1, false);
m_DecalPool.emplace_back(rstl::optional<CDecal>{}, 0, i - 1, false);
m_FreeIndex = 63;
m_PoolInitialized = true;
@@ -39,7 +39,7 @@ void CDecalManager::Reinitialize() {
m_DecalPool.clear();
for (int i = 0; i < 64; ++i)
m_DecalPool.emplace_back(std::experimental::optional<CDecal>{}, 0, i - 1, false);
m_DecalPool.emplace_back(rstl::optional<CDecal>{}, 0, i - 1, false);
m_ActiveIndexList.clear();

4
Runtime/Particle/CDecalManager.hpp
View File

@@ -12,11 +12,11 @@ class CStateManager;
class CDecalManager {
struct SDecal {
std::experimental::optional<CDecal> x0_decal;
rstl::optional<CDecal> x0_decal;
TAreaId x70_areaId;
s8 x74_index;
bool x75_24_notIce : 1;
SDecal(const std::experimental::optional<CDecal>& decal, TAreaId aid, s8 idx, bool notIce)
SDecal(const rstl::optional<CDecal>& decal, TAreaId aid, s8 idx, bool notIce)
: x0_decal(decal), x70_areaId(aid), x74_index(idx) {
x75_24_notIce = notIce;
}

4
Runtime/Particle/CElementGen.cpp
View File

@@ -1846,9 +1846,9 @@ bool CElementGen::IsSystemDeletable() const {
return false;
}
std::experimental::optional<zeus::CAABox> CElementGen::GetBounds() const {
rstl::optional<zeus::CAABox> CElementGen::GetBounds() const {
if (GetParticleCountAll() == 0)
return std::experimental::nullopt;
return rstl::nullopt;
else
return {x2f0_systemBounds};
}

2
Runtime/Particle/CElementGen.hpp
View File

@@ -211,7 +211,7 @@ public:
const zeus::CColor& GetModulationColor() const;
float GetGeneratorRate() const { return x98_generatorRate; }
bool IsSystemDeletable() const;
std::experimental::optional<zeus::CAABox> GetBounds() const;
rstl::optional<zeus::CAABox> GetBounds() const;
u32 GetParticleCount() const;
bool SystemHasLight() const;
CLight GetLight() const;

2
Runtime/Particle/CParticleElectric.cpp
View File

@@ -684,7 +684,7 @@ bool CParticleElectric::IsSystemDeletable() const {
return true;
}
std::experimental::optional<zeus::CAABox> CParticleElectric::GetBounds() const {
rstl::optional<zeus::CAABox> CParticleElectric::GetBounds() const {
if (GetParticleCount() <= 0)
return {};
else

10
Runtime/Particle/CParticleElectric.hpp
View File

@@ -59,10 +59,10 @@ private:
int x158 = 0;
float x15c_genRem = 0.f;
zeus::CAABox x160_systemBounds = zeus::CAABox::skInvertedBox;
std::experimental::optional<zeus::CVector3f> x178_overrideIPos;
std::experimental::optional<zeus::CVector3f> x188_overrideIVel;
std::experimental::optional<zeus::CVector3f> x198_overrideFPos;
std::experimental::optional<zeus::CVector3f> x1a8_overrideFVel;
rstl::optional<zeus::CVector3f> x178_overrideIPos;
rstl::optional<zeus::CVector3f> x188_overrideIVel;
rstl::optional<zeus::CVector3f> x198_overrideFPos;
rstl::optional<zeus::CVector3f> x1a8_overrideFVel;
zeus::CColor x1b8_moduColor;
rstl::reserved_vector<bool, 32> x1bc_allocated;
rstl::reserved_vector<std::unique_ptr<CParticleSwoosh>, 32> x1e0_swooshGenerators;
@@ -126,7 +126,7 @@ public:
const zeus::CVector3f& GetGlobalScale() const;
const zeus::CColor& GetModulationColor() const;
bool IsSystemDeletable() const;
std::experimental::optional<zeus::CAABox> GetBounds() const;
rstl::optional<zeus::CAABox> GetBounds() const;
u32 GetParticleCount() const;
bool SystemHasLight() const;
CLight GetLight() const;

2
Runtime/Particle/CParticleGen.hpp
View File

@@ -49,7 +49,7 @@ public:
virtual const zeus::CColor& GetModulationColor() const = 0;
virtual float GetGeneratorRate() const { return 1.f; }
virtual bool IsSystemDeletable() const = 0;
virtual std::experimental::optional<zeus::CAABox> GetBounds() const = 0;
virtual rstl::optional<zeus::CAABox> GetBounds() const = 0;
virtual u32 GetParticleCount() const = 0;
virtual bool SystemHasLight() const = 0;
virtual CLight GetLight() const = 0;

2
Runtime/Particle/CParticleSwoosh.cpp
View File

@@ -987,7 +987,7 @@ bool CParticleSwoosh::IsSystemDeletable() const {
return true;
}
std::experimental::optional<zeus::CAABox> CParticleSwoosh::GetBounds() const {
rstl::optional<zeus::CAABox> CParticleSwoosh::GetBounds() const {
if (GetParticleCount() <= 1) {
zeus::CVector3f trans = x38_translation + xa4_globalTranslation;
return zeus::CAABox(trans, trans);

2
Runtime/Particle/CParticleSwoosh.hpp
View File

@@ -150,7 +150,7 @@ public:
const zeus::CVector3f& GetGlobalScale() const;
const zeus::CColor& GetModulationColor() const;
bool IsSystemDeletable() const;
std::experimental::optional<zeus::CAABox> GetBounds() const;
rstl::optional<zeus::CAABox> GetBounds() const;
u32 GetParticleCount() const;
bool SystemHasLight() const;
CLight GetLight() const;