TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 06:34:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'development' into EngineAPI-Refactor

Browse source
This commit is contained in:
Areloch 2018-12-09 14:48:50 -06:00 • committed by GitHub
commit 3a71c75596
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1937 changed files with 102332 additions and 70549 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)
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;
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* input = vertices->getInput_array().get(iInput);
if (dStrEqual(input->getSemantic(), semantic))
domInputLocal* vInput = vertices->getInput_array().get(iInput);
if (dStrEqual(vInput->getSemantic(), semantic))
{
source = daeSafeCast<domSource>(findInputSource(input));
source = daeSafeCast<domSource>(findInputSource(vInput));
break;
}
}
@ -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);
const domInt* vindices = (domInt*)weights_v.getRaw(0);
vindices = (domInt*)weights_v.getRaw(0);
vindices += vindicesOffset[vertTuples[iVert].vertex];
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++)
{
domInstance_node* instnode = node->getInstance_node_array()[i];
domNode* node = daeSafeCast<domNode>(instnode->getUrl().getElement());
if (node)
processNode(tree, node, nodeID, stats);
domNode* dNode = daeSafeCast<domNode>(instnode->getUrl().getElement());
if (dNode)
processNode(tree, dNode, nodeID, stats);
}
}

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

@ -266,10 +266,10 @@ void AnimData::parseTargetString(const char* target, S32 fullCount, const char*
targetValueCount = 1;
}
}
else if (const char* p = dStrrchr(target, '.')) {
else if (const char* p2 = dStrrchr(target, '.')) {
// Check for named elements
for (S32 iElem = 0; elements[iElem][0] != 0; iElem++) {
if (!dStrcmp(p, elements[iElem])) {
if (!dStrcmp(p2, elements[iElem])) {
targetValueOffset = iElem;
targetValueCount = 1;
break;
@ -2948,7 +2948,7 @@ void ColladaUtils::ExportData::processData()
detailLevels.clear();
detailLevels.setSize(numDetailLevels);
for (U32 m = 0; m < meshData.size(); ++m)
for (U32 meshNum = 0; meshNum < meshData.size(); ++meshNum)
{
for (U32 i = 0; i < numDetailLevels; ++i)
{
@ -2967,7 +2967,7 @@ void ColladaUtils::ExportData::processData()
{
//walk backwards as needed to find our first valid detail level for this mesh. if we find none, just move on
S32 testDetailLevelSize = getDetailLevelSize(mdl);
detailLevelIdx = meshData[m].hasDetailLevel(testDetailLevelSize);
detailLevelIdx = meshData[meshNum].hasDetailLevel(testDetailLevelSize);
if (detailLevelIdx != -1)
break;
@ -2983,7 +2983,7 @@ void ColladaUtils::ExportData::processData()
{
//walk backwards as needed to find our first valid detail level for this mesh. if we find none, just move on
S32 testDetailLevelSize = getDetailLevelSize(mdl);
detailLevelIdx = meshData[m].hasDetailLevel(testDetailLevelSize);
detailLevelIdx = meshData[meshNum].hasDetailLevel(testDetailLevelSize);
if (detailLevelIdx != -1)
break;
@ -2994,13 +2994,13 @@ void ColladaUtils::ExportData::processData()
//If we found the detail level index, go ahead and build out the data for it
if (detailLevelIdx != -1)
{
curDetail->mesh.setTransform(&meshData[m].meshTransform, meshData[m].scale);
curDetail->mesh.setObject(meshData[m].originatingObject);
curDetail->mesh.setTransform(&meshData[meshNum].meshTransform, meshData[meshNum].scale);
curDetail->mesh.setObject(meshData[meshNum].originatingObject);
if (meshData[m].shapeInst != nullptr)
if (meshData[meshNum].shapeInst != nullptr)
{
if (!meshData[m].shapeInst->buildPolyList(&curDetail->mesh, detailLevelIdx))
if (!meshData[meshNum].shapeInst->buildPolyList(&curDetail->mesh, detailLevelIdx))
{
Con::errorf("TSStatic::buildExportPolyList - failed to build polylist for LOD %i", i);
continue;
@ -3009,10 +3009,10 @@ void ColladaUtils::ExportData::processData()
else
{
//special handling classes
ConvexShape* convexShp = dynamic_cast<ConvexShape*>(meshData[m].originatingObject);
ConvexShape* convexShp = dynamic_cast<ConvexShape*>(meshData[meshNum].originatingObject);
if (convexShp != nullptr)
{
if (!convexShp->buildPolyList(PLC_Export, &curDetail->mesh, meshData[m].originatingObject->getWorldBox(), meshData[m].originatingObject->getWorldSphere()))
if (!convexShp->buildPolyList(PLC_Export, &curDetail->mesh, meshData[meshNum].originatingObject->getWorldBox(), meshData[meshNum].originatingObject->getWorldSphere()))
{
Con::errorf("TSStatic::buildExportPolyList - failed to build ConvexShape polylist for LOD %i", i);
continue;
@ -3021,19 +3021,19 @@ void ColladaUtils::ExportData::processData()
}
//lastly, get material
for (U32 m = 0; m < curDetail->mesh.mMaterialList.size(); m++)
for (U32 matNum = 0; matNum < curDetail->mesh.mMaterialList.size(); matNum++)
{
S32 matIdx = hasMaterialInstance(curDetail->mesh.mMaterialList[m]);
S32 matIdx = hasMaterialInstance(curDetail->mesh.mMaterialList[matNum]);
if (matIdx == -1)
{
//cool, haven't already got this material, so lets store it out
materials.push_back(curDetail->mesh.mMaterialList[m]);
curDetail->materialRefList.insert(m, materials.size() - 1);
materials.push_back(curDetail->mesh.mMaterialList[matNum]);
curDetail->materialRefList.insert(matNum, materials.size() - 1);
}
else
{
curDetail->materialRefList.insert(m, matIdx);
curDetail->materialRefList.insert(matNum, matIdx);
}
}
}