AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-20 05:05:25 +00:00
Code Issues Projects Releases Wiki Activity

Transition all Textured/ColoredQuad usages

Browse Source 
- Upload textures using staging buffer
- Fixes SetOrtho logic
- More work on thermal visor rendering (still WIP)
- Rework Dawn backend initialization
- Support MoltenVK on Metal
- Various fixes & cleanup
This commit is contained in:
Luke Street
2022-05-23 20:26:35 -04:00
parent 36a7bfc464
commit f80813b9cc
65 changed files with 857 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Runtime/AutoMapper/CMappableObject.cpp
View File

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