UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-19 00:06:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

[cpp] Fix float exception, closes #2583

Browse Source
This commit is contained in:
Mario Zechner 2024-07-24 13:49:42 +02:00
parent cd8dadc02a
commit aca86fa588
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-cpp/spine-cpp/include/spine/MathUtil.h
View File

@ -88,6 +88,8 @@ namespace spine {
static bool isNan(float v); static bool isNan(float v);
static float quietNan();
static float random(); static float random();
static float randomTriangular(float min, float max); static float randomTriangular(float min, float max);

2
spine-cpp/spine-cpp/src/spine/AnimationState.cpp
View File

@ -921,7 +921,7 @@ void AnimationState::setAttachment(Skeleton &skeleton, Slot &slot, const String
void AnimationState::queueEvents(TrackEntry *entry, float animationTime) { void AnimationState::queueEvents(TrackEntry *entry, float animationTime) {
float animationStart = entry->_animationStart, animationEnd = entry->_animationEnd; float animationStart = entry->_animationStart, animationEnd = entry->_animationEnd;
float duration = animationEnd - animationStart; float duration = animationEnd - animationStart;
float trackLastWrapped = MathUtil::fmod(entry->_trackLast, duration); float trackLastWrapped = duration != 0 ? MathUtil::fmod(entry->_trackLast, duration) : MathUtil::quietNan();
// Queue events before complete. // Queue events before complete.
size_t i = 0, n = _events.size(); size_t i = 0, n = _events.size();

11
spine-cpp/spine-cpp/src/spine/MathUtil.cpp
View File

@ -30,6 +30,7 @@
#include <spine/MathUtil.h> #include <spine/MathUtil.h>
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include <cmath>
// Required for division by 0 in _isNaN on MSVC // Required for division by 0 in _isNaN on MSVC
#ifdef _MSC_VER #ifdef _MSC_VER
@ -99,14 +100,12 @@ float MathUtil::cosDeg(float degrees) {
return (float) ::cos(degrees * MathUtil::Deg_Rad); return (float) ::cos(degrees * MathUtil::Deg_Rad);
} }
/* Need to pass 0 as an argument, so VC++ doesn't error with C2124 */ bool MathUtil::isNan(float v) {
static bool _isNan(float value, float zero) { return std::isnan(v);
float _nan = (float) 0.0 / zero;
return 0 == memcmp((void *) &value, (void *) &_nan, sizeof(value));
} }
bool MathUtil::isNan(float v) { float MathUtil::quietNan() {
return _isNan(v, 0); return std::nan("");
} }
float MathUtil::random() { float MathUtil::random() {