2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 19:44:55 +00:00

CActorContraption fixes, better CMake dependency handling

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

View File

@@ -12,8 +12,8 @@ namespace urde {
u32 CHUDBillboardEffect::g_IndirectTexturedBillboardCount = 0;
u32 CHUDBillboardEffect::g_BillboardCount = 0;
CHUDBillboardEffect::CHUDBillboardEffect(const rstl::optional<TToken<CGenDescription>>& particle,
const rstl::optional<TToken<CElectricDescription>>& electric,
CHUDBillboardEffect::CHUDBillboardEffect(const std::optional<TToken<CGenDescription>>& particle,
const std::optional<TToken<CElectricDescription>>& electric,
TUniqueId uid, bool active, std::string_view name, float dist,
const zeus::CVector3f& scale0, const zeus::CColor& color,
const zeus::CVector3f& scale1, const zeus::CVector3f& translation)