PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-08-19 15:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some updates (#19)

Browse Source
This commit is contained in:
Luke Street 2025-05-09 12:53:41 -06:00 committed by GitHub
parent eb29f75407
commit 8f91d0820c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/GM8E01_00/symbols.txt
View File

@ -292,7 +292,7 @@ __dt__Q24rstl43single_ptr<Q27CPlayer19CPlayerStuckTracker>Fv = .text:0x80010874;
__dt__Q27CPlayer19CPlayerStuckTrackerFv = .text:0x800108CC; // type:function size:0x1CC scope:global __dt__Q27CPlayer19CPlayerStuckTrackerFv = .text:0x800108CC; // type:function size:0x1CC scope:global
IsTransparent__7CPlayerCFv = .text:0x80010A98; // type:function size:0x18 scope:global IsTransparent__7CPlayerCFv = .text:0x80010A98; // type:function size:0x18 scope:global
IsEnergyLow__7CPlayerCFRC13CStateManager = .text:0x80010AB0; // type:function size:0x7C scope:global IsEnergyLow__7CPlayerCFRC13CStateManager = .text:0x80010AB0; // type:function size:0x7C scope:global
FinishNewScan__7CPlayerFR13CStateManager = .text:0x80010B2C; // type:function size:0x12C scope:global UpdateSlideShowUnlocking__7CPlayerFR13CStateManager = .text:0x80010B2C; // type:function size:0x12C scope:global
GetAttachedActorStruggle__7CPlayerCFv = .text:0x80010C58; // type:function size:0x8 scope:global GetAttachedActorStruggle__7CPlayerCFv = .text:0x80010C58; // type:function size:0x8 scope:global
StartSamusVoiceSfx__7CPlayerFUssi = .text:0x80010C60; // type:function size:0xD0 scope:global StartSamusVoiceSfx__7CPlayerFUssi = .text:0x80010C60; // type:function size:0xD0 scope:global
DoPostCameraStuff__7CPlayerFfR13CStateManager = .text:0x80010D30; // type:function size:0x1D4 scope:global DoPostCameraStuff__7CPlayerFfR13CStateManager = .text:0x80010D30; // type:function size:0x1D4 scope:global
@ -302,7 +302,7 @@ DoSfxEffects__7CPlayerF10CSfxHandle = .text:0x8001118C; // type:function size:0x
UpdatePhazonDamage__7CPlayerFfR13CStateManager = .text:0x800111D4; // type:function size:0x578 scope:global UpdatePhazonDamage__7CPlayerFfR13CStateManager = .text:0x800111D4; // type:function size:0x578 scope:global
__dt__17CCollidableSphereFv = .text:0x8001174C; // type:function size:0x5C scope:global __dt__17CCollidableSphereFv = .text:0x8001174C; // type:function size:0x5C scope:global
__dt__19CCollisionPrimitiveFv = .text:0x800117A8; // type:function size:0x48 scope:global __dt__19CCollisionPrimitiveFv = .text:0x800117A8; // type:function size:0x48 scope:global
UpdatePhazonCameraShake__7CPlayerFfR13CStateManager = .text:0x800117F0; // type:function size:0x154 scope:global UpdateEnvironmentDamageCameraShake__7CPlayerFfR13CStateManager = .text:0x800117F0; // type:function size:0x154 scope:global
DecrementEnvironmentDamage__7CPlayerFv = .text:0x80011944; // type:function size:0x18 scope:global DecrementEnvironmentDamage__7CPlayerFv = .text:0x80011944; // type:function size:0x18 scope:global
IncrementEnvironmentDamage__7CPlayerFv = .text:0x8001195C; // type:function size:0x24 scope:global IncrementEnvironmentDamage__7CPlayerFv = .text:0x8001195C; // type:function size:0x24 scope:global
DoPreThink__7CPlayerFfR13CStateManager = .text:0x80011980; // type:function size:0x84 scope:global DoPreThink__7CPlayerFfR13CStateManager = .text:0x80011980; // type:function size:0x84 scope:global

4
config/GM8E01_01/symbols.txt
View File

@ -292,7 +292,7 @@ __dt__Q24rstl43single_ptr<Q27CPlayer19CPlayerStuckTracker>Fv = .text:0x800108F0;
__dt__Q27CPlayer19CPlayerStuckTrackerFv = .text:0x80010948; // type:function size:0x1CC scope:global __dt__Q27CPlayer19CPlayerStuckTrackerFv = .text:0x80010948; // type:function size:0x1CC scope:global
IsTransparent__7CPlayerCFv = .text:0x80010B14; // type:function size:0x18 scope:global IsTransparent__7CPlayerCFv = .text:0x80010B14; // type:function size:0x18 scope:global
IsEnergyLow__7CPlayerCFRC13CStateManager = .text:0x80010B2C; // type:function size:0x7C scope:global IsEnergyLow__7CPlayerCFRC13CStateManager = .text:0x80010B2C; // type:function size:0x7C scope:global
FinishNewScan__7CPlayerFR13CStateManager = .text:0x80010BA8; // type:function size:0x12C scope:global UpdateSlideShowUnlocking__7CPlayerFR13CStateManager = .text:0x80010BA8; // type:function size:0x12C scope:global
GetAttachedActorStruggle__7CPlayerCFv = .text:0x80010CD4; // type:function size:0x8 scope:global GetAttachedActorStruggle__7CPlayerCFv = .text:0x80010CD4; // type:function size:0x8 scope:global
StartSamusVoiceSfx__7CPlayerFUssi = .text:0x80010CDC; // type:function size:0xD0 scope:global StartSamusVoiceSfx__7CPlayerFUssi = .text:0x80010CDC; // type:function size:0xD0 scope:global
DoPostCameraStuff__7CPlayerFfR13CStateManager = .text:0x80010DAC; // type:function size:0x1D4 scope:global DoPostCameraStuff__7CPlayerFfR13CStateManager = .text:0x80010DAC; // type:function size:0x1D4 scope:global
@ -302,7 +302,7 @@ DoSfxEffects__7CPlayerF10CSfxHandle = .text:0x80011208; // type:function size:0x
UpdatePhazonDamage__7CPlayerFfR13CStateManager = .text:0x80011250; // type:function size:0x578 scope:global UpdatePhazonDamage__7CPlayerFfR13CStateManager = .text:0x80011250; // type:function size:0x578 scope:global
__dt__17CCollidableSphereFv = .text:0x800117C8; // type:function size:0x5C scope:global __dt__17CCollidableSphereFv = .text:0x800117C8; // type:function size:0x5C scope:global
__dt__19CCollisionPrimitiveFv = .text:0x80011824; // type:function size:0x48 scope:global __dt__19CCollisionPrimitiveFv = .text:0x80011824; // type:function size:0x48 scope:global
UpdatePhazonCameraShake__7CPlayerFfR13CStateManager = .text:0x8001186C; // type:function size:0x154 scope:global UpdateEnvironmentDamageCameraShake__7CPlayerFfR13CStateManager = .text:0x8001186C; // type:function size:0x154 scope:global
DecrementEnvironmentDamage__7CPlayerFv = .text:0x800119C0; // type:function size:0x18 scope:global DecrementEnvironmentDamage__7CPlayerFv = .text:0x800119C0; // type:function size:0x18 scope:global
IncrementEnvironmentDamage__7CPlayerFv = .text:0x800119D8; // type:function size:0x24 scope:global IncrementEnvironmentDamage__7CPlayerFv = .text:0x800119D8; // type:function size:0x24 scope:global
DoPreThink__7CPlayerFfR13CStateManager = .text:0x800119FC; // type:function size:0x84 scope:global DoPreThink__7CPlayerFfR13CStateManager = .text:0x800119FC; // type:function size:0x84 scope:global

4
config/GM8E01_48/symbols.txt
View File

@ -292,7 +292,7 @@ __dt__Q24rstl43single_ptr<Q27CPlayer19CPlayerStuckTracker>Fv = .text:0x800108E8;
__dt__Q27CPlayer19CPlayerStuckTrackerFv = .text:0x80010940; // type:function size:0x1CC __dt__Q27CPlayer19CPlayerStuckTrackerFv = .text:0x80010940; // type:function size:0x1CC
IsTransparent__7CPlayerCFv = .text:0x80010B0C; // type:function size:0x18 IsTransparent__7CPlayerCFv = .text:0x80010B0C; // type:function size:0x18
IsEnergyLow__7CPlayerCFRC13CStateManager = .text:0x80010B24; // type:function size:0x7C IsEnergyLow__7CPlayerCFRC13CStateManager = .text:0x80010B24; // type:function size:0x7C
FinishNewScan__7CPlayerFR13CStateManager = .text:0x80010BA0; // type:function size:0x12C UpdateSlideShowUnlocking__7CPlayerFR13CStateManager = .text:0x80010BA0; // type:function size:0x12C
GetAttachedActorStruggle__7CPlayerCFv = .text:0x80010CCC; // type:function size:0x8 GetAttachedActorStruggle__7CPlayerCFv = .text:0x80010CCC; // type:function size:0x8
StartSamusVoiceSfx__7CPlayerFUssi = .text:0x80010CD4; // type:function size:0xD0 StartSamusVoiceSfx__7CPlayerFUssi = .text:0x80010CD4; // type:function size:0xD0
DoPostCameraStuff__7CPlayerFfR13CStateManager = .text:0x80010DA4; // type:function size:0x1D4 DoPostCameraStuff__7CPlayerFfR13CStateManager = .text:0x80010DA4; // type:function size:0x1D4
@ -302,7 +302,7 @@ DoSfxEffects__7CPlayerF10CSfxHandle = .text:0x80011200; // type:function size:0x
UpdatePhazonDamage__7CPlayerFfR13CStateManager = .text:0x80011248; // type:function size:0x578 UpdatePhazonDamage__7CPlayerFfR13CStateManager = .text:0x80011248; // type:function size:0x578
__dt__17CCollidableSphereFv = .text:0x800117C0; // type:function size:0x5C __dt__17CCollidableSphereFv = .text:0x800117C0; // type:function size:0x5C
__dt__19CCollisionPrimitiveFv = .text:0x8001181C; // type:function size:0x48 __dt__19CCollisionPrimitiveFv = .text:0x8001181C; // type:function size:0x48
UpdatePhazonCameraShake__7CPlayerFfR13CStateManager = .text:0x80011864; // type:function size:0x154 UpdateEnvironmentDamageCameraShake__7CPlayerFfR13CStateManager = .text:0x80011864; // type:function size:0x154
DecrementEnvironmentDamage__7CPlayerFv = .text:0x800119B8; // type:function size:0x18 DecrementEnvironmentDamage__7CPlayerFv = .text:0x800119B8; // type:function size:0x18
IncrementEnvironmentDamage__7CPlayerFv = .text:0x800119D0; // type:function size:0x24 IncrementEnvironmentDamage__7CPlayerFv = .text:0x800119D0; // type:function size:0x24
DoPreThink__7CPlayerFfR13CStateManager = .text:0x800119F4; // type:function size:0x84 DoPreThink__7CPlayerFfR13CStateManager = .text:0x800119F4; // type:function size:0x84

5
include/MetaRender/CCubeRenderer.hpp
View File

@ -1,6 +1,7 @@
#ifndef _CCUBERENDERER #ifndef _CCUBERENDERER
#define _CCUBERENDERER #define _CCUBERENDERER
#include "Kyoto/Math/CPlane.hpp"
#include "types.h" #include "types.h"
#include <dolphin/gx/GXEnum.h> #include <dolphin/gx/GXEnum.h>
@ -96,7 +97,7 @@ public:
float zfar) override; float zfar) override;
void SetClippingPlanes(const CFrustumPlanes&) override; void SetClippingPlanes(const CFrustumPlanes&) override;
void SetViewport(int left, int right, int width, int height) override; void SetViewport(int left, int right, int width, int height) override;
void SetDepthReadWrite(bool read, bool update) override; void SetDepthReadWrite(const bool read, const bool update) override;
void SetBlendMode_AdditiveAlpha() override; void SetBlendMode_AdditiveAlpha() override;
void SetBlendMode_AlphaBlended() override; void SetBlendMode_AlphaBlended() override;
void SetBlendMode_NoColorWrite() override; void SetBlendMode_NoColorWrite() override;
@ -144,9 +145,11 @@ public:
void AllocatePhazonSuitMaskTexture(); void AllocatePhazonSuitMaskTexture();
void SetupRendererStates(bool depthWrite); void SetupRendererStates(bool depthWrite);
void SetupCGraphicsStates(); void SetupCGraphicsStates();
void DrawRenderBucketsDebug();
void SetRequestRGBA6(bool req) { x318_26_requestRGBA6 = req; } void SetRequestRGBA6(bool req) { x318_26_requestRGBA6 = req; }
CTexture* GetRealReflection(); CTexture* GetRealReflection();
const CPlane& GetViewPlane() const { return xb0_viewPlane; }
private: private:
CResFactory& x8_factory; CResFactory& x8_factory;

2
include/MetaRender/IRenderer.hpp
View File

@ -82,7 +82,7 @@ public:
float zfar); float zfar);
virtual void SetClippingPlanes(const CFrustumPlanes&); virtual void SetClippingPlanes(const CFrustumPlanes&);
virtual void SetViewport(int left, int right, int width, int height); virtual void SetViewport(int left, int right, int width, int height);
virtual void SetDepthReadWrite(bool read, bool update); virtual void SetDepthReadWrite(const bool read, const bool update);
virtual void SetBlendMode_AdditiveAlpha(); virtual void SetBlendMode_AdditiveAlpha();
virtual void SetBlendMode_AlphaBlended(); virtual void SetBlendMode_AlphaBlended();
virtual void SetBlendMode_NoColorWrite(); virtual void SetBlendMode_NoColorWrite();

28
src/MetaRender/CCubeRenderer.cpp
View File

@ -219,6 +219,7 @@ void CCubeRenderer::GenerateSphereRampTex() {
x220_sphereRamp.UnLock(); x220_sphereRamp.UnLock();
} }
// TODO non-matching
void CCubeRenderer::LoadThermoPalette() { void CCubeRenderer::LoadThermoPalette() {
x288_thermalPalette.Lock(); x288_thermalPalette.Lock();
TLockedToken< CTexture > token = xc_objStore.GetObj("TXTR_ThermoPalette"); TLockedToken< CTexture > token = xc_objStore.GetObj("TXTR_ThermoPalette");
@ -307,6 +308,7 @@ void CCubeRenderer::BeginScene() {
CGraphics::SetDepthWriteMode(true, kE_LEqual, true); CGraphics::SetDepthWriteMode(true, kE_LEqual, true);
CGraphics::SetBlendMode(kBM_Blend, kBF_SrcAlpha, kBF_InvSrcAlpha, kLO_Clear); CGraphics::SetBlendMode(kBM_Blend, kBF_SrcAlpha, kBF_InvSrcAlpha, kLO_Clear);
#if NONMATCHING #if NONMATCHING
// TODO: double check this
float aspect = static_cast< float >(width) / static_cast< float >(height); float aspect = static_cast< float >(width) / static_cast< float >(height);
#else #else
float aspect = 1.3333334f; float aspect = 1.3333334f;
@ -346,25 +348,25 @@ void CCubeRenderer::EndScene() {
void CCubeRenderer::AddParticleGen(const CParticleGen& gen) { void CCubeRenderer::AddParticleGen(const CParticleGen& gen) {
AUTO(bounds, gen.GetBounds()); AUTO(bounds, gen.GetBounds());
if (bounds) { if (bounds) {
CVector3f closestPoint = bounds->ClosestPointAlongVector(xb0_viewPlane.GetNormal()); CVector3f closestPoint = bounds->ClosestPointAlongVector(GetViewPlane().GetNormal());
Buckets::Insert(closestPoint, *bounds, kDT_Particle, static_cast< const void* >(&gen), Buckets::Insert(closestPoint, *bounds, kDT_Particle, static_cast< const void* >(&gen),
xb0_viewPlane, 0); GetViewPlane(), 0);
} }
} }
void CCubeRenderer::AddParticleGen(const CParticleGen& gen, const CVector3f& pos, void CCubeRenderer::AddParticleGen(const CParticleGen& gen, const CVector3f& pos,
const CAABox& bounds) { const CAABox& bounds) {
Buckets::Insert(pos, bounds, kDT_Particle, static_cast< const void* >(&gen), xb0_viewPlane, 0); Buckets::Insert(pos, bounds, kDT_Particle, static_cast< const void* >(&gen), GetViewPlane(), 0);
} }
void CCubeRenderer::AddPlaneObject(const void* obj, const CAABox& aabb, const CPlane& plane, void CCubeRenderer::AddPlaneObject(const void* obj, const CAABox& aabb, const CPlane& plane,
int type) { int type) {
static const CVector3f sOptimalPlane(0.f, 0.f, 1.f); static const CVector3f sOptimalPlane(0.f, 0.f, 1.f);
CVector3f closestPoint = aabb.ClosestPointAlongVector(xb0_viewPlane.GetNormal()); CVector3f closestPoint = aabb.ClosestPointAlongVector(GetViewPlane().GetNormal());
float closestDist = xb0_viewPlane.GetHeight(closestPoint); float closestDist = GetViewPlane().GetHeight(closestPoint);
CVector3f furthestPoint = aabb.FurthestPointAlongVector(xb0_viewPlane.GetNormal()); CVector3f furthestPoint = aabb.FurthestPointAlongVector(GetViewPlane().GetNormal());
float furthestDist = xb0_viewPlane.GetHeight(furthestPoint); float furthestDist = GetViewPlane().GetHeight(furthestPoint);
if (closestDist < 0.f && furthestDist < 0.f) { if (closestDist < 0.f && furthestDist < 0.f) {
return; return;
} }
@ -398,7 +400,7 @@ void CCubeRenderer::AddDrawable(const void* obj, const CVector3f& pos, const CAA
if (sorting == IRenderer::kDS_UnsortedCallback) { if (sorting == IRenderer::kDS_UnsortedCallback) {
xa8_drawableCallback(obj, xac_drawableCallbackUserData, mode); xa8_drawableCallback(obj, xac_drawableCallbackUserData, mode);
} else { } else {
Buckets::Insert(pos, aabb, EDrawableType(mode + 2), obj, xb0_viewPlane, 0); Buckets::Insert(pos, aabb, EDrawableType(mode + 2), obj, GetViewPlane(), 0);
} }
} }
@ -424,6 +426,8 @@ void CCubeRenderer::SetupCGraphicsStates() {
CCubeMaterial::EnsureTevsDirect(); CCubeMaterial::EnsureTevsDirect();
} }
void CCubeRenderer::DrawRenderBucketsDebug() {}
namespace Renderer { namespace Renderer {
IRenderer* AllocateRenderer(IObjectStore& objStore, COsContext& osContext, CMemorySys& memorySys, IRenderer* AllocateRenderer(IObjectStore& objStore, COsContext& osContext, CMemorySys& memorySys,
CResFactory& resFactory) { CResFactory& resFactory) {
@ -498,14 +502,14 @@ void CCubeRenderer::EndPrimitive() {
void CCubeRenderer::SetAmbientColor(const CColor& color) { CGraphics::SetAmbientColor(color); } void CCubeRenderer::SetAmbientColor(const CColor& color) { CGraphics::SetAmbientColor(color); }
void CCubeRenderer::SetPerspective(float fovy, float aspect, float znear, float zfar) {
CGraphics::SetPerspective(fovy, aspect, znear, zfar);
}
void CCubeRenderer::SetPerspective(float fovy, float width, float height, float znear, float zfar) { void CCubeRenderer::SetPerspective(float fovy, float width, float height, float znear, float zfar) {
CGraphics::SetPerspective(fovy, width / height, znear, zfar); CGraphics::SetPerspective(fovy, width / height, znear, zfar);
} }
void CCubeRenderer::SetPerspective(float fovy, float aspect, float znear, float zfar) {
CGraphics::SetPerspective(fovy, aspect, znear, zfar);
}
rstl::pair< CVector2f, CVector2f > CCubeRenderer::SetViewportOrtho(bool centered, float znear, rstl::pair< CVector2f, CVector2f > CCubeRenderer::SetViewportOrtho(bool centered, float znear,
float zfar) { float zfar) {
const CViewport& vp = CGraphics::GetViewport(); const CViewport& vp = CGraphics::GetViewport();

2
src/MetroidPrime/Cameras/CCameraFilter.cpp
View File

@ -1,3 +1,5 @@
#include "Kyoto/Math/CVector2f.hpp"
#include "Kyoto/Math/CVector3f.hpp"
#include "MetroidPrime/Cameras/CCameraFilterPass.hpp" #include "MetroidPrime/Cameras/CCameraFilterPass.hpp"
#include "Kyoto/Graphics/CGraphics.hpp" #include "Kyoto/Graphics/CGraphics.hpp"