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

uninitialized and unused value cleanups

Browse source 
(cherry picked from commit 1f08602cf0ad84409cd8b3520510f9c6ce7d5f9c)
This commit is contained in:
AzaezelX 2023-05-01 10:37:44 -05:00
parent 1230d0d280
commit 0d4221fa59
38 changed files with 176 additions and 360 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/ts/tsLastDetail.cpp
View file

@ -224,8 +224,7 @@ void TSLastDetail::update( bool forceUpdate )
// Do we need to update the imposter?
const String diffuseMapPath = _getDiffuseMapPath();
bool isFile = Platform::isFile(diffuseMapPath.c_str());
if ( forceUpdate || !Platform::isFile(diffuseMapPath.c_str()) ||
Platform::compareModifiedTimes( diffuseMapPath, shapeFile ) <= 0 )
if ( forceUpdate || !isFile || Platform::compareModifiedTimes( diffuseMapPath, shapeFile ) <= 0 )
_update();
// If the time check fails now then the update must have not worked.

2
Engine/source/ts/tsShapeInstance.cpp
View file

@ -294,8 +294,6 @@ void TSShapeInstance::reSkin( String newBaseName, String oldBaseName )
if ( newBaseName.equal( oldBaseName, String::NoCase ) )
return;
const U32 oldBaseNameLength = oldBaseName.length();
// Make our own copy of the materials list from the resource if necessary
if (ownMaterialList() == false)
cloneMaterialList();

33
Engine/source/ts/tsShapeInstance.h
View file

@ -740,25 +740,25 @@ class TSThread
/// if in transition...
struct TransitionData
{
bool inTransition;
bool inTransition = false;
F32 duration;
F32 pos;
F32 direction;
F32 targetScale; ///< time scale for sequence we are transitioning to (during transition only)
F32 duration = 0.0f;
F32 pos = 0.0f;
F32 direction = 1.0f;
F32 targetScale = 1.0f; ///< time scale for sequence we are transitioning to (during transition only)
///< this is either 1 or 0 (if 1 target sequence plays as we transition, if 0 it doesn't)
TSIntegerSet oldRotationNodes; ///< nodes controlled by this thread pre-transition
TSIntegerSet oldTranslationNodes; ///< nodes controlled by this thread pre-transition
TSIntegerSet oldScaleNodes; ///< nodes controlled by this thread pre-transition
U32 oldSequence; ///< sequence that was set before transition began
F32 oldPos; ///< position of sequence before transition began
U32 oldSequence = 0; ///< sequence that was set before transition began
F32 oldPos = 0.0f; ///< position of sequence before transition began
} transitionData;
struct
{
F32 start;
F32 end;
S32 loop;
F32 start = 0.0f;
F32 end = 0.0f;
S32 loop = 0.0f;
} path;
bool makePath;
@ -781,7 +781,18 @@ class TSThread
/// @}
TSThread(TSShapeInstance*);
TSThread() {}
TSThread() {
blendDisabled = true;
keyNum1 = 0;
keyNum2 = 0;
keyPos = 0;
mSeqPos = 0;
mShapeInstance = NULL;
makePath = NULL;
priority = 0;
sequence = 0;
timeScale = 1.0f;
}
void setSequence(S32 seq, F32 pos);
void transitionToSequence(S32 seq, F32 pos, F32 duration, bool continuePlay);