PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-07-15 16:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CActorParameters, const memes

Browse Source
This commit is contained in:
Phillip Stephens 2025-01-19 13:05:07 -08:00
parent 9e537083d9
commit cc2ffc9f42
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Dolphin/os/OSReboot.c
View File

@ -3,6 +3,7 @@
#include "dolphin/os/OSBootInfo.h" #include "dolphin/os/OSBootInfo.h"
#include "dolphin/os/OSContext.h" #include "dolphin/os/OSContext.h"
#include "dolphin/os/OSInterrupt.h" #include "dolphin/os/OSInterrupt.h"
#include "dolphin/types.h"
typedef struct ApploaderHeader { typedef struct ApploaderHeader {
// total size: 0x20 // total size: 0x20
@ -24,7 +25,7 @@ struct {
void* argsAddr; // offset 0x18, size 0x4 void* argsAddr; // offset 0x18, size 0x4
} __OSRebootParams; // size: 0x1C, address: 0x0 } __OSRebootParams; // size: 0x1C, address: 0x0
static ApploaderHeader Header; static ApploaderHeader Header ATTRIBUTE_ALIGN(32);
extern void* __OSSavedRegionStart; extern void* __OSSavedRegionStart;
extern void* __OSSavedRegionEnd; extern void* __OSSavedRegionEnd;

3
src/Kyoto/Graphics/CCubeMaterial.cpp
View File

@ -2,6 +2,7 @@
#include "Kyoto/Graphics/CGX.hpp" #include "Kyoto/Graphics/CGX.hpp"
#include "Kyoto/Graphics/CGraphics.hpp" #include "Kyoto/Graphics/CGraphics.hpp"
#include "Kyoto/Graphics/CModelFlags.hpp"
#include "Kyoto/Math/CMath.hpp" #include "Kyoto/Math/CMath.hpp"
#include <dolphin/mtx.h> #include <dolphin/mtx.h>
@ -66,7 +67,7 @@ static CTransform4f sTextureProjectionTransform = CTransform4f::Identity();
void CCubeMaterial::SetupBlendMode(uint blendFactors, const CModelFlags& flags, bool alphaTest) { void CCubeMaterial::SetupBlendMode(uint blendFactors, const CModelFlags& flags, bool alphaTest) {
GXBlendFactor newSrcFactor = static_cast< GXBlendFactor >(blendFactors & 0xFFFF); GXBlendFactor newSrcFactor = static_cast< GXBlendFactor >(blendFactors & 0xFFFF);
GXBlendFactor newDstFactor = static_cast< GXBlendFactor >(blendFactors >> 0x10); GXBlendFactor newDstFactor = static_cast< GXBlendFactor >(blendFactors >> 0x10);
CModelFlags::ETrans blendMode = flags.GetTrans(); CModelFlags::ETrans blendMode = static_cast<CModelFlags::ETrans>(flags.GetTrans());
if (alphaTest) { if (alphaTest) {
CGX::SetAlphaCompare(GX_GEQUAL, 64, GX_AOP_OR, GX_NEVER, 0); CGX::SetAlphaCompare(GX_GEQUAL, 64, GX_AOP_OR, GX_NEVER, 0);
newSrcFactor = GX_BL_ONE; newSrcFactor = GX_BL_ONE;

6
src/MetroidPrime/CActorParameters.cpp
View File

@ -19,9 +19,9 @@ CActorParameters::CActorParameters(const CLightParameters& lightParms,
const CScannableParameters& scanParms, const CScannableParameters& scanParms,
const rstl::pair< CAssetId, CAssetId >& xrayAssets, const rstl::pair< CAssetId, CAssetId >& xrayAssets,
const rstl::pair< CAssetId, CAssetId >& thermalAssets, const rstl::pair< CAssetId, CAssetId >& thermalAssets,
const CVisorParameters& visorParms, bool globalTimeProvider, const CVisorParameters& visorParms, const bool globalTimeProvider,
bool thermalHeat, bool renderUnsorted, bool noSortThermal, const bool thermalHeat, const bool renderUnsorted, const bool noSortThermal,
float fadeInTime, float fadeOutTime, float thermalMag) const float fadeInTime, const float fadeOutTime, const float thermalMag)
: x0_lighting(lightParms) : x0_lighting(lightParms)
, x40_scannable(scanParms) , x40_scannable(scanParms)
, x44_xrayAssets(xrayAssets) , x44_xrayAssets(xrayAssets)