Merge pull request #1432 from Azaezel/alpha41/percent

add 0-100 percent ranges
This commit is contained in:
Brian Roberts 2025-04-02 16:21:36 -05:00 committed by GitHub
commit 2e33228009
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 1 deletions

View file

@ -105,6 +105,7 @@ namespace CommonValidators
FRangeValidator PositiveFloat(0.0f, F32_MAX); FRangeValidator PositiveFloat(0.0f, F32_MAX);
FRangeValidator PositiveNonZeroFloat((F32)POINT_EPSILON, F32_MAX); FRangeValidator PositiveNonZeroFloat((F32)POINT_EPSILON, F32_MAX);
FRangeValidator NormalizedFloat(0.0f, 1.0f); FRangeValidator NormalizedFloat(0.0f, 1.0f);
FRangeValidator F32Percent(0.0f, 100.0f);
FRangeValidator F32_8BitPercent(0.0f, 1.0f, BIT(8)); FRangeValidator F32_8BitPercent(0.0f, 1.0f, BIT(8));
FRangeValidator F32_16BitPercent(0.0f, 1.0f, BIT(16)); FRangeValidator F32_16BitPercent(0.0f, 1.0f, BIT(16));
@ -116,6 +117,7 @@ namespace CommonValidators
IRangeValidator NegDefaultInt(-1, S32_MAX); IRangeValidator NegDefaultInt(-1, S32_MAX);
IRangeValidator PositiveInt(0, S32_MAX); IRangeValidator PositiveInt(0, S32_MAX);
IRangeValidator NaturalNumber(1, S32_MAX); IRangeValidator NaturalNumber(1, S32_MAX);
IRangeValidator S32Percent(0, 100);
//see "T3D/gameBase/processList.h" for TickMs = 32 //see "T3D/gameBase/processList.h" for TickMs = 32
IRangeValidator MSTickRange(32, S32_MAX); IRangeValidator MSTickRange(32, S32_MAX);

View file

@ -120,6 +120,7 @@ namespace CommonValidators
extern FRangeValidator PositiveFloat; extern FRangeValidator PositiveFloat;
extern FRangeValidator PositiveNonZeroFloat; extern FRangeValidator PositiveNonZeroFloat;
extern FRangeValidator NormalizedFloat; extern FRangeValidator NormalizedFloat;
extern FRangeValidator F32Percent;
extern FRangeValidator F32_8BitPercent; extern FRangeValidator F32_8BitPercent;
extern FRangeValidator F32_16BitPercent; extern FRangeValidator F32_16BitPercent;
extern FRangeValidator ValidSlopeAngle; extern FRangeValidator ValidSlopeAngle;
@ -130,6 +131,7 @@ namespace CommonValidators
extern IRangeValidator NegDefaultInt; extern IRangeValidator NegDefaultInt;
extern IRangeValidator PositiveInt; extern IRangeValidator PositiveInt;
extern IRangeValidator NaturalNumber; extern IRangeValidator NaturalNumber;
extern IRangeValidator S32Percent;
extern IRangeValidator MSTickRange; extern IRangeValidator MSTickRange;
extern IRangeValidator S32_8BitCap; extern IRangeValidator S32_8BitCap;
extern IRangeValidator S32_16BitCap; extern IRangeValidator S32_16BitCap;

View file

@ -44,7 +44,7 @@ GuiBitmapBarCtrl::GuiBitmapBarCtrl(void)
void GuiBitmapBarCtrl::initPersistFields() void GuiBitmapBarCtrl::initPersistFields()
{ {
docsURL; docsURL;
addFieldV("percent", TypeRangedF32, Offset(mPercent, GuiBitmapBarCtrl), &CommonValidators::NormalizedFloat, addFieldV("percent", TypeRangedF32, Offset(mPercent, GuiBitmapBarCtrl), &CommonValidators::F32Percent,
"% shown"); "% shown");
addField("vertical", TypeBool, Offset(mVertical, GuiBitmapBarCtrl), addField("vertical", TypeBool, Offset(mVertical, GuiBitmapBarCtrl),
"If true, the bitmap is clipped vertically."); "If true, the bitmap is clipped vertically.");