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

tsmesh: parentMesh and indicies to mParentMesh and mIndicies (usual deal, complaints about method vars or temp ones potentially conflicting with class vars)

Browse source
This commit is contained in:
Azaezel 2018-03-13 11:36:36 -05:00
parent af0922e175
commit e2d27952aa
8 changed files with 125 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Engine/source/ts/tsShape.cpp
View file

@ -585,14 +585,14 @@ void TSShape::initObjects()
if (!mesh)
continue;
if (mesh->parentMesh >= meshes.size())
if (mesh->mParentMesh >= meshes.size())
{
Con::warnf("Mesh %i has a bad parentMeshObject (%i)", iter - meshes.begin(), mesh->parentMesh);
Con::warnf("Mesh %i has a bad parentMeshObject (%i)", iter - meshes.begin(), mesh->mParentMesh);
}
if (mesh->parentMesh >= 0 && mesh->parentMesh < meshes.size())
if (mesh->mParentMesh >= 0 && mesh->mParentMesh < meshes.size())
{
mesh->parentMeshObject = meshes[mesh->parentMesh];
mesh->parentMeshObject = meshes[mesh->mParentMesh];
}
else
{
@ -622,7 +622,7 @@ void TSShape::initVertexBuffers()
mesh->getMeshType() != TSMesh::SkinMeshType))
continue;
destIndices += mesh->indices.size();
destIndices += mesh->mIndices.size();
destPrims += mesh->primitives.size();
}
@ -661,14 +661,14 @@ void TSShape::initVertexBuffers()
vertStart += mesh->mNumVerts;
primStart += mesh->primitives.size();
indStart += mesh->indices.size();
indStart += mesh->mIndices.size();
mesh->mVB = mShapeVertexBuffer;
mesh->mPB = mShapeVertexIndices;
// Advance
piInput += mesh->primitives.size();
ibIndices += mesh->indices.size();
ibIndices += mesh->mIndices.size();
if (TSSkinMesh::smDebugSkinVerts && mesh->getMeshType() == TSMesh::SkinMeshType)
{
@ -845,7 +845,7 @@ void TSShape::initVertexFeatures()
mesh->mVertOffset = destVertex;
destVertex += mesh->mVertSize * mesh->getNumVerts();
destIndices += mesh->indices.size();
destIndices += mesh->mIndices.size();
count += 1;
}