/*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <dali/dali.h>
#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
#include "shared/view.h"
using namespace Dali;
// Ball setup
mBallStartPosition = stageSize * Vector3( BALL_START_POSITION );
mBall = CreateImage(BALL_IMAGE);
- mBall.SetPosition( mBallStartPosition );
- mBall.SetSize( BALL_SIZE * stageSize.width );
+ mBall.SetProperty( Actor::Property::POSITION, mBallStartPosition );
+ mBall.SetProperty( Actor::Property::SIZE, BALL_SIZE * stageSize.width );
mContentLayer.Add(mBall);
mBallVelocity = Vector3::ZERO;
mPaddleImage = CreateImage(PADDLE_IMAGE);
mPaddle.Add( mPaddleHandle );
mPaddle.Add( mPaddleImage );
- mPaddleHandle.SetParentOrigin( ParentOrigin::TOP_CENTER );
- mPaddleHandle.SetAnchorPoint( AnchorPoint::TOP_CENTER );
- mPaddleHandle.SetPosition( 0.0f, stageSize.width * 0.0125f );
- mPaddleImage.SetParentOrigin( ParentOrigin::TOP_CENTER );
- mPaddleImage.SetAnchorPoint( AnchorPoint::TOP_CENTER );
- mPaddle.SetParentOrigin( ParentOrigin::TOP_LEFT );
- mPaddle.SetAnchorPoint( AnchorPoint::CENTER );
+ mPaddleHandle.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER );
+ mPaddleHandle.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER );
+ mPaddleHandle.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, stageSize.width * 0.0125f ));
+ mPaddleImage.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER );
+ mPaddleImage.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER );
+ mPaddle.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+ mPaddle.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
mPaddleFullSize = PADDLE_SIZE * stageSize.width;
- mPaddle.SetSize( mPaddleFullSize + mPaddleHitMargin );
- mPaddleHandle.SetSize( PADDLE_HANDLE_SIZE * stageSize.width );
- mPaddleImage.SetSize( mPaddleFullSize );
+ mPaddle.SetProperty( Actor::Property::SIZE, mPaddleFullSize + mPaddleHitMargin );
+ mPaddleHandle.SetProperty( Actor::Property::SIZE, PADDLE_HANDLE_SIZE * stageSize.width );
+ mPaddleImage.SetProperty( Actor::Property::SIZE, mPaddleFullSize );
mWobbleProperty = mPaddle.RegisterProperty(WOBBLE_PROPERTY_NAME, 0.0f);
Constraint wobbleConstraint = Constraint::New<Quaternion>( mPaddle, Actor::Property::ORIENTATION, WobbleConstraint(Degree( 10.0f )));
wobbleConstraint.AddSource( LocalSource(mWobbleProperty) );
wobbleConstraint.Apply();
- mPaddle.SetPosition( stageSize * Vector3( PADDLE_START_POSITION ) );
+ mPaddle.SetProperty( Actor::Property::POSITION, stageSize * Vector3( PADDLE_START_POSITION ) );
mContentLayer.Add(mPaddle);
mPaddle.TouchSignal().Connect(this, &ExampleController::OnTouchPaddle);
mContentLayer.TouchSignal().Connect(this, &ExampleController::OnTouchLayer);
{
mLives = TOTAL_LIVES;
mLevel = 0;
- mBall.SetPosition( mBallStartPosition );
+ mBall.SetProperty( Actor::Property::POSITION, mBallStartPosition );
mBallVelocity = Vector3::ZERO;
- mPaddle.SetSize( mPaddleFullSize + mPaddleHitMargin );
- mPaddleImage.SetSize( mPaddleFullSize );
+ mPaddle.SetProperty( Actor::Property::SIZE, mPaddleFullSize + mPaddleHitMargin );
+ mPaddleImage.SetProperty( Actor::Property::SIZE, mPaddleFullSize );
LoadLevel(mLevel);
}
}
mLevelContainer = Actor::New();
- mLevelContainer.SetAnchorPoint( AnchorPoint::CENTER );
- mLevelContainer.SetParentOrigin( ParentOrigin::CENTER );
+ mLevelContainer.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+ mLevelContainer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
mLevelContainer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
mContentLayer.Add( mLevelContainer );
mBrickImageMap["url"] = BRICK_IMAGE_PATH[type];
ImageView brick = ImageView::New();
brick.SetProperty( ImageView::Property::IMAGE, mBrickImageMap );
- brick.SetParentOrigin(ParentOrigin::TOP_LEFT);
- brick.SetAnchorPoint(AnchorPoint::CENTER);
- brick.SetPosition( Vector3( position ) );
+ brick.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ brick.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER);
+ brick.SetProperty( Actor::Property::POSITION, position );
// Add a constraint on the brick between it and the ball generating a collision-property
Property::Index property = brick.RegisterProperty(COLLISION_PROPERTY_NAME, Vector3::ZERO);
*/
ImageView CreateImage(const std::string& filename)
{
- ImageView actor = ImageView::New(filename);
- actor.SetParentOrigin(ParentOrigin::TOP_LEFT);
- actor.SetAnchorPoint(AnchorPoint::CENTER);
+ Property::Map propertyMap;
+ propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+ propertyMap.Insert(ImageVisual::Property::URL, filename);
+ propertyMap.Insert(DevelVisual::Property::VISUAL_FITTING_MODE, DevelVisual::FILL);
+ ImageView actor = ImageView::New();
+ actor.SetProperty(Toolkit::ImageView::Property::IMAGE, propertyMap);
+ actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER);
return actor;
}
// Get point where user touched paddle (relative to paddle's center)
Vector2 screenPoint = event.GetScreenPosition( 0 );
mRelativeDragPoint = screenPoint;
- mRelativeDragPoint -= actor.GetCurrentPosition();
+ mRelativeDragPoint -= actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION );
mDragActor = actor;
mDragAnimation = Animation::New(0.25f);
if(mDragActor)
{
Vector3 position( event.GetScreenPosition( 0 ) );
- mPaddle.SetPosition( position - mRelativeDragPoint );
+ mPaddle.SetProperty( Actor::Property::POSITION, position - mRelativeDragPoint );
if( event.GetState( 0 ) == PointState::UP ) // Stop dragging
{
void OnPaddleShrunk( Animation &source )
{
// Reposition Ball in start position, and make ball appear.
- mBall.SetPosition( mBallStartPosition );
- mBall.SetColor( Vector4(1.0f, 1.0f, 1.0f, 0.1f) );
+ mBall.SetProperty( Actor::Property::POSITION, mBallStartPosition );
+ mBall.SetProperty( Actor::Property::COLOR, Vector4(1.0f, 1.0f, 1.0f, 0.1f) );
Animation appear = Animation::New(0.5f);
appear.AnimateTo( Property(mBall, Actor::Property::COLOR), Vector4(1.0f, 1.0f, 1.0f, 1.0f) );
appear.Play();
{
Actor delegate = Actor::DownCast(source.GetTarget());
Vector3 collisionVector = delegate.GetCurrentProperty< Vector3 >( source.GetTargetProperty() );
- Vector3 ballRelativePosition(mBall.GetCurrentPosition() - mPaddle.GetCurrentPosition());
+ Vector3 ballRelativePosition(mBall.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ) - mPaddle.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ));
ballRelativePosition.Normalize();
collisionVector.x += ballRelativePosition.x * 0.5f;