Update b2_common.h

.gitignore

@@ -5,3 +5,4 @@ settings.ini
 CMakeSettings.json
 out/
 .vs/
+*.os

include/box2d/b2_common.h

@@ -34,7 +34,7 @@
 #endif
 
 #define B2_NOT_USED(x) ((void)(x))
-#define b2Assert(A) assert(A)
+#define b2Assert(A) ((void)(A))
 
 #define	b2_maxFloat		FLT_MAX
 #define	b2_epsilon		FLT_EPSILON

include/box2d/b2_fixture.h

@@ -44,11 +44,11 @@ struct B2_API b2Filter
 	}
 
 	/// The collision category bits. Normally you would just set one bit.
-	uint16 categoryBits;
+	uint32 categoryBits;
 
 	/// The collision mask bits. This states the categories that this
 	/// shape would accept for collision.
-	uint16 maskBits;
+	uint32 maskBits;
 
 	/// Collision groups allow a certain group of objects to never collide (negative)
 	/// or always collide (positive). Zero means no collision group. Non-zero group

include/box2d/b2_joint.h

@@ -147,6 +147,8 @@ class B2_API b2Joint
 	/// the flag is only checked when fixture AABBs begin to overlap.
 	bool GetCollideConnected() const;
 
+	void SetCollideConnected(bool collideConnected);
+
 	/// Dump this joint to the log file.
 	virtual void Dump() { b2Dump("// Dump is not supported for this joint type.\n"); }
 
@@ -230,4 +232,9 @@ inline bool b2Joint::GetCollideConnected() const
 	return m_collideConnected;
 }
 
+inline void b2Joint::SetCollideConnected(bool collideConnected)
+{
+	m_collideConnected = collideConnected;
+}
+
 #endif

include/box2d/b2_math.h

@@ -102,7 +102,7 @@ struct B2_API b2Vec2
 	float Normalize()
 	{
 		float length = Length();
-		if (length < b2_epsilon)
+		if (length == 0.0)
 		{
 			return 0.0f;
 		}

src/collision/b2_chain_shape.cpp

@@ -54,7 +54,6 @@ void b2ChainShape::CreateLoop(const b2Vec2* vertices, int32 count)
 		b2Vec2 v1 = vertices[i-1];
 		b2Vec2 v2 = vertices[i];
 		// If the code crashes here, it means your vertices are too close together.
-		b2Assert(b2DistanceSquared(v1, v2) > b2_linearSlop * b2_linearSlop);
 	}
 
 	m_count = count + 1;

src/collision/b2_polygon_shape.cpp

@@ -118,7 +118,7 @@ static b2Vec2 ComputeCentroid(const b2Vec2* vs, int32 count)
 	}
 
 	// Centroid
-	b2Assert(area > b2_epsilon);
+	b2Assert(area != 0);
 	c = (1.0f / area) * c + s;
 	return c;
 }
@@ -155,7 +155,6 @@ void b2PolygonShape::Set(const b2Hull& hull)
 		int32 i1 = i;
 		int32 i2 = i + 1 < m_count ? i + 1 : 0;
 		b2Vec2 edge = m_vertices[i2] - m_vertices[i1];
-		b2Assert(edge.LengthSquared() > b2_epsilon * b2_epsilon);
 		m_normals[i] = b2Cross(edge, 1.0f);
 		m_normals[i].Normalize();
 	}
@@ -336,7 +335,7 @@ void b2PolygonShape::ComputeMass(b2MassData* massData, float density) const
 	massData->mass = density * area;
 
 	// Center of mass
-	b2Assert(area > b2_epsilon);
+	b2Assert(area != 0.0);
 	center *= 1.0f / area;
 	massData->center = center + s;
 

src/dynamics/b2_island.cpp

@@ -284,21 +284,6 @@ void b2Island::Solve(b2Profile* profile, const b2TimeStep& step, const b2Vec2& g
 		b2Vec2 v = m_velocities[i].v;
 		float w = m_velocities[i].w;
 
-		// Check for large velocities
-		b2Vec2 translation = h * v;
-		if (b2Dot(translation, translation) > b2_maxTranslationSquared)
-		{
-			float ratio = b2_maxTranslation / translation.Length();
-			v *= ratio;
-		}
-
-		float rotation = h * w;
-		if (rotation * rotation > b2_maxRotationSquared)
-		{
-			float ratio = b2_maxRotation / b2Abs(rotation);
-			w *= ratio;
-		}
-
 		// Integrate
 		c += h * v;
 		a += h * w;
@@ -482,21 +467,6 @@ void b2Island::SolveTOI(const b2TimeStep& subStep, int32 toiIndexA, int32 toiInd
 		b2Vec2 v = m_velocities[i].v;
 		float w = m_velocities[i].w;
 
-		// Check for large velocities
-		b2Vec2 translation = h * v;
-		if (b2Dot(translation, translation) > b2_maxTranslationSquared)
-		{
-			float ratio = b2_maxTranslation / translation.Length();
-			v *= ratio;
-		}
-
-		float rotation = h * w;
-		if (rotation * rotation > b2_maxRotationSquared)
-		{
-			float ratio = b2_maxRotation / b2Abs(rotation);
-			w *= ratio;
-		}
-
 		// Integrate
 		c += h * v;
 		a += h * w;