mirror of https://github.com/axmolengine/axmol.git
issue #2771: fix compile errors
This commit is contained in:
parent
99d904363a
commit
0100c05a93
|
@ -268,11 +268,6 @@ To enable set it to a value different than 0. Disabled by default.
|
||||||
|
|
||||||
#ifdef CC_USE_PHYSICS
|
#ifdef CC_USE_PHYSICS
|
||||||
#define PHYSICS_CONTACT_POINT_MAX 4
|
#define PHYSICS_CONTACT_POINT_MAX 4
|
||||||
namespace cocos2d
|
|
||||||
{
|
|
||||||
class Point;
|
|
||||||
typedef Point Vect;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // __CCCONFIG_H__
|
#endif // __CCCONFIG_H__
|
||||||
|
|
|
@ -40,9 +40,10 @@ NS_CC_BEGIN
|
||||||
class Sprite;
|
class Sprite;
|
||||||
class PhysicsWorld;
|
class PhysicsWorld;
|
||||||
class PhysicsJoint;
|
class PhysicsJoint;
|
||||||
|
|
||||||
class PhysicsBodyInfo;
|
class PhysicsBodyInfo;
|
||||||
|
|
||||||
|
typedef Point Vect;
|
||||||
|
|
||||||
|
|
||||||
const PhysicsMaterial PHYSICSBODY_MATERIAL_DEFAULT(0.1f, 0.5f, 0.5f);
|
const PhysicsMaterial PHYSICSBODY_MATERIAL_DEFAULT(0.1f, 0.5f, 0.5f);
|
||||||
|
|
||||||
|
|
|
@ -40,6 +40,7 @@ class PhysicsWorld;
|
||||||
|
|
||||||
class PhysicsContactInfo;
|
class PhysicsContactInfo;
|
||||||
|
|
||||||
|
typedef Point Vect;
|
||||||
|
|
||||||
typedef struct PhysicsContactData
|
typedef struct PhysicsContactData
|
||||||
{
|
{
|
||||||
|
|
|
@ -42,6 +42,8 @@ class PhysicsShape;
|
||||||
class PhysicsContact;
|
class PhysicsContact;
|
||||||
class Array;
|
class Array;
|
||||||
|
|
||||||
|
typedef Point Vect;
|
||||||
|
|
||||||
class Sprite;
|
class Sprite;
|
||||||
class Scene;
|
class Scene;
|
||||||
class DrawNode;
|
class DrawNode;
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include "CCPlatformMacros.h"
|
#include "CCPlatformMacros.h"
|
||||||
#include "CCGeometry.h"
|
#include "CCGeometry.h"
|
||||||
NS_CC_BEGIN
|
NS_CC_BEGIN
|
||||||
class Vect;
|
typedef Point Vect;
|
||||||
class PhysicsBodyInfo;
|
class PhysicsBodyInfo;
|
||||||
class PhysicsJointInfo;
|
class PhysicsJointInfo;
|
||||||
class PhysicsShapeInfo;
|
class PhysicsShapeInfo;
|
||||||
|
|
Loading…
Reference in New Issue