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

CCameraFilter: Implement DrawRandomStatic

This commit is contained in:
Luke Street 2022-07-02 12:39:14 -04:00
parent 8bb2f33a45
commit d8f4f522f2
3 changed files with 55 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/CStaticInterference.cpp
View File

@ -19,7 +19,7 @@ void CStaticInterference::RemoveSource(TUniqueId id) {
void CStaticInterference::Update(CStateManager&, float dt) { void CStaticInterference::Update(CStateManager&, float dt) {
std::vector<CStaticInterferenceSource> newSources; std::vector<CStaticInterferenceSource> newSources;
newSources.reserve(x0_sources.size()); newSources.reserve(x0_sources.capacity());
for (CStaticInterferenceSource& src : x0_sources) { for (CStaticInterferenceSource& src : x0_sources) {
if (src.x8_timeLeft >= 0.f) { if (src.x8_timeLeft >= 0.f) {
src.x8_timeLeft -= dt; src.x8_timeLeft -= dt;

45
Runtime/Camera/CCameraFilter.cpp
View File

@ -1,10 +1,11 @@
#include "Runtime/Camera/CCameraFilter.hpp" #include "Runtime/Camera/CCameraFilter.hpp"
#include "Runtime/CDvdFile.hpp"
#include "Runtime/CSimplePool.hpp" #include "Runtime/CSimplePool.hpp"
#include "Runtime/GameGlobalObjects.hpp" #include "Runtime/GameGlobalObjects.hpp"
#include "Runtime/Graphics/CCubeRenderer.hpp" #include "Runtime/Graphics/CCubeRenderer.hpp"
#include "Runtime/Graphics/CGraphics.hpp"
#include "Runtime/Graphics/CGX.hpp" #include "Runtime/Graphics/CGX.hpp"
#include "Runtime/Graphics/CGraphics.hpp"
#include <algorithm> #include <algorithm>
#include <zeus/CColor.hpp> #include <zeus/CColor.hpp>
@ -132,6 +133,7 @@ void CCameraFilterPass::DrawFilter(EFilterType type, EFilterShape shape, const z
} }
void CCameraFilterPass::DrawFullScreenColoredQuad(const zeus::CColor& color) { void CCameraFilterPass::DrawFullScreenColoredQuad(const zeus::CColor& color) {
SCOPED_GRAPHICS_DEBUG_GROUP("CCameraFilterPass::DrawFullScreenColoredQuad", zeus::skBlue);
const auto [lt, rb] = g_Renderer->SetViewportOrtho(true, -4096.f, 4096.f); const auto [lt, rb] = g_Renderer->SetViewportOrtho(true, -4096.f, 4096.f);
g_Renderer->SetDepthReadWrite(false, false); g_Renderer->SetDepthReadWrite(false, false);
g_Renderer->BeginTriangleStrip(4); g_Renderer->BeginTriangleStrip(4);
@ -178,6 +180,7 @@ void CCameraFilterPass::DrawFilterShape(EFilterShape shape, const zeus::CColor&
} }
void CCameraFilterPass::DrawFullScreenTexturedQuadQuarters(const zeus::CColor& color, CTexture* tex, float lod) { void CCameraFilterPass::DrawFullScreenTexturedQuadQuarters(const zeus::CColor& color, CTexture* tex, float lod) {
SCOPED_GRAPHICS_DEBUG_GROUP("CCameraFilterPass::DrawFullScreenTexturedQuadQuarters", zeus::skBlue);
const auto [lt, rb] = g_Renderer->SetViewportOrtho(true, -4096.f, 4096.f); const auto [lt, rb] = g_Renderer->SetViewportOrtho(true, -4096.f, 4096.f);
CGraphics::SetTevOp(ERglTevStage::Stage0, CTevCombiners::sTevPass805a5ebc); CGraphics::SetTevOp(ERglTevStage::Stage0, CTevCombiners::sTevPass805a5ebc);
CGraphics::SetTevOp(ERglTevStage::Stage1, CTevCombiners::skPassThru); CGraphics::SetTevOp(ERglTevStage::Stage1, CTevCombiners::skPassThru);
@ -204,6 +207,7 @@ void CCameraFilterPass::DrawFullScreenTexturedQuadQuarters(const zeus::CColor& c
} }
void CCameraFilterPass::DrawFullScreenTexturedQuad(const zeus::CColor& color, CTexture* tex, float lod) { void CCameraFilterPass::DrawFullScreenTexturedQuad(const zeus::CColor& color, CTexture* tex, float lod) {
SCOPED_GRAPHICS_DEBUG_GROUP("CCameraFilterPass::DrawFullScreenTexturedQuad", zeus::skBlue);
const float u = 0.5f - 0.5f * lod; const float u = 0.5f - 0.5f * lod;
const float v = 0.5f + 0.5f * lod; const float v = 0.5f + 0.5f * lod;
const auto [lt, rb] = g_Renderer->SetViewportOrtho(true, -4096.f, 4096.f); const auto [lt, rb] = g_Renderer->SetViewportOrtho(true, -4096.f, 4096.f);
@ -227,7 +231,44 @@ void CCameraFilterPass::DrawFullScreenTexturedQuad(const zeus::CColor& color, CT
} }
void CCameraFilterPass::DrawRandomStatic(const zeus::CColor& color, float alpha, bool cookieCutterDepth) { void CCameraFilterPass::DrawRandomStatic(const zeus::CColor& color, float alpha, bool cookieCutterDepth) {
// TODO // TODO this shouldn't be here
static CTexture m_randomStatic{ETexelFormat::IA4, 640, 448, 1, "Camera Random Static"};
SCOPED_GRAPHICS_DEBUG_GROUP("CCameraFilterPass::DrawRandomStatic", zeus::skBlue);
const auto [lb, rt] = g_Renderer->SetViewportOrtho(true, 0.f, 1.f);
if (cookieCutterDepth) {
CGraphics::SetAlphaCompare(ERglAlphaFunc::GEqual, static_cast<u8>((1.f - alpha) * 255.f), ERglAlphaOp::And,
ERglAlphaFunc::Always, 0);
g_Renderer->SetDepthReadWrite(true, true);
CGraphics::SetTevOp(ERglTevStage::Stage0, CTevCombiners::sTevPass805a5ebc);
CGraphics::SetTevOp(ERglTevStage::Stage1, CTevCombiners::skPassThru);
} else {
g_Renderer->SetDepthReadWrite(false, false);
CGraphics::SetTevOp(ERglTevStage::Stage0, CTevCombiners::sTevPass805a6038);
CGraphics::SetTevOp(ERglTevStage::Stage1, CTevCombiners::skPassThru);
}
// Upload random static texture (game reads from .text)
const u8* buf = CDvdFile::GetDolBuf() + 0x4f60;
u8* out = m_randomStatic.Lock();
memcpy(out, buf + ROUND_UP_32(rand() & 0x7fff), m_randomStatic.GetMemoryAllocated());
m_randomStatic.UnLock();
m_randomStatic.Load(GX::TEXMAP0, EClampMode::Clamp);
CGraphics::StreamBegin(GX::TRIANGLESTRIP);
CGraphics::StreamColor(color);
CGraphics::StreamTexcoord(0.f, 1.f);
CGraphics::StreamVertex(lb.x() - 1.f, 0.01f, rt.y() + 1.f);
CGraphics::StreamTexcoord(0.f, 0.f);
CGraphics::StreamVertex(lb.x() - 1.f, 0.01f, lb.y() - 1.f);
CGraphics::StreamTexcoord(1.f, 1.f);
CGraphics::StreamVertex(rt.x() + 1.f, 0.01f, rt.y() + 1.f);
CGraphics::StreamTexcoord(1.f, 0.f);
CGraphics::StreamVertex(rt.x() + 1.f, 0.01f, lb.y() - 1.f);
CGraphics::StreamEnd();
if (cookieCutterDepth) {
CGraphics::SetAlphaCompare(ERglAlphaFunc::Always, 0, ERglAlphaOp::And, ERglAlphaFunc::Always, 0);
}
} }
void CCameraFilterPass::DrawScanLines(const zeus::CColor& color, bool even) { void CCameraFilterPass::DrawScanLines(const zeus::CColor& color, bool even) {

22
Runtime/Graphics/CCubeMaterial.cpp
View File

@ -232,17 +232,17 @@ void CCubeMaterial::SetCurrentBlack() {
} else { } else {
CGX::SetBlendMode(GX::BM_BLEND, GX::BL_ONE, GX::BL_ZERO, GX::LO_CLEAR); CGX::SetBlendMode(GX::BM_BLEND, GX::BL_ONE, GX::BL_ZERO, GX::LO_CLEAR);
} }
// CGX::SetVtxDescv_Compressed(vatFlags); CGX::SetVtxDescv_Compressed(vatFlags);
// CGX::SetTevColorIn(GX::TEVSTAGE0, GX::CC_ZERO, GX::CC_ZERO, GX::CC_ZERO, GX::CC_ZERO /* ? CC_ONE */); CGX::SetTevColorIn(GX::TEVSTAGE0, GX::CC_ZERO, GX::CC_ZERO, GX::CC_ZERO, GX::CC_ZERO /* ? CC_ONE */);
// CGX::SetTevAlphaIn(GX::TEVSTAGE0, GX::CA_ZERO, GX::CA_ZERO, GX::CA_ZERO, GX::CA_ZERO /* ? CA_KONST */); CGX::SetTevAlphaIn(GX::TEVSTAGE0, GX::CA_ZERO, GX::CA_ZERO, GX::CA_ZERO, GX::CA_ZERO /* ? CA_KONST */);
// CGX::SetTevKAlphaSel(GX::TEVSTAGE0, GX::TEV_KASEL_1); CGX::SetTevKAlphaSel(GX::TEVSTAGE0, GX::TEV_KASEL_1);
// CGX::SetTexCoordGen(GX::TEXCOORD0, GX::TG_MTX2x4, GX::TG_POS, GX::IDENTITY, false, GX::PTIDENTITY); CGX::SetTexCoordGen(GX::TEXCOORD0, GX::TG_MTX2x4, GX::TG_POS, GX::IDENTITY, false, GX::PTIDENTITY);
// CGX::SetStandardTevColorAlphaOp(GX::TEVSTAGE0); CGX::SetStandardTevColorAlphaOp(GX::TEVSTAGE0);
// CGX::SetTevOrder(GX::TEVSTAGE0, GX::TEXCOORD_NULL, GX::TEXMAP_NULL, GX::COLOR_NULL); CGX::SetTevOrder(GX::TEVSTAGE0, GX::TEXCOORD_NULL, GX::TEXMAP_NULL, GX::COLOR_NULL);
// CGX::SetNumTevStages(1); CGX::SetNumTevStages(1);
// CGX::SetNumChans(0); CGX::SetNumChans(0);
// CGX::SetNumTexGens(1); CGX::SetNumTexGens(1);
// CGX::SetNumIndStages(0); CGX::SetNumIndStages(0);
} }
void CCubeMaterial::SetupBlendMode(u32 blendFactors, const CModelFlags& flags, bool alphaTest) { void CCubeMaterial::SetupBlendMode(u32 blendFactors, const CModelFlags& flags, bool alphaTest) {