2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 11:07:43 +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

@@ -192,7 +192,7 @@ public:
struct CPostConstructed {
std::unique_ptr<CAreaOctTree> x0_collision;
u32 x8_collisionSize = 0;
rstl::optional<CAreaRenderOctTree> xc_octTree;
std::optional<CAreaRenderOctTree> xc_octTree;
std::vector<CMetroidModelInstance> x4c_insts;
SShader m_materialSet = {0};
// std::unique_ptr<from unknown, pointless MREA section> x5c_;