Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-07-04 15:05:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Lars Mueller 2024-05-22 00:34:36 +02:00
parent cbc6b2b394
commit dfb0f14d95
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
irr/src/CGLTFMeshFileLoader.cpp
View File

@ -434,9 +434,8 @@ void SelfType::MeshExtractor::deferAddMesh(
indices = generateIndices(vertices->size()); indices = generateIndices(vertices->size());
} }
auto *meshbuf = m_irr_model->addMeshBuffer(); m_irr_model->addMeshBuffer(
meshbuf->append(vertices->data(), vertices->size(), SSkinMeshBuffer(std::move(*vertices), std::move(indices)));
indices.data(), indices.size());
const auto buffer_id = m_irr_model->getMeshBufferCount() - 1; const auto buffer_id = m_irr_model->getMeshBufferCount() - 1;
if (!skinIdx.has_value()) if (!skinIdx.has_value())
@ -584,7 +583,7 @@ void SelfType::MeshExtractor::loadNode(
} }
} }
void SelfType::MeshExtractor::loadNodes() const void SelfType::MeshExtractor::loadNodes()
{ {
m_loaded_nodes = std::vector<CSkinnedMesh::SJoint *>(m_gltf_model.nodes->size()); m_loaded_nodes = std::vector<CSkinnedMesh::SJoint *>(m_gltf_model.nodes->size());
@ -605,7 +604,7 @@ void SelfType::MeshExtractor::loadNodes() const
} }
} }
void CMFL::MeshExtractor::loadSkins() void SelfType::MeshExtractor::loadSkins()
{ {
if (!m_gltf_model.skins.has_value()) if (!m_gltf_model.skins.has_value())
return; return;
@ -622,7 +621,7 @@ void CMFL::MeshExtractor::loadSkins()
} }
} }
void CMFL::MeshExtractor::loadAnimation(const std::size_t animIdx) void SelfType::MeshExtractor::loadAnimation(const std::size_t animIdx)
{ {
const auto &anim = m_gltf_model.animations->at(animIdx); const auto &anim = m_gltf_model.animations->at(animIdx);
for (const auto &channel : anim.channels) { for (const auto &channel : anim.channels) {
@ -672,7 +671,7 @@ void CMFL::MeshExtractor::loadAnimation(const std::size_t animIdx)
} }
} }
void CMFL::MeshExtractor::load() void SelfType::MeshExtractor::load()
{ {
loadNodes(); loadNodes();
for (const auto &loadMesh : m_mesh_loaders) { for (const auto &loadMesh : m_mesh_loaders) {