[WIP] Implement Physics2D with box2d-v3

Author: halx99

core/2d/Node.cpp

@@ -125,7 +125,7 @@ Node::Node()
     , _onExitCallback(nullptr)
     , _onEnterTransitionDidFinishCallback(nullptr)
     , _onExitTransitionDidStartCallback(nullptr)
-#if defined(AX_ENABLE_PHYSICS) && 0
+#if defined(AX_ENABLE_PHYSICS)
     , _physicsBody(nullptr)
 #endif
 {

core/2d/Node.h

@@ -28,8 +28,8 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#ifndef __CCNODE_H__
-#define __CCNODE_H__
+#ifndef __AXNODE_H__
+#define __AXNODE_H__
 
 #include <cstdint>
 #include "base/Macros.h"
@@ -41,7 +41,7 @@
 #include "2d/ComponentContainer.h"
 #include "2d/Component.h"
 
-#if defined(AX_ENABLE_PHYSICS) && 0
+#if defined(AX_ENABLE_PHYSICS)
 #    include "physics/PhysicsBody.h"
 #endif
 
@@ -2026,7 +2026,7 @@ class AX_DLL Node : public Object
     backend::ProgramState* _programState = nullptr;
 
 // Physics:remaining backwardly compatible
-#if defined(AX_ENABLE_PHYSICS) && 0
+#if defined(AX_ENABLE_PHYSICS)
     PhysicsBody* _physicsBody;
 
 public:

core/2d/Scene.cpp

@@ -35,7 +35,7 @@ THE SOFTWARE.
 #include "base/UTF8.h"
 #include "renderer/Renderer.h"
 
-#if defined(AX_ENABLE_PHYSICS) && 0
+#if defined(AX_ENABLE_PHYSICS)
 #    include "physics/PhysicsWorld.h"
 #endif
 
@@ -351,7 +351,7 @@ bool Scene::initWithPhysics()
 
 bool Scene::initPhysicsWorld()
 {
-#    if defined(AX_ENABLE_PHYSICS) && 0
+#    if defined(AX_ENABLE_PHYSICS)
     _physicsWorld = PhysicsWorld::construct(this);
 #    endif
 
@@ -377,7 +377,7 @@ bool Scene::initPhysicsWorld()
 #if defined(AX_ENABLE_PHYSICS) || defined(AX_ENABLE_3D_PHYSICS) || defined(AX_ENABLE_NAVMESH)
 void Scene::stepPhysicsAndNavigation(float deltaTime)
 {
-#    if defined(AX_ENABLE_PHYSICS) && 0
+#    if defined(AX_ENABLE_PHYSICS)
     if (_physicsWorld && _physicsWorld->isAutoStep())
         _physicsWorld->update(deltaTime);
 #    endif

core/axmol.h

@@ -165,11 +165,11 @@ THE SOFTWARE.
 #include "renderer/Shaders.h"
 
 // physics
-// #include "physics/PhysicsBody.h"
-// #include "physics/PhysicsContact.h"
-// #include "physics/PhysicsJoint.h"
-// #include "physics/PhysicsCollider.h"
-// #include "physics/PhysicsWorld.h"
+ #include "physics/PhysicsBody.h"
+ #include "physics/PhysicsContact.h"
+ #include "physics/PhysicsJoint.h"
+ #include "physics/PhysicsCollider.h"
+ #include "physics/PhysicsWorld.h"
 
 // platform
 #include "platform/Common.h"

core/physics/CMakeLists.txt

@@ -1 +1,16 @@
-# place holder for builtin physics based on box2d v3
+set(_AX_PHYSICS_HEADER
+    physics/PhysicsContact.h
+    physics/PhysicsWorld.h
+    physics/PhysicsBody.h
+    physics/PhysicsCollider.h
+    physics/PhysicsHelper.h
+    physics/PhysicsJoint.h
+    )
+
+set(_AX_PHYSICS_SRC
+    physics/PhysicsBody.cpp
+    physics/PhysicsContact.cpp
+    physics/PhysicsJoint.cpp
+    physics/PhysicsCollider.cpp
+    physics/PhysicsWorld.cpp
+    )