TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "collada/ts chain shadowvar and member var clenaups"

Browse source 
This reverts commit 3ce15b33eb.
This commit is contained in:
Azaezel 2018-04-01 23:16:13 -05:00
parent c386e90348
commit 0c316dab46
6 changed files with 264 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Engine/source/ts/collada/colladaAppMesh.cpp
View file

@ -147,12 +147,12 @@ private:
end = start;
// Get the set for this input
domInputLocalOffset* localOffset = daeSafeCast<domInputLocalOffset>(input);
const domInputLocalOffset* localOffset = daeSafeCast<domInputLocalOffset>(input);
domUint newSet = localOffset ? localOffset->getSet() : 0;
// Add the input to the right place in the list (somewhere between start and end)
for (S32 i = start; i <= end; i++) {
localOffset = daeSafeCast<domInputLocalOffset>(sortedInputs[i]);
const domInputLocalOffset* localOffset = daeSafeCast<domInputLocalOffset>(sortedInputs[i]);
domUint set = localOffset ? localOffset->getSet() : 0xFFFFFFFF;
if (newSet < set) {
for (S32 j = i + 1; j <= end; j++)
@ -181,10 +181,10 @@ private:
const char* semantic = SourceTypeToSemantic( type );
for (S32 iInput = 0; iInput < vertices->getInput_array().getCount(); iInput++)
{
domInputLocal* vInput = vertices->getInput_array().get(iInput);
if (dStrEqual(vInput->getSemantic(), semantic))
domInputLocal* input = vertices->getInput_array().get(iInput);
if (dStrEqual(input->getSemantic(), semantic))
{
source = daeSafeCast<domSource>(findInputSource(vInput));
source = daeSafeCast<domSource>(findInputSource(input));
break;
}
}
@ -966,7 +966,7 @@ void ColladaAppMesh::lookupSkinData()
// Determine the offset into the vindices array for each vertex (since each
// vertex may have multiple [bone, weight] pairs in the array)
Vector<U32> vindicesOffset;
domInt* vindices = (domInt*)weights_v.getRaw(0);
const domInt* vindices = (domInt*)weights_v.getRaw(0);
for (S32 iWeight = 0; iWeight < weights_vcount.getCount(); iWeight++) {
// Store the offset into the vindices array for this vertex
vindicesOffset.push_back(vindices - (domInt*)weights_v.getRaw(0));
@ -977,7 +977,7 @@ void ColladaAppMesh::lookupSkinData()
bool tooManyWeightsWarning = false;
for (S32 iVert = 0; iVert < vertsPerFrame; iVert++) {
const domUint* vcount = (domUint*)weights_vcount.getRaw(0);
vindices = (domInt*)weights_v.getRaw(0);
const domInt* vindices = (domInt*)weights_v.getRaw(0);
vindices += vindicesOffset[vertTuples[iVert].vertex];
S32 nonZeroWeightCount = 0;