Peter M. Groen / dali-demo

Commit 44f5a0739be75d2b101c5df7abe6d9f4f3c0b0e6

Authored by Adeel Kazmi
Committed by Gerrit Code Review
2 parents 7fc706d7 00d626ba

Merge "Use Handle::GetCurrentProperty instead of Devel API" into devel/master

Inline Side-by-side
Showing 1 changed file with 2 additions and 4 deletions
examples/blocks/blocks-example.cpp
  View file @44f5a07
... ... @@ -25,8 +25,6 @@
25 25 #include <dali-toolkit/dali-toolkit.h>
26 26 #include "shared/view.h"
27 27  
28   -#include <dali/devel-api/object/handle-devel.h>
29   -
30 28 using namespace Dali;
31 29 using namespace Dali::Toolkit;
32 30 using namespace DemoHelper;
... ... @@ -744,7 +742,7 @@ private:
744 742 void OnHitPaddle(PropertyNotification& source)
745 743 {
746 744 Actor delegate = Actor::DownCast(source.GetTarget());
747   - Vector3 collisionVector = DevelHandle::GetCurrentProperty< Vector3 >( delegate, source.GetTargetProperty() );
  745 + Vector3 collisionVector = delegate.GetCurrentProperty< Vector3 >( source.GetTargetProperty() );
748 746 Vector3 ballRelativePosition(mBall.GetCurrentPosition() - mPaddle.GetCurrentPosition());
749 747 ballRelativePosition.Normalize();
750 748  
... ... @@ -779,7 +777,7 @@ private:
779 777 void OnHitBrick(PropertyNotification& source)
780 778 {
781 779 Actor brick = Actor::DownCast(source.GetTarget());
782   - Vector3 collisionVector = DevelHandle::GetCurrentProperty< Vector3 >( brick, source.GetTargetProperty() );
  780 + Vector3 collisionVector = brick.GetCurrentProperty< Vector3 >( source.GetTargetProperty() );
783 781  
784 782 const float normalVelocity = fabsf(mBallVelocity.Dot(collisionVector));
785 783 mBallVelocity += collisionVector * normalVelocity * 2.0f;
... ...