love.physics: simplify Body and Shape API.

#1130

- Shapes are now directly attached to Bodies when they're created (similar to love 0.7 and older).
- Fixtures are removed.
- All methods that were in Fixtures now exist in Shapes.
- All APIs that used or returned a Fixture now do the same with a Shape.

- Add new love.physics.new*Shape variants that take a Body as the first parameter.
- Deprecate the new*Shape APIs that don't take a Body.
- Deprecate love.physics.newFixture (the deprecated function now returns a Shape).
- Replace Body:getFixture and Body:getFixtures with Body:getShape and Body:getShapes (Body:getFixtures is deprecated).
- Replace World:queryFixturesInArea and World:getFixturesInArea with World:queryShapesInArea and World:getShapesInArea (queryFixturesInArea is deprecated).
- Replace Contact:getFixtures with Contact:getShapes (Contact:getFixtures is deprecated).
- Replace all love.physics callback Fixture parameters with Shape parameters.
- Deprecate ChainShape:getChildEdge.

CMakeLists.txt

@@ -837,8 +837,6 @@ set(LOVE_SRC_MODULE_PHYSICS_BOX2D
 	src/modules/physics/box2d/DistanceJoint.h
 	src/modules/physics/box2d/EdgeShape.cpp
 	src/modules/physics/box2d/EdgeShape.h
-	src/modules/physics/box2d/Fixture.cpp
-	src/modules/physics/box2d/Fixture.h
 	src/modules/physics/box2d/FrictionJoint.cpp
 	src/modules/physics/box2d/FrictionJoint.h
 	src/modules/physics/box2d/GearJoint.cpp
@@ -881,8 +879,6 @@ set(LOVE_SRC_MODULE_PHYSICS_BOX2D
 	src/modules/physics/box2d/wrap_DistanceJoint.h
 	src/modules/physics/box2d/wrap_EdgeShape.cpp
 	src/modules/physics/box2d/wrap_EdgeShape.h
-	src/modules/physics/box2d/wrap_Fixture.cpp
-	src/modules/physics/box2d/wrap_Fixture.h
 	src/modules/physics/box2d/wrap_FrictionJoint.cpp
 	src/modules/physics/box2d/wrap_FrictionJoint.h
 	src/modules/physics/box2d/wrap_GearJoint.cpp

src/common/deprecation.cpp

@@ -107,8 +107,12 @@ std::string getDeprecationNotice(const DeprecationInfo &info, bool usewhere)
 
 	if (info.apiType == API_FUNCTION)
 		notice << "function ";
+	else if (info.apiType == API_FUNCTION_VARIANT)
+		notice << "function variant in ";
 	else if (info.apiType == API_METHOD)
 		notice << "method ";
+	else if (info.apiType == API_METHOD_VARIANT)
+		notice << "method variant in ";
 	else if (info.apiType == API_CALLBACK)
 		notice << "callback ";
 	else if (info.apiType == API_FIELD)
@@ -188,7 +192,9 @@ MarkDeprecated::~MarkDeprecated()
 STRINGMAP_BEGIN(APIType, API_MAX_ENUM, apiType)
 {
 	{ "function", API_FUNCTION },
+	{ "functionvariant", API_FUNCTION_VARIANT },
 	{ "method",   API_METHOD   },
+	{ "methodvariant", API_METHOD_VARIANT },
 	{ "callback", API_CALLBACK },
 	{ "field",    API_FIELD    },
 	{ "constant", API_CONSTANT },

src/common/deprecation.h

@@ -32,7 +32,9 @@ namespace love
 enum APIType
 {
 	API_FUNCTION,
+	API_FUNCTION_VARIANT,
 	API_METHOD,
+	API_METHOD_VARIANT,
 	API_CALLBACK,
 	API_FIELD,
 	API_CONSTANT,

src/modules/physics/box2d/Body.cpp

@@ -23,12 +23,12 @@
 #include "common/math.h"
 
 #include "Shape.h"
-#include "Fixture.h"
 #include "World.h"
 #include "Physics.h"
 
 // Needed for luax_pushjoint.
 #include "wrap_Joint.h"
+#include "wrap_Shape.h"
 
 namespace love
 {
@@ -461,20 +461,20 @@ World *Body::getWorld() const
 	return world;
 }
 
-Fixture *Body::getFixture() const
+Shape *Body::getShape() const
 {
 	b2Fixture *f = body->GetFixtureList();
 	if (f == nullptr)
 		return nullptr;
 
-	Fixture *fixture = (Fixture *)(f->GetUserData().pointer);
-	if (!fixture)
-		throw love::Exception("A fixture has escaped Memoizer!");
+	Shape *shape = (Shape *)(f->GetUserData().pointer);
+	if (!shape)
+		throw love::Exception("A Shape has escaped Memoizer!");
 
-	return fixture;
+	return shape;
 }
 
-int Body::getFixtures(lua_State *L) const
+int Body::getShapes(lua_State *L) const
 {
 	lua_newtable(L);
 	b2Fixture *f = body->GetFixtureList();
@@ -483,10 +483,10 @@ int Body::getFixtures(lua_State *L) const
 	{
 		if (!f)
 			break;
-		Fixture *fixture = (Fixture *)(f->GetUserData().pointer);
-		if (!fixture)
-			throw love::Exception("A fixture has escaped Memoizer!");
-		luax_pushtype(L, fixture);
+		Shape *shape = (Shape *)(f->GetUserData().pointer);
+		if (!shape)
+			throw love::Exception("A Shape has escaped Memoizer!");
+		luax_pushshape(L, shape);
 		lua_rawseti(L, -2, i);
 		i++;
 	}

src/modules/physics/box2d/Body.h

@@ -39,7 +39,6 @@ namespace box2d
 // Forward declarations.
 class World;
 class Shape;
-class Fixture;
 
 /**
  * A Body is an entity which has position and orientation
@@ -57,7 +56,6 @@ class Body : public love::physics::Body
 	friend class CircleShape;
 	friend class PolygonShape;
 	friend class Shape;
-	friend class Fixture;
 
 	// Public because joints et al ask for b2body
 	b2Body *body;
@@ -391,15 +389,14 @@ class Body : public love::physics::Body
 	World *getWorld() const;
 
 	/**
-	 * Gets the first Fixture attached to this Body.
+	 * Gets the first Shape attached to this Body.
 	 **/
-	Fixture *getFixture() const;
+	Shape *getShape() const;
 
 	/**
-	 * Get an array of all the Fixtures attached to this Body.
-	 * @return An array of Fixtures.
+	 * Get an array of all the Shapes attached to this Body.
 	 **/
-	int getFixtures(lua_State *L) const;
+	int getShapes(lua_State *L) const;
 
 	/**
 	 * Get an array of all Joints attached to this Body.

src/modules/physics/box2d/ChainShape.cpp

@@ -34,8 +34,8 @@ namespace box2d
 
 love::Type ChainShape::type("ChainShape", &Shape::type);
 
-ChainShape::ChainShape(b2ChainShape *c, bool own)
-	: Shape(c, own)
+ChainShape::ChainShape(Body *body, const b2ChainShape &c)
+	: Shape(body, c)
 {
 }
 
@@ -45,58 +45,56 @@ ChainShape::~ChainShape()
 
 void ChainShape::setNextVertex(float x, float y)
 {
+	throwIfShapeNotValid();
 	b2Vec2 v(x, y);
 	b2ChainShape *c = (b2ChainShape *)shape;
 	c->m_nextVertex = Physics::scaleDown(v);
 }
 
 void ChainShape::setPreviousVertex(float x, float y)
 {
+	throwIfShapeNotValid();
 	b2Vec2 v(x, y);
 	b2ChainShape *c = (b2ChainShape *)shape;
 	c->m_prevVertex = Physics::scaleDown(v);
 }
 
 b2Vec2 ChainShape::getNextVertex() const
 {
+	throwIfShapeNotValid();
 	b2ChainShape *c = (b2ChainShape *)shape;
-
 	return Physics::scaleUp(c->m_nextVertex);
 }
 
 b2Vec2 ChainShape::getPreviousVertex() const
 {
+	throwIfShapeNotValid();
 	b2ChainShape *c = (b2ChainShape *)shape;
-
 	return Physics::scaleUp(c->m_prevVertex);
 }
 
 EdgeShape *ChainShape::getChildEdge(int index) const
 {
+	throwIfShapeNotValid();
+
 	b2ChainShape *c = (b2ChainShape *)shape;
-	b2EdgeShape *e = new b2EdgeShape;
-
-	try
-	{
-		c->GetChildEdge(e, index);
-	}
-	catch (love::Exception &)
-	{
-		delete e;
-		throw;
-	}
-
-	return new EdgeShape(e, true);
+
+	b2EdgeShape e;
+	c->GetChildEdge(&e, index);
+
+	return new EdgeShape(nullptr, e);
 }
 
 int ChainShape::getVertexCount() const
 {
+	throwIfShapeNotValid();
 	b2ChainShape *c = (b2ChainShape *)shape;
 	return c->m_count;
 }
 
 b2Vec2 ChainShape::getPoint(int index) const
 {
+	throwIfShapeNotValid();
 	b2ChainShape *c = (b2ChainShape *)shape;
 	if (index < 0 || index >= c->m_count)
 		throw love::Exception("Physics error: index out of bounds");
@@ -106,6 +104,7 @@ b2Vec2 ChainShape::getPoint(int index) const
 
 const b2Vec2 *ChainShape::getPoints() const
 {
+	throwIfShapeNotValid();
 	b2ChainShape *c = (b2ChainShape *)shape;
 	return c->m_vertices;
 }

src/modules/physics/box2d/ChainShape.h

@@ -45,7 +45,7 @@ class ChainShape : public Shape
 	 * Create a new ChainShape from a Box2D chain shape.
 	 * @param c The chain shape.
 	 **/
-	ChainShape(b2ChainShape *c, bool own = true);
+	ChainShape(Body *body, const b2ChainShape &c);
 
 	virtual ~ChainShape();
 

src/modules/physics/box2d/CircleShape.cpp

@@ -34,8 +34,8 @@ namespace box2d
 
 love::Type CircleShape::type("CircleShape", &Shape::type);
 
-CircleShape::CircleShape(b2CircleShape *c, bool own)
-	: Shape(c, own)
+CircleShape::CircleShape(Body *body, const b2CircleShape &c)
+	: Shape(body, c)
 {
 }
 
@@ -45,23 +45,27 @@ CircleShape::~CircleShape()
 
 float CircleShape::getRadius() const
 {
+	throwIfShapeNotValid();
 	return Physics::scaleUp(shape->m_radius);
 }
 
 void CircleShape::setRadius(float r)
 {
+	throwIfShapeNotValid();
 	shape->m_radius = Physics::scaleDown(r);
 }
 
 void CircleShape::getPoint(float &x_o, float &y_o) const
 {
+	throwIfShapeNotValid();
 	b2CircleShape *c = (b2CircleShape *) shape;
 	x_o = Physics::scaleUp(c->m_p.x);
 	y_o = Physics::scaleUp(c->m_p.y);
 }
 
 void CircleShape::setPoint(float x, float y)
 {
+	throwIfShapeNotValid();
 	b2CircleShape *c = (b2CircleShape *) shape;
 	c->m_p = Physics::scaleDown(b2Vec2(x, y));
 }

src/modules/physics/box2d/CircleShape.h

@@ -50,7 +50,7 @@ class CircleShape : public Shape
 	 * Create a new CircleShape from the a Box2D CircleShape definition.
 	 * @param c The CircleShape definition.
 	 **/
-	CircleShape(b2CircleShape *c, bool own = true);
+	CircleShape(Body *body, const b2CircleShape &c);
 
 	virtual ~CircleShape();
 

src/modules/physics/box2d/Contact.cpp

@@ -35,7 +35,6 @@ Contact::Contact(World *world, b2Contact *contact)
 	: contact(contact)
 	, world(world)
 {
-	//contact->user
 	world->registerObject(contact, this);
 }
 
@@ -46,16 +45,16 @@ Contact::~Contact()
 
 void Contact::invalidate()
 {
-	if (contact != NULL)
+	if (contact != nullptr)
 	{
 		world->unregisterObject(contact);
-		contact = NULL;
+		contact = nullptr;
 	}
 }
 
 bool Contact::isValid()
 {
-	return contact != NULL;
+	return contact != nullptr;
 }
 
 int Contact::getPositions(lua_State *L)
@@ -144,13 +143,13 @@ void Contact::getChildren(int &childA, int &childB)
 	childB = contact->GetChildIndexB();
 }
 
-void Contact::getFixtures(Fixture *&fixtureA, Fixture *&fixtureB)
+void Contact::getShapes(Shape *&shapeA, Shape *&shapeB)
 {
-	fixtureA = (Fixture *) (contact->GetFixtureA()->GetUserData().pointer);
-	fixtureB = (Fixture *) (contact->GetFixtureB()->GetUserData().pointer);
+	shapeA = (Shape *) (contact->GetFixtureA()->GetUserData().pointer);
+	shapeB = (Shape *) (contact->GetFixtureB()->GetUserData().pointer);
 
-	if (!fixtureA || !fixtureB)
-		throw love::Exception("A fixture has escaped Memoizer!");
+	if (!shapeA || !shapeB)
+		throw love::Exception("A Shape has escaped Memoizer!");
 }
 
 } // box2d

src/modules/physics/box2d/Contact.h

@@ -151,9 +151,9 @@ class Contact : public Object
 	void getChildren(int &childA, int &childB);
 
 	/**
-	 * Gets the Fixtures associated with this Contact.
+	 * Gets the Shapes associated with this Contact.
 	 **/
-	void getFixtures(Fixture *&fixtureA, Fixture *&fixtureB);
+	void getShapes(Shape *&shapeA, Shape *&shapeB);
 
 private: