shweet/anm2ed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Float fixes, sensible settings

Browse Source
This commit is contained in:
shweet
2025-09-14 21:27:14 -04:00
parent ce3f0b3415
commit cf9f04ecdc
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/COMMON.h
View File

@@ -114,9 +114,21 @@ static inline std::string string_to_lowercase(std::string string) {
return string; return string;
} }
#define FLOAT_FORMAT_MAX_DECIMALS 2
#define FLOAT_FORMAT_EPSILON 1e-6f #define FLOAT_FORMAT_MAX_DECIMALS 9
static constexpr f32 FLOAT_FORMAT_POW10[] = {1.f, 10.f, 100.f}; #define FLOAT_FORMAT_EPSILON 1e-9f
static constexpr f32 FLOAT_FORMAT_POW10[] = {
1.f,
10.f,
100.f,
1000.f,
10000.f,
100000.f,
1000000.f,
10000000.f,
100000000.f,
1000000000.f
};
static inline s32 f32_decimals_needed(f32 value) static inline s32 f32_decimals_needed(f32 value)
{ {
@@ -130,8 +142,11 @@ static inline s32 f32_decimals_needed(f32 value)
for (s32 decimalCount = 1; decimalCount <= FLOAT_FORMAT_MAX_DECIMALS; ++decimalCount) for (s32 decimalCount = 1; decimalCount <= FLOAT_FORMAT_MAX_DECIMALS; ++decimalCount)
{ {
f32 scaledFraction = fractionalPart * FLOAT_FORMAT_POW10[decimalCount]; f32 scaledFraction = fractionalPart * FLOAT_FORMAT_POW10[decimalCount];
if (fabsf(scaledFraction - roundf(scaledFraction)) < FLOAT_FORMAT_EPSILON * FLOAT_FORMAT_POW10[decimalCount]) if (fabsf(scaledFraction - roundf(scaledFraction)) <
FLOAT_FORMAT_EPSILON * FLOAT_FORMAT_POW10[decimalCount])
{
return decimalCount; return decimalCount;
}
} }
return FLOAT_FORMAT_MAX_DECIMALS; return FLOAT_FORMAT_MAX_DECIMALS;
} }
@@ -140,7 +155,9 @@ static inline const char* f32_format_get(f32 value)
{ {
static std::string formatString; static std::string formatString;
const s32 decimalCount = f32_decimals_needed(value); const s32 decimalCount = f32_decimals_needed(value);
formatString = (decimalCount == 0) ? "%.0f" : ("%." + std::to_string(decimalCount) + "f"); formatString = (decimalCount == 0)
? "%.0f"
: ("%." + std::to_string(decimalCount) + "f");
return formatString.c_str(); return formatString.c_str();
} }
@@ -150,7 +167,9 @@ static inline const char* vec2_format_get(const vec2& value)
const s32 decimalCountX = f32_decimals_needed(value.x); const s32 decimalCountX = f32_decimals_needed(value.x);
const s32 decimalCountY = f32_decimals_needed(value.y); const s32 decimalCountY = f32_decimals_needed(value.y);
const s32 decimalCount = (decimalCountX > decimalCountY) ? decimalCountX : decimalCountY; const s32 decimalCount = (decimalCountX > decimalCountY) ? decimalCountX : decimalCountY;
formatString = (decimalCount == 0) ? "%.0f" : ("%." + std::to_string(decimalCount) + "f"); formatString = (decimalCount == 0)
? "%.0f"
: ("%." + std::to_string(decimalCount) + "f");
return formatString.c_str(); return formatString.c_str();
} }

4
src/settings.h
View File

@@ -88,7 +88,7 @@
\ \
X(previewIsAxes, PREVIEW_IS_AXES, TYPE_BOOL, true) \ X(previewIsAxes, PREVIEW_IS_AXES, TYPE_BOOL, true) \
X(previewIsGrid, PREVIEW_IS_GRID, TYPE_BOOL, true) \ X(previewIsGrid, PREVIEW_IS_GRID, TYPE_BOOL, true) \
X(previewIsRootTransform, PREVIEW_IS_ROOT_TRANSFORM, TYPE_BOOL, false) \ X(previewIsRootTransform, PREVIEW_IS_ROOT_TRANSFORM, TYPE_BOOL, true) \
X(previewIsTriggers, PREVIEW_IS_TRIGGERS, TYPE_BOOL, true) \ X(previewIsTriggers, PREVIEW_IS_TRIGGERS, TYPE_BOOL, true) \
X(previewIsPivots, PREVIEW_IS_PIVOTS, TYPE_BOOL, false) \ X(previewIsPivots, PREVIEW_IS_PIVOTS, TYPE_BOOL, false) \
X(previewIsIcons, PREVIEW_IS_ICONS, TYPE_BOOL, true) \ X(previewIsIcons, PREVIEW_IS_ICONS, TYPE_BOOL, true) \
@@ -103,7 +103,7 @@
X(previewAxesColor, PREVIEW_AXES_COLOR, TYPE_VEC4, {1.0,1.0,1.0,0.125}) \ X(previewAxesColor, PREVIEW_AXES_COLOR, TYPE_VEC4, {1.0,1.0,1.0,0.125}) \
X(previewBackgroundColor, PREVIEW_BACKGROUND_COLOR, TYPE_VEC4, {0.113,0.184,0.286,1.0}) \ X(previewBackgroundColor, PREVIEW_BACKGROUND_COLOR, TYPE_VEC4, {0.113,0.184,0.286,1.0}) \
\ \
X(propertiesIsRound, PROPERTIES_IS_ROUND, TYPE_BOOL, true) \ X(propertiesIsRound, PROPERTIES_IS_ROUND, TYPE_BOOL, false) \
\ \
X(generateStartPosition, GENERATE_START_POSITION, TYPE_IVEC2, {}) \ X(generateStartPosition, GENERATE_START_POSITION, TYPE_IVEC2, {}) \
X(generateSize, GENERATE_SIZE, TYPE_IVEC2, {64,64}) \ X(generateSize, GENERATE_SIZE, TYPE_IVEC2, {64,64}) \