mirror of https://github.com/AxioDL/metaforce.git
Compile fixes & cleanup
This commit is contained in:
parent
63041d5b70
commit
3be470b7b8
|
@ -1,9 +1,5 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <compare>
|
|
||||||
#include <memory>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
#include "CToken.hpp"
|
#include "CToken.hpp"
|
||||||
#include "GCNTypes.hpp"
|
#include "GCNTypes.hpp"
|
||||||
#include "Graphics/CTexture.hpp"
|
#include "Graphics/CTexture.hpp"
|
||||||
|
|
|
@ -100,7 +100,7 @@ public:
|
||||||
bool AreTexturesLoaded() const { return x40_24_texturesLoaded; }
|
bool AreTexturesLoaded() const { return x40_24_texturesLoaded; }
|
||||||
void SetVisible(bool v) { x40_25_modelVisible = v; }
|
void SetVisible(bool v) { x40_25_modelVisible = v; }
|
||||||
bool IsVisible() const { return x40_25_modelVisible; }
|
bool IsVisible() const { return x40_25_modelVisible; }
|
||||||
[[nodiscard]] GetIndex() const { return x44_idx; }
|
[[nodiscard]] u32 GetIndex() const { return x44_idx; }
|
||||||
[[nodiscard]] CCubeSurface* GetFirstUnsortedSurface() { return x38_firstUnsortedSurf; }
|
[[nodiscard]] CCubeSurface* GetFirstUnsortedSurface() { return x38_firstUnsortedSurf; }
|
||||||
[[nodiscard]] const CCubeSurface* GetFirstUnsortedSurface() const { return x38_firstUnsortedSurf; }
|
[[nodiscard]] const CCubeSurface* GetFirstUnsortedSurface() const { return x38_firstUnsortedSurf; }
|
||||||
[[nodiscard]] CCubeSurface* GetFirstSortedSurface() { return x3c_firstSortedSurf; }
|
[[nodiscard]] CCubeSurface* GetFirstSortedSurface() { return x3c_firstSortedSurf; }
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
#include "Graphics/GX.hpp"
|
#include "Graphics/GX.hpp"
|
||||||
#include "RetroTypes.hpp"
|
#include "RetroTypes.hpp"
|
||||||
|
|
||||||
|
#include <compare>
|
||||||
|
|
||||||
namespace metaforce {
|
namespace metaforce {
|
||||||
enum class ERglTevStage : std::underlying_type_t<GX::TevStageID> {
|
enum class ERglTevStage : std::underlying_type_t<GX::TevStageID> {
|
||||||
Stage0 = GX::TEVSTAGE0,
|
Stage0 = GX::TEVSTAGE0,
|
||||||
|
|
|
@ -615,7 +615,7 @@ enum ColorSrc {
|
||||||
SRC_VTX,
|
SRC_VTX,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum LightID {
|
enum LightID : u32 {
|
||||||
LIGHT0 = 0x001,
|
LIGHT0 = 0x001,
|
||||||
LIGHT1 = 0x002,
|
LIGHT1 = 0x002,
|
||||||
LIGHT2 = 0x004,
|
LIGHT2 = 0x004,
|
||||||
|
|
Loading…
Reference in New Issue