AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update zeus

This commit is contained in:
Phillip Stephens 2022-03-12 09:03:55 -08:00
parent a3d0da44e2
commit 3b5d5e1473
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Runtime/Graphics/CCubeModel.hpp
View File

@ -100,6 +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]] 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; }

6
Runtime/Graphics/CCubeRenderer.cpp
View File

@ -10,6 +10,7 @@
#include "Runtime/Graphics/CLight.hpp" #include "Runtime/Graphics/CLight.hpp"
#include "Runtime/Graphics/CMetroidModelInstance.hpp" #include "Runtime/Graphics/CMetroidModelInstance.hpp"
#include "Runtime/Graphics/CModel.hpp" #include "Runtime/Graphics/CModel.hpp"
#include "Runtime/World/CGameArea.hpp"
#include "Runtime/Particle/CParticleGen.hpp" #include "Runtime/Particle/CParticleGen.hpp"
namespace metaforce { namespace metaforce {
@ -499,9 +500,8 @@ void CCubeRenderer::HandleUnsortedModelWireframe(CAreaListItem* areaItem, CCubeM
} }
} }
void CCubeRenderer::ActivateLightsForModel(const CAreaListItem* areaItem, CCubeModel& model) { constexpr bool TestBit(const u32* words, size_t bit) { return (words[bit / 32] & (1U << (bit & 0x1f))) != 0; }
// TODO void CCubeRenderer::ActivateLightsForModel(const CAreaListItem* areaItem, CCubeModel& model) {}
}
void CCubeRenderer::AddParticleGen(CParticleGen& gen) { void CCubeRenderer::AddParticleGen(CParticleGen& gen) {
auto bounds = gen.GetBounds(); auto bounds = gen.GetBounds();

2
extern/zeus vendored

@ -1 +1 @@
Subproject commit 82a3a0def9cd31efe9b28ee9332cb2fcf1d27173 Subproject commit fc33e18b4abfacfa0cd7016013889cd9c76488dc