AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-08-10 14:59:05 +00:00
Code Issues Projects Releases Wiki Activity

CGameArea: VBO & IBO buffer updates

Browse Source
This commit is contained in:
Luke Street 2020-10-21 01:57:10 -04:00
parent 2d2dc9e520
commit 5c6f7ce9ea
1 changed files with 45 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Runtime/World/CGameArea.cpp
View File

@ -1049,9 +1049,8 @@ void CGameArea::FillInStaticGeometry(bool textures) {
++secIt; ++secIt;
} }
CGraphics::CommitResources([&](boo::IGraphicsDataFactory::Context& ctx) {
/* Reserve extra buffers for 16 cubemaps and shadow rendering */ /* Reserve extra buffers for 16 cubemaps and shadow rendering */
matSet.m_geomLayout->ReserveSharedBuffers(ctx, 96 + int(EWorldShadowMode::MAX)); // matSet.m_geomLayout->ReserveSharedBuffers(96 + int(EWorldShadowMode::MAX));
/* Models */ /* Models */
for (CMetroidModelInstance& inst : x12c_postConstructed->x4c_insts) { for (CMetroidModelInstance& inst : x12c_postConstructed->x4c_insts) {
@ -1071,17 +1070,19 @@ void CGameArea::FillInStaticGeometry(bool textures) {
} }
++secIt; ++secIt;
boo::ObjToken<boo::IGraphicsBufferS> vbo; MapVertData(
boo::ObjToken<boo::IGraphicsBufferS> ibo; inst.m_hmdlMeta, [&]<typename VertData>() constexpr {
vbo = ctx.newStaticBuffer(boo::BufferUse::Vertex, secIt->first, inst.m_hmdlMeta.vertStride, inst.m_staticVbo = hsh::create_vertex_buffer<VertData>(
inst.m_hmdlMeta.vertCount); hsh::detail::ArrayProxy{reinterpret_cast<const VertData*>(secIt->first), inst.m_hmdlMeta.vertCount});
});
++secIt; ++secIt;
ibo = ctx.newStaticBuffer(boo::BufferUse::Index, secIt->first, 4, inst.m_hmdlMeta.indexCount);
inst.m_staticIbo = hsh::create_index_buffer(
hsh::detail::ArrayProxy{reinterpret_cast<const u32*>(secIt->first), inst.m_hmdlMeta.indexCount});
++secIt; ++secIt;
const u32 surfCount = hecl::SBig(*reinterpret_cast<const u32*>(secIt->first)); const u32 surfCount = hecl::SBig(*reinterpret_cast<const u32*>(secIt->first));
inst.m_surfaces.reserve(surfCount); inst.m_surfaces.reserve(surfCount);
inst.m_shaders.reserve(surfCount);
++secIt; ++secIt;
for (u32 j = 0; j < surfCount; ++j) { for (u32 j = 0; j < surfCount; ++j) {
CBooSurface& surf = inst.m_surfaces.emplace_back(); CBooSurface& surf = inst.m_surfaces.emplace_back();
@ -1092,20 +1093,13 @@ void CGameArea::FillInStaticGeometry(bool textures) {
} }
TToken<CModel> nullModel; TToken<CModel> nullModel;
inst.m_instance = std::make_unique<CBooModel>(nullModel, nullptr, &inst.m_surfaces, matSet, vbo, ibo, inst.m_instance = std::make_unique<CBooModel>(
inst.x34_aabb, static_cast<u8>(inst.x0_visorFlags), 0); nullModel, nullptr, &inst.m_surfaces, matSet, inst.m_staticVbo.get(), inst.m_staticIbo.get(), inst.x34_aabb,
static_cast<u8>(inst.x0_visorFlags), 0, VertexFormat{inst.m_hmdlMeta});
} }
return true;
} BooTrace);
for (CMetroidModelInstance& inst : x12c_postConstructed->x4c_insts) { for (CMetroidModelInstance& inst : x12c_postConstructed->x4c_insts) {
for (CBooSurface& surf : inst.m_surfaces) { inst.m_instance->RemapMaterialData(matSet);
auto& shad = inst.m_shaders[surf.m_data.matIdx];
if (!shad)
shad = matSet.BuildShader(inst.m_hmdlMeta, matSet.m_matSet.materials[surf.m_data.matIdx]);
}
inst.m_instance->RemapMaterialData(matSet, inst.m_shaders);
} }
x12c_postConstructed->x1108_25_modelsConstructed = true; x12c_postConstructed->x1108_25_modelsConstructed = true;