Commit 78142e288ab69bd408cbf04328532354a81f137a
[dali_1.2.37] Merge branch 'devel/master'
Change-Id: Id8e40438fc8525e74243c31b9467bf52886cdf0d
Showing
3 changed files
with
8 additions
and
16 deletions
examples/blocks/blocks-example.cpp
| 1 | 1 | /* |
| 2 | - * Copyright (c) 2016 Samsung Electronics Co., Ltd. | |
| 2 | + * Copyright (c) 2017 Samsung Electronics Co., Ltd. | |
| 3 | 3 | * |
| 4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | 5 | * you may not use this file except in compliance with the License. |
| ... | ... | @@ -25,6 +25,8 @@ |
| 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 | + | |
| 28 | 30 | using namespace Dali; |
| 29 | 31 | using namespace Dali::Toolkit; |
| 30 | 32 | using namespace DemoHelper; |
| ... | ... | @@ -742,7 +744,7 @@ private: |
| 742 | 744 | void OnHitPaddle(PropertyNotification& source) |
| 743 | 745 | { |
| 744 | 746 | Actor delegate = Actor::DownCast(source.GetTarget()); |
| 745 | - Vector3 collisionVector = delegate.GetProperty<Vector3>(source.GetTargetProperty()); | |
| 747 | + Vector3 collisionVector = DevelHandle::GetCurrentProperty< Vector3 >( delegate, source.GetTargetProperty() ); | |
| 746 | 748 | Vector3 ballRelativePosition(mBall.GetCurrentPosition() - mPaddle.GetCurrentPosition()); |
| 747 | 749 | ballRelativePosition.Normalize(); |
| 748 | 750 | |
| ... | ... | @@ -777,7 +779,7 @@ private: |
| 777 | 779 | void OnHitBrick(PropertyNotification& source) |
| 778 | 780 | { |
| 779 | 781 | Actor brick = Actor::DownCast(source.GetTarget()); |
| 780 | - Vector3 collisionVector = brick.GetProperty<Vector3>(source.GetTargetProperty()); | |
| 782 | + Vector3 collisionVector = DevelHandle::GetCurrentProperty< Vector3 >( brick, source.GetTargetProperty() ); | |
| 781 | 783 | |
| 782 | 784 | const float normalVelocity = fabsf(mBallVelocity.Dot(collisionVector)); |
| 783 | 785 | mBallVelocity += collisionVector * normalVelocity * 2.0f; | ... | ... |
examples/video-view/video-view-example.cpp
| ... | ... | @@ -184,10 +184,9 @@ class VideoViewController: public ConnectionTracker |
| 184 | 184 | |
| 185 | 185 | Stage::GetCurrent().KeyEventSignal().Connect( this, &VideoViewController::OnKeyEvent ); |
| 186 | 186 | |
| 187 | - mWindowSurfaceTarget.Insert( "RENDERING_TARGET", "windowSurfaceTarget" ); | |
| 188 | - mNativeImageTarget.Insert( "RENDERING_TARGET", "nativeImageTarget" ); | |
| 187 | + mWindowSurfaceTarget.Insert( "renderingTarget", "windowSurfaceTarget" ); | |
| 188 | + mNativeImageTarget.Insert( "renderingTarget", "nativeImageTarget" ); | |
| 189 | 189 | |
| 190 | - mVideoView.FinishedSignal().Connect( this, &VideoViewController::OnFinished ); | |
| 191 | 190 | } |
| 192 | 191 | |
| 193 | 192 | bool OnButtonClicked( Button button ) |
| ... | ... | @@ -266,15 +265,6 @@ class VideoViewController: public ConnectionTracker |
| 266 | 265 | return true; |
| 267 | 266 | } |
| 268 | 267 | |
| 269 | - void OnFinished( VideoView& view ) | |
| 270 | - { | |
| 271 | - if( !mIsFullScreen ) | |
| 272 | - { | |
| 273 | - mRotationAnimation.Play(); | |
| 274 | - mIsStop = true; | |
| 275 | - } | |
| 276 | - } | |
| 277 | - | |
| 278 | 268 | void OnPan( Actor actor, const PanGesture& gesture ) |
| 279 | 269 | { |
| 280 | 270 | if( !mIsFullScreen && gesture.state == Gesture::Continuing ) | ... | ... |