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

clean up math varsize complaints

Browse source
This commit is contained in:
AzaezelX 2023-04-27 16:10:04 -05:00
parent 1230d0d280
commit 0ce2da3a23
30 changed files with 61 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -512,7 +512,7 @@ void ColladaAppMesh::getPrimitives(const domGeometry* geometry)
if (!pTriData)
continue;
U32 numTriangles = pTriData->getCount() / meshPrims[iPrim]->getStride() / 3;
U32 numTriangles = (U32)(pTriData->getCount() / meshPrims[iPrim]->getStride() / 3);
if (!numTriangles)
continue;

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

@ -195,8 +195,8 @@ DefineEngineFunction( enumColladaForImport, bool, (const char * shapePath, const
for (S32 i = 0; i < root->getLibrary_materials_array().getCount(); i++)
{
const domLibrary_materials* libraryMats = root->getLibrary_materials_array()[i];
stats.numMaterials += libraryMats->getMaterial_array().getCount();
for (S32 j = 0; j < libraryMats->getMaterial_array().getCount(); j++)
stats.numMaterials += (S32)libraryMats->getMaterial_array().getCount();
for (S32 j = 0; j < (S32)libraryMats->getMaterial_array().getCount(); j++)
{
domMaterial* mat = libraryMats->getMaterial_array()[j];
tree->insertItem(matsID, _GetNameOrId(mat), "", "", 0, 0);
@ -225,7 +225,7 @@ DefineEngineFunction( enumColladaForImport, bool, (const char * shapePath, const
for (S32 i = 0; i < root->getLibrary_animation_clips_array().getCount(); i++)
{
const domLibrary_animation_clips* libraryClips = root->getLibrary_animation_clips_array()[i];
stats.numClips += libraryClips->getAnimation_clip_array().getCount();
stats.numClips += (S32)libraryClips->getAnimation_clip_array().getCount();
for (S32 j = 0; j < libraryClips->getAnimation_clip_array().getCount(); j++)
{
domAnimation_clip* clip = libraryClips->getAnimation_clip_array()[j];

3
Engine/source/ts/collada/colladaShapeLoader.cpp
View file

@ -462,7 +462,7 @@ void updateMaterialsScript(const Torque::Path &path, bool copyTextures = false)
#endif
return;
/*
Torque::Path scriptPath(path);
scriptPath.setFileName("materials");
scriptPath.setExtension(TORQUE_SCRIPT_EXTENSION);
@ -510,6 +510,7 @@ void updateMaterialsScript(const Torque::Path &path, bool copyTextures = false)
}
persistMgr.saveDirty();
*/
}
//-----------------------------------------------------------------------------

2
Engine/source/ts/collada/colladaUtils.h
View file

@ -831,7 +831,7 @@ template<> inline const domListOfUInts *ColladaPrimitive<domPolylist>::getTriang
pSrcData += stride;
for (S32 iTri = 0; iTri < vcount[iPoly]-2; iTri++) {
pTriangleData->appendArray(stride, v0);
pTriangleData->appendArray(stride*2, pSrcData);
pTriangleData->appendArray((U64)(stride*2), pSrcData);
pSrcData += stride;
}
pSrcData += stride;