Added integration api to physics

[platform/core/uifw/dali-toolkit.git] / dali-physics / public-api / scoped-physics-accessor.cpp

diff --git a/dali-physics/public-api/scoped-physics-accessor.cpp b/dali-physics/public-api/scoped-physics-accessor.cpp
index 1f4b6e8..e0804f8 100644 (file)
--- a/dali-physics/public-api/scoped-physics-accessor.cpp
+++ b/dali-physics/public-api/scoped-physics-accessor.cpp
@@ -24,14 +24,17 @@ namespace Dali::Toolkit::Physics
 struct PhysicsAdaptor::ScopedPhysicsAccessor::Impl
 {
   Impl(Internal::PhysicsWorld& world)
-  : mLock(world.GetMutex()),
-    mPhysicsWorld(world)
+  : mPhysicsWorld(world)
   {
+    mPhysicsWorld.Lock();
   }
   Impl(Impl&)         = delete;
   const Impl& operator=(const Impl&) = delete;
 
-  Dali::Mutex::ScopedLock mLock;
+  ~Impl()
+  {
+    mPhysicsWorld.Unlock();
+  }
   Internal::PhysicsWorld& mPhysicsWorld;
   friend Internal::PhysicsAdaptor;
 };
@@ -52,9 +55,9 @@ Dali::Any PhysicsAdaptor::ScopedPhysicsAccessor::GetNative()
 }
 
 Dali::Any PhysicsAdaptor::ScopedPhysicsAccessor::HitTest(
-  Dali::Vector3 rayFromWorld, Dali::Vector3 rayToWorld, Dali::Vector3& localPivot, float& distanceFromCamera)
+  Dali::Vector3 rayFromWorld, Dali::Vector3 rayToWorld, Dali::Any nativeFilter, Dali::Vector3& localPivot, float& distanceFromCamera)
 {
-  return mImpl->mPhysicsWorld.HitTest(rayFromWorld, rayToWorld, localPivot, distanceFromCamera);
+  return mImpl->mPhysicsWorld.HitTest(rayFromWorld, rayToWorld, nativeFilter, localPivot, distanceFromCamera);
 }
 
 } // namespace Dali::Toolkit::Physics