TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix load with DTS shapes introduced with HW skinning changes

Browse source
This commit is contained in:
James Urquhart 2016-08-30 19:07:02 +01:00
parent 26241020ff
commit 12019173af
5 changed files with 85 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Engine/source/ts/tsShapeEdit.cpp
View file

@ -742,9 +742,26 @@ void TSShape::removeMeshFromObject(S32 objIndex, S32 meshIndex)
{
if (meshIndex < objects[i].numMeshes)
{
meshes.erase(objects[i].startMeshIndex + meshIndex);
U32 idxToRemove = objects[i].startMeshIndex + meshIndex;
meshes.erase(idxToRemove);
objects[i].numMeshes--;
// Clear invalid parent
for (U32 k = 0; k < meshes.size(); k++)
{
if (meshes[k] == NULL)
continue;
if (meshes[k]->parentMesh == idxToRemove)
{
meshes[k]->parentMesh = -1;
}
else if (meshes[k]->parentMesh > idxToRemove)
{
meshes[k]->parentMesh--;
}
}
for (S32 j = 0; j < objects.size(); j++)
{
if (objects[j].startMeshIndex > objects[i].startMeshIndex)
@ -770,7 +787,25 @@ void TSShape::removeMeshFromObject(S32 objIndex, S32 meshIndex)
S32 oldNumMeshes = obj.numMeshes;
while (obj.numMeshes && !meshes[obj.startMeshIndex + obj.numMeshes - 1])
{
meshes.erase(obj.startMeshIndex + obj.numMeshes - 1);
U32 idxToRemove = obj.startMeshIndex + obj.numMeshes - 1;
meshes.erase(idxToRemove);
// Clear invalid parent
for (U32 k = 0; k < meshes.size(); k++)
{
if (meshes[k] == NULL)
continue;
if (meshes[k]->parentMesh == idxToRemove)
{
meshes[k]->parentMesh = -1;
}
else if (meshes[k]->parentMesh > idxToRemove)
{
meshes[k]->parentMesh--;
}
}
obj.numMeshes--;
}
@ -858,6 +893,12 @@ bool TSShape::removeObject(const String& name)
// Update smallest visible detail
updateSmallestVisibleDL();
// Ensure shape is dirty
if (meshes[0])
{
meshes[0]->makeEditable();
}
// Re-initialise the shape
init();
@ -1298,6 +1339,12 @@ bool TSShape::removeDetail( S32 size )
billboardDetails.erase( dl );
}
// Ensure shape is dirty
if (meshes[0])
{
meshes[0]->makeEditable();
}
// Update smallest visible detail
updateSmallestVisibleDL();