TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into style-cleanup

Browse source 
Conflicts:
	Engine/source/console/astNodes.cpp
	Engine/source/console/codeBlock.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/collada/colladaAppMesh.cpp
	Engine/source/ts/tsShape.cpp
	Engine/source/ts/tsShapeConstruct.cpp
This commit is contained in:
Daniel Buckmaster 2014-12-15 12:15:55 +11:00
commit 33ff180593
2053 changed files with 172002 additions and 69530 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Engine/source/ts/tsShapeConstruct.cpp
View file

@ -1216,8 +1216,9 @@ DefineTSShapeConstructorMethod( getMeshName, const char*, ( const char* name, S3
CHECK_INDEX_IN_RANGE( getMeshName, index, objectDetails.size(), "" );
char* returnBuffer = Con::getReturnBuffer(256);
dSprintf(returnBuffer, 256, "%s %d", name, (S32)mShape->mDetails[objectDetails[index]].size);
static const U32 bufSize = 256;
char* returnBuffer = Con::getReturnBuffer(bufSize);
dSprintf(returnBuffer, bufSize, "%s %d", name, (S32)mShape->mDetails[objectDetails[index]].size);
return returnBuffer;
}}
@ -1602,8 +1603,9 @@ DefineTSShapeConstructorMethod( getImposterSettings, const char*, ( S32 index ),
// Return information about the detail level
const TSShape::Detail& det = mShape->mDetails[index];
char* returnBuffer = Con::getReturnBuffer(512);
dSprintf(returnBuffer, 512, "%d\t%d\t%d\t%d\t%d\t%d\t%g",
static const U32 bufSize = 512;
char* returnBuffer = Con::getReturnBuffer(bufSize);
dSprintf(returnBuffer, bufSize, "%d\t%d\t%d\t%d\t%d\t%d\t%g",
(S32)( det.subShapeNum < 0 ), // isImposter
det.bbEquatorSteps,
det.bbPolarSteps,
@ -1727,8 +1729,9 @@ DefineTSShapeConstructorMethod( getSequenceSource, const char*, ( const char* na
GET_SEQUENCE( getSequenceSource, seq, name, "" );
// Return information about the source data for this sequence
char* returnBuffer = Con::getReturnBuffer(512);
dSprintf( returnBuffer, 512, "%s\t%d\t%d\t%d",
static const U32 bufSize = 512;
char* returnBuffer = Con::getReturnBuffer(bufSize);
dSprintf( returnBuffer, bufSize, "%s\t%d\t%d\t%d",
seq->sourceData.from.c_str(), seq->sourceData.start,
seq->sourceData.end, seq->sourceData.total );
return returnBuffer;
@ -1802,8 +1805,9 @@ DefineTSShapeConstructorMethod( getSequenceGroundSpeed, const char*, ( const cha
rot = mat.toEuler();
}
char* returnBuffer = Con::getReturnBuffer(256);
dSprintf( returnBuffer, 256, "%g %g %g %g %g %g",
static const U32 bufSize = 256;
char* returnBuffer = Con::getReturnBuffer(bufSize);
dSprintf( returnBuffer, bufSize, "%g %g %g %g %g %g",
trans.x, trans.y, trans.z, rot.x, rot.y, rot.z );
return returnBuffer;
}}
@ -1896,8 +1900,9 @@ DefineTSShapeConstructorMethod( getSequenceBlend, const char*, ( const char* nam
GET_SEQUENCE( getSequenceBlend, seq, name, "0" );
// Return the blend information (flag reference_sequence reference_frame)
char* returnBuffer = Con::getReturnBuffer(512);
dSprintf( returnBuffer, 512, "%d\t%s\t%d", (int)seq->isBlend(),
static const U32 bufSize = 512;
char* returnBuffer = Con::getReturnBuffer(bufSize);
dSprintf( returnBuffer, bufSize, "%d\t%s\t%d", (int)seq->isBlend(),
seq->sourceData.blendSeq.c_str(), seq->sourceData.blendFrame );
return returnBuffer;
}}
@ -2038,8 +2043,9 @@ DefineTSShapeConstructorMethod( getTrigger, const char*, ( const char* name, S32
if (!(trig.state & TSShape::Trigger::StateOn))
state = -state;
char* returnBuffer = Con::getReturnBuffer(32);
dSprintf(returnBuffer, 32, "%d %d", frame, state);
static const U32 bufSize = 32;
char* returnBuffer = Con::getReturnBuffer(bufSize);
dSprintf(returnBuffer, bufSize, "%d %d", frame, state);
return returnBuffer;
}}