Added missing null implementation of the new dmPhysics::Wakeup function (defold#5878)

Author: JCash

Diff for: engine/physics/src/dmsdk/physics/physics.h

@@ -13,6 +13,15 @@
 #ifndef DMSDK_PHYSICS_H
 #define DMSDK_PHYSICS_H
 
+/*# Physics
+ * Physics related structs and functions
+ *
+ * @document
+ * @name Physics
+ * @namespace dmPhysics
+ * @path engine/physics/src/dmsdk/physics/physics.h
+ */
+
 namespace dmPhysics
 {
     /*#

Diff for: engine/physics/src/physics/physics_2d_null.cpp

@@ -191,6 +191,10 @@ namespace dmPhysics
         return false;
     }
 
+    void Wakeup2D(HCollisionObject2D collision_object)
+    {
+    }
+
     void SetLockedRotation2D(HCollisionObject2D collision_object, bool locked_rotation)
     {
     }

Diff for: engine/physics/src/physics/physics_3d_null.cpp

@@ -159,6 +159,10 @@ namespace dmPhysics
         return false;
     }
 
+    void Wakeup3D(HCollisionObject3D collision_object)
+    {
+    }
+
     void SetLockedRotation3D(HCollisionObject3D collision_object, bool locked_rotation)
     {
     }

Diff for: engine/physics/src/physics/test/test_physics.cpp

@@ -117,6 +117,7 @@ Test3D::Test3D()
 , m_IsEnabledFunc(dmPhysics::IsEnabled3D)
 , m_SetEnabledFunc(dmPhysics::SetEnabled3D)
 , m_IsSleepingFunc(dmPhysics::IsSleeping3D)
+, m_WakeupFunc(dmPhysics::Wakeup3D)
 , m_SetLockedRotationFunc(dmPhysics::SetLockedRotation3D)
 , m_GetLinearDampingFunc(dmPhysics::GetLinearDamping3D)
 , m_SetLinearDampingFunc(dmPhysics::SetLinearDamping3D)
@@ -174,6 +175,7 @@ Test2D::Test2D()
 , m_IsEnabledFunc(dmPhysics::IsEnabled2D)
 , m_SetEnabledFunc(dmPhysics::SetEnabled2D)
 , m_IsSleepingFunc(dmPhysics::IsSleeping2D)
+, m_WakeupFunc(dmPhysics::Wakeup2D)
 , m_SetLockedRotationFunc(dmPhysics::SetLockedRotation2D)
 , m_GetLinearDampingFunc(dmPhysics::GetLinearDamping2D)
 , m_SetLinearDampingFunc(dmPhysics::SetLinearDamping2D)
@@ -1689,6 +1691,27 @@ TYPED_TEST(PhysicsTest, KinematicSleep)
     (*TestFixture::m_Test.m_DeleteCollisionShapeFunc)(box0_shape);
 }
 
+// Although we don't have a good way of testing the functionality here (we do it in an integration test instead),
+// we need to make sure the linking will work as expected
+TYPED_TEST(PhysicsTest, Wakeup)
+{
+    float box_half_ext = 0.5f;
+
+    VisualObject box0_vo;
+    box0_vo.m_Position = Point3(0, 5.0f, 0);
+    dmPhysics::CollisionObjectData box0_data;
+    box0_data.m_Type = dmPhysics::COLLISION_OBJECT_TYPE_KINEMATIC;
+    box0_data.m_Mass = 0.0f;
+    typename TypeParam::CollisionShapeType box0_shape = (*TestFixture::m_Test.m_NewBoxShapeFunc)(TestFixture::m_Context, Vector3(box_half_ext, box_half_ext, box_half_ext));
+    box0_data.m_UserData = &box0_vo;
+    typename TypeParam::CollisionObjectType box0_co = (*TestFixture::m_Test.m_NewCollisionObjectFunc)(TestFixture::m_World, box0_data, &box0_shape, 1u);
+
+    (*TestFixture::m_Test.m_WakeupFunc)(box0_co);
+
+    (*TestFixture::m_Test.m_DeleteCollisionObjectFunc)(TestFixture::m_World, box0_co);
+    (*TestFixture::m_Test.m_DeleteCollisionShapeFunc)(box0_shape);
+}
+
 // Detecting native bug in box2d when the penetration distance assumes a negative amount
 TYPED_TEST(PhysicsTest, SphereBoxDeepPenetration)
 {

Diff for: engine/physics/src/physics/test/test_physics.h

@@ -112,6 +112,7 @@ struct Funcs
     typedef bool (*IsEnabledFunc)(typename T::CollisionObjectType collision_object);
     typedef void (*SetEnabledFunc)(typename T::WorldType world, typename T::CollisionObjectType collision_object, bool enabled);
     typedef bool (*IsSleepingFunc)(typename T::CollisionObjectType collision_object);
+    typedef void (*WakeupFunc)(typename T::CollisionObjectType collision_object);
     typedef void (*SetLockedRotationFunc)(typename T::CollisionObjectType collision_object, bool locked_rotation);
     typedef float (*GetLinearDampingFunc)(typename T::CollisionObjectType collision_object);
     typedef void (*SetLinearDampingFunc)(typename T::CollisionObjectType collision_object, float linear_damping);
@@ -166,6 +167,7 @@ struct Test3D
     Funcs<Test3D>::IsEnabledFunc                    m_IsEnabledFunc;
     Funcs<Test3D>::SetEnabledFunc                   m_SetEnabledFunc;
     Funcs<Test3D>::IsSleepingFunc                   m_IsSleepingFunc;
+    Funcs<Test3D>::WakeupFunc                       m_WakeupFunc;
     Funcs<Test3D>::SetLockedRotationFunc            m_SetLockedRotationFunc;
     Funcs<Test3D>::GetLinearDampingFunc             m_GetLinearDampingFunc;
     Funcs<Test3D>::SetLinearDampingFunc             m_SetLinearDampingFunc;
@@ -223,6 +225,7 @@ struct Test2D
     Funcs<Test2D>::IsEnabledFunc                    m_IsEnabledFunc;
     Funcs<Test2D>::SetEnabledFunc                   m_SetEnabledFunc;
     Funcs<Test2D>::IsSleepingFunc                   m_IsSleepingFunc;
+    Funcs<Test2D>::WakeupFunc                       m_WakeupFunc;
     Funcs<Test2D>::SetLockedRotationFunc            m_SetLockedRotationFunc;
     Funcs<Test2D>::GetLinearDampingFunc             m_GetLinearDampingFunc;
     Funcs<Test2D>::SetLinearDampingFunc             m_SetLinearDampingFunc;