Moved most constants into relevant classes.

This commit is contained in:
rude
2009-07-26 23:05:26 +02:00
parent dcb3dfd83d
commit e0115a384e
25 changed files with 901 additions and 555 deletions
+6 -6
View File
@@ -61,17 +61,17 @@ namespace box2d
switch(joint->GetType())
{
case e_revoluteJoint:
return love::JOINT_REVOLUTE;
return JOINT_REVOLUTE;
case e_prismaticJoint:
return love::JOINT_PRISMATIC;
return JOINT_PRISMATIC;
case e_distanceJoint:
return love::JOINT_DISTANCE;
return JOINT_DISTANCE;
case e_pulleyJoint:
return love::JOINT_PULLEY;
return JOINT_PULLEY;
case e_mouseJoint:
return love::JOINT_MOUSE;
return JOINT_MOUSE;
case e_gearJoint:
return love::JOINT_GEAR;
return JOINT_GEAR;
default:
return -1;
}
+2 -3
View File
@@ -23,8 +23,7 @@
// LOVE
#include <common/runtime.h>
#include <common/Object.h>
#include <common/constants.h>
#include <physics/Joint.h>
// Box2D
#include "Include/Box2D.h"
@@ -44,7 +43,7 @@ namespace box2d
* A Joint can be used to prevent Bodies from going to
* far apart, or coming too close together.
**/
class Joint : public Object
class Joint : public love::physics::Joint
{
friend class GearJoint;
+2 -3
View File
@@ -22,9 +22,8 @@
#define LOVE_PHYSICS_BOX2D_SHAPE_H
// LOVE
#include <common/Object.h>
#include <physics/Shape.h>
#include <common/Reference.h>
#include <common/constants.h>
// Box2D
#include "Include/Box2D.h"
@@ -56,7 +55,7 @@ namespace box2d
* a Shape's geometry will be affected by the parent
* body's transformation.
**/
class Shape : public Object
class Shape : public love::physics::Shape
{
protected: