2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-20 05:05:25 +00:00

TexturedQuad fixes, Better controller input handling (needs custom mapping)

This commit is contained in:
2022-02-08 11:18:12 -08:00
parent 5add26b42e
commit acd861754c
14 changed files with 240 additions and 59 deletions

View File

@@ -167,7 +167,7 @@ void CMappableObject::Draw(int curArea, const CMapWorldInfo& mwInfo, float alpha
TLockedToken<CTexture> tex = g_SimplePool->GetObj(SObjectTag{FOURCC('TXTR'), iconRes});
if (!m_texQuadFilter || m_texQuadFilter->GetTex().GetObj() != tex.GetObj()) {
m_texQuadFilter.emplace(EFilterType::Add, tex, CTexturedQuadFilter::ZTest::GEqual);
//m_texQuadFilter.emplace(EFilterType::Add, tex, CTexturedQuadFilter::ZTest::GEqual);
}
constexpr std::array<CTexturedQuadFilter::Vert, 4> verts{{
@@ -176,7 +176,7 @@ void CMappableObject::Draw(int curArea, const CMapWorldInfo& mwInfo, float alpha
{{2.6f, 0.f, 2.6f}, {1.f, 1.f}},
{{2.6f, 0.f, -2.6f}, {1.f, 0.f}},
}};
m_texQuadFilter->drawVerts(iconColor, verts);
//m_texQuadFilter->drawVerts(iconColor, verts);
}
}