TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

slimmed down shadowvar cleanups, plus removal of an unused membervar.

Browse source
This commit is contained in:
Azaezel 2018-04-02 03:06:58 -05:00
parent 0c316dab46
commit 0e3c128ec4
4 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -152,7 +152,7 @@ private:
// Add the input to the right place in the list (somewhere between start and end) // Add the input to the right place in the list (somewhere between start and end)
for (S32 i = start; i <= end; i++) { for (S32 i = start; i <= end; i++) {
const domInputLocalOffset* localOffset = daeSafeCast<domInputLocalOffset>(sortedInputs[i]); localOffset = daeSafeCast<domInputLocalOffset>(sortedInputs[i]);
domUint set = localOffset ? localOffset->getSet() : 0xFFFFFFFF; domUint set = localOffset ? localOffset->getSet() : 0xFFFFFFFF;
if (newSet < set) { if (newSet < set) {
for (S32 j = i + 1; j <= end; j++) for (S32 j = i + 1; j <= end; j++)
@ -181,10 +181,10 @@ private:
const char* semantic = SourceTypeToSemantic( type ); const char* semantic = SourceTypeToSemantic( type );
for (S32 iInput = 0; iInput < vertices->getInput_array().getCount(); iInput++) for (S32 iInput = 0; iInput < vertices->getInput_array().getCount(); iInput++)
{ {
domInputLocal* input = vertices->getInput_array().get(iInput); domInputLocal* vInput = vertices->getInput_array().get(iInput);
if (dStrEqual(input->getSemantic(), semantic)) if (dStrEqual(vInput->getSemantic(), semantic))
{ {
source = daeSafeCast<domSource>(findInputSource(input)); source = daeSafeCast<domSource>(findInputSource(vInput));
break; break;
} }
} }
@ -977,7 +977,7 @@ void ColladaAppMesh::lookupSkinData()
bool tooManyWeightsWarning = false; bool tooManyWeightsWarning = false;
for (S32 iVert = 0; iVert < vertsPerFrame; iVert++) { for (S32 iVert = 0; iVert < vertsPerFrame; iVert++) {
const domUint* vcount = (domUint*)weights_vcount.getRaw(0); const domUint* vcount = (domUint*)weights_vcount.getRaw(0);
const domInt* vindices = (domInt*)weights_v.getRaw(0); vindices = (domInt*)weights_v.getRaw(0);
vindices += vindicesOffset[vertTuples[iVert].vertex]; vindices += vindicesOffset[vertTuples[iVert].vertex];
S32 nonZeroWeightCount = 0; S32 nonZeroWeightCount = 0;

6
Engine/source/ts/collada/colladaImport.cpp
View file

@ -120,9 +120,9 @@ static void processNode(GuiTreeViewCtrl* tree, domNode* node, S32 parentID, Scen
for (S32 i = 0; i < node->getInstance_node_array().getCount(); i++) for (S32 i = 0; i < node->getInstance_node_array().getCount(); i++)
{ {
domInstance_node* instnode = node->getInstance_node_array()[i]; domInstance_node* instnode = node->getInstance_node_array()[i];
domNode* node = daeSafeCast<domNode>(instnode->getUrl().getElement()); domNode* dNode = daeSafeCast<domNode>(instnode->getUrl().getElement());
if (node) if (dNode)
processNode(tree, node, nodeID, stats); processNode(tree, dNode, nodeID, stats);
} }
} }

4
Engine/source/ts/collada/colladaUtils.cpp
View file

@ -266,10 +266,10 @@ void AnimData::parseTargetString(const char* target, S32 fullCount, const char*
targetValueCount = 1; targetValueCount = 1;
} }
} }
else if (const char* p = dStrrchr(target, '.')) { else if (const char* p2 = dStrrchr(target, '.')) {
// Check for named elements // Check for named elements
for (S32 iElem = 0; elements[iElem][0] != 0; iElem++) { for (S32 iElem = 0; elements[iElem][0] != 0; iElem++) {
if (!dStrcmp(p, elements[iElem])) { if (!dStrcmp(p2, elements[iElem])) {
targetValueOffset = iElem; targetValueOffset = iElem;
targetValueCount = 1; targetValueCount = 1;
break; break;

2
Engine/source/ts/loader/tsShapeLoader.h
View file

@ -118,8 +118,6 @@ protected:
Vector<QuatF*> nodeScaleRotCache; Vector<QuatF*> nodeScaleRotCache;
Vector<Point3F*> nodeScaleCache; Vector<Point3F*> nodeScaleCache;
Point3F shapeOffset; ///< Offset used to translate the shape origin
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// Collect the nodes, objects and sequences for the scene // Collect the nodes, objects and sequences for the scene