AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-10 15:25:53 +00:00
Code Issues Projects Releases Wiki Activity

COmegaPirate: Fix CFlash rendering

Browse Source
This commit is contained in:
Luke Street 2020-04-20 03:20:22 -04:00
parent 3563a1c8c4
commit 2ee2bbc0c1
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Runtime/MP1/World/COmegaPirate.cpp
View File

@ -43,7 +43,7 @@ COmegaPirate::CFlash::CFlash(TUniqueId uid, const CEntityInfo& info, const zeus:
: CActor(uid, true, "Omega Pirate Flash", info, zeus::CTransform::Translate(pos), CModelData::CModelDataNull(), {}, : CActor(uid, true, "Omega Pirate Flash", info, zeus::CTransform::Translate(pos), CModelData::CModelDataNull(), {},
CActorParameters::None(), kInvalidUniqueId) CActorParameters::None(), kInvalidUniqueId)
, xf4_delay(delay) , xf4_delay(delay)
, m_thermalSpotBlend(EFilterType::Blend, thermalSpot) , m_thermalSpotAdd(EFilterType::Add, thermalSpot)
, m_thermalSpotSubtract(EFilterType::Subtract, thermalSpot) {} , m_thermalSpotSubtract(EFilterType::Subtract, thermalSpot) {}
void COmegaPirate::CFlash::Accept(IVisitor& visitor) { visitor.Visit(this); } void COmegaPirate::CFlash::Accept(IVisitor& visitor) { visitor.Visit(this); }
@ -55,8 +55,8 @@ void COmegaPirate::CFlash::Think(float dt, CStateManager& mgr) {
return; return;
} }
xf8_ += dt; xf8_time += dt;
float intensity = xf8_; float intensity = xf8_time;
if (intensity <= 0.75f) { if (intensity <= 0.75f) {
intensity /= 0.75f; intensity /= 0.75f;
} else { } else {
@ -69,8 +69,8 @@ void COmegaPirate::CFlash::Think(float dt, CStateManager& mgr) {
if (dot >= 0.f) { if (dot >= 0.f) {
dVar4 = dot * dot; dVar4 = dot * dot;
} }
xfc_ = dVar4 * intensity; xfc_size = dVar4 * intensity;
if (xf8_ > 1.f) { if (xf8_time > 1.f) {
mgr.FreeScriptObject(GetUniqueId()); mgr.FreeScriptObject(GetUniqueId());
} }
} }
@ -90,33 +90,32 @@ void COmegaPirate::CFlash::Render(CStateManager& mgr) {
return; return;
} }
float alphaMul = 35.f; float sizeMul = 35.f;
CTexturedQuadFilter* filter = nullptr; CTexturedQuadFilter* filter = nullptr;
if (visor == CPlayerState::EPlayerVisor::XRay) { if (visor == CPlayerState::EPlayerVisor::XRay) {
// CGraphics::SetBlendMode(ERglBlendMode::Subtract, ERglBlendFactor::One, ERglBlendFactor::Zero, // CGraphics::SetBlendMode(ERglBlendMode::Subtract, ERglBlendFactor::One, ERglBlendFactor::Zero,
// ERglLogicOp::Clear); // ERglLogicOp::Clear);
filter = &m_thermalSpotSubtract; filter = &m_thermalSpotSubtract;
alphaMul = 60.f; sizeMul = 60.f;
} else { } else {
// CGraphics::SetBlendMode(ERglBlendMode::Blend, ERglBlendFactor::SrcAlpha, ERglBlendFactor::One, // CGraphics::SetBlendMode(ERglBlendMode::Blend, ERglBlendFactor::SrcAlpha, ERglBlendFactor::One,
// ERglLogicOp::Clear); // ERglLogicOp::Clear);
filter = &m_thermalSpotBlend; filter = &m_thermalSpotAdd;
} }
CGraphics::SetModelMatrix(zeus::CTransform()); float size = xfc_size * sizeMul;
zeus::CColor useColor{1.f, std::max(0.f, (xfc_ * alphaMul) / 255.f)}; const auto rightVec = size * CGraphics::g_ViewMatrix.rightVector();
const auto upVec = size * CGraphics::g_ViewMatrix.upVector();
const auto rightVec = CGraphics::g_GXModelView.rightVector();
const auto upVec = CGraphics::g_GXModelView.upVector();
const auto rvS = GetTranslation() - rightVec; const auto rvS = GetTranslation() - rightVec;
const auto rvP = GetTranslation() + rightVec; const auto rvP = GetTranslation() + rightVec;
CGraphics::SetModelMatrix(zeus::CTransform());
const std::array<CTexturedQuadFilter::Vert, 4> verts{{ const std::array<CTexturedQuadFilter::Vert, 4> verts{{
{rvS + upVec, {0.f, 0.f}}, {rvS + upVec, {0.f, 0.f}},
{rvP + upVec, {0.f, 1.f}},
{rvS - upVec, {1.f, 0.f}}, {rvS - upVec, {1.f, 0.f}},
{rvP - upVec, {1.f, 1.f}}, {rvP - upVec, {1.f, 1.f}},
{rvP + upVec, {0.f, 1.f}},
}}; }};
filter->drawVerts(useColor, verts); filter->drawVerts(zeus::CColor{1.f, std::min(1.f, size)}, verts);
} }
COmegaPirate::COmegaPirate(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, COmegaPirate::COmegaPirate(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,

6
Runtime/MP1/World/COmegaPirate.hpp
View File

@ -10,10 +10,10 @@ private:
// TToken<CTexture> xe8_thermalSpotToken; // TToken<CTexture> xe8_thermalSpotToken;
// CTexture* xf0_thermalSpot = nullptr; // CTexture* xf0_thermalSpot = nullptr;
float xf4_delay; float xf4_delay;
float xf8_ = 0.f; float xf8_time = 0.f;
float xfc_ = 0.f; float xfc_size = 0.f;
CTexturedQuadFilter m_thermalSpotBlend; CTexturedQuadFilter m_thermalSpotAdd;
CTexturedQuadFilter m_thermalSpotSubtract; CTexturedQuadFilter m_thermalSpotSubtract;
public: public: