Add MathUtil::ipow which is depended by Json.cpp.

cocos · Nov 1, 2024 · 5c94b34 · 5c94b34
1 parent 78e1435
commit 5c94b34
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/native/cocos/editor-support/spine/Json.cpp b/native/cocos/editor-support/spine/Json.cpp
@@ -41,6 +41,7 @@ THE SOFTWARE.
 #include <spine/Extension.h>
 #include <spine/Json.h>
 #include <spine/SpineString.h>
+#include <spine/MathUtil.h>
 
 #include <assert.h>
 #include <math.h>
@@ -393,15 +394,15 @@ const char *Json::parseNumber(Json *item, const char *num) {
             ++ptr;
             ++n;
         }
-        result += fraction / pow(10.0, n);
+        result += fraction / MathUtil::ipow(10, n);
     }
 
     if (negative) {
         result = -result;
     }
 
     if (*ptr == 'e' || *ptr == 'E') {
-        double exponent = 0;
+        uint32_t exponent = 0;
         int expNegative = 0;
         int n = 0;
         ++ptr;
@@ -414,15 +415,15 @@ const char *Json::parseNumber(Json *item, const char *num) {
         }
 
         while (*ptr >= '0' && *ptr <= '9') {
-            exponent = (exponent * 10.0) + (*ptr - '0');
+            exponent = (exponent * 10) + (*ptr - '0');
             ++ptr;
             ++n;
         }
 
         if (expNegative) {
-            result = result / pow(10, exponent);
+            result = result / MathUtil::ipow(10, exponent);
         } else {
-            result = result * pow(10, exponent);
+            result = result * MathUtil::ipow(10, exponent);
         }
     }
 

diff --git a/native/cocos/editor-support/spine/MathUtil.cpp b/native/cocos/editor-support/spine/MathUtil.cpp
@@ -71,3 +71,17 @@ float MathUtil::randomTriangular(float min, float max, float mode) {
     if (u <= (mode - min) / d) return min + sqrt(u * d * (mode - min));
     return max - sqrt((1 - u) * d * (max - mode));
 }
+
+uint64_t MathUtil::ipow(uint64_t base, uint32_t exp) {
+	uint64_t result = 1;
+
+	while (exp) {
+		if (exp & 1) {
+			result *= base;
+        }
+		exp >>= 1;
+		base *= base;
+	}
+
+	return result;
+}
diff --git a/native/cocos/editor-support/spine/MathUtil.h b/native/cocos/editor-support/spine/MathUtil.h
@@ -113,6 +113,8 @@ class SP_API MathUtil {
     static inline float pow(float a, float b) {
         return (float)::pow(a, b);
     }
+
+    static uint64_t ipow(uint64_t base, uint32_t exp);
 };
 
 struct SP_API Interpolation {