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

CActorContraption fixes, better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Weapon/CPlasmaProjectile.hpp
View File

@@ -83,7 +83,7 @@ private:
boo::ObjToken<boo::ITexture> tex,
boo::ObjToken<boo::ITexture> glowTex);
};
mutable rstl::optional<RenderObjects> m_renderObjs;
mutable std::optional<RenderObjects> m_renderObjs;
void SetLightsActive(bool active, CStateManager& mgr);
void CreatePlasmaLights(u32 sourceId, const CLight& l, CStateManager& mgr);
@@ -94,8 +94,8 @@ private:
void RenderBeam(s32 subdivs, float width, const zeus::CColor& color, s32 flags,
CColoredStripShader& shader) const;
float UpdateBeamState(float dt, CStateManager& mgr);
void MakeBillboardEffect(const rstl::optional<TToken<CGenDescription>>& particle,
const rstl::optional<TToken<CElectricDescription>>& electric,
void MakeBillboardEffect(const std::optional<TToken<CGenDescription>>& particle,
const std::optional<TToken<CElectricDescription>>& electric,
std::string_view name, CStateManager& mgr);
void UpdatePlayerEffects(float dt, CStateManager& mgr);
public: