Dynamics build fix

Change-Id: I16aa313ecf6000e005bba5059a9fb815a5d1ab61

diff --git a/.gitignore b/.gitignore
index caf34e7..d1d20c1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ BROWSE
 *.swp
 *.creator
 *.creator.user
+/automated-tests/CMakeLists.txt
 /docs/generated/*
 /build/tizen/doc
 /build/tizen/.cov

diff --git a/automated-tests/CMakeLists.txt b/automated-tests/CMakeLists.txt
deleted file mode 100644 (file)
index c27852a..0000000
--- a/automated-tests/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(tct_coreapi_utc)
-
-INCLUDE(FindPkgConfig)
-SET(BIN_DIR "/opt/usr/bin")
-
-INCLUDE_DIRECTORIES(
-       src/common
-)
-
-ADD_SUBDIRECTORY(src)
-
-SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ")

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index b46b249..1394e18 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -130,4 +130,5 @@ Configuration
   Data Dir (Read Only):             $dataReadOnlyDir
   Emscripten:                       $enable_emscripten
   Backtrace:                        $enable_backtrace
+  Dynamics:                         $dynamics_support
 "

diff --git a/dali/internal/event/dynamics/dynamics-body-impl.cpp b/dali/internal/event/dynamics/dynamics-body-impl.cpp
index 7be21b9..cef2353 100644 (file)
--- a/dali/internal/event/dynamics/dynamics-body-impl.cpp
+++ b/dali/internal/event/dynamics/dynamics-body-impl.cpp
@@ -61,7 +61,7 @@ DynamicsBody::DynamicsBody(const std::string& name, DynamicsBodyConfigPtr config
 
   Integration::DynamicsBodySettings* settings( new Integration::DynamicsBodySettings(*config->GetSettings()) ); // copy settings
   SceneGraph::DynamicsShape* sceneShape( mShape->GetSceneObject() );
-  InitializeDynamicsBodyMessage( stage->GetUpdateInterface(), *mDynamicsBody, settings, *sceneShape );
+  InitializeDynamicsBodyMessage( *stage, *mDynamicsBody, settings, *sceneShape );
 
   SetMass( config->GetMass() );
   SetElasticity( config->GetElasticity() );
@@ -78,8 +78,8 @@ DynamicsBody::DynamicsBody(const std::string& name, DynamicsBodyConfigPtr config
     }
   }
 
-  SetCollisionGroupMessage( stage->GetUpdateInterface(), *mDynamicsBody, collisionGroup );
-  SetCollisionMaskMessage( stage->GetUpdateInterface(), *mDynamicsBody, collisionMask );
+  SetCollisionGroupMessage( *stage, *mDynamicsBody, collisionGroup );
+  SetCollisionMaskMessage( *stage, *mDynamicsBody, collisionMask );
 
   world->MapActor(mDynamicsBody, actor);
 }
@@ -90,7 +90,7 @@ DynamicsBody::~DynamicsBody()
 
   if( Stage::IsInstalled() )
   {
-    DeleteBodyMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()) );
+    DeleteBodyMessage( *( Stage::GetCurrent() ), *(GetSceneObject()) );
 
     DynamicsWorldPtr world( Stage::GetCurrent()->GetDynamicsWorld() );
 
@@ -127,7 +127,7 @@ void DynamicsBody::SetMass(const float mass)
     mMass = mass;
     if( !IsKinematic() )
     {
-      SetMassMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), mMass );
+      SetMassMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), mMass );
     }
   }
 }
@@ -142,13 +142,13 @@ void DynamicsBody::SetElasticity(const float elasticity)
   if( fabsf(mElasticity - elasticity) >= GetRangedEpsilon(mElasticity, elasticity) )
   {
     mElasticity = elasticity;
-    SetElasticityMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), mElasticity );
+    SetElasticityMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), mElasticity );
   }
 }
 
 void DynamicsBody::SetLinearVelocity(const Vector3& velocity)
 {
-  SetLinearVelocityMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), velocity );
+  SetLinearVelocityMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), velocity );
 }
 
 Vector3 DynamicsBody::GetCurrentLinearVelocity() const
@@ -158,7 +158,7 @@ Vector3 DynamicsBody::GetCurrentLinearVelocity() const
 
 void DynamicsBody::SetAngularVelocity(const Vector3& velocity)
 {
-  SetAngularVelocityMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), velocity );
+  SetAngularVelocityMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), velocity );
 }
 
 Vector3 DynamicsBody::GetCurrentAngularVelocity() const
@@ -173,20 +173,20 @@ void DynamicsBody::SetKinematic( const bool flag )
     // kinematic objects have zero mass
     if( flag && ( ! EqualsZero( mMass ) ) )
     {
-      SetMassMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), 0.0f );
+      SetMassMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), 0.0f );
     }
 
     mKinematic = flag;
-    SetKinematicMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), flag );
+    SetKinematicMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), flag );
 
     if( !flag && ( ! EqualsZero( mMass ) ) )
     {
-      SetMassMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), mMass );
+      SetMassMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), mMass );
     }
 
     if( !flag )
     {
-      SetSleepEnabledMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), mSleepEnabled );
+      SetSleepEnabledMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), mSleepEnabled );
     }
   }
 }
@@ -204,7 +204,7 @@ void DynamicsBody::SetSleepEnabled( const bool flag )
 
     if( !IsKinematic() )
     {
-      SetSleepEnabledMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), flag );
+      SetSleepEnabledMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), flag );
     }
   }
 }
@@ -216,22 +216,22 @@ bool DynamicsBody::GetSleepEnabled() const
 
 void DynamicsBody::WakeUp()
 {
-  WakeUpMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()) );
+  WakeUpMessage( *( Stage::GetCurrent() ), *(GetSceneObject()) );
 }
 
 void DynamicsBody::AddAnchor(const unsigned int index, DynamicsBodyPtr body, const bool collisions)
 {
-  AddAnchorMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), index, *(body->GetSceneObject()), collisions );
+  AddAnchorMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), index, *(body->GetSceneObject()), collisions );
 }
 
 void DynamicsBody::ConserveVolume(const bool flag)
 {
-  ConserveVolumeMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), flag );
+  ConserveVolumeMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), flag );
 }
 
 void DynamicsBody::ConserveShape(const bool flag)
 {
-  ConserveShapeMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), flag );
+  ConserveShapeMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), flag );
 }
 
 Actor& DynamicsBody::GetActor() const

diff --git a/dali/internal/event/dynamics/dynamics-body-impl.h b/dali/internal/event/dynamics/dynamics-body-impl.h
index a681beb..f31e61d 100644 (file)
--- a/dali/internal/event/dynamics/dynamics-body-impl.h
+++ b/dali/internal/event/dynamics/dynamics-body-impl.h
@@ -18,13 +18,15 @@
  *
  */
 
-// BASE CLASS HEADER
+// CLASS HEADER
 #include <dali/public-api/object/base-object.h>
 
-// INTERNAL HEADERS
+// INTERNAL INCLUDES
+#include <dali/internal/event/common/event-thread-services.h>
 #include <dali/internal/event/dynamics/dynamics-declarations.h>
 #include <dali/public-api/dynamics/dynamics-body.h>
 
+
 namespace Dali
 {
 
@@ -134,13 +136,13 @@ public:
    * Called when the associated actor is added to the stage
    * @param[in] eventThreadServices Object that can send messages to scene graph
    */
-  void Connect(EventThreadServices& eventThreadServices );
+  void Connect( EventThreadServices& eventThreadServices );
 
   /**
    * Called when the associated actor is removed from the stage
    * @param[in] eventThreadServices Object that can send messages to scene graph
    */
-  void Disconnect(EventThreadServices& eventThreadServices );
+  void Disconnect( EventThreadServices& eventThreadServices );
 
   SceneGraph::DynamicsBody* GetSceneObject()
   {

diff --git a/dali/internal/event/dynamics/dynamics-capsule-shape-impl.cpp b/dali/internal/event/dynamics/dynamics-capsule-shape-impl.cpp
index 1c964e1..90db76d 100644 (file)
--- a/dali/internal/event/dynamics/dynamics-capsule-shape-impl.cpp
+++ b/dali/internal/event/dynamics/dynamics-capsule-shape-impl.cpp
@@ -45,7 +45,7 @@ DynamicsCapsuleShape::DynamicsCapsuleShape(const float radius, const float lengt
   mDynamicsShape = capsuleShape;
 
   // Queue a message to ensure the underlying dynamics object is created in the update thread
-  InitializeDynamicsCapsuleShapeMessage( stage->GetUpdateInterface(), *capsuleShape, radius, length );
+  InitializeDynamicsCapsuleShapeMessage( *stage, *capsuleShape, radius, length );
 }
 
 DynamicsCapsuleShape::~DynamicsCapsuleShape()

diff --git a/dali/internal/event/dynamics/dynamics-cone-shape-impl.cpp b/dali/internal/event/dynamics/dynamics-cone-shape-impl.cpp
index 0079d86..fd1915d 100644 (file)
--- a/dali/internal/event/dynamics/dynamics-cone-shape-impl.cpp
+++ b/dali/internal/event/dynamics/dynamics-cone-shape-impl.cpp
@@ -45,7 +45,7 @@ DynamicsConeShape::DynamicsConeShape(const float radius, const float length)
   mDynamicsShape = coneShape;
 
   // Queue a message to ensure the underlying dynamics object is created in the update thread
-  InitializeDynamicsConeShapeMessage( stage->GetUpdateInterface(), *coneShape, radius, length );
+  InitializeDynamicsConeShapeMessage( *stage, *coneShape, radius, length );
 }
 
 DynamicsConeShape::~DynamicsConeShape()

diff --git a/dali/internal/event/dynamics/dynamics-cube-shape-impl.cpp b/dali/internal/event/dynamics/dynamics-cube-shape-impl.cpp
index 3f992b1..73e1945 100644 (file)
--- a/dali/internal/event/dynamics/dynamics-cube-shape-impl.cpp
+++ b/dali/internal/event/dynamics/dynamics-cube-shape-impl.cpp
@@ -45,7 +45,7 @@ DynamicsCubeShape::DynamicsCubeShape(const Vector3& dimensions)
   mDynamicsShape = cubeShape;
 
   // Queue a message to ensure the underlying dynamics object is created in the update thread
-  InitializeDynamicsCubeShapeMessage( stage->GetUpdateInterface(), *cubeShape, dimensions );
+  InitializeDynamicsCubeShapeMessage( *stage, *cubeShape, dimensions );
 }
 
 DynamicsCubeShape::~DynamicsCubeShape()

diff --git a/dali/internal/event/dynamics/dynamics-cylinder-shape-impl.cpp b/dali/internal/event/dynamics/dynamics-cylinder-shape-impl.cpp
index 481a7e0..bf05d65 100644 (file)
--- a/dali/internal/event/dynamics/dynamics-cylinder-shape-impl.cpp
+++ b/dali/internal/event/dynamics/dynamics-cylinder-shape-impl.cpp
@@ -45,7 +45,7 @@ DynamicsCylinderShape::DynamicsCylinderShape(const float radius, const float len
   mDynamicsShape = cylinderShape;
 
   // Queue a message to ensure the underlying dynamics object is created in the update thread
-  InitializeDynamicsCylinderShapeMessage( stage->GetUpdateInterface(), *cylinderShape, radius, length );
+  InitializeDynamicsCylinderShapeMessage( *stage, *cylinderShape, radius, length );
 }
 
 DynamicsCylinderShape::~DynamicsCylinderShape()

diff --git a/dali/internal/event/dynamics/dynamics-joint-impl.cpp b/dali/internal/event/dynamics/dynamics-joint-impl.cpp
index aee80ed..3ddcdd8 100644 (file)
--- a/dali/internal/event/dynamics/dynamics-joint-impl.cpp
+++ b/dali/internal/event/dynamics/dynamics-joint-impl.cpp
@@ -70,7 +70,7 @@ DynamicsJoint::~DynamicsJoint()
 
   if( Stage::IsInstalled() )
   {
-    DeleteJointMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()) );
+    DeleteJointMessage( *( Stage::GetCurrent() ), *(GetSceneObject()) );
   }
 }
 
@@ -97,7 +97,7 @@ void DynamicsJoint::SetLinearLimit(const int axisIndex, const float lowerLimit,
 
   if( valueChanged )
   {
-    SetLimitMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), axisIndex, lowerLimit, upperLimit );
+    SetLimitMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), axisIndex, lowerLimit, upperLimit );
   }
 }
 
@@ -123,7 +123,7 @@ void DynamicsJoint::SetAngularLimit(const int  axisIndex, const Radian& lowerLim
 
   if( valueChanged )
   {
-    SetLimitMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), axisIndex, lowerLimit, upperLimit );
+    SetLimitMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), axisIndex, lowerLimit, upperLimit );
   }
 }
 
@@ -152,7 +152,7 @@ void DynamicsJoint::EnableSpring(const int axisIndex, const bool flag)
 
   if( 0 != valueChanged )
   {
-    SetEnableSpringMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), valueChanged, flag );
+    SetEnableSpringMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), valueChanged, flag );
   }
 }
 
@@ -174,7 +174,7 @@ void DynamicsJoint::DynamicsJoint::SetSpringStiffness(const int  axisIndex, cons
 
   if( 0 != valueChanged )
   {
-    SetSpringStiffnessMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), valueChanged, stiffness );
+    SetSpringStiffnessMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), valueChanged, stiffness );
   }
 }
 
@@ -198,7 +198,7 @@ void DynamicsJoint::SetSpringDamping(const int axisIndex, const float damping)
 
   if( 0 != valueChanged )
   {
-    SetSpringDampingMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), valueChanged, clampedDamping );
+    SetSpringDampingMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), valueChanged, clampedDamping );
   }
 }
 
@@ -220,7 +220,7 @@ void DynamicsJoint::DynamicsJoint::SetSpringCenterPoint(const int  axisIndex, co
 
   if( 0 != valueChanged )
   {
-    SetSpringCenterPointMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), valueChanged, ratio );
+    SetSpringCenterPointMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), valueChanged, ratio );
   }
 }
 
@@ -248,7 +248,7 @@ void DynamicsJoint::EnableMotor(const int  axisIndex, const bool flag)
 
   if( valueChanged )
   {
-    SetEnableMotorMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), axisIndex, flag );
+    SetEnableMotorMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), axisIndex, flag );
   }
 }
 
@@ -270,7 +270,7 @@ void DynamicsJoint::SetMotorVelocity(const int  axisIndex, const float velocity)
 
   if( valueChanged )
   {
-    SetMotorVelocityMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), axisIndex, velocity );
+    SetMotorVelocityMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), axisIndex, velocity );
   }
 }
 
@@ -292,7 +292,7 @@ void DynamicsJoint::SetMotorForce(const int  axisIndex, const float force)
 
   if( valueChanged )
   {
-    SetMotorForceMessage( Stage::GetCurrent()->GetUpdateInterface(), *(GetSceneObject()), axisIndex, force );
+    SetMotorForceMessage( *( Stage::GetCurrent() ), *(GetSceneObject()), axisIndex, force );
   }
 }
 

diff --git a/dali/internal/event/dynamics/dynamics-mesh-shape-impl.cpp b/dali/internal/event/dynamics/dynamics-mesh-shape-impl.cpp
index 7f39b45..c074caa 100644 (file)
--- a/dali/internal/event/dynamics/dynamics-mesh-shape-impl.cpp
+++ b/dali/internal/event/dynamics/dynamics-mesh-shape-impl.cpp
@@ -46,7 +46,7 @@ DynamicsMeshShape::DynamicsMeshShape(Mesh& mesh)
   mDynamicsShape = meshShape;
 
   // Queue a message to ensure the underlying dynamics object is created in the update thread
-  InitializeDynamicsMeshShapeMessage( stage->GetUpdateInterface(), *meshShape );
+  InitializeDynamicsMeshShapeMessage( *stage, *meshShape );
 }
 
 DynamicsMeshShape::~DynamicsMeshShape()

diff --git a/dali/internal/event/dynamics/dynamics-shape-impl.cpp b/dali/internal/event/dynamics/dynamics-shape-impl.cpp
index 055584e..071ea88 100644 (file)
--- a/dali/internal/event/dynamics/dynamics-shape-impl.cpp
+++ b/dali/internal/event/dynamics/dynamics-shape-impl.cpp
@@ -42,7 +42,7 @@ DynamicsShape::~DynamicsShape()
   DALI_LOG_INFO(Debug::Filter::gDynamics, Debug::Verbose, "%s\n", __PRETTY_FUNCTION__);
   if( mDynamicsShape && Stage::IsInstalled() )
   {
-    DeleteShapeMessage( Stage::GetCurrent()->GetUpdateInterface(), *mDynamicsShape );
+    DeleteShapeMessage( *( Stage::GetCurrent() ), *mDynamicsShape );
   }
 }
 

diff --git a/dali/internal/event/dynamics/dynamics-sphere-shape-impl.cpp b/dali/internal/event/dynamics/dynamics-sphere-shape-impl.cpp
index aa5e86e..bd8c657 100644 (file)
--- a/dali/internal/event/dynamics/dynamics-sphere-shape-impl.cpp
+++ b/dali/internal/event/dynamics/dynamics-sphere-shape-impl.cpp
@@ -43,7 +43,7 @@ DynamicsSphereShape::DynamicsSphereShape(const float radius)
   mDynamicsShape = sphereShape;
 
   // Queue a message to ensure the underlying dynamics object is created in the update thread
-  InitializeDynamicsSphereShapeMessage( stage->GetUpdateInterface(), *sphereShape, radius );
+  InitializeDynamicsSphereShapeMessage( *stage, *sphereShape, radius );
 }
 
 DynamicsSphereShape::~DynamicsSphereShape()

diff --git a/dali/internal/event/dynamics/dynamics-world-impl.cpp b/dali/internal/event/dynamics/dynamics-world-impl.cpp
index e8f2b00..22f74b5 100644 (file)
--- a/dali/internal/event/dynamics/dynamics-world-impl.cpp
+++ b/dali/internal/event/dynamics/dynamics-world-impl.cpp
@@ -18,22 +18,22 @@
 // CLASS HEADER
 #include <dali/internal/event/dynamics/dynamics-world-impl.h>
 
-// EXTERNAL HEADERS
+// EXTERNAL INCLUDES
+#include <cstring>
 
-// INTERNAL HEADERS
+// INTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/dynamics/dynamics-collision-data.h>
 #include <dali/integration-api/dynamics/dynamics-world-settings.h>
-
-#include <dali/public-api/object/type-registry.h>
-#include <dali/internal/event/common/stage-impl.h>
 #include <dali/internal/event/actors/actor-impl.h>
+#include <dali/internal/event/common/stage-impl.h>
 #include <dali/internal/event/dynamics/dynamics-body-impl.h>
 #include <dali/internal/event/dynamics/dynamics-collision-impl.h>
 #include <dali/internal/event/dynamics/dynamics-joint-impl.h>
 #include <dali/internal/event/dynamics/dynamics-world-config-impl.h>
 #include <dali/internal/update/dynamics/scene-graph-dynamics-body.h>
 #include <dali/internal/update/dynamics/scene-graph-dynamics-world.h>
+#include <dali/public-api/object/type-registry.h>
 
 namespace Dali
 {
@@ -150,7 +150,7 @@ void DynamicsWorld::SetGravity(const Vector3& gravity)
   {
     mGravity = gravity;
 
-    SetGravityMessage( Stage::GetCurrent()->GetUpdateInterface(), *mDynamicsWorld, mGravity );
+    SetGravityMessage( *( Stage::GetCurrent() ), *mDynamicsWorld, mGravity );
   }
 }
 
@@ -190,7 +190,7 @@ void DynamicsWorld::SetRootActor(ActorPtr rootActor)
     {
       if( mRootActor->OnStage() )
       {
-        SetRootActorMessage( Stage::GetCurrent()->GetUpdateInterface(), *mDynamicsWorld, static_cast<const SceneGraph::Node*>(mRootActor->GetSceneObject()) );
+        SetRootActorMessage( *( Stage::GetCurrent() ), *mDynamicsWorld, static_cast<const SceneGraph::Node*>(mRootActor->GetSceneObject()) );
       }
 
       mRootActor->OnStageSignal().Connect( mSlotDelegate, &DynamicsWorld::RootOnStage );
@@ -210,14 +210,14 @@ void DynamicsWorld::RootOnStage( Dali::Actor actor )
 {
   DALI_LOG_INFO(Debug::Filter::gDynamics, Debug::Verbose, "%s\n", __PRETTY_FUNCTION__);
 
-  SetRootActorMessage( Stage::GetCurrent()->GetUpdateInterface(), *mDynamicsWorld, static_cast<const SceneGraph::Node*>(mRootActor->GetSceneObject()) );
+  SetRootActorMessage( *( Stage::GetCurrent() ), *mDynamicsWorld, static_cast<const SceneGraph::Node*>(mRootActor->GetSceneObject()) );
 }
 
 void DynamicsWorld::RootOffStage( Dali::Actor actor )
 {
   DALI_LOG_INFO(Debug::Filter::gDynamics, Debug::Verbose, "%s\n", __PRETTY_FUNCTION__);
 
-  SetRootActorMessage( Stage::GetCurrent()->GetUpdateInterface(), *mDynamicsWorld, static_cast<const SceneGraph::Node*>(NULL) );
+  SetRootActorMessage( *( Stage::GetCurrent() ), *mDynamicsWorld, static_cast<const SceneGraph::Node*>(NULL) );
 }
 
 Dali::DynamicsWorld::CollisionSignalType& DynamicsWorld::CollisionSignal()

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-body.cpp b/dali/internal/update/dynamics/scene-graph-dynamics-body.cpp
index 8f38082..1e6c38a 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-body.cpp
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-body.cpp
@@ -266,7 +266,7 @@ void DynamicsBody::GetNodePositionAndRotation(Vector3& position, Quaternion& rot
 {
   const BufferIndex bufferIndex = mWorld.GetBufferIndex();
   position = mNode.GetPosition(bufferIndex) / mWorld.GetWorldScale();
-  rotation = mNode.GetRotation(bufferIndex);
+  rotation = mNode.GetOrientation(bufferIndex);
 }
 
 void DynamicsBody::SetNodePositionAndRotation(const Vector3& position, const Quaternion& rotation)

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-body.h b/dali/internal/update/dynamics/scene-graph-dynamics-body.h
index 370c410..448f14d 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-body.h
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-body.h
@@ -18,10 +18,10 @@
  *
  */
 
-// INTERNAL HEADERS
+// INTERNAL INCLUDES
 #include <dali/internal/common/message.h>
-#include <dali/internal/common/event-thread-services.h>
 #include <dali/internal/common/owner-pointer.h>
+#include <dali/internal/event/common/event-thread-services.h>
 #include <dali/internal/event/dynamics/dynamics-declarations.h>
 #include <dali/internal/update/common/double-buffered.h>
 #include <dali/internal/update/modeling/scene-graph-mesh-declarations.h>

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-capsule-shape.h b/dali/internal/update/dynamics/scene-graph-dynamics-capsule-shape.h
index d333962..113921d 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-capsule-shape.h
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-capsule-shape.h
@@ -18,13 +18,13 @@
  *
  */
 
-// BASE CLASS HEADERS
+// CLASS HEADERS
 #include <dali/internal/update/dynamics/scene-graph-dynamics-shape.h>
 
-// INTERNAL HEADERS
-#include <dali/internal/event/dynamics/dynamics-declarations.h>
+// INTERNAL INCLUDES
 #include <dali/internal/common/message.h>
-#include <dali/internal/common/event-thread-services.h>
+#include <dali/internal/event/common/event-thread-services.h>
+#include <dali/internal/event/dynamics/dynamics-declarations.h>
 
 namespace Dali
 {

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-cone-shape.h b/dali/internal/update/dynamics/scene-graph-dynamics-cone-shape.h
index 0058f8e..20e2dfb 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-cone-shape.h
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-cone-shape.h
@@ -18,13 +18,13 @@
  *
  */
 
-// BASE CLASS HEADERS
+// CLASS HEADERS
 #include <dali/internal/update/dynamics/scene-graph-dynamics-shape.h>
 
-// INTERNAL HEADERS
-#include <dali/internal/event/dynamics/dynamics-declarations.h>
+// INTERNAL INCLUDES
 #include <dali/internal/common/message.h>
-#include <dali/internal/common/event-thread-services.h>
+#include <dali/internal/event/common/event-thread-services.h>
+#include <dali/internal/event/dynamics/dynamics-declarations.h>
 
 namespace Dali
 {

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-cube-shape.h b/dali/internal/update/dynamics/scene-graph-dynamics-cube-shape.h
index e20c09b..9dc9c01 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-cube-shape.h
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-cube-shape.h
@@ -18,13 +18,13 @@
  *
  */
 
-// BASE CLASS HEADERS
+// CLASS HEADERS
 #include <dali/internal/update/dynamics/scene-graph-dynamics-shape.h>
 
-// INTERNAL HEADERS
-#include <dali/internal/event/dynamics/dynamics-declarations.h>
+// INTERNAL INCLUDES
 #include <dali/internal/common/message.h>
-#include <dali/internal/common/event-thread-services.h>
+#include <dali/internal/event/common/event-thread-services.h>
+#include <dali/internal/event/dynamics/dynamics-declarations.h>
 #include <dali/public-api/math/vector3.h>
 
 namespace Dali

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-cylinder-shape.h b/dali/internal/update/dynamics/scene-graph-dynamics-cylinder-shape.h
index 60fa122..0438f03 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-cylinder-shape.h
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-cylinder-shape.h
@@ -18,13 +18,13 @@
  *
  */
 
-// BASE CLASS HEADERS
+// CLASS HEADERS
 #include <dali/internal/update/dynamics/scene-graph-dynamics-shape.h>
 
-// INTERNAL HEADERS
-#include <dali/internal/event/dynamics/dynamics-declarations.h>
+// INTERNAL INCLUDES
 #include <dali/internal/common/message.h>
-#include <dali/internal/common/event-thread-services.h>
+#include <dali/internal/event/common/event-thread-services.h>
+#include <dali/internal/event/dynamics/dynamics-declarations.h>
 
 namespace Dali
 {

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-joint.h b/dali/internal/update/dynamics/scene-graph-dynamics-joint.h
index 109b898..4871434 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-joint.h
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-joint.h
@@ -18,12 +18,15 @@
  *
  */
 
-// INTERNAL HEADERS
-#include <dali/internal/event/dynamics/dynamics-declarations.h>
+// EXTERNAL INCLUDES
+#include <new>
+
+// INTERNAL INCLUDES
 #include <dali/internal/common/message.h>
-#include <dali/internal/common/event-thread-services.h>
-#include <dali/public-api/math/vector3.h>
+#include <dali/internal/event/common/event-thread-services.h>
+#include <dali/internal/event/dynamics/dynamics-declarations.h>
 #include <dali/public-api/math/quaternion.h>
+#include <dali/public-api/math/vector3.h>
 
 class btGeneric6DofSpringConstraint;
 

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-mesh-shape.h b/dali/internal/update/dynamics/scene-graph-dynamics-mesh-shape.h
index 912df81..d588d63 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-mesh-shape.h
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-mesh-shape.h
@@ -18,13 +18,13 @@
  *
  */
 
-// BASE CLASS HEADERS
+// CLASS HEADERS
 #include <dali/internal/update/dynamics/scene-graph-dynamics-shape.h>
 
-// INTERNAL HEADERS
+// INTERNAL INCLUDES
 #include <dali/integration-api/resource-declarations.h>
 #include <dali/internal/common/message.h>
-#include <dali/internal/common/event-thread-services.h>
+#include <dali/internal/event/common/event-thread-services.h>
 #include <dali/internal/event/dynamics/dynamics-declarations.h>
 #include <dali/internal/update/modeling/scene-graph-mesh-declarations.h>
 

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-shape.h b/dali/internal/update/dynamics/scene-graph-dynamics-shape.h
index a61ea09..6195936 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-shape.h
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-shape.h
@@ -18,10 +18,13 @@
  *
  */
 
-// INTERNAL HEADERS
-#include <dali/internal/event/dynamics/dynamics-declarations.h>
+// EXTERNAL INCLUDES
+#include <new>
+
+// INTERNAL INCLUDES
 #include <dali/internal/common/message.h>
-#include <dali/internal/common/event-thread-services.h>
+#include <dali/internal/event/common/event-thread-services.h>
+#include <dali/internal/event/dynamics/dynamics-declarations.h>
 
 namespace Dali
 {

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-sphere-shape.h b/dali/internal/update/dynamics/scene-graph-dynamics-sphere-shape.h
index 5a9937f..5877b68 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-sphere-shape.h
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-sphere-shape.h
@@ -18,13 +18,13 @@
  *
  */
 
-// BASE CLASS HEADERS
+// CLASS HEADERS
 #include <dali/internal/update/dynamics/scene-graph-dynamics-shape.h>
 
-// INTERNAL HEADERS
-#include <dali/internal/event/dynamics/dynamics-declarations.h>
+// INTERNAL INCLUDES
 #include <dali/internal/common/message.h>
-#include <dali/internal/common/event-thread-services.h>
+#include <dali/internal/event/common/event-thread-services.h>
+#include <dali/internal/event/dynamics/dynamics-declarations.h>
 
 namespace Dali
 {

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-world.h b/dali/internal/update/dynamics/scene-graph-dynamics-world.h
index 8f4bdbf..691bc7d 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-world.h
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-world.h
@@ -18,14 +18,14 @@
  *
  */
 
-// INTERNAL HEADERS
-#include <dali/public-api/common/map-wrapper.h>
-#include <dali/internal/common/owner-pointer.h>
+// INTERNAL INCLUDES
+#include <dali/internal/common/message.h>
 #include <dali/internal/common/owner-container.h>
+#include <dali/internal/common/owner-pointer.h>
+#include <dali/internal/event/common/event-thread-services.h>
 #include <dali/internal/event/dynamics/dynamics-declarations.h>
-#include <dali/internal/common/message.h>
-#include <dali/internal/common/event-thread-services.h>
 #include <dali/internal/update/common/scene-graph-buffers.h>
+#include <dali/public-api/common/map-wrapper.h>
 #include <dali/public-api/math/vector3.h>
 
 namespace Dali