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

compile fixes.

Browse source
This commit is contained in:
Jeff Hutchinson 2021-03-31 22:10:55 -04:00
parent 50df52ecfc
commit 02447f0996
20 changed files with 3207 additions and 3168 deletions
Download patch file Download diff file Expand all files Collapse all files

56
Engine/source/console/console.h
View file

@ -158,25 +158,12 @@ class ConsoleValue
char* convertToBuffer() const;
TORQUE_FORCEINLINE bool isStringType() const
{
return type == ConsoleValueType::cvString || type == ConsoleValueType::cvSTEntry;
}
TORQUE_FORCEINLINE bool isNumberType() const
{
return type == ConsoleValueType::cvFloat || type == ConsoleValueType::cvInteger;
}
TORQUE_FORCEINLINE bool hasAllocatedData() const
{
return type == ConsoleValueType::cvString || type >= ConsoleValueType::cvConsoleValueType;
return type == ConsoleValueType::cvString || isConsoleType();
}
TORQUE_FORCEINLINE const char* getConsoleData() const
{
return Con::getData(type, ct->dataPtr, 0, ct->enumTable);
}
const char* getConsoleData() const;
TORQUE_FORCEINLINE void cleanupData()
{
@ -192,7 +179,7 @@ public:
type = ConsoleValueType::cvNone;
}
ConsoleValue(ConsoleValue&& ref)
ConsoleValue(ConsoleValue&& ref) noexcept
{
cleanupData();
type = ref.type;
@ -209,7 +196,7 @@ public:
f = ref.f;
break;
case cvSTEntry:
TORQUE_CASE_FALLTHROUGH
TORQUE_CASE_FALLTHROUGH;
case cvString:
s = ref.s;
break;
@ -229,6 +216,12 @@ public:
cleanupData();
}
TORQUE_FORCEINLINE void reset()
{
cleanupData();
type = ConsoleValueType::cvNone;
}
TORQUE_FORCEINLINE F64 getFloat() const
{
AssertFatal(type == ConsoleValueType::cvNone, "Attempted to access ConsoleValue when it has no value!");
@ -263,6 +256,11 @@ public:
return getConsoleData();
}
TORQUE_FORCEINLINE operator const char* () const
{
return getString();
}
TORQUE_FORCEINLINE bool getBool() const
{
AssertFatal(type == ConsoleValueType::cvNone, "Attempted to access ConsoleValue when it has no value!");
@ -290,6 +288,11 @@ public:
i = val;
}
TORQUE_FORCEINLINE void setString(const char* val)
{
setString(val, dStrlen(val));
}
TORQUE_FORCEINLINE void setString(const char* val, S32 len)
{
cleanupData();
@ -315,11 +318,11 @@ public:
s = const_cast<char*>(val);
}
TORQUE_FORCEINLINE void setConsoleData(S32 consoleType, void* dataPtr, EnumTable* enumTable)
TORQUE_FORCEINLINE void setConsoleData(S32 consoleType, void* dataPtr, const EnumTable* enumTable)
{
cleanupData();
type = ConsoleValueType::cvSTEntry;
ct = new ConsoleValueConsoleType{ dataPtr, enumTable };
ct = new ConsoleValueConsoleType{ dataPtr, const_cast<EnumTable*>(enumTable) };
}
TORQUE_FORCEINLINE S32 getType() const
@ -327,6 +330,21 @@ public:
return type;
}
TORQUE_FORCEINLINE bool isStringType() const
{
return type == ConsoleValueType::cvString || type == ConsoleValueType::cvSTEntry;
}
TORQUE_FORCEINLINE bool isNumberType() const
{
return type == ConsoleValueType::cvFloat || type == ConsoleValueType::cvInteger;
}
TORQUE_FORCEINLINE bool isConsoleType() const
{
return type >= ConsoleValueType::cvConsoleValueType;
}
static void init();
static S32 getConstantBufferCount() { return (S32)ConversionBufferSize / StringSize; }
};