From f4441e516639255e8d018af34520bb8746e555b6 Mon Sep 17 00:00:00 2001 From: Tom Robinson Date: Mon, 8 Jun 2015 18:41:36 +0100 Subject: [PATCH] Changed dynamics variable and UTC tests to use pkgconfig Change-Id: I8b6a6ddbe144c113ab478e9c861207491f755c8e --- .gitignore | 2 - .../{CMakeLists.txt.in => CMakeLists.txt} | 2 +- automated-tests/src/dali-devel/CMakeLists.txt | 2 +- .../src/dali-devel/utc-Dali-DynamicsBody.cpp | 26 ++++----- .../src/dali-devel/utc-Dali-DynamicsBodyConfig.cpp | 36 ++++++------ .../src/dali-devel/utc-Dali-DynamicsJoint.cpp | 18 +++--- .../src/dali-devel/utc-Dali-DynamicsShape.cpp | 16 ++--- .../src/dali-devel/utc-Dali-DynamicsWorld.cpp | 50 ++++------------ .../dali-devel/utc-Dali-DynamicsWorldConfig.cpp | 6 +- automated-tests/src/dali-internal/CMakeLists.txt | 2 +- .../src/dali/{CMakeLists.txt.in => CMakeLists.txt} | 2 +- build/tizen/configure.ac | 12 ++-- build/tizen/dali-core.pc.in | 2 +- build/tizen/dali-core/Makefile.am | 2 +- dali/devel-api/dynamics/dynamics-body-config.cpp | 68 +++++++++++----------- dali/devel-api/dynamics/dynamics-body.cpp | 32 +++++----- dali/devel-api/dynamics/dynamics-collision.cpp | 16 ++--- dali/devel-api/dynamics/dynamics-joint.cpp | 24 ++++---- dali/devel-api/dynamics/dynamics-shape.cpp | 18 +++--- dali/devel-api/dynamics/dynamics-world-config.cpp | 18 +++--- dali/devel-api/dynamics/dynamics-world.cpp | 26 ++++----- dali/internal/event/actors/actor-impl.cpp | 18 +++--- dali/internal/event/actors/actor-impl.h | 8 +-- .../internal/event/common/thread-local-storage.cpp | 6 +- dali/internal/event/common/thread-local-storage.h | 6 +- dali/internal/update/manager/update-manager.cpp | 10 ++-- dali/internal/update/manager/update-manager.h | 8 +-- 27 files changed, 203 insertions(+), 233 deletions(-) rename automated-tests/{CMakeLists.txt.in => CMakeLists.txt} (73%) rename automated-tests/src/dali/{CMakeLists.txt.in => CMakeLists.txt} (96%) diff --git a/.gitignore b/.gitignore index 4143a88..caf34e7 100644 --- a/.gitignore +++ b/.gitignore @@ -32,8 +32,6 @@ BROWSE *.swp *.creator *.creator.user -/automated-tests/CMakeLists.txt -/automated-tests/src/dali/CMakeLists.txt /docs/generated/* /build/tizen/doc /build/tizen/.cov diff --git a/automated-tests/CMakeLists.txt.in b/automated-tests/CMakeLists.txt similarity index 73% rename from automated-tests/CMakeLists.txt.in rename to automated-tests/CMakeLists.txt index 191c421..c27852a 100644 --- a/automated-tests/CMakeLists.txt.in +++ b/automated-tests/CMakeLists.txt @@ -10,4 +10,4 @@ INCLUDE_DIRECTORIES( ADD_SUBDIRECTORY(src) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} @DYNAMICS_SUPPORT@") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ") diff --git a/automated-tests/src/dali-devel/CMakeLists.txt b/automated-tests/src/dali-devel/CMakeLists.txt index 39a58b0..2bffbb0 100644 --- a/automated-tests/src/dali-devel/CMakeLists.txt +++ b/automated-tests/src/dali-devel/CMakeLists.txt @@ -43,7 +43,7 @@ PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED dali-core ) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -ggdb --coverage -Wall -Werror=return-type") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${CAPI_LIB}_CFLAGS_OTHER} -O0 -ggdb --coverage -Wall -Werror=return-type") FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS}) SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}") diff --git a/automated-tests/src/dali-devel/utc-Dali-DynamicsBody.cpp b/automated-tests/src/dali-devel/utc-Dali-DynamicsBody.cpp index 3c09a8d..964eec1 100644 --- a/automated-tests/src/dali-devel/utc-Dali-DynamicsBody.cpp +++ b/automated-tests/src/dali-devel/utc-Dali-DynamicsBody.cpp @@ -23,7 +23,7 @@ int UtcDaliDynamicsBodyConstructor(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -65,7 +65,7 @@ int UtcDaliDynamicsBodyConstructor(void) int UtcDaliDynamicsBodyGetMass(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -103,7 +103,7 @@ int UtcDaliDynamicsBodyGetMass(void) int UtcDaliDynamicsBodyGetElasticity(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -140,7 +140,7 @@ int UtcDaliDynamicsBodyGetElasticity(void) int UtcDaliDynamicsBodySetLinearVelocity(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -187,7 +187,7 @@ int UtcDaliDynamicsBodySetLinearVelocity(void) int UtcDaliDynamicsBodySetAngularVelocity(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -234,7 +234,7 @@ int UtcDaliDynamicsBodySetAngularVelocity(void) int UtcDaliDynamicsBodySetKinematic(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -282,7 +282,7 @@ int UtcDaliDynamicsBodySetKinematic(void) int UtcDaliDynamicsBodyIsKinematic(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -326,7 +326,7 @@ int UtcDaliDynamicsBodyIsKinematic(void) int UtcDaliDynamicsBodySetSleepEnabled(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -378,7 +378,7 @@ int UtcDaliDynamicsBodySetSleepEnabled(void) int UtcDaliDynamicsBodyGetSleepEnabled(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -418,7 +418,7 @@ int UtcDaliDynamicsBodyGetSleepEnabled(void) int UtcDaliDynamicsBodyWakeUp(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -466,7 +466,7 @@ int UtcDaliDynamicsBodyWakeUp(void) int UtcDaliDynamicsBodyAddAnchor(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -530,7 +530,7 @@ int UtcDaliDynamicsBodyAddAnchor(void) int UtcDaliDynamicsBodyConserveVolume(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -568,7 +568,7 @@ int UtcDaliDynamicsBodyConserveVolume(void) int UtcDaliDynamicsBodyConserveShape(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif diff --git a/automated-tests/src/dali-devel/utc-Dali-DynamicsBodyConfig.cpp b/automated-tests/src/dali-devel/utc-Dali-DynamicsBodyConfig.cpp index e01c9c5..ecf45a4 100644 --- a/automated-tests/src/dali-devel/utc-Dali-DynamicsBodyConfig.cpp +++ b/automated-tests/src/dali-devel/utc-Dali-DynamicsBodyConfig.cpp @@ -27,7 +27,7 @@ using namespace Dali; int UtcDaliDynamicsBodyConfigNew(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -59,7 +59,7 @@ int UtcDaliDynamicsBodyConfigNew(void) int UtcDaliDynamicsBodyConfigConstructor(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -96,7 +96,7 @@ int UtcDaliDynamicsBodyConfigConstructor(void) int UtcDaliDynamicsBodyConfigType(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -130,7 +130,7 @@ int UtcDaliDynamicsBodyConfigType(void) int UtcDaliDynamicsBodyConfigSetShape01(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -166,7 +166,7 @@ int UtcDaliDynamicsBodyConfigSetShape01(void) int UtcDaliDynamicsBodyConfigSetShape02(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -203,7 +203,7 @@ int UtcDaliDynamicsBodyConfigSetShape02(void) int UtcDaliDynamicsBodyConfigGetShape(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -234,7 +234,7 @@ int UtcDaliDynamicsBodyConfigGetShape(void) int UtcDaliDynamicsBodyConfigMass(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -272,7 +272,7 @@ int UtcDaliDynamicsBodyConfigMass(void) int UtcDaliDynamicsBodyConfigElasticity(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -310,7 +310,7 @@ int UtcDaliDynamicsBodyConfigElasticity(void) int UtcDaliDynamicsBodyConfigFriction(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -348,7 +348,7 @@ int UtcDaliDynamicsBodyConfigFriction(void) int UtcDaliDynamicsBodyConfigLinearDamping(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -386,7 +386,7 @@ int UtcDaliDynamicsBodyConfigLinearDamping(void) int UtcDaliDynamicsBodyConfigAngularDamping(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -424,7 +424,7 @@ int UtcDaliDynamicsBodyConfigAngularDamping(void) int UtcDaliDynamicsBodyConfigLinearSleepVelocity(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -462,7 +462,7 @@ int UtcDaliDynamicsBodyConfigLinearSleepVelocity(void) int UtcDaliDynamicsBodyConfigAngularSleepVelocity(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -500,7 +500,7 @@ int UtcDaliDynamicsBodyConfigAngularSleepVelocity(void) int UtcDaliDynamicsBodyConfigCollisionGroup(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -538,7 +538,7 @@ int UtcDaliDynamicsBodyConfigCollisionGroup(void) int UtcDaliDynamicsBodyConfigCollisionMask(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -576,7 +576,7 @@ int UtcDaliDynamicsBodyConfigCollisionMask(void) int UtcDaliDynamicsBodyConfigAnchorHardness(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -614,7 +614,7 @@ int UtcDaliDynamicsBodyConfigAnchorHardness(void) int UtcDaliDynamicsBodyConfigVolumeConservation(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -647,7 +647,7 @@ int UtcDaliDynamicsBodyConfigVolumeConservation(void) int UtcDaliDynamicsBodyConfigShapeConservation(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif diff --git a/automated-tests/src/dali-devel/utc-Dali-DynamicsJoint.cpp b/automated-tests/src/dali-devel/utc-Dali-DynamicsJoint.cpp index 854fd87..88f4eb4 100644 --- a/automated-tests/src/dali-devel/utc-Dali-DynamicsJoint.cpp +++ b/automated-tests/src/dali-devel/utc-Dali-DynamicsJoint.cpp @@ -43,7 +43,7 @@ int UtcDaliDynamicsJointConstructor(void) int UtcDaliDynamicsJointLinearLimit(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -84,7 +84,7 @@ int UtcDaliDynamicsJointLinearLimit(void) int UtcDaliDynamicsJointAngularLimit(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -121,7 +121,7 @@ int UtcDaliDynamicsJointAngularLimit(void) int UtcDaliDynamicsJointEnableSpring(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -158,7 +158,7 @@ int UtcDaliDynamicsJointEnableSpring(void) int UtcDaliDynamicsJointSetSpringStiffness(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -195,7 +195,7 @@ int UtcDaliDynamicsJointSetSpringStiffness(void) int UtcDaliDynamicsJointSetSpringCenterPoint(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -232,7 +232,7 @@ int UtcDaliDynamicsJointSetSpringCenterPoint(void) int UtcDaliDynamicsJointEnableMotor(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -269,7 +269,7 @@ int UtcDaliDynamicsJointEnableMotor(void) int UtcDaliDynamicsJointSetMotorVelocity(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -306,7 +306,7 @@ int UtcDaliDynamicsJointSetMotorVelocity(void) int UtcDaliDynamicsJointSetMotorForce(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -343,7 +343,7 @@ int UtcDaliDynamicsJointSetMotorForce(void) int UtcDaliDynamicsJointGetActor(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif diff --git a/automated-tests/src/dali-devel/utc-Dali-DynamicsShape.cpp b/automated-tests/src/dali-devel/utc-Dali-DynamicsShape.cpp index 3acdfc1..985dcce 100644 --- a/automated-tests/src/dali-devel/utc-Dali-DynamicsShape.cpp +++ b/automated-tests/src/dali-devel/utc-Dali-DynamicsShape.cpp @@ -26,7 +26,7 @@ using namespace Dali; int UtcDaliDynamicsShapeConstructor(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -65,7 +65,7 @@ int UtcDaliDynamicsShapeConstructor(void) int UtcDaliDynamicsShapeNewCapsule(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -100,7 +100,7 @@ int UtcDaliDynamicsShapeNewCapsule(void) int UtcDaliDynamicsShapeNewCone(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -134,7 +134,7 @@ int UtcDaliDynamicsShapeNewCone(void) int UtcDaliDynamicsShapeNewCube(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -167,7 +167,7 @@ int UtcDaliDynamicsShapeNewCube(void) int UtcDaliDynamicsShapeNewCylinder(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -200,7 +200,7 @@ int UtcDaliDynamicsShapeNewCylinder(void) int UtcDaliDynamicsShapeNewMesh(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -233,7 +233,7 @@ int UtcDaliDynamicsShapeNewMesh(void) int UtcDaliDynamicsShapeNewSphere(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -266,7 +266,7 @@ int UtcDaliDynamicsShapeNewSphere(void) int UtcDaliDynamicsShapeGetType(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif diff --git a/automated-tests/src/dali-devel/utc-Dali-DynamicsWorld.cpp b/automated-tests/src/dali-devel/utc-Dali-DynamicsWorld.cpp index 56120f0..2219975 100644 --- a/automated-tests/src/dali-devel/utc-Dali-DynamicsWorld.cpp +++ b/automated-tests/src/dali-devel/utc-Dali-DynamicsWorld.cpp @@ -28,7 +28,7 @@ using namespace Dali; int UtcDaliDynamicsWorldConstructor(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -55,7 +55,7 @@ int UtcDaliDynamicsWorldConstructor(void) int UtcDaliDynamicsWorldGetInstanceP(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline( "No dynamics support compiled\n" ); return 0; #endif @@ -86,7 +86,7 @@ int UtcDaliDynamicsWorldGetInstanceP(void) int UtcDaliDynamicsWorldGetInstanceN(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline( "No dynamics support compiled\n" ); return 0; #endif @@ -113,7 +113,7 @@ int UtcDaliDynamicsWorldGetInstanceN(void) int UtcDaliDynamicsWorldGetP(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline( "No dynamics support compiled\n" ); return 0; #endif @@ -138,33 +138,11 @@ int UtcDaliDynamicsWorldGetP(void) END_TEST; } -int UtcDaliDynamicsWorldGetN(void) -{ -#if !defined(DYNAMICS_SUPPORT) - tet_infoline( "No dynamics support compiled\n" ); - return 0; -#endif - TestApplication app; - - bool asserted = false; - try - { - DynamicsWorld::Get(); - } - catch( Dali::DaliException& e ) - { - DALI_TEST_PRINT_ASSERT( e ); - DALI_TEST_ASSERT( e, "dynamicsWorld && \"DynamicsWorld doesn't exist\"", TEST_LOCATION ); - asserted = true; - } - DALI_TEST_CHECK( asserted ); - - END_TEST; -} +// No Negative check for UtcDaliDynamicsWorldGet as the instance is created on Get(). int UtcDaliDynamicsWorldDestroyInstanceP(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline( "No dynamics support compiled\n" ); return 0; #endif @@ -173,29 +151,25 @@ int UtcDaliDynamicsWorldDestroyInstanceP(void) DynamicsWorldConfig config = DynamicsWorldConfig::New(); DynamicsWorld world = DynamicsWorld::GetInstance( config ); DALI_TEST_CHECK( world ); - DynamicsWorld::DestroyInstance(); - // After destroying the instance, check we assert when trying to get the instance, - // to prove that it's been removed correctly. bool asserted = false; try { - DynamicsWorld::Get(); + DynamicsWorld::DestroyInstance(); } catch( Dali::DaliException& e ) { DALI_TEST_PRINT_ASSERT( e ); - DALI_TEST_ASSERT( e, "dynamicsWorld && \"DynamicsWorld doesn't exist\"", TEST_LOCATION ); asserted = true; } - DALI_TEST_CHECK( asserted ); + DALI_TEST_CHECK( !asserted ); END_TEST; } int UtcDaliDynamicsWorldDestroyInstanceN(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline( "No dynamics support compiled\n" ); return 0; #endif @@ -219,7 +193,7 @@ int UtcDaliDynamicsWorldDestroyInstanceN(void) int UtcDaliDynamicsWorldGravity(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -261,7 +235,7 @@ int UtcDaliDynamicsWorldGravity(void) int UtcDaliDynamicsWorldDebugDrawMode(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -305,7 +279,7 @@ int UtcDaliDynamicsWorldDebugDrawMode(void) int UtcDaliDynamicsWorldRootActor(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif diff --git a/automated-tests/src/dali-devel/utc-Dali-DynamicsWorldConfig.cpp b/automated-tests/src/dali-devel/utc-Dali-DynamicsWorldConfig.cpp index 372ed66..16af634 100644 --- a/automated-tests/src/dali-devel/utc-Dali-DynamicsWorldConfig.cpp +++ b/automated-tests/src/dali-devel/utc-Dali-DynamicsWorldConfig.cpp @@ -26,7 +26,7 @@ using namespace Dali; int UtcDaliDynamicsWorldConfigConstructor(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -52,7 +52,7 @@ int UtcDaliDynamicsWorldConfigConstructor(void) int UtcDaliDynamicsWorldConfigNew(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif @@ -74,7 +74,7 @@ int UtcDaliDynamicsWorldConfigNew(void) int UtcDaliDynamicsWorldConfigType(void) { -#if !defined(DYNAMICS_SUPPORT) +#if !defined(DALI_DYNAMICS_SUPPORT) tet_infoline("No dynamics support compiled\n"); return 0; #endif diff --git a/automated-tests/src/dali-internal/CMakeLists.txt b/automated-tests/src/dali-internal/CMakeLists.txt index fc3eda3..5a08cef 100644 --- a/automated-tests/src/dali-internal/CMakeLists.txt +++ b/automated-tests/src/dali-internal/CMakeLists.txt @@ -35,7 +35,7 @@ PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED dali-core ) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -ggdb --coverage -Wall -Werror=return-type") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${CAPI_LIB}_CFLAGS_OTHER} -O0 -ggdb --coverage -Wall -Werror=return-type") FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS}) SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}") diff --git a/automated-tests/src/dali/CMakeLists.txt.in b/automated-tests/src/dali/CMakeLists.txt similarity index 96% rename from automated-tests/src/dali/CMakeLists.txt.in rename to automated-tests/src/dali/CMakeLists.txt index 0598b6f..8a9e161 100644 --- a/automated-tests/src/dali/CMakeLists.txt.in +++ b/automated-tests/src/dali/CMakeLists.txt @@ -95,7 +95,7 @@ PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED dali-core ) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} @DYNAMICS_SUPPORT@ -O0 -ggdb --coverage -Wall -Werror=return-type") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${CAPI_LIB}_CFLAGS_OTHER} -O0 -ggdb --coverage -Wall -Werror=return-type") FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS}) SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}") diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac index 47442e4..1fd60d6 100644 --- a/build/tizen/configure.ac +++ b/build/tizen/configure.ac @@ -74,19 +74,19 @@ if test "x$enable_emscripten" = "xyes"; then enable_backtrace="no" fi -DYNAMICS_SUPPORT= +DALI_DYNAMICS_SUPPORT= if test "x$dynamics_support" = "xyes"; then - DALI_CFLAGS="$DALI_CFLAGS -DDYNAMICS_SUPPORT" - DYNAMICS_SUPPORT=-DDYNAMICS_SUPPORT + DALI_CFLAGS="$DALI_CFLAGS -DDALI_DYNAMICS_SUPPORT" + DALI_DYNAMICS_SUPPORT=-DDALI_DYNAMICS_SUPPORT fi -AC_SUBST(DYNAMICS_SUPPORT) +AC_SUBST(DALI_DYNAMICS_SUPPORT) # Must come after Emscripten feature test if test "x$enable_backtrace" = "xyes"; then DALI_CFLAGS="$DALI_CFLAGS -DBACKTRACE_ENABLED" fi -AM_CONDITIONAL([DYNAMICS_SUPPORT], [test x$dynamics_support = xyes]) +AM_CONDITIONAL([DALI_DYNAMICS_SUPPORT], [test x$dynamics_support = xyes]) if test x$DALI_DATA_RW_DIR != x; then dataReadWriteDir=$DALI_DATA_RW_DIR @@ -116,8 +116,6 @@ AC_CONFIG_FILES([ Makefile dali-core/Makefile dali-core.pc - ../../automated-tests/CMakeLists.txt - ../../automated-tests/src/dali/CMakeLists.txt ]) AC_OUTPUT diff --git a/build/tizen/dali-core.pc.in b/build/tizen/dali-core.pc.in index 429a595..51503cf 100644 --- a/build/tizen/dali-core.pc.in +++ b/build/tizen/dali-core.pc.in @@ -9,4 +9,4 @@ Description: 3D Canvas Toolkit using OpenGLES Version: ${apiversion} Requires: Libs: -L${libdir} -ldali-core -Cflags: -I${includedir} +Cflags: -I${includedir} @DALI_DYNAMICS_SUPPORT@ diff --git a/build/tizen/dali-core/Makefile.am b/build/tizen/dali-core/Makefile.am index 7d380d6..7e8f28f 100644 --- a/build/tizen/dali-core/Makefile.am +++ b/build/tizen/dali-core/Makefile.am @@ -39,7 +39,7 @@ src_files = $(internal_src_files) \ $(public_api_src_files) \ $(devel_api_src_files) -if DYNAMICS_SUPPORT +if DALI_DYNAMICS_SUPPORT src_files += $(internal_dynamics_src_files) endif diff --git a/dali/devel-api/dynamics/dynamics-body-config.cpp b/dali/devel-api/dynamics/dynamics-body-config.cpp index 6ce1b4b..9f2ee2b 100644 --- a/dali/devel-api/dynamics/dynamics-body-config.cpp +++ b/dali/devel-api/dynamics/dynamics-body-config.cpp @@ -19,7 +19,7 @@ #include // INTERNAL HEADERS -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT #include #include #include @@ -31,7 +31,7 @@ namespace Dali DynamicsBodyConfig DynamicsBodyConfig::New() { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Internal::DynamicsBodyConfigPtr internal( new Internal::DynamicsBodyConfig() ); return DynamicsBodyConfig( internal.Get() ); @@ -61,14 +61,14 @@ DynamicsBodyConfig& DynamicsBodyConfig::operator=(const DynamicsBodyConfig& rhs) void DynamicsBodyConfig::SetType( const DynamicsBodyConfig::BodyType type ) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetType( type ); #endif } DynamicsBodyConfig::BodyType DynamicsBodyConfig::GetType() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetType(); #else return DynamicsBodyConfig::RIGID; @@ -77,14 +77,14 @@ DynamicsBodyConfig::BodyType DynamicsBodyConfig::GetType() const void DynamicsBodyConfig::SetShape( const DynamicsShape::ShapeType type, const Vector3& dimensions ) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetShape( type, dimensions ); #endif } void DynamicsBodyConfig::SetShape( DynamicsShape shape ) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Internal::DynamicsShapePtr internal( &(GetImplementation(shape)) ); GetImplementation(*this).SetShape( internal ); @@ -93,7 +93,7 @@ void DynamicsBodyConfig::SetShape( DynamicsShape shape ) DynamicsShape DynamicsBodyConfig::GetShape() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Internal::DynamicsShapePtr internal( GetImplementation(*this).GetShape() ); return DynamicsShape( internal.Get() ); @@ -104,7 +104,7 @@ DynamicsShape DynamicsBodyConfig::GetShape() const float DynamicsBodyConfig::GetMass() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetMass(); #else return float(); @@ -113,14 +113,14 @@ float DynamicsBodyConfig::GetMass() const void DynamicsBodyConfig::SetMass( float mass ) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetMass( mass ); #endif } float DynamicsBodyConfig::GetElasticity() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetElasticity(); #else return float(); @@ -129,14 +129,14 @@ float DynamicsBodyConfig::GetElasticity() const void DynamicsBodyConfig::SetElasticity( float elasticity ) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetElasticity( elasticity ); #endif } float DynamicsBodyConfig::GetFriction() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetFriction(); #else return float(); @@ -145,14 +145,14 @@ float DynamicsBodyConfig::GetFriction() const void DynamicsBodyConfig::SetFriction(float friction) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetFriction( friction ); #endif } float DynamicsBodyConfig::GetLinearDamping() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetLinearDamping(); #else return float(); @@ -161,14 +161,14 @@ float DynamicsBodyConfig::GetLinearDamping() const void DynamicsBodyConfig::SetLinearDamping( float damping ) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetLinearDamping( damping ); #endif } float DynamicsBodyConfig::GetAngularDamping() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetAngularDamping(); #else return float(); @@ -177,14 +177,14 @@ float DynamicsBodyConfig::GetAngularDamping() const void DynamicsBodyConfig::SetAngularDamping(float damping) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetAngularDamping( damping ); #endif } float DynamicsBodyConfig::GetLinearSleepVelocity() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetLinearSleepVelocity(); #else return float(); @@ -193,14 +193,14 @@ float DynamicsBodyConfig::GetLinearSleepVelocity() const void DynamicsBodyConfig::SetLinearSleepVelocity( float sleepVelocity ) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetLinearSleepVelocity( sleepVelocity ); #endif } float DynamicsBodyConfig::GetAngularSleepVelocity() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetAngularSleepVelocity(); #else return float(); @@ -209,14 +209,14 @@ float DynamicsBodyConfig::GetAngularSleepVelocity() const void DynamicsBodyConfig::SetAngularSleepVelocity(float sleepVelocity) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetAngularSleepVelocity( sleepVelocity ); #endif } short int DynamicsBodyConfig::GetCollisionGroup() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetCollisionGroup(); #else return short(); @@ -225,14 +225,14 @@ short int DynamicsBodyConfig::GetCollisionGroup() const void DynamicsBodyConfig::SetCollisionGroup(const short int collisionGroup) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetCollisionGroup(collisionGroup); #endif } short int DynamicsBodyConfig::GetCollisionMask() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetCollisionMask(); #else return short(); @@ -241,14 +241,14 @@ short int DynamicsBodyConfig::GetCollisionMask() const void DynamicsBodyConfig::SetCollisionMask(const short int collisionMask) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetCollisionMask(collisionMask); #endif } float DynamicsBodyConfig::GetStiffness() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetStiffness(); #else return float(); @@ -257,14 +257,14 @@ float DynamicsBodyConfig::GetStiffness() const void DynamicsBodyConfig::SetStiffness( float stiffness ) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetStiffness( stiffness ); #endif } float DynamicsBodyConfig::GetAnchorHardness() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetAnchorHardness(); #else return float(); @@ -273,14 +273,14 @@ float DynamicsBodyConfig::GetAnchorHardness() const void DynamicsBodyConfig::SetAnchorHardness( float hardness ) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetAnchorHardness( hardness ); #endif } float DynamicsBodyConfig::GetVolumeConservation() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetVolumeConservation(); #else return float(); @@ -289,14 +289,14 @@ float DynamicsBodyConfig::GetVolumeConservation() const void DynamicsBodyConfig::SetVolumeConservation(float conservation) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetVolumeConservation(conservation); #endif } float DynamicsBodyConfig::GetShapeConservation() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetShapeConservation(); #else return float(); @@ -305,13 +305,13 @@ float DynamicsBodyConfig::GetShapeConservation() const void DynamicsBodyConfig::SetShapeConservation(float conservation) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetShapeConservation(conservation); #endif } DynamicsBodyConfig::DynamicsBodyConfig( Internal::DynamicsBodyConfig* internal ) -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT : BaseHandle(internal) #else : BaseHandle(NULL) diff --git a/dali/devel-api/dynamics/dynamics-body.cpp b/dali/devel-api/dynamics/dynamics-body.cpp index 98db1f6..8cb656d 100644 --- a/dali/devel-api/dynamics/dynamics-body.cpp +++ b/dali/devel-api/dynamics/dynamics-body.cpp @@ -21,7 +21,7 @@ // INTERNAL HEADERS #include -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT #include #include #include @@ -51,7 +51,7 @@ DynamicsBody& DynamicsBody::operator=(const DynamicsBody& rhs) } DynamicsBody::DynamicsBody(Internal::DynamicsBody* internal) -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT : BaseHandle(internal) #else : BaseHandle(NULL) @@ -61,7 +61,7 @@ DynamicsBody::DynamicsBody(Internal::DynamicsBody* internal) float DynamicsBody::GetMass() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetMass(); #else return float(); @@ -70,7 +70,7 @@ float DynamicsBody::GetMass() const float DynamicsBody::GetElasticity() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetElasticity(); #else return float(); @@ -79,14 +79,14 @@ float DynamicsBody::GetElasticity() const void DynamicsBody::SetLinearVelocity(const Vector3& velocity) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetLinearVelocity(velocity); #endif } Vector3 DynamicsBody::GetCurrentLinearVelocity() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetCurrentLinearVelocity(); #else return Vector3(); @@ -95,14 +95,14 @@ Vector3 DynamicsBody::GetCurrentLinearVelocity() const void DynamicsBody::SetAngularVelocity(const Vector3& velocity) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetAngularVelocity(velocity); #endif } Vector3 DynamicsBody::GetCurrentAngularVelocity() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetCurrentAngularVelocity(); #else return Vector3(); @@ -111,14 +111,14 @@ Vector3 DynamicsBody::GetCurrentAngularVelocity() const void DynamicsBody::SetKinematic( const bool flag ) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetKinematic(flag); #endif } bool DynamicsBody::IsKinematic() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).IsKinematic(); #else return bool(); @@ -127,14 +127,14 @@ bool DynamicsBody::IsKinematic() const void DynamicsBody::SetSleepEnabled( const bool flag ) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetSleepEnabled(flag); #endif } bool DynamicsBody::GetSleepEnabled() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetSleepEnabled(); #else return bool(); @@ -143,28 +143,28 @@ bool DynamicsBody::GetSleepEnabled() const void DynamicsBody::WakeUp() { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).WakeUp(); #endif } void DynamicsBody::AddAnchor(const unsigned int index, DynamicsBody body, const bool collisions) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).AddAnchor(index, &GetImplementation(body), collisions); #endif } void DynamicsBody::ConserveVolume(const bool flag) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).ConserveVolume(flag); #endif } void DynamicsBody::ConserveShape(const bool flag) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).ConserveShape(flag); #endif } diff --git a/dali/devel-api/dynamics/dynamics-collision.cpp b/dali/devel-api/dynamics/dynamics-collision.cpp index 6e481ba..dcb89ef 100644 --- a/dali/devel-api/dynamics/dynamics-collision.cpp +++ b/dali/devel-api/dynamics/dynamics-collision.cpp @@ -22,7 +22,7 @@ #include #include -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT #include #include #endif @@ -51,7 +51,7 @@ DynamicsCollision& DynamicsCollision::operator=(const DynamicsCollision& rhs) Actor DynamicsCollision::GetActorA() { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Internal::ActorPtr actor( GetImplementation(*this).GetActorA() ); return Actor( actor.Get() ); #else @@ -61,7 +61,7 @@ Actor DynamicsCollision::GetActorA() Actor DynamicsCollision::GetActorB() { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Internal::ActorPtr actor( GetImplementation(*this).GetActorB() ); return Actor( actor.Get() ); #else @@ -71,7 +71,7 @@ Actor DynamicsCollision::GetActorB() float DynamicsCollision::GetImpactForce() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetImpactForce(); #else return float(); @@ -80,7 +80,7 @@ float DynamicsCollision::GetImpactForce() const Vector3 DynamicsCollision::GetPointOnA() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetPointOnA(); #else return Vector3(); @@ -89,7 +89,7 @@ Vector3 DynamicsCollision::GetPointOnA() const Vector3 DynamicsCollision::GetPointOnB() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetPointOnB(); #else return Vector3(); @@ -98,7 +98,7 @@ Vector3 DynamicsCollision::GetPointOnB() const Vector3 DynamicsCollision::GetNormal() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetNormal(); #else return Vector3(); @@ -106,7 +106,7 @@ Vector3 DynamicsCollision::GetNormal() const } DynamicsCollision::DynamicsCollision( Internal::DynamicsCollision* internal ) -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT : BaseHandle(internal) #else : BaseHandle(NULL) diff --git a/dali/devel-api/dynamics/dynamics-joint.cpp b/dali/devel-api/dynamics/dynamics-joint.cpp index 7d36d3d..ccc1137 100644 --- a/dali/devel-api/dynamics/dynamics-joint.cpp +++ b/dali/devel-api/dynamics/dynamics-joint.cpp @@ -21,7 +21,7 @@ // INTERNAL HEADERS #include -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT #include #endif @@ -49,70 +49,70 @@ DynamicsJoint& DynamicsJoint::operator=(const DynamicsJoint& rhs) void DynamicsJoint::SetLinearLimit( const int axisIndex, const float lowerLimit, const float upperLimit ) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetLinearLimit(axisIndex, lowerLimit, upperLimit); #endif } void DynamicsJoint::SetAngularLimit( const int axisIndex, const Degree& lowerLimit, const Degree& upperLimit ) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetAngularLimit( axisIndex, Radian(lowerLimit), Radian(upperLimit) ); #endif } void DynamicsJoint::EnableSpring(const int axisIndex, const bool flag) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).EnableSpring(axisIndex, flag); #endif } void DynamicsJoint::SetSpringStiffness(const int axisIndex, const float stiffness) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetSpringStiffness(axisIndex, stiffness); #endif } void DynamicsJoint::SetSpringDamping(const int axisIndex, const float damping) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetSpringDamping(axisIndex, damping); #endif } void DynamicsJoint::SetSpringCenterPoint(const int axisIndex, const float ratio) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetSpringCenterPoint(axisIndex, ratio); #endif } void DynamicsJoint::EnableMotor(const int axisIndex, const bool flag) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).EnableMotor(axisIndex, flag); #endif } void DynamicsJoint::SetMotorVelocity(const int axisIndex, const float velocity) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetMotorVelocity(axisIndex, velocity); #endif } void DynamicsJoint::SetMotorForce(const int axisIndex, const float force) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetMotorForce(axisIndex, force); #endif } Actor DynamicsJoint::GetActor( const bool first ) const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Internal::ActorPtr internal( GetImplementation(*this).GetActor(first) ); return Actor(internal.Get()); @@ -122,7 +122,7 @@ Actor DynamicsJoint::GetActor( const bool first ) const } DynamicsJoint::DynamicsJoint(Internal::DynamicsJoint* internal) -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT : BaseHandle(internal) #else : BaseHandle(NULL) diff --git a/dali/devel-api/dynamics/dynamics-shape.cpp b/dali/devel-api/dynamics/dynamics-shape.cpp index 6c41f04..33b7257 100644 --- a/dali/devel-api/dynamics/dynamics-shape.cpp +++ b/dali/devel-api/dynamics/dynamics-shape.cpp @@ -21,7 +21,7 @@ // INTERNAL HEADERS #include -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT #include #include #include @@ -37,7 +37,7 @@ namespace Dali DynamicsShape DynamicsShape::NewCapsule(const float radius, const float length) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Internal::DynamicsCapsuleShapePtr internal( new Internal::DynamicsCapsuleShape( radius, length) ); return DynamicsShape(internal.Get()); @@ -48,7 +48,7 @@ DynamicsShape DynamicsShape::NewCapsule(const float radius, const float length) DynamicsShape DynamicsShape::NewCone(const float radius, const float length) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Internal::DynamicsConeShapePtr internal( new Internal::DynamicsConeShape( radius, length) ); return DynamicsShape(internal.Get()); @@ -59,7 +59,7 @@ DynamicsShape DynamicsShape::NewCone(const float radius, const float length) DynamicsShape DynamicsShape::NewCube(const Vector3& dimensions) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Internal::DynamicsCubeShapePtr internal( new Internal::DynamicsCubeShape( dimensions ) ); return DynamicsShape(internal.Get()); @@ -70,7 +70,7 @@ DynamicsShape DynamicsShape::NewCube(const Vector3& dimensions) DynamicsShape DynamicsShape::NewCylinder(const float radius, const float length) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Internal::DynamicsCylinderShapePtr internal( new Internal::DynamicsCylinderShape( radius, length) ); return DynamicsShape(internal.Get()); @@ -81,7 +81,7 @@ DynamicsShape DynamicsShape::NewCylinder(const float radius, const float length) DynamicsShape DynamicsShape::NewMesh(Cloth cloth) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Internal::DynamicsMeshShapePtr internal( new Internal::DynamicsMeshShape( GetImplementation(cloth) ) ); return DynamicsShape(internal.Get()); @@ -92,7 +92,7 @@ DynamicsShape DynamicsShape::NewMesh(Cloth cloth) DynamicsShape DynamicsShape::NewSphere(const float radius) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Internal::DynamicsSphereShapePtr internal( new Internal::DynamicsSphereShape( radius ) ); return DynamicsShape(internal.Get()); @@ -121,7 +121,7 @@ DynamicsShape& DynamicsShape::operator=(const DynamicsShape& rhs) } DynamicsShape::DynamicsShape(Internal::DynamicsShape* internal) -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT : BaseHandle(internal) #else : BaseHandle(NULL) @@ -131,7 +131,7 @@ DynamicsShape::DynamicsShape(Internal::DynamicsShape* internal) DynamicsShape::ShapeType DynamicsShape::GetType() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetType(); #else return DynamicsShape::CAPSULE; diff --git a/dali/devel-api/dynamics/dynamics-world-config.cpp b/dali/devel-api/dynamics/dynamics-world-config.cpp index 805b789..e158fcd 100644 --- a/dali/devel-api/dynamics/dynamics-world-config.cpp +++ b/dali/devel-api/dynamics/dynamics-world-config.cpp @@ -19,7 +19,7 @@ #include // INTERNAL HEADERS -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT #include #endif @@ -28,7 +28,7 @@ namespace Dali DynamicsWorldConfig DynamicsWorldConfig::New() { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Internal::DynamicsWorldConfigPtr internal( new Internal::DynamicsWorldConfig() ); return DynamicsWorldConfig( internal.Get() ); @@ -58,14 +58,14 @@ DynamicsWorldConfig& DynamicsWorldConfig::operator=(const DynamicsWorldConfig& r void DynamicsWorldConfig::SetType( const DynamicsWorldConfig::WorldType type ) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetType( type ); #endif } DynamicsWorldConfig::WorldType DynamicsWorldConfig::GetType() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetType(); #else return DynamicsWorldConfig::RIGID; @@ -74,14 +74,14 @@ DynamicsWorldConfig::WorldType DynamicsWorldConfig::GetType() const void DynamicsWorldConfig::SetUnit(float unit) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetUnit( unit ); #endif } float DynamicsWorldConfig::GetUnit() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetUnit(); #else return float(); @@ -90,14 +90,14 @@ float DynamicsWorldConfig::GetUnit() const void DynamicsWorldConfig::SetSimulationSubSteps(int subSteps) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetSimulationSubSteps( subSteps ); #endif } int DynamicsWorldConfig::GetSimulationSubSteps() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetSimulationSubSteps(); #else return int(); @@ -105,7 +105,7 @@ int DynamicsWorldConfig::GetSimulationSubSteps() const } DynamicsWorldConfig::DynamicsWorldConfig( Internal::DynamicsWorldConfig* internal ) -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT : BaseHandle(internal) #else : BaseHandle(NULL) diff --git a/dali/devel-api/dynamics/dynamics-world.cpp b/dali/devel-api/dynamics/dynamics-world.cpp index 71fd8f2..dcb0b0d 100644 --- a/dali/devel-api/dynamics/dynamics-world.cpp +++ b/dali/devel-api/dynamics/dynamics-world.cpp @@ -22,7 +22,7 @@ #include #include -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT #include #include #include @@ -32,7 +32,7 @@ namespace Dali { -#ifndef DYNAMICS_SUPPORT +#ifndef DALI_DYNAMICS_SUPPORT DynamicsWorld::CollisionSignalType STUB_COLLISION_SIGNAL; #endif @@ -57,7 +57,7 @@ DynamicsWorld& DynamicsWorld::operator=(const DynamicsWorld& rhs) DynamicsWorld DynamicsWorld::GetInstance( DynamicsWorldConfig configuration ) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Internal::DynamicsWorldConfigPtr configImpl( &( GetImplementation( configuration ) ) ); return DynamicsWorld( Internal::DynamicsWorld::GetInstance( configImpl ).Get() ); @@ -68,7 +68,7 @@ DynamicsWorld DynamicsWorld::GetInstance( DynamicsWorldConfig configuration ) DynamicsWorld DynamicsWorld::Get() { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Internal::DynamicsWorld* dynamicsWorld = Internal::DynamicsWorld::Get().Get(); DALI_ASSERT_ALWAYS( dynamicsWorld && "DynamicsWorld doesn't exist" ); return DynamicsWorld( dynamicsWorld ); @@ -79,21 +79,21 @@ DynamicsWorld DynamicsWorld::Get() void DynamicsWorld::DestroyInstance() { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Internal::DynamicsWorld::DestroyInstance(); #endif } void DynamicsWorld::SetGravity(const Vector3& gravity ) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetGravity(gravity); #endif } const Vector3& DynamicsWorld::GetGravity() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetGravity(); #else return Vector3::ZERO; @@ -102,7 +102,7 @@ const Vector3& DynamicsWorld::GetGravity() const int DynamicsWorld::GetDebugDrawMode() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).GetDebugDrawMode(); #else return int(); @@ -111,21 +111,21 @@ int DynamicsWorld::GetDebugDrawMode() const void DynamicsWorld::SetDebugDrawMode(int mode) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetDebugDrawMode( mode ); #endif } void DynamicsWorld::SetRootActor(Actor actor) { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT GetImplementation(*this).SetRootActor( &GetImplementation(actor) ); #endif } Actor DynamicsWorld::GetRootActor() const { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Internal::ActorPtr actor( GetImplementation(*this).GetRootActor() ); DALI_ASSERT_DEBUG(actor || "Root Actor has not been set"); @@ -138,7 +138,7 @@ Actor DynamicsWorld::GetRootActor() const DynamicsWorld::CollisionSignalType& DynamicsWorld::CollisionSignal() { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT return GetImplementation(*this).CollisionSignal(); #else return STUB_COLLISION_SIGNAL; @@ -146,7 +146,7 @@ DynamicsWorld::CollisionSignalType& DynamicsWorld::CollisionSignal() } DynamicsWorld::DynamicsWorld( Internal::DynamicsWorld* internal ) -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT : BaseHandle(internal) #else : BaseHandle(NULL) diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp index 8793e1a..a6bee0a 100644 --- a/dali/internal/event/actors/actor-impl.cpp +++ b/dali/internal/event/actors/actor-impl.cpp @@ -53,7 +53,7 @@ #include #include -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT #include #include #include @@ -149,7 +149,7 @@ struct Actor::RelayoutData bool insideRelayout :1; ///< Locking flag to prevent recursive relayouts on size set }; -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT // Encapsulate actor related dynamics data struct DynamicsData @@ -169,7 +169,7 @@ struct DynamicsData SlotDelegate< Actor > slotDelegate; }; -#endif // DYNAMICS_SUPPORT +#endif // DALI_DYNAMICS_SUPPORT namespace // unnamed namespace { @@ -1446,7 +1446,7 @@ bool Actor::RelayoutRequired( Dimension::Type dimension ) const return mRelayoutData->relayoutEnabled && IsLayoutDirty( dimension ); } -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT //--------------- Dynamics --------------- @@ -1822,7 +1822,7 @@ void Actor::DisconnectDynamics() } } -#endif // DYNAMICS_SUPPORT +#endif // DALI_DYNAMICS_SUPPORT void Actor::SetOverlay( bool enable ) { @@ -2274,7 +2274,7 @@ Actor::Actor( DerivedType derivedType ) mParentOrigin( NULL ), mAnchorPoint( NULL ), mRelayoutData( NULL ), -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT mDynamicsData( NULL ), #endif mGestureData( NULL ), @@ -2343,7 +2343,7 @@ Actor::~Actor() GetEventThreadServices().UnregisterObject( this ); } -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT // Cleanup dynamics delete mDynamicsData; #endif @@ -2430,7 +2430,7 @@ void Actor::ConnectToSceneGraph( int index ) mAttachment->Connect(); } -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT // Notify dynamics if( NULL != mDynamicsData ) { @@ -2527,7 +2527,7 @@ void Actor::DisconnectFromSceneGraph() mAttachment->Disconnect(); } -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT // Notify dynamics if( NULL != mDynamicsData ) { diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h index 412d2a0..cafe5bc 100644 --- a/dali/internal/event/actors/actor-impl.h +++ b/dali/internal/event/actors/actor-impl.h @@ -35,7 +35,7 @@ #include #include -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT #include #endif @@ -1220,7 +1220,7 @@ public: */ float GetMaximumSize( Dimension::Type dimension ) const; -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT // Dynamics @@ -1304,7 +1304,7 @@ private: */ void AttachedActorOffStage( Dali::Actor actor ); -#endif // DYNAMICS_SUPPORT +#endif // DALI_DYNAMICS_SUPPORT public: /** @@ -1867,7 +1867,7 @@ protected: struct RelayoutData; mutable RelayoutData* mRelayoutData; ///< Struct to hold optional collection of relayout variables -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT DynamicsData* mDynamicsData; ///< optional physics data #endif diff --git a/dali/internal/event/common/thread-local-storage.cpp b/dali/internal/event/common/thread-local-storage.cpp index ce9f1a4..9286f45 100644 --- a/dali/internal/event/common/thread-local-storage.cpp +++ b/dali/internal/event/common/thread-local-storage.cpp @@ -35,7 +35,7 @@ __thread ThreadLocalStorage* threadLocal = NULL; ThreadLocalStorage::ThreadLocalStorage(Core* core) : mCore( core ) -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT , mDynamicsWorldInstance( NULL ) #endif { @@ -51,7 +51,7 @@ ThreadLocalStorage::~ThreadLocalStorage() void ThreadLocalStorage::Remove() { -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT if( mDynamicsWorldInstance ) { mDynamicsWorldInstance.Reset(); @@ -78,7 +78,7 @@ ThreadLocalStorage* ThreadLocalStorage::GetInternal() return threadLocal; } -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Dali::Internal::DynamicsWorldPtr ThreadLocalStorage::GetDynamicsWorldInstance() { if( !mDynamicsWorldInstance ) diff --git a/dali/internal/event/common/thread-local-storage.h b/dali/internal/event/common/thread-local-storage.h index 90e3722..ad6b92e 100644 --- a/dali/internal/event/common/thread-local-storage.h +++ b/dali/internal/event/common/thread-local-storage.h @@ -20,7 +20,7 @@ // INTERNAL INCLUDES #include -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT #include #endif @@ -101,7 +101,7 @@ public: */ Dali::Integration::PlatformAbstraction& GetPlatformAbstraction(); -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT /** * Get DynamicsWorld instance * @return A pointer to the current DynamicsWorld. @@ -166,7 +166,7 @@ public: private: Core* mCore; ///< reference to core -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT Dali::Internal::DynamicsWorldPtr mDynamicsWorldInstance; ///< Instance of DynamicsWorld (This does not need to be in core) #endif diff --git a/dali/internal/update/manager/update-manager.cpp b/dali/internal/update/manager/update-manager.cpp index 75d43ea..ae1173c 100644 --- a/dali/internal/update/manager/update-manager.cpp +++ b/dali/internal/update/manager/update-manager.cpp @@ -66,7 +66,7 @@ #include #include -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT #include #include #endif @@ -269,7 +269,7 @@ struct UpdateManager::Impl MessageQueue messageQueue; ///< The messages queued from the event-thread -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT OwnerPointer dynamicsWorld; ///< Wrapper for dynamics simulation #endif bool dynamicsChanged; ///< This is set to true if an object is changed in the dynamics simulation tick @@ -1045,7 +1045,7 @@ unsigned int UpdateManager::Update( float elapsedSeconds, // 8) Apply Constraints ApplyConstraints(); -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT // 9) Update dynamics simulation mImpl->dynamicsChanged = false; if( mImpl->dynamicsWorld ) @@ -1245,7 +1245,7 @@ void UpdateManager::SetLayerDepths( const SortedLayerPointers& layers, bool syst } } -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT void UpdateManager::InitializeDynamicsWorld( SceneGraph::DynamicsWorld* dynamicsWorld, Integration::DynamicsWorldSettings* worldSettings ) { @@ -1258,7 +1258,7 @@ void UpdateManager::TerminateDynamicsWorld() mImpl->dynamicsWorld.Reset(); } -#endif // DYNAMICS_SUPPORT +#endif // DALI_DYNAMICS_SUPPORT } // namespace SceneGraph diff --git a/dali/internal/update/manager/update-manager.h b/dali/internal/update/manager/update-manager.h index 5a3f53a..b0910a0 100644 --- a/dali/internal/update/manager/update-manager.h +++ b/dali/internal/update/manager/update-manager.h @@ -389,7 +389,7 @@ public: */ void SetLayerDepths( const std::vector< Layer* >& layers, bool systemLevel ); -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT /** * Initialize the dynamics world @@ -404,7 +404,7 @@ public: */ void TerminateDynamicsWorld(); -#endif // DYNAMICS_SUPPORT +#endif // DALI_DYNAMICS_SUPPORT private: @@ -850,7 +850,7 @@ inline void RemoveGestureMessage( UpdateManager& manager, PanGesture* gesture ) new (slot) LocalType( &manager, &UpdateManager::RemoveGesture, gesture ); } -#ifdef DYNAMICS_SUPPORT +#ifdef DALI_DYNAMICS_SUPPORT // Dynamics messages inline void InitializeDynamicsWorldMessage( UpdateManager& manager, DynamicsWorld* dynamicsworld, Integration::DynamicsWorldSettings* worldSettings ) @@ -875,7 +875,7 @@ inline void TerminateDynamicsWorldMessage(UpdateManager& manager) new (slot) LocalType( &manager, &UpdateManager::TerminateDynamicsWorld ); } -#endif // DYNAMICS_SUPPORT +#endif // DALI_DYNAMICS_SUPPORT } // namespace SceneGraph -- 2.7.4