oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-21 18:11:11 +00:00
Code Wiki Activity

Apply same changes to SSkinMeshBuffer

Browse source
This commit is contained in:
sfan5 2024-08-28 17:59:53 +02:00
parent 47e4c33a50
commit 435a89b5a4
3 changed files with 135 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

27
irr/src/CB3DMeshFileLoader.cpp
View file

@ -259,14 +259,15 @@ bool CB3DMeshFileLoader::readChunkMESH(CSkinnedMesh::SJoint *inJoint)
if (!NormalsInFile) {
s32 i;
for (i = 0; i < (s32)meshBuffer->Indices.size(); i += 3) {
core::plane3df p(meshBuffer->getVertex(meshBuffer->Indices[i + 0])->Pos,
meshBuffer->getVertex(meshBuffer->Indices[i + 1])->Pos,
meshBuffer->getVertex(meshBuffer->Indices[i + 2])->Pos);
auto &indices = meshBuffer->Indices->Data;
for (i = 0; i < (s32)indices.size(); i += 3) {
core::plane3df p(meshBuffer->getVertex(indices[i + 0])->Pos,
meshBuffer->getVertex(indices[i + 1])->Pos,
meshBuffer->getVertex(indices[i + 2])->Pos);
meshBuffer->getVertex(meshBuffer->Indices[i + 0])->Normal += p.Normal;
meshBuffer->getVertex(meshBuffer->Indices[i + 1])->Normal += p.Normal;
meshBuffer->getVertex(meshBuffer->Indices[i + 2])->Normal += p.Normal;
meshBuffer->getVertex(indices[i + 0])->Normal += p.Normal;
meshBuffer->getVertex(indices[i + 1])->Normal += p.Normal;
meshBuffer->getVertex(indices[i + 2])->Normal += p.Normal;
}
for (i = 0; i < (s32)meshBuffer->getVertexCount(); ++i) {
@ -433,7 +434,7 @@ bool CB3DMeshFileLoader::readChunkTRIS(scene::SSkinMeshBuffer *meshBuffer, u32 m
}
const s32 memoryNeeded = B3dStack.getLast().length / sizeof(s32);
meshBuffer->Indices.reserve(memoryNeeded + meshBuffer->Indices.size() + 1);
meshBuffer->Indices->Data.reserve(memoryNeeded + meshBuffer->Indices->Data.size() + 1);
while ((B3dStack.getLast().startposition + B3dStack.getLast().length) > B3DFile->getPos()) // this chunk repeats
{
@ -471,9 +472,9 @@ bool CB3DMeshFileLoader::readChunkTRIS(scene::SSkinMeshBuffer *meshBuffer, u32 m
// Add the vertex to the meshbuffer:
if (meshBuffer->VertexType == video::EVT_STANDARD)
meshBuffer->Vertices_Standard.push_back(BaseVertices[vertex_id[i]]);
meshBuffer->Vertices_Standard->Data.push_back(BaseVertices[vertex_id[i]]);
else
meshBuffer->Vertices_2TCoords.push_back(BaseVertices[vertex_id[i]]);
meshBuffer->Vertices_2TCoords->Data.push_back(BaseVertices[vertex_id[i]]);
// create vertex id to meshbuffer index link:
AnimatedVertices_VertexID[vertex_id[i]] = meshBuffer->getVertexCount() - 1;
@ -504,9 +505,9 @@ bool CB3DMeshFileLoader::readChunkTRIS(scene::SSkinMeshBuffer *meshBuffer, u32 m
}
}
meshBuffer->Indices.push_back(AnimatedVertices_VertexID[vertex_id[0]]);
meshBuffer->Indices.push_back(AnimatedVertices_VertexID[vertex_id[1]]);
meshBuffer->Indices.push_back(AnimatedVertices_VertexID[vertex_id[2]]);
meshBuffer->Indices->Data.push_back(AnimatedVertices_VertexID[vertex_id[0]]);
meshBuffer->Indices->Data.push_back(AnimatedVertices_VertexID[vertex_id[1]]);
meshBuffer->Indices->Data.push_back(AnimatedVertices_VertexID[vertex_id[2]]);
}
B3dStack.erase(B3dStack.size() - 1);

18
irr/src/CXMeshFileLoader.cpp
View file

@ -273,12 +273,12 @@ bool CXMeshFileLoader::load(io::IReadFile *file)
}
if (mesh->TCoords2.size()) {
for (i = 0; i != mesh->Buffers.size(); ++i) {
mesh->Buffers[i]->Vertices_2TCoords.reserve(vCountArray[i]);
mesh->Buffers[i]->Vertices_2TCoords->Data.reserve(vCountArray[i]);
mesh->Buffers[i]->VertexType = video::EVT_2TCOORDS;
}
} else {
for (i = 0; i != mesh->Buffers.size(); ++i)
mesh->Buffers[i]->Vertices_Standard.reserve(vCountArray[i]);
mesh->Buffers[i]->Vertices_Standard->Data.reserve(vCountArray[i]);
}
verticesLinkIndex.set_used(mesh->Vertices.size());
@ -290,14 +290,14 @@ bool CXMeshFileLoader::load(io::IReadFile *file)
scene::SSkinMeshBuffer *buffer = mesh->Buffers[verticesLinkBuffer[i]];
if (mesh->TCoords2.size()) {
verticesLinkIndex[i] = buffer->Vertices_2TCoords.size();
buffer->Vertices_2TCoords.emplace_back(mesh->Vertices[i]);
verticesLinkIndex[i] = buffer->Vertices_2TCoords->getCount();
buffer->Vertices_2TCoords->Data.emplace_back(mesh->Vertices[i]);
// We have a problem with correct tcoord2 handling here
// crash fixed for now by checking the values
buffer->Vertices_2TCoords.back().TCoords2 = (i < mesh->TCoords2.size()) ? mesh->TCoords2[i] : mesh->Vertices[i].TCoords;
buffer->Vertices_2TCoords->Data.back().TCoords2 = (i < mesh->TCoords2.size()) ? mesh->TCoords2[i] : mesh->Vertices[i].TCoords;
} else {
verticesLinkIndex[i] = buffer->Vertices_Standard.size();
buffer->Vertices_Standard.push_back(mesh->Vertices[i]);
verticesLinkIndex[i] = buffer->Vertices_Standard->getCount();
buffer->Vertices_Standard->Data.push_back(mesh->Vertices[i]);
}
}
@ -306,13 +306,13 @@ bool CXMeshFileLoader::load(io::IReadFile *file)
for (i = 0; i < mesh->FaceMaterialIndices.size(); ++i)
++vCountArray[mesh->FaceMaterialIndices[i]];
for (i = 0; i != mesh->Buffers.size(); ++i)
mesh->Buffers[i]->Indices.reserve(vCountArray[i]);
mesh->Buffers[i]->Indices->Data.reserve(vCountArray[i]);
delete[] vCountArray;
// create indices per buffer
for (i = 0; i < mesh->FaceMaterialIndices.size(); ++i) {
scene::SSkinMeshBuffer *buffer = mesh->Buffers[mesh->FaceMaterialIndices[i]];
for (u32 id = i * 3 + 0; id != i * 3 + 3; ++id) {
buffer->Indices.push_back(verticesLinkIndex[mesh->Indices[id]]);
buffer->Indices->Data.push_back(verticesLinkIndex[mesh->Indices[id]]);
}
}
}