2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 15:47:46 +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

@@ -2,7 +2,7 @@
#include "hecl/Runtime.hpp"
#include "hecl/Backend.hpp"
#include "optional.hpp"
#include <optional>
#include "zeus/CVector3f.hpp"
#include "zeus/CColor.hpp"
#include "Graphics/CGraphics.hpp"

View File

@@ -7,7 +7,7 @@ namespace urde {
class CWorldShadowShader {
boo::ObjToken<boo::ITextureR> m_tex;
rstl::optional<CTexturedQuadFilter> m_prevQuad;
std::optional<CTexturedQuadFilter> m_prevQuad;
u32 m_w, m_h;
struct Uniform {