Updated Box2D to 2.3.2-git.

This commit is contained in:
Alex Szpakowski
2015-11-30 23:55:50 -04:00
parent 5bdd858487
commit 0474f8167a
12 changed files with 87 additions and 51 deletions
+3 -3
View File
@@ -25,9 +25,9 @@
struct b2Color
{
b2Color() {}
b2Color(float32 r, float32 g, float32 b) : r(r), g(g), b(b) {}
void Set(float32 ri, float32 gi, float32 bi) { r = ri; g = gi; b = bi; }
float32 r, g, b;
b2Color(float32 r, float32 g, float32 b, float32 a = 1.0f) : r(r), g(g), b(b), a(a) {}
void Set(float32 ri, float32 gi, float32 bi, float32 ai = 1.0f) { r = ri; g = gi; b = bi; a = ai; }
float32 r, g, b, a;
};
/// Implement and register this class with a b2World to provide debug drawing of physics
-1
View File
@@ -21,7 +21,6 @@
#include <Box2D/Common/b2Settings.h>
#include <math.h>
#include <float.h>
/// This function is used to ensure that a floating point number is not a NaN or infinity.
inline bool b2IsValid(float32 x)
+1 -1
View File
@@ -23,7 +23,7 @@
#include "common/Exception.h"
b2Version b2_version = {2, 3, 0};
b2Version b2_version = {2, 3, 2};
// Memory allocators. Modify these to use your own allocator.
void* b2Alloc(int32 size)