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

rename overloaded function so linux and mac stop bitching

Browse source
This commit is contained in:
marauder2k7 2025-04-09 16:05:22 +01:00
parent 7c3fbfc9d8
commit cd7666bf2a
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/console/propertyParsing.h
View file

@ -168,12 +168,12 @@ namespace PropertyInfo
{ {
static const U32 bufSize = 256; static const U32 bufSize = 256;
char* buffer = Con::getReturnBuffer(bufSize); char* buffer = Con::getReturnBuffer(bufSize);
FormatProperty<T,count>(dataPtr, buffer, bufSize); FormatPropertyBuffer<T,count>(dataPtr, buffer, bufSize);
return buffer; return buffer;
} }
template<typename T, size_t count> template<typename T, size_t count>
char* FormatProperty(const void* dataPtr, char* buffer, U32 bufSize) char* FormatPropertyBuffer(const void* dataPtr, char* buffer, U32 bufSize)
{ {
const T* values = reinterpret_cast<const T*>(dataPtr); const T* values = reinterpret_cast<const T*>(dataPtr);
char* ptr = buffer; char* ptr = buffer;

14
Engine/source/math/mathTypes.cpp
View file

@ -394,11 +394,11 @@ ConsoleGetType( TypeMatrixF )
char* buffer = Con::getReturnBuffer(bufSize); char* buffer = Con::getReturnBuffer(bufSize);
F32* mat = (F32*)dptr; F32* mat = (F32*)dptr;
buffer = PropertyInfo::FormatProperty<F32, 3>(mat + 0, buffer, bufSize); buffer = PropertyInfo::FormatPropertyBuffer<F32, 3>(mat + 0, buffer, bufSize);
*buffer++ = ' '; *buffer++ = ' ';
buffer = PropertyInfo::FormatProperty<F32, 3>(mat + 4, buffer, bufSize); buffer = PropertyInfo::FormatPropertyBuffer<F32, 3>(mat + 4, buffer, bufSize);
*buffer++ = ' '; *buffer++ = ' ';
buffer = PropertyInfo::FormatProperty<F32, 3>(mat + 8, buffer, bufSize); buffer = PropertyInfo::FormatPropertyBuffer<F32, 3>(mat + 8, buffer, bufSize);
*buffer = '\0'; // null-terminate just in case *buffer = '\0'; // null-terminate just in case
return buffer; return buffer;
@ -631,9 +631,9 @@ ConsoleGetType( TypeEaseF )
char* buffer = Con::getReturnBuffer(bufSize); char* buffer = Con::getReturnBuffer(bufSize);
EaseF* pEase = (EaseF*)dptr; EaseF* pEase = (EaseF*)dptr;
buffer = PropertyInfo::FormatProperty<S32, 2>(pEase + 0, buffer, bufSize); buffer = PropertyInfo::FormatPropertyBuffer<S32, 2>(pEase + 0, buffer, bufSize);
*buffer++ = ' '; *buffer++ = ' ';
buffer = PropertyInfo::FormatProperty<F32, 2>(pEase + 2, buffer, bufSize); buffer = PropertyInfo::FormatPropertyBuffer<F32, 2>(pEase + 2, buffer, bufSize);
*buffer = '\0'; // null-terminate just in case *buffer = '\0'; // null-terminate just in case
return buffer; return buffer;
@ -678,12 +678,12 @@ ConsoleGetType(TypeRotationF)
if (pt->mRotationType == RotationF::Euler) if (pt->mRotationType == RotationF::Euler)
{ {
EulerF out = pt->asEulerF(RotationF::Degrees); EulerF out = pt->asEulerF(RotationF::Degrees);
returnBuffer = PropertyInfo::FormatProperty<F32, 3>(out, returnBuffer, bufSize); returnBuffer = PropertyInfo::FormatPropertyBuffer<F32, 3>(out, returnBuffer, bufSize);
} }
else if (pt->mRotationType == RotationF::AxisAngle) else if (pt->mRotationType == RotationF::AxisAngle)
{ {
AngAxisF out = pt->asAxisAngle(RotationF::Degrees); AngAxisF out = pt->asAxisAngle(RotationF::Degrees);
returnBuffer = PropertyInfo::FormatProperty<F32, 4>(&out, returnBuffer, bufSize); returnBuffer = PropertyInfo::FormatPropertyBuffer<F32, 4>(&out, returnBuffer, bufSize);
} }
*returnBuffer = '\0'; // null-terminate just in case *returnBuffer = '\0'; // null-terminate just in case