/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
// External includes
#include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
#include "beat-control.h"
#include <cstdio>
#include <sstream>
using namespace Dali;
using namespace Dali::Toolkit;
+namespace
+{
+
+void SetLabelText( Button button, const char* label )
+{
+ button.SetProperty( Toolkit::Button::Property::LABEL, label );
+}
+
+}
+
namespace Demo
{
const char* DALI_ROBOT_MODEL_PATH( DEMO_MODEL_DIR "ToyRobot-Metal.obj" );
const char* DALI_ROBOT_MATERIAL_PATH( DEMO_MODEL_DIR "ToyRobot-Metal.mtl" );
-
TransitionApplication::TransitionApplication( Application& application )
: mApplication( application ),
mTitle(),
mBeatControl(),
mActionButtons(),
+ mVisualIndex( Property::INVALID_INDEX ),
mActionIndex( Property::INVALID_INDEX )
{
application.InitSignal().Connect( this, &TransitionApplication::Create );
mBeatControl = BeatControl::New();
mBeatControl.SetName("BeatControl");
mBeatControl.SetProperty( BeatControl::Property::BEAT_VISUAL, Property::Map()
- .Add( DevelVisual::Property::TRANSFORM, Property::Map()
- .Add( DevelVisual::Transform::Property::SIZE, Vector2(0.5f, 0.5f) ) ) );
+ .Add( Visual::Property::TRANSFORM, Property::Map()
+ .Add( Visual::Transform::Property::SIZE, Vector2(0.5f, 0.5f) ) ) );
mBeatControl.SetAnchorPoint( AnchorPoint::CENTER );
mBeatControl.SetParentOrigin( ParentOrigin::CENTER );
{
Property::Map map;
CreateVisualMap( i, map );
- map.Add( DevelVisual::Property::TRANSFORM, Property::Map()
- .Add( DevelVisual::Transform::Property::SIZE, Vector2(0.8f, 0.8f) ) );
+ map.Add( Visual::Property::TRANSFORM, Property::Map()
+ .Add( Visual::Transform::Property::SIZE, Vector2(0.8f, 0.8f) ) );
mVisualButtons[i] = BeatControl::New();
mVisualButtons[i].SetProperty( BeatControl::Property::BEAT_VISUAL, map );
mVisualButtons[i].SetName("VisualButton");
mActionButtons[i].ClickedSignal().Connect( this, &TransitionApplication::OnActionButtonClicked );
actionButtonLayout.AddChild( mActionButtons[i], TableView::CellPosition( 0, 1+i ) );
}
- mActionButtons[0].SetLabelText( "Bounce" );
- mActionButtons[1].SetLabelText( "X" );
- mActionButtons[2].SetLabelText( "Y" );
- mActionButtons[3].SetLabelText( "Fade" );
+
+ SetLabelText( mActionButtons[0], "Bounce" );
+ SetLabelText( mActionButtons[1], "X" );
+ SetLabelText( mActionButtons[2], "Y" );
+ SetLabelText( mActionButtons[3], "Fade" );
contentLayout.Add( actionButtonLayout );
contentLayout.SetFitHeight(3);
{
case 0:
{
- map[ Visual::Property::TYPE ] = Visual::COLOR;
+ map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR;
map[ ColorVisual::Property::MIX_COLOR ] = Color::YELLOW;
break;
}
case 1:
{
- map[ Visual::Property::TYPE ] = Visual::BORDER;
+ map[ Toolkit::Visual::Property::TYPE ] = Visual::BORDER;
map[ BorderVisual::Property::COLOR ] = Color::GREEN;
map[ BorderVisual::Property::SIZE ] = 5;
break;
}
case 2:
{
- map[ Visual::Property::TYPE ] = Visual::GRADIENT;
+ map[ Toolkit::Visual::Property::TYPE ] = Visual::GRADIENT;
Property::Array stopOffsets;
stopOffsets.PushBack( 0.0f );
}
case 3:
{
- map[ Visual::Property::TYPE ] = Visual::IMAGE;
+ map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
map[ ImageVisual::Property::URL ] = DALI_LOGO_PATH;
break;
}
case 4:
{
- map[ Visual::Property::TYPE ] = Visual::IMAGE;
+ map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "preMultAlpha.png";
- map[ DevelVisual::Property::PREMULTIPLIED_ALPHA ] = true;
+ map[ Visual::Property::PREMULTIPLIED_ALPHA ] = true;
break;
}
case 5:
{
- map[ Visual::Property::TYPE ] = Visual::MESH;
+ map[ Toolkit::Visual::Property::TYPE ] = Visual::MESH;
map[ MeshVisual::Property::OBJECT_URL ] = DALI_ROBOT_MODEL_PATH;
map[ MeshVisual::Property::MATERIAL_URL ] = DALI_ROBOT_MATERIAL_PATH;
map[ MeshVisual::Property::TEXTURES_PATH ] = DEMO_IMAGE_DIR;
case 6:
{
- map[ Visual::Property::TYPE ] = Visual::PRIMITIVE;
+ map[ Toolkit::Visual::Property::TYPE ] = Visual::PRIMITIVE;
map[ PrimitiveVisual::Property::SHAPE ] = PrimitiveVisual::Shape::BEVELLED_CUBE;
map[ PrimitiveVisual::Property::BEVEL_PERCENTAGE ] = 0.3f;
case 7:
{
// NPatch
- map[ Visual::Property::TYPE ] = Visual::IMAGE;
+ map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "button-up-16.9.png";
break;
}
case 8:
{
// SVG
- map[ Visual::Property::TYPE ] = Visual::IMAGE;
+ map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "Kid1.svg";
break;
}
case 9:
{
- map[ Visual::Property::TYPE ] = DevelVisual::TEXT;
+ map[ Toolkit::Visual::Property::TYPE ] = Visual::TEXT;
map[ TextVisual::Property::TEXT ] = "Text";
map[ TextVisual::Property::TEXT_COLOR ] = Color::CYAN;
map[ TextVisual::Property::POINT_SIZE ] = 10;
default:
{
- map[ Visual::Property::TYPE ] = Visual::COLOR;
+ map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR;
map[ ColorVisual::Property::MIX_COLOR ] = Color::MAGENTA;
break;
}
int visual = actor.GetProperty<int>( mVisualIndex );
Property::Map map;
CreateVisualMap( visual, map );
- map.Add( DevelVisual::Property::TRANSFORM, Property::Map()
- .Add( DevelVisual::Transform::Property::SIZE, Vector2( 0.5f, 0.5f ) ) );
+ map.Add( Visual::Property::TRANSFORM, Property::Map()
+ .Add( Visual::Transform::Property::SIZE, Vector2( 0.5f, 0.5f ) ) );
mBeatControl.SetProperty( BeatControl::Property::BEAT_VISUAL, map );
}
return true;