Daniele Bartolini vor 8 Jahren
Ursprung
Commit
181ed89051
2 geänderte Dateien mit 8 neuen und 2 gelöschten Zeilen
  1. 6 0
      src/core/math/math.h
  2. 2 2
      src/resource/expression_language.cpp

+ 6 - 0
src/core/math/math.h

@@ -50,6 +50,12 @@ inline f32 ffract(f32 a)
 	return a - floorf(a);
 }
 
+/// Returns the absolute value of @a a.
+inline f32 fabs(f32 a)
+{
+	return ::fabs(a);
+}
+
 /// Returns @a deg in radians.
 inline f32 frad(f32 deg)
 {

+ 2 - 2
src/resource/expression_language.cpp

@@ -1,7 +1,7 @@
+#include "core/math/math.h"
 #include "resource/expression_language.h"
 
 #include <alloca.h>
-#include <math.h>
 #include <string.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -85,7 +85,7 @@ namespace skinny { namespace expression_language {
 			case OP_UNARY_MINUS: PUSH(-POP()); break;
 			case OP_SIN: PUSH(sinf(POP())); break;
 			case OP_COS: PUSH(cosf(POP())); break;
-			case OP_ABS: a = POP(); PUSH(abs(a)); break;
+			case OP_ABS: a = POP(); PUSH(fabs(a)); break;
 			case OP_MATCH: b=POP(); a=POP(); PUSH(match(a, b)); break;
 			case OP_MATCH2D: d=POP(); c=POP(); b=POP(); a=POP(); PUSH(match2d(a,b,c,d)); break;
 			case OP_NOP: break;