PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-09-19 01:49:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Oops, broke the build

Browse Source
This commit is contained in:
Luke Street 2025-01-29 23:43:39 -07:00
parent 636613d434
commit d39bfb5d2c
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Kyoto/PVS/CPVSVisSet.hpp
View File

@ -6,6 +6,8 @@
class CPVSVisSet { class CPVSVisSet {
public: public:
CPVSVisSet(int); CPVSVisSet(int);
// TODO: real? see CPVSAreaSet::GetLightSet
CPVSVisSet(int numBits, int numLights, const char* leafPtr);
void SetFromMemory(int numBits, int numLights, const char* leafPtr); void SetFromMemory(int numBits, int numLights, const char* leafPtr);

5
include/MetaRender/CCubeRenderer.hpp
View File

@ -141,6 +141,10 @@ public:
void Something() override; void Something() override;
void PrepareDynamicLights(const rstl::vector< CLight >& lights) override; void PrepareDynamicLights(const rstl::vector< CLight >& lights) override;
void AllocatePhazonSuitMaskTexture();
void SetRequestRGBA6(bool req) { x318_26_requestRGBA6 = req; }
private: private:
CResFactory& x8_factory; CResFactory& x8_factory;
IObjectStore& xc_objStore; IObjectStore& xc_objStore;
@ -187,7 +191,6 @@ private:
bool x318_30_inAreaDraw : 1; bool x318_30_inAreaDraw : 1;
bool x318_31_persistRGBA6 : 1; bool x318_31_persistRGBA6 : 1;
void AllocatePhazonSuitMaskTexture();
void GenerateReflectionTex(); void GenerateReflectionTex();
void GenerateFogVolumeRampTex(); void GenerateFogVolumeRampTex();
void GenerateSphereRampTex(); void GenerateSphereRampTex();

2
src/MetroidPrime/CErrorOutputWindow.cpp
View File

@ -126,7 +126,7 @@ void CErrorOutputWindow::Draw() const {
case 3: case 3:
CGraphics::SetIsBeginSceneClearFb(false); CGraphics::SetIsBeginSceneClearFb(false);
if (gpRender != NULL) { if (gpRender != NULL) {
gpRender->x318_26_requestRGBA6 = true; gpRender->SetRequestRGBA6(true);
} }
break; break;
} }

4
src/WorldFormat/CPVSAreaSet.cpp
View File

@ -37,8 +37,6 @@ rstl::auto_ptr< CPVSAreaSet > CPVSAreaSet::MakeAreaSet(const char* data, int len
const CPVSVisOctree& CPVSAreaSet::GetVisOctree(const uint) const { return x20_octree; } const CPVSVisOctree& CPVSAreaSet::GetVisOctree(const uint) const { return x20_octree; }
CPVSVisSet CPVSAreaSet::GetLightSet(int lightIdx) const { CPVSVisSet CPVSAreaSet::GetLightSet(int lightIdx) const {
CPVSVisSet ret; return CPVSVisSet(x20_octree.GetNumObjects(), x20_octree.GetNumLights(),
ret.SetFromMemory(x20_octree.GetNumObjects(), x20_octree.GetNumLights(),
x1c_lightLeaves + x10_leafSize * lightIdx); x1c_lightLeaves + x10_leafSize * lightIdx);
return ret;
} }