TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-01 19:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

skip trying to be clever and just report the variable name being checked directly

Browse source
This commit is contained in:
AzaezelX 2025-03-18 03:13:37 -05:00
parent 55ac453ab9
commit 011a8906ff
14 changed files with 29 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/console/consoleObject.cpp
View file

@ -646,7 +646,6 @@ void ConsoleObject::addProtectedFieldV(const char* in_pFieldname,
f.offset = in_fieldOffset;
f.elementCount = in_elementCount;
f.validator = v;
f.validator->fieldIndex = sg_tempFieldList.size();
f.flag = flags;
f.setDataFn = in_setDataFn;
@ -722,7 +721,6 @@ void ConsoleObject::addFieldV(const char* in_pFieldname,
f.writeDataFn = &defaultProtectedWriteFn;
f.elementCount = in_elementCount;
f.validator = v;
f.validator->fieldIndex = sg_tempFieldList.size();
f.networkMask = 0;
sg_tempFieldList.push_back(f);

4
Engine/source/console/simObject.cpp
View file

@ -1097,7 +1097,7 @@ void SimObject::setDataField(StringTableEntry slotName, const char *array, const
Con::setData(fld->type, (void *) (((const char *)this) + fld->offset), array1, 1, &value, fld->table);
if(fld->validator)
fld->validator->validateType(this, (void *) (((const char *)this) + fld->offset));
fld->validator->validateType(this, fld->pFieldname, (void *) (((const char *)this) + fld->offset));
if (fld->networkMask != 0)
{
@ -1111,7 +1111,7 @@ void SimObject::setDataField(StringTableEntry slotName, const char *array, const
}
if(fld->validator)
fld->validator->validateType(this, (void *) (((const char *)this) + fld->offset));
fld->validator->validateType(this, fld->pFieldname, (void *) (((const char *)this) + fld->offset));
onStaticModified( slotName, value );
return;

21
Engine/source/console/typeValidators.cpp
View file

@ -28,7 +28,7 @@
#include "math/mPoint3.h"
#include <stdarg.h>
void TypeValidator::consoleError(SimObject *object, const char *format, ...)
void TypeValidator::consoleError(SimObject *object, StringTableEntry varname, const char *format, ...)
{
char buffer[1024];
va_list argptr;
@ -37,22 +37,21 @@ void TypeValidator::consoleError(SimObject *object, const char *format, ...)
va_end(argptr);
AbstractClassRep *rep = object->getClassRep();
AbstractClassRep::Field &fld = rep->mFieldList[fieldIndex];
const char *objectName = object->getName();
if(!objectName)
objectName = "unnamed";
Con::warnf("%s - %s(%d) - invalid value for %s: %s",
rep->getClassName(), objectName, object->getId(), fld.pFieldname, buffer);
rep->getClassName(), objectName, object->getId(), varname, buffer);
}
void FRangeValidator::validateType(SimObject *object, void *typePtr)
void FRangeValidator::validateType(SimObject *object, StringTableEntry varname, void *typePtr)
{
F32 *v = (F32 *) typePtr;
if(*v < minV || *v > maxV)
{
consoleError(object, "=(%g). Must be between %g and %g", *v, minV, maxV);
consoleError(object, varname, "=(%g). Must be between %g and %g", *v, minV, maxV);
if(*v < minV)
*v = minV;
else if(*v > maxV)
@ -60,12 +59,12 @@ void FRangeValidator::validateType(SimObject *object, void *typePtr)
}
}
void IRangeValidator::validateType(SimObject *object, void *typePtr)
void IRangeValidator::validateType(SimObject *object, StringTableEntry varname, void *typePtr)
{
S32 *v = (S32 *) typePtr;
if(*v < minV || *v > maxV)
{
consoleError(object, "=(%d). Must be between %d and %d", *v, minV, maxV);
consoleError(object, varname, "=(%d). Must be between %d and %d", *v, minV, maxV);
if(*v < minV)
*v = minV;
else if(*v > maxV)
@ -73,13 +72,13 @@ void IRangeValidator::validateType(SimObject *object, void *typePtr)
}
}
void IRangeValidatorScaled::validateType(SimObject *object, void *typePtr)
void IRangeValidatorScaled::validateType(SimObject *object, StringTableEntry varname, void *typePtr)
{
S32 *v = (S32 *) typePtr;
*v /= factor;
if(*v < minV || *v > maxV)
{
consoleError(object, "=(%d). Scaled value must be between %d and %d", *v, minV, maxV);
consoleError(object, varname, "=(%d). Scaled value must be between %d and %d", *v, minV, maxV);
if(*v < minV)
*v = minV;
else if(*v > maxV)
@ -87,13 +86,13 @@ void IRangeValidatorScaled::validateType(SimObject *object, void *typePtr)
}
}
void Point3NormalizeValidator::validateType(SimObject *object, void *typePtr)
void Point3NormalizeValidator::validateType(SimObject *object, StringTableEntry varname, void *typePtr)
{
Point3F *v = (Point3F *) typePtr;
const F32 len = v->len();
if(!mIsEqual(len, 1.0f))
{
consoleError(object, "=(%g). Vector length must be %g", len, length);
consoleError(object, varname, "=(%g). Vector length must be %g", len, length);
*v *= length / len;
}
}

15
Engine/source/console/typeValidators.h
View file

@ -30,8 +30,7 @@
class TypeValidator
{
public:
S32 fieldIndex;
TypeValidator() : fieldIndex(0) {}
TypeValidator() {}
~TypeValidator() {}
/// Prints a console error message for the validator.
///
@ -39,11 +38,11 @@ class TypeValidator
/// @code
/// className objectName (objectId) - invalid value for fieldName: msg
/// @endcode
void consoleError(SimObject *object, const char *format, ...);
void consoleError(SimObject *object, StringTableEntry varname, const char *format, ...);
/// validateType is called for each assigned value on the field this
/// validator is attached to.
virtual void validateType(SimObject *object, void *typePtr) = 0;
virtual void validateType(SimObject *object, StringTableEntry varname, void *typePtr) = 0;
};
@ -58,7 +57,7 @@ public:
maxV = mFabs(maxValue) > F32_MIN ? maxValue : 0.0f;
mFidelity = fidelity;
}
void validateType(SimObject *object, void *typePtr) override;
void validateType(SimObject *object, StringTableEntry varname, void *typePtr) override;
F32 getMin() { return minV; };
F32 getMax() { return maxV; };
F32 getFidelity() { return mFidelity; };
@ -75,7 +74,7 @@ public:
maxV = maxValue;
mFidelity = fidelity;
}
void validateType(SimObject *object, void *typePtr) override;
void validateType(SimObject *object, StringTableEntry varname, void *typePtr) override;
S32 getMin() { return minV; };
S32 getMax() { return maxV; };
S32 getFidelity() { return mFidelity; };
@ -96,7 +95,7 @@ public:
maxV = maxValueScaled;
factor = scaleFactor;
}
void validateType(SimObject *object, void *typePtr) override;
void validateType(SimObject *object, StringTableEntry varname, void *typePtr) override;
S32 getMin() { return minV; };
S32 getMax() { return maxV; };
S32 getScaleFactor() { return factor; };
@ -108,7 +107,7 @@ class Point3NormalizeValidator : public TypeValidator
F32 length;
public:
Point3NormalizeValidator(F32 normalizeLength = 1.0f) : length(normalizeLength) { }
void validateType(SimObject *object, void *typePtr) override;
void validateType(SimObject *object, StringTableEntry varname, void *typePtr) override;
F32 getLength() { return length; };
};