Merge pull request #7916 from andyque/fixChipumnk

remove chipmunk.h include in header file

cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.cpp

@@ -24,6 +24,7 @@
 
 #include "CCPhysicsBodyInfo_chipmunk.h"
 #if CC_USE_PHYSICS
+#include "chipmunk.h"
 NS_CC_BEGIN
 
 PhysicsBodyInfo::PhysicsBodyInfo()

cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.h

@@ -28,10 +28,11 @@
 #include "base/ccConfig.h"
 #if CC_USE_PHYSICS
 
-#include "chipmunk.h"
 #include "base/CCPlatformMacros.h"
 #include "base/CCRef.h"
 
+struct cpBody;
+
 NS_CC_BEGIN
 
 class PhysicsBodyInfo

cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.cpp

@@ -24,6 +24,7 @@
 
 #include "CCPhysicsContactInfo_chipmunk.h"
 #if CC_USE_PHYSICS
+#include "chipmunk.h"
 NS_CC_BEGIN
 
 PhysicsContactInfo::PhysicsContactInfo(PhysicsContact* contact)

cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.h

@@ -28,7 +28,6 @@
 #include "base/ccConfig.h"
 #if CC_USE_PHYSICS
 
-#include "chipmunk.h"
 #include "base/CCPlatformMacros.h"
 NS_CC_BEGIN
 

cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.cpp

@@ -26,6 +26,7 @@
 #if CC_USE_PHYSICS
 #include <algorithm>
 #include <unordered_map>
+#include "chipmunk.h"
 
 NS_CC_BEGIN
 

cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.h

@@ -28,10 +28,11 @@
 #include "base/ccConfig.h"
 #if CC_USE_PHYSICS
 
-#include "chipmunk.h"
 #include "base/CCPlatformMacros.h"
 #include <vector>
 #include <unordered_map>
+
+struct cpConstraint;
 NS_CC_BEGIN
 
 class PhysicsJoint;

cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.cpp

@@ -26,6 +26,7 @@
 #if CC_USE_PHYSICS
 #include <algorithm>
 #include <unordered_map>
+#include "chipmunk.h"
 
 NS_CC_BEGIN
 

cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.h

@@ -30,9 +30,12 @@
 
 #include <vector>
 #include <unordered_map>
-#include "chipmunk.h"
 #include "base/CCPlatformMacros.h"
 
+typedef uintptr_t cpGroup;
+struct cpShape;
+struct cpBody;
+
 NS_CC_BEGIN
 
 class PhysicsShape;

cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.cpp

@@ -28,6 +28,8 @@
 #include "CCPhysicsBodyInfo_chipmunk.h"
 #include "CCPhysicsShapeInfo_chipmunk.h"
 #include "CCPhysicsJointInfo_chipmunk.h"
+#include "chipmunk.h"
+
 NS_CC_BEGIN
 
 PhysicsWorldInfo::PhysicsWorldInfo()
@@ -96,5 +98,15 @@ void PhysicsWorldInfo::removeJoint(PhysicsJointInfo& joint)
     }
 }
 
+bool PhysicsWorldInfo::isLocked()
+{
+    return 0 == _space->locked_private ? false : true;
+}
+
+void PhysicsWorldInfo::step(float delta)
+{
+    cpSpaceStep(_space, delta);
+}
+
 NS_CC_END
 #endif // CC_USE_PHYSICS

cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.h

@@ -29,9 +29,12 @@
 #if CC_USE_PHYSICS
 
 #include <vector>
-#include "chipmunk.h"
 #include "base/CCPlatformMacros.h"
 #include "math/CCGeometry.h"
+
+struct cpSpace;
+
+
 NS_CC_BEGIN
 typedef Vec2 Vect;
 class PhysicsBodyInfo;
@@ -49,8 +52,8 @@ public:
     void addJoint(PhysicsJointInfo& joint);
     void removeJoint(PhysicsJointInfo& joint);
     void setGravity(const Vect& gravity);
-    inline bool isLocked() { return 0 == _space->locked_private ? false : true; }
+    bool isLocked();
-    inline void step(float delta) { cpSpaceStep(_space, delta); }
+    void step(float delta);
     
 private:
     PhysicsWorldInfo();