/*
- * Copyright (c) 2014 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.
#include <dali-toolkit-test-suite-utils.h>
#include <dali-toolkit/devel-api/builder/builder.h>
#include <dali/integration-api/events/touch-event-integ.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <test-button.h>
+#include <test-animation-data.h>
#define STRINGIFY(A)#A
using namespace Dali;
using namespace Toolkit;
+namespace BuilderControlProperty
+{
+
+enum
+{
+ INTEGER_PROPERTY = Toolkit::Control::CONTROL_PROPERTY_END_INDEX + 1,
+ MATRIX3_PROPERTY,
+ MATRIX_PROPERTY,
+ NONE_PROPERTY
+};
+
namespace
{
-std::string ReplaceQuotes(const std::string &in_s)
+BaseHandle Create()
{
- std::string s(in_s);
- // wrong as no embedded quote but had regex link problems
- std::replace(s.begin(), s.end(), '\'', '"');
- return s;
+ return Toolkit::Control::New();
}
+int gSetPropertyCalledCount = 0;
+
+void SetProperty( BaseObject* object, Property::Index propertyIndex, const Property::Value& value )
+{
+ ++gSetPropertyCalledCount;
+}
+
+Property::Value GetProperty( BaseObject* object, Property::Index propertyIndex )
+{
+ return Property::Value();
+}
+
+} // unnamed namespace
+
+// Properties
+Dali::TypeRegistration typeRegistration( "BuilderControl", typeid( Toolkit::Control ), Create );
+
+Dali::PropertyRegistration propertyInteger( typeRegistration, "integerProperty", INTEGER_PROPERTY, Property::INTEGER, &SetProperty, &GetProperty );
+Dali::PropertyRegistration propertyMatrix3( typeRegistration, "matrix3Property", MATRIX3_PROPERTY, Property::MATRIX3, &SetProperty, &GetProperty );
+Dali::PropertyRegistration propertyMatrix( typeRegistration, "matrixProperty", MATRIX_PROPERTY, Property::MATRIX, &SetProperty, &GetProperty );
+Dali::PropertyRegistration propertyNone( typeRegistration, "noneProperty", NONE_PROPERTY, Property::NONE, &SetProperty, &GetProperty );
+
+}
+
+namespace
+{
+
struct BuilderFunctor
{
BuilderFunctor( bool& called ) : mCalled( called )
"{"
"\"stage\":"
"[{"
- "\"type\": \"Actor\","
+ "\"type\": \"Layer\","
"\"size\": [100,100,1],"
"\"parentOrigin\": \"TOP_LEFT\","
"\"anchorPoint\": \"TOP_LEFT\","
+ "\"maximumSize\": [100,100],"
+ "\"orientation\": [10,10,10,10],"
+ "\"clippingBox\": [10,10,10,10],"
"\"signals\": [{"
- "\"name\": \"touched\","
+ "\"name\": \"touch\","
"\"action\": \"quit\""
"}]"
"}]"
// Emit touch event and check that our quit method is called
Integration::TouchEvent touchEvent;
- touchEvent.points.push_back( TouchPoint ( 0, TouchPoint::Down, 10.0f, 10.0f ) );
+ Integration::Point point;
+ point.SetState( PointState::DOWN );
+ point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
+ touchEvent.points.push_back( point );
application.ProcessEvent( touchEvent );
DALI_TEST_CHECK( functorCalled );
" \"size\": [200, 200, 1],"
" \"orientation\": [0, 0, 30],"
" \"signals\": [{"
- " \"name\": \"touched\","
+ " \"name\": \"touch\","
" \"action\": \"play\","
" \"animation\": \"animate\""
" }]"
// trigger play
// Emit touch event and check that our quit method is called
Integration::TouchEvent touchEvent;
- touchEvent.points.push_back( TouchPoint ( 0, TouchPoint::Down, 10.0f, 10.0f ) );
+ Integration::Point point;
+ point.SetState( PointState::DOWN );
+ point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
+ touchEvent.points.push_back( point );
application.ProcessEvent( touchEvent );
// Render and notify
" \"size\": [200, 200, 1],"
" \"orientation\": [0, 0, 30],"
" \"signals\": [{"
- " \"name\": \"touched\","
+ " \"name\": \"touch\","
" \"action\": \"play\","
" \"animation\": \"animate\""
" }]"
"},"
"\"stage\":"
"[{"
- " \"type\": \"ImageActor\","
+ " \"type\": \"ImageView\","
" \"name\": \"{NAME}\","
" \"size\": [100,100,1],"
" \"parentOrigin\": \"TOP_LEFT\","
" \"anchorPoint\": \"{ANCHOR}\","
" \"padding\": \"{PADDING}\","
- " \"image\": { \"filename\": \"dir/{IMAGE_PATH}\" },"
+ " \"image\": { \"url\": \"dir/{IMAGE_PATH}\" },"
" \"sizeWidth\": \"{WIDTH}\","
" \"signals\": [{"
- " \"name\": \"touched\","
+ " \"name\": \"touch\","
" \"action\": \"quit\""
" }]"
"}]"
" \"color\": [1,0,0,1],\n"
" \"actors\": {\n"
" \"childImage\": {\n"
- " \"color\": [0,1,0,1]\n"
+ " \"color\": \"34\"\n"
" }\n"
" }\n"
" }\n"
"},\n"
"\"templates\":\n"
"{\n"
+ " \"imageViewTemplate\": { \n"
+ " \"type\": \"ImageView\",\n"
+ " \"styles\": [\"imageStyle\"]\n"
+ " },\n"
" \"imageTree\": { \n"
- " \"type\": \"ImageActor\",\n"
+ " \"type\": \"ImageView\",\n"
" \"styles\": [\"imageStyle\"],\n"
" \"name\": \"image\",\n"
" \"size\": \"{SIZE}\",\n"
" \"signals\": [{\n"
- " \"name\": \"touched\",\n"
+ " \"name\": \"touch\",\n"
" \"action\": \"quit\"\n"
" }],\n"
" \"actors\": [\n"
" {\n"
- " \"type\":\"ImageActor\",\n"
- " \"name\":\"childImage\" \n"
+ " \"type\":\"ImageView\",\n"
+ " \"name\":\"childImage\", \n"
+ " \"color\": \n"
+ " {\n"
+ " \"r\": 10,\n"
+ " \"g\": 10,\n"
+ " \"b\": 10,\n"
+ " \"a\": 100\n"
+ " }\n"
+ " },\n"
+ " {\n"
+ " \"type\":\"imageViewTemplate\",\n"
+ " \"name\":\"childImage2\"\n"
" }\n"
" ]\n"
" }\n"
" \"color\": [1,0,0,1],\n"
" \"actors\": {\n"
" \"childImage\": {\n"
- " \"color\": [0,1,0,1]\n"
+ " \"color\": \"#344353\"\n"
" }\n"
" }\n"
"}\n"
std::string templatejson(
"{ \n"
- " \"type\": \"ImageActor\",\n"
+ " \"type\": \"ImageView\",\n"
" \"styles\": [\"imageStyle\"],\n"
" \"name\": \"image\",\n"
" \"size\": \"{SIZE}\",\n"
" \"signals\": [{\n"
- " \"name\": \"touched\",\n"
+ " \"name\": \"touch\",\n"
" \"action\": \"quit\"\n"
" }],\n"
" \"actors\": [\n"
" {\n"
- " \"type\":\"ImageActor\",\n"
+ " \"type\":\"ImageView\",\n"
" \"name\":\"childImage\" \n"
" }\n"
" ]\n"
Builder builder = Builder::New();
builder.LoadFromString( json );
- ImageActor actor = ImageActor::DownCast( builder.Create( "imageTree" ) );
+ ImageView actor = ImageView::DownCast( builder.Create( "imageTree" ) );
DALI_TEST_CHECK( actor );
Dali::Property::Map map;
map["SIZE"] = Vector3(100,100,1);
- actor = ImageActor::DownCast( builder.Create( "imageTree", map ) );
+ actor = ImageView::DownCast( builder.Create( "imageTree", map ) );
DALI_TEST_CHECK( actor );
// create from json snippet
- actor = ImageActor::DownCast( builder.CreateFromJson( templatejson ) );
+ actor = ImageView::DownCast( builder.CreateFromJson( templatejson ) );
DALI_TEST_CHECK( actor );
"[\n"
" { \n"
" \"type\": \"CameraActor\",\n"
- " \"name\": \"image\"\n"
+ " \"name\": \"camera\"\n"
" }, \n"
" { \n"
- " \"type\": \"ImageActor\",\n"
+ " \"type\": \"ImageView\",\n"
" \"name\": \"image\",\n"
" \"size\": [100,100,1],\n"
" \"signals\": [{\n"
- " \"name\": \"touched\",\n"
+ " \"name\": \"touch\",\n"
" \"action\": \"quit\"\n"
" }],\n"
" \"actors\": [\n"
" {\n"
- " \"type\":\"ImageActor\",\n"
+ " \"type\":\"ImageView\",\n"
" \"name\":\"childImage\" \n"
" }\n"
" ]\n"
" \"name\": \"subActor\"\n"
" }],\n"
" \"signals\": [{\n"
- " \"name\": \"touched\",\n"
+ " \"name\": \"touch\",\n"
" \"action\": \"hide\",\n"
" \"actor\": \"actor\",\n"
" \"childActor\": \"subActor\"\n"
// Emit touch event and check that our quit method is called
Integration::TouchEvent touchEvent;
- touchEvent.points.push_back( TouchPoint ( 0, TouchPoint::Down, 10.0f, 10.0f ) );
+ Integration::Point point;
+ point.SetState( PointState::DOWN );
+ point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
+ touchEvent.points.push_back( point );
application.ProcessEvent( touchEvent );
// Render and notify
" \"name\": \"subActor\"\n"
" }],\n"
" \"signals\": [{\n"
- " \"name\": \"touched\",\n"
+ " \"name\": \"touch\",\n"
" \"action\": \"set\",\n"
" \"actor\": \"subActor\",\n"
" \"property\": \"visible\",\n"
// Emit touch event and check that our quit method is called
Integration::TouchEvent touchEvent;
- touchEvent.points.push_back( TouchPoint ( 0, TouchPoint::Down, 10.0f, 10.0f ) );
+ Integration::Point point;
+ point.SetState( PointState::DOWN );
+ point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
+ touchEvent.points.push_back( point );
application.ProcessEvent( touchEvent );
// Render and notify
" \"name\": \"subActor\"\n"
" }],\n"
" \"signals\": [{\n"
- " \"name\": \"touched\",\n"
+ " \"name\": \"touch\",\n"
" \"action\": \"hide\"\n"
" }]\n"
" }]\n"
// Emit touch event and check that our quit method is called
Integration::TouchEvent touchEvent;
- touchEvent.points.push_back( TouchPoint ( 0, TouchPoint::Down, 10.0f, 10.0f ) );
+ Integration::Point point;
+ point.SetState( PointState::DOWN );
+ point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
+ touchEvent.points.push_back( point );
application.ProcessEvent( touchEvent );
// Render and notify
" \"name\": \"subActor\"\n"
" }],\n"
" \"signals\": [{\n"
- " \"name\": \"touched\",\n"
+ " \"name\": \"touch\",\n"
" \"action\": \"hide\"\n"
" }],\n"
" \"notifications\": [{\n"
" \"property\": \"visible\",\n"
" \"condition\": \"False\",\n"
" \"action\": \"show\"\n"
+ " },\n"
+ " {\n"
+ " \"property\": \"positionX\",\n"
+ " \"condition\": \"LessThan\",\n"
+ " \"arg0\": 0.0,\n"
+ " \"action\": \"show\"\n"
+ " },\n"
+ " {\n"
+ " \"property\": \"positionY\",\n"
+ " \"condition\": \"GreaterThan\",\n"
+ " \"arg0\": 200.0,\n"
+ " \"action\": \"show\"\n"
+ " },\n"
+ " {\n"
+ " \"property\": \"positionZ\",\n"
+ " \"condition\": \"Inside\",\n"
+ " \"arg0\": 0.0,\n"
+ " \"arg1\": 10.0,\n"
+ " \"action\": \"show\"\n"
+ " },\n"
+ " {\n"
+ " \"property\": \"positionZ\",\n"
+ " \"condition\": \"Outside\",\n"
+ " \"arg0\": 40.0,\n"
+ " \"arg1\": 50.0,\n"
+ " \"action\": \"show\"\n"
" }]\n"
" }]\n"
"}\n"
// Emit touch event and check that our quit method is called
Integration::TouchEvent touchEvent;
- touchEvent.points.push_back( TouchPoint ( 0, TouchPoint::Down, 10.0f, 10.0f ) );
+ Integration::Point point;
+ point.SetState( PointState::DOWN );
+ point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
+ touchEvent.points.push_back( point );
application.ProcessEvent( touchEvent );
// Render and notify
END_TEST;
}
+int UtcDaliBuilderPropertyNotificationN(void)
+{
+ ToolkitTestApplication application;
+
+ // JSON with a quit event when the actor is touched
+ std::string json(
+ "{\n"
+ " \"stage\":\n"
+ " [{\n"
+ " \"type\": \"Actor\",\n"
+ " \"notifications\": [{\n"
+ " \"property\": \"visible\",\n"
+ " \"condition\": \"ErrorCondition\",\n"
+ " \"action\": \"show\"\n"
+ " }]\n"
+ " }]\n"
+ "}\n"
+ );
+
+ try
+ {
+ Builder builder = Builder::New();
+ builder.LoadFromString( json );
+ builder.AddActors ( Stage::GetCurrent().GetRootLayer() );
+ DALI_TEST_CHECK( false );
+ }
+ catch(...)
+ {
+ DALI_TEST_CHECK( true );
+ }
+
+ END_TEST;
+}
+
+
+
int UtcDaliBuilderCustomPropertyP(void)
{
ToolkitTestApplication application;
"\"templates\":\n"
"{\n"
" \"imageTree\": { \n"
- " \"type\": \"ImageActor\",\n"
+ " \"type\": \"ImageView\",\n"
" \"name\": \"image\",\n"
" \"size\": [100,100,1],\n"
" \"signals\": [{\n"
- " \"name\": \"touched\",\n"
+ " \"name\": \"touch\",\n"
" \"action\": \"quit\"\n"
" }],\n"
- " \"customProperties\": {\n"
+ " \"properties\": {\n"
" \"newproperty\": true\n"
" },\n"
+ " \"animatableProperties\": {\n"
+ " \"newAnimatableproperty\": 3\n"
+ " },\n"
" \"actors\": [\n"
" {\n"
- " \"type\":\"ImageActor\",\n"
+ " \"type\":\"ImageView\",\n"
" \"name\":\"childImage\" \n"
" }\n"
" ]\n"
Builder builder = Builder::New();
builder.LoadFromString( json );
- ImageActor actor = ImageActor::DownCast( builder.Create( "imageTree" ) );
+ ImageView actor = ImageView::DownCast( builder.Create( "imageTree" ) );
DALI_TEST_CHECK( actor );
// NB: already applied in create
Property::Value value = actor.GetProperty(index);
DALI_TEST_CHECK( value.Get<bool>() == true );
+ index = actor.GetPropertyIndex("newAnimatableproperty");
+ DALI_TEST_CHECK( Property::INVALID_INDEX != index );
+ value = actor.GetProperty(index);
+ DALI_TEST_CHECK( value.Get<int>() == 3 );
+
END_TEST;
}
-int UtcDaliBuilderShaderEffectP(void)
+int UtcDaliBuilderCustomShaderP(void)
{
ToolkitTestApplication application;
"{\n"
" \"stage\": [\n"
" {\n"
- " \"type\": \"ImageActor\",\n"
+ " \"type\": \"ImageView\",\n"
" \"name\": \"Image1\",\n"
" \"position\": [\n"
" 0.40461349487305,\n"
" \"size\": [200, 200, 0],\n"
" \"effect\": \"Ripple2D\",\n"
" \"image\": {\n"
- " \"filename\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\",\n"
- " \"width\": 200,\n"
- " \"height\": 80,\n"
- " \"loadPolicy\": \"IMMEDIATE\",\n"
- " \"releasePolicy\": \"NEVER\"\n"
+ " \"url\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\",\n"
+ " \"desiredWidth\": 200,\n"
+ " \"desiredHeight\": 80,\n"
+ " \"shader\": {\n"
+ " \"fragmentShader\": \"precision mediump float;\\nuniform sampler2D sTexture;\\nuniform vec4 uColor;\\nuniform float uAmplitude;\\nuniform float uTime;\\nvarying vec2 vTexCoord;\\nvoid main()\\n{\\n highp vec2 pos = -1.0 + 2.0 * vTexCoord;\\n highp float len = length(pos);\\n highp vec2 texCoord = vTexCoord + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude;\\n gl_FragColor = texture2D(sTexture, texCoord) * uColor;}\\n\\n\"\n"
+ " }\n"
+ " },\n"
+ " \"customAnimatableProperties\": {\n"
+ " \"uAmplitude\": 0.02,\n"
+ " \"uTime\": 0.0\n"
" },\n"
" \"signals\": [\n"
" {\n"
" ]\n"
" }\n"
" ],\n"
- " \"paths\": {},\n"
" \"animations\": {\n"
" \"Animation_1\": {\n"
" \"loop\":true,\n"
" \"timePeriod\": {\n"
" \"delay\": 0,\n"
" \"duration\": 10.0\n"
- " },\n"
- " \"gui-builder-timeline-color\": \"#8dc0da\"\n"
+ " }\n"
" }\n"
" ]\n"
" }\n"
- " },\n"
- " \"shaderEffects\": {\n"
- " \"Ripple2D\": {\n"
- " \"program\": {\n"
- " \"vertexPrefix\": \"\",\n"
- " \"vertex\": \"void main(void)\\n{\\n gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n vTexCoord = aTexCoord;\\n}\\n\\n\",\n"
- " \"fragmentPrefix\": \"\",\n"
- " \"fragment\": \"precision mediump float;\\nuniform float uAmplitude; // 0.02; (< 1)\\nuniform float uTime;\\nvoid main()\\n{\\n highp vec2 textureSize = sTextureRect.zw - sTextureRect.xy;\\n highp vec2 pos = -1.0 + 2.0 * vTexCoord.st/textureSize;\\n highp float len = length(pos);\\n highp vec2 texCoord = vTexCoord.st/textureSize + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude; \\n gl_FragColor = texture2D(sTexture, texCoord) * uColor;\\n}\\n\\n\\n\",\n"
- " \"geometryType\": \"GEOMETRY_TYPE_IMAGE\"\n"
- " },\n"
- " \"geometryHints\": \"HINT_NONE\",\n"
- " \"gridDensity\": 0,\n"
- " \"loop\": true,\n"
- " \"uAmplitude\": 0.02,\n"
- " \"uTime\": 0.0\n"
- " }\n"
" }\n"
"}\n"
Builder builder = Builder::New();
builder.LoadFromString( json );
- ShaderEffect effect = builder.GetShaderEffect("Ripple2D");
+ builder.AddActors ( "stage", Stage::GetCurrent().GetRootLayer() );
+
+ // Render and notify
+ application.SendNotification();
+ application.Render();
+
+ Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("Image1");
// coverage
- DALI_TEST_CHECK( effect );
+ DALI_TEST_CHECK( actor );
END_TEST;
}
"\"parentOrigin\": \"TOP_LEFT\","
"\"anchorPoint\": \"TOP_LEFT\","
"\"signals\": [{"
- "\"name\": \"touched\","
+ "\"name\": \"touch\","
"\"action\": \"quit\""
"}]"
"}]"
END_TEST;
}
-int UtcDaliBuilderShaderEffect2P(void)
-{
- ToolkitTestApplication application;
-
- // JSON with a quit event when the actor is touched
- std::string json(
- "{\n"
- "\"templates\":\n"
- "{\n"
- " \"imageTree\": { \n"
- " \"type\": \"ImageActor\",\n"
- " \"size\": [100,100,1],\n"
- " \"parentOrigin\": [0.5, 0.5, 0.5],\n"
- " \"position\": [\n"
- " 0.40461349487305,\n"
- " 0.9150390625,\n"
- " 0.0\n"
- " ],\n"
- " \"signals\": [{\n"
- " \"name\": \"touched\",\n"
- " \"action\": \"quit\"\n"
- " }],\n"
- " \"actors\": [\n"
- " {\n"
- " \"type\":\"ImageActor\",\n"
- " \"name\":\"childImage\" \n"
- " }\n"
- " ]\n"
- " }\n"
- "},\n"
- " \"stage\": [\n"
- " {\n"
- " \"type\": \"imageTree\",\n"
- " \"name\": \"Image1\",\n"
- " \"effect\": \"Ripple2D\",\n"
- " \"image\": \"offscreen\""
- " }\n"
- " ],\n"
- " \"shaderEffects\": {\n"
- " \"Ripple2D\": {\n"
- " \"program\": {\n"
- " \"vertexPrefix\": \"\",\n"
- " \"vertex\": \"void main(void)\\n{\\n gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n vTexCoord = aTexCoord;\\n}\\n\\n\",\n"
- " \"fragmentPrefix\": \"\",\n"
- " \"fragment\": \"precision mediump float;\\nuniform float uAmplitude; // 0.02; (< 1)\\nuniform float uTime;\\nvoid main()\\n{\\n highp vec2 textureSize = sTextureRect.zw - sTextureRect.xy;\\n highp vec2 pos = -1.0 + 2.0 * vTexCoord.st/textureSize;\\n highp float len = length(pos);\\n highp vec2 texCoord = vTexCoord.st/textureSize + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude; \\n gl_FragColor = texture2D(sTexture, texCoord) * uColor;\\n}\\n\\n\\n\",\n"
- " \"geometryType\": \"GEOMETRY_TYPE_IMAGE\"\n"
- " },\n"
- " \"geometryHints\": \"HINT_NONE\",\n"
- " \"gridDensity\": 0,\n"
- " \"loop\": true,\n"
- " \"uAmplitude\": 0.02,\n"
- " \"uTime\": 0.0\n"
- " }\n"
- " },\n"
- " \"frameBufferImages\": {\n"
- " \"offscreen\": {\n"
- " \"type\": \"FrameBufferImage\","
- " \"pixelFormat\":\"RGBA8888\","
- " \"width\": 400,"
- " \"height\": 400"
- " }"
- " }"
- "}\n"
-
- );
-
- Builder builder = Builder::New();
- builder.LoadFromString( json );
-
- // coverage
- DALI_TEST_CHECK( true );
-
- END_TEST;
-}
int UtcDaliBuilderAddActorsP(void)
{
" \"visible\": false\n"
" }],\n"
" \"signals\": [{\n"
- " \"name\": \"touched\",\n"
+ " \"name\": \"touch\",\n"
" \"action\": \"hide\",\n"
" \"actor\": \"actor\",\n"
" \"childActor\": \"subActor\"\n"
" },\n"
" \"stage\": [\n"
" {\n"
- " \"type\": \"ImageActor\",\n"
+ " \"type\": \"ImageView\",\n"
" \"name\": \"fbOnStage\",\n"
" \"position\": [\n"
" 0.40461349487305,\n"
" \"clearColor\": [1,0,0,1]\n"
" },\n"
" {\n"
- " \"type\": \"ImageActor\",\n"
+ " \"type\": \"ImageView\",\n"
" \"name\": \"Image1\",\n"
" \"size\": [200, 200, 0],\n"
" \"parentOrigin\": [0.5, 0.5, 0.5],\n"
" \"effect\": \"Ripple2D\",\n"
" \"image\": {\n"
- " \"filename\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\",\n"
- " \"width\": 200,\n"
- " \"height\": 80,\n"
- " \"loadPolicy\": \"IMMEDIATE\",\n"
- " \"releasePolicy\": \"NEVER\"\n"
+ " \"url\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\"\n"
" },\n"
" \"signals\": [\n"
" {\n"
" }\n"
" ]\n"
" }\n"
- " },\n"
- " \"shaderEffects\": {\n"
- " \"Ripple2D\": {\n"
- " \"program\": {\n"
- " \"vertexPrefix\": \"\",\n"
- " \"vertex\": \"void main(void)\\n{\\n gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n vTexCoord = aTexCoord;\\n}\\n\\n\",\n"
- " \"fragmentPrefix\": \"\",\n"
- " \"fragment\": \"precision mediump float;\\nuniform float uAmplitude; // 0.02; (< 1)\\nuniform float uTime;\\nvoid main()\\n{\\n highp vec2 textureSize = sTextureRect.zw - sTextureRect.xy;\\n highp vec2 pos = -1.0 + 2.0 * vTexCoord.st/textureSize;\\n highp float len = length(pos);\\n highp vec2 texCoord = vTexCoord.st/textureSize + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude; \\n gl_FragColor = texture2D(sTexture, texCoord) * uColor;\\n}\\n\\n\\n\",\n"
- " \"geometryType\": \"GEOMETRY_TYPE_IMAGE\"\n"
- " },\n"
- " \"geometryHints\": \"HINT_NONE\",\n"
- " \"gridDensity\": 0,\n"
- " \"loop\": true,\n"
- " \"uAmplitude\": 0.02,\n"
- " \"uTime\": 0.0\n"
- " }\n"
" }\n"
"}\n");
" },\n"
" \"stage\": [\n"
" {\n"
- " \"type\": \"ImageActor\",\n"
+ " \"type\": \"ImageView\",\n"
" \"name\": \"Image1\",\n"
" \"size\": [200, 200, 0],\n"
" \"parentOrigin\": [0.5, 0.5, 0.5],\n"
" \"effect\": \"Ripple2D\",\n"
" \"image\": {\n"
- " \"filename\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\",\n"
- " \"width\": 200,\n"
- " \"height\": 80,\n"
- " \"loadPolicy\": \"IMMEDIATE\",\n"
- " \"releasePolicy\": \"NEVER\"\n"
+ " \"url\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\"\n"
" },\n"
" \"signals\": [\n"
" {\n"
" \"range\": [-300,300]\n"
" }\n"
" ]\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"offStage\",\n"
+ " \"action\": \"removeConstraints\",\n"
+ " \"constrainer\": \"constrainer0\",\n"
+ " \"properties\":\n"
+ " [\n"
+ " {\n"
+ " \"source\": \"Image1\",\n"
+ " \"sourceProperty\": \"positionX\",\n"
+ " \"target\": \"Image1\",\n"
+ " \"targetProperty\": \"colorRed\",\n"
+ " \"range\": [-300,300]\n"
+ " }\n"
+ " ]\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"offStage\",\n"
+ " \"action\": \"removeConstraints\",\n"
+ " \"constrainer\": \"constrainer1\",\n"
+ " \"properties\":\n"
+ " [\n"
+ " {\n"
+ " \"source\": \"Image1\",\n"
+ " \"sourceProperty\": \"positionX\",\n"
+ " \"target\": \"Image1\",\n"
+ " \"targetProperty\": \"colorBlue\",\n"
+ " \"range\": [-300,300]\n"
+ " }\n"
+ " ]\n"
" }\n"
" ]\n"
" }\n"
" }\n"
" ]\n"
" }\n"
- " },\n"
- " \"shaderEffects\": {\n"
- " \"Ripple2D\": {\n"
- " \"program\": {\n"
- " \"vertexPrefix\": \"\",\n"
- " \"vertex\": \"void main(void)\\n{\\n gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n vTexCoord = aTexCoord;\\n}\\n\\n\",\n"
- " \"fragmentPrefix\": \"\",\n"
- " \"fragment\": \"precision mediump float;\\nuniform float uAmplitude; // 0.02; (< 1)\\nuniform float uTime;\\nvoid main()\\n{\\n highp vec2 textureSize = sTextureRect.zw - sTextureRect.xy;\\n highp vec2 pos = -1.0 + 2.0 * vTexCoord.st/textureSize;\\n highp float len = length(pos);\\n highp vec2 texCoord = vTexCoord.st/textureSize + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude; \\n gl_FragColor = texture2D(sTexture, texCoord) * uColor;\\n}\\n\\n\\n\",\n"
- " \"geometryType\": \"GEOMETRY_TYPE_IMAGE\"\n"
- " },\n"
- " \"geometryHints\": \"HINT_NONE\",\n"
- " \"gridDensity\": 0,\n"
- " \"loop\": true,\n"
- " \"uAmplitude\": 0.02,\n"
- " \"uTime\": 0.0\n"
- " }\n"
" }\n"
"}\n");
Dali::LinearConstrainer constrainer1_2 = builder.GetLinearConstrainer( "constrainer1" );
DALI_TEST_CHECK( constrainer1 == constrainer1_2 );
+ // For coverage
+
+ Actor actor = Actor::New();
+ Stage::GetCurrent().Add( actor );
+ builder.AddActors( actor );
+
+ // Render and notify
+ application.SendNotification();
+ application.Render();
+
+ actor.GetChildAt( 0 ).Unparent();
+
+ END_TEST;
+}
+
+#define CHECK_MAP_ELEMENT( xMap, xKey, xType, xPropType, xExpected, xLocation ) \
+ { \
+ Property::Value* value = xMap->Find( xKey ); \
+ DALI_TEST_EQUALS( value==NULL, false, xLocation); \
+ if( value != NULL ) \
+ { \
+ DALI_TEST_EQUALS( value->GetType(), xPropType, xLocation ); \
+ xType result; \
+ value->Get(result); \
+ DALI_TEST_EQUALS( result, xExpected, TEST_LOCATION ); \
+ std::ostringstream oss; \
+ oss << "Animation element " << xKey << "= " << result << std::endl; \
+ tet_printf( oss.str().c_str() ); \
+ } \
+ else \
+ { \
+ tet_printf("Can't find map element " xKey "\n"); \
+ } \
+ }
+
+
+int UtcDaliBuilderMapping01(void)
+{
+ ToolkitTestApplication application;
+
+ const char* json =
+ "{\n"
+ " \"mappings\":\n"
+ " {\n"
+ " \"buttonPressFadeOut\":{\n"
+ " \"alphaFunction\":\"EASE_OUT\",\n"
+ " \"timePeriod\":{\n"
+ " \"delay\":0.0,\n"
+ " \"duration\":0.4\n"
+ " }\n"
+ " },\n"
+ " \"buttonPressFadeIn\":{\n"
+ " \"alphaFunction\":\"EASE_IN\",\n"
+ " \"timePeriod\":{\n"
+ " \"delay\":0.4,\n"
+ " \"duration\":0.5\n"
+ " }\n"
+ " },\n"
+ " \"transition:buttonPressed\":\n"
+ " [\n"
+ " {\n"
+ " \"target\": \"unselectedBackgroundRenderer\",\n"
+ " \"property\": \"opacity\",\n"
+ " \"value\": 0,\n"
+ " \"animator\":\"<buttonPressFadeOut>\"\n"
+ " }\n"
+ " ],\n"
+ " \"transition:buttonReleased\":\n"
+ " [\n"
+ " {\n"
+ " \"target\": \"unselectedBackgroundRenderer\",\n"
+ " \"property\": \"opacity\",\n"
+ " \"value\": 1,\n"
+ " \"animator\":\"<buttonPressFadeIn>\"\n"
+ " },\n"
+ " {\n"
+ " \"target\": \"unselectedForegroundRenderer\",\n"
+ " \"property\": \"scale\",\n"
+ " \"value\": [ 1, 1, 1 ],\n"
+ " \"animator\":\"<buttonPressFadeIn>\"\n"
+ " },\n"
+ " {\n"
+ " \"target\": \"selectedBackgroundRenderer\",\n"
+ " \"property\": \"opacity\",\n"
+ " \"value\": 0,\n"
+ " \"animator\": \"<buttonPressFadeOut>\"\n"
+ " },\n"
+ " {\n"
+ " \"target\": \"selectedForegroundRenderer\",\n"
+ " \"property\": \"scale\",\n"
+ " \"value\": [ 0, 0, 0 ],\n"
+ " \"animator\":\"<buttonPressFadeOut>\"\n"
+ " }\n"
+ " ]\n"
+ " },\n"
+ " \"styles\":\n"
+ " {\n"
+ " \"testbutton\":\n"
+ " {\n"
+ " \"pressTransition\":\"<transition:buttonPressed>\",\n"
+ " \"releaseTransition\":\"<transition:buttonReleased>\"\n"
+ " }\n"
+ " }\n"
+ "}\n";
+
+ Builder builder = Builder::New();
+ builder.LoadFromString( json );
+
+ Test::TestButton testButton = Test::TestButton::New();
+ Stage::GetCurrent().Add( testButton );
+
+ // Render and notify
+ application.SendNotification();
+ application.Render();
+
+ DALI_TEST_CHECK( builder.ApplyStyle( "testbutton", testButton ) );
+
+ // Now check that it has loaded the transition correctly:
+ Property::Value transition = testButton.GetProperty(Test::TestButton::Property::PRESS_TRANSITION);
+ DALI_TEST_EQUALS( transition.GetType(), Property::ARRAY, TEST_LOCATION );
+ Property::Array* array = transition.GetArray();
+
+ DALI_TEST_EQUALS( array->Size(), 1, TEST_LOCATION );
+ Property::Value element = array->GetElementAt(0);
+ DALI_TEST_CHECK( element.GetType() == Property::MAP );
+ Property::Map* map = element.GetMap();
+
+ CHECK_MAP_ELEMENT(map, "target", std::string, Property::STRING, "unselectedBackgroundRenderer", TEST_LOCATION);
+ CHECK_MAP_ELEMENT(map, "property", std::string, Property::STRING, "opacity", TEST_LOCATION);
+ CHECK_MAP_ELEMENT(map, "alphaFunction", int, Property::INTEGER, (int)Dali::AlphaFunction::EASE_OUT, TEST_LOCATION);
+ CHECK_MAP_ELEMENT(map, "timePeriodDelay", float, Property::FLOAT, 0.0f, TEST_LOCATION);
+ CHECK_MAP_ELEMENT(map, "timePeriodDuration", float, Property::FLOAT, 0.4f, TEST_LOCATION);
+
+ END_TEST;
+}
+
+
+int UtcDaliBuilderMappingCycleCheck(void)
+{
+ ToolkitTestApplication application;
+
+ std::string json(
+ "{\n"
+ " \"mappings\":\n"
+ " {\n"
+ " \"cyclicKey1\":\"<cyclicKey1>\",\n"
+ " \"cyclicKey2\":\"<cyclicKey3>\",\n"
+ " \"cyclicKey3\":\"<cyclicKey2>\",\n"
+ " \"FadeOut\":{\n"
+ " \"alphaFunction\":\"EASE_IN\",\n"
+ " \"timePeriod\":{\n"
+ " \"delay\":\"<cyclicKey3>\",\n"
+ " \"duration\":0.6\n"
+ " }\n"
+ " },\n"
+ " \"transition:buttonPressed\":\n"
+ " [\n"
+ " {\n"
+ " \"target\": \"<cyclicKey1>\",\n"
+ " \"property\": \"<cyclicKey2>\",\n"
+ " \"value\": 0,\n"
+ " \"animator\":\"<FadeOut>\"\n"
+ " }\n"
+ " ]\n"
+ " },\n"
+ " \"styles\":\n"
+ " {\n"
+ " \"testbutton\":\n"
+ " {\n"
+ " \"pressTransition\":\"<transition:buttonPressed>\",\n"
+ " \"releaseTransition\":\"<cyclicKey2>\",\n"
+ " \"disabledTransition\":\"<cyclicKey3>\",\n"
+ " \"enabledTransition\":\"<unknownKey>\"\n"
+ " }\n"
+ " }\n"
+ "}\n");
+
+ Builder builder = Builder::New();
+ builder.LoadFromString( json );
+
+ Test::TestButton testButton = Test::TestButton::New();
+ Stage::GetCurrent().Add( testButton );
+
+ // Render and notify
+ application.SendNotification();
+ application.Render();
+
+ DALI_TEST_CHECK( builder.ApplyStyle( "testbutton", testButton ) );
+
+ // Now check that it has loaded the transition correctly:
+ Property::Value transition = testButton.GetProperty(Test::TestButton::Property::PRESS_TRANSITION);
+ DALI_TEST_EQUALS( transition.GetType(), Property::ARRAY, TEST_LOCATION );
+ Property::Array* array = transition.GetArray();
+
+ DALI_TEST_EQUALS( array->Size(), 1, TEST_LOCATION );
+ Property::Value element = array->GetElementAt(0);
+ DALI_TEST_CHECK( element.GetType() == Property::MAP );
+ Property::Map* map = element.GetMap();
+
+ CHECK_MAP_ELEMENT(map, "target", std::string, Property::STRING, "", TEST_LOCATION);
+ CHECK_MAP_ELEMENT(map, "property", std::string, Property::STRING, "", TEST_LOCATION);
+ CHECK_MAP_ELEMENT(map, "timePeriodDuration", float, Property::FLOAT, 0.6f, TEST_LOCATION);
+
+ END_TEST;
+}
+
+int UtcDaliBuilderTypeCasts(void)
+{
+ ToolkitTestApplication application;
+
+ std::string json(
+ "{"
+ "\"stage\":"
+ "[{"
+ "\"type\": \"Layer\","
+ "\"maximumSize\": { \"typeCast\":\"vector2\", \"value\":[100,15] },"
+ "\"position\": { \"typeCast\":\"vector3\", \"value\":[100,10,1] },"
+ "\"color\": { \"typeCast\":\"vector4\", \"value\":[0.5,0.5,0.5,1] },"
+ "\"sensitive\": { \"typeCast\":\"boolean\", \"value\":false },"
+ "\"orientation\": { \"typeCast\":\"rotation\", \"value\":[10,10,10,10] },"
+ "\"colorMode\": { \"typeCast\":\"string\", \"value\":\"USE_OWN_MULTIPLY_PARENT_COLOR\" },"
+ "\"clippingBox\": { \"typeCast\":\"rect\", \"value\":[10,10,10,10] }"
+ "}]"
+ "}"
+ );
+
+ Actor rootActor = Actor::New();
+ Stage::GetCurrent().Add( rootActor );
+
+ Builder builder = Builder::New();
+ builder.LoadFromString( json );
+ builder.AddActors( rootActor );
+
+ application.SendNotification();
+ application.Render();
+
+ Actor createdActor = rootActor.GetChildAt( 0 );
+ DALI_TEST_EQUALS( createdActor.GetMaximumSize(), Vector2(100.0f,15.0f), TEST_LOCATION );
+ DALI_TEST_EQUALS( createdActor.GetCurrentPosition(), Vector3(100.0f,10.0f,1.0f), TEST_LOCATION );
+ DALI_TEST_EQUALS( createdActor.GetCurrentColor(), Vector4(0.5f,0.5f,0.5f,1.0f), TEST_LOCATION );
+ DALI_TEST_EQUALS( createdActor.IsSensitive(), false, TEST_LOCATION );
+ DALI_TEST_EQUALS( createdActor.GetColorMode(), USE_OWN_MULTIPLY_PARENT_COLOR, TEST_LOCATION );
+
+ END_TEST;
+}
+
+int UtcDaliBuilderBuilderControl(void)
+{
+ ToolkitTestApplication application;
+
+ std::string json(
+ "{"
+ "\"stage\":"
+ "[{"
+ "\"type\": \"BuilderControl\","
+ "\"integerProperty\": 10,"
+ "\"matrix3Property\": [ 1,2,3,4,5,6,7,8,9 ],"
+ "\"matrixProperty\": [ 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 ],"
+ "\"noneProperty\": 10"
+ "}]"
+ "}"
+ );
+
+ Actor rootActor = Actor::New();
+ Stage::GetCurrent().Add( rootActor );
+
+ Builder builder = Builder::New();
+ builder.LoadFromString( json );
+ builder.AddActors( rootActor );
+
+ application.SendNotification();
+ application.Render();
+
+ DALI_TEST_EQUALS( BuilderControlProperty::gSetPropertyCalledCount, 4, TEST_LOCATION );
+
+ END_TEST;
+}
+
+int UtcDaliBuilderActionsWithParams(void)
+{
+ ToolkitTestApplication application;
+
+ // JSON with a quit event when the actor is touched
+ std::string json(
+ "{\n"
+ "\"stage\":\n"
+ "[\n"
+ " { \n"
+ " \"type\": \"ImageView\",\n"
+ " \"name\": \"image\",\n"
+ " \"size\": [100,100,1],\n"
+ " \"signals\": [{\n"
+ " \"name\": \"touch\",\n"
+ " \"action\": \"show\",\n"
+ " \"parameters\": {\n"
+ " \"property1\" : 10,\n"
+ " \"property2\" : [1,2],\n"
+ " \"property3\" : [1,2,3],\n"
+ " \"property4\" : [1,2,3,4]\n"
+ " }\n"
+ " }]\n"
+ " }\n"
+ "]\n"
+ "}\n"
+ );
+
+ Builder builder = Builder::New();
+ builder.LoadFromString( json );
+ builder.AddActors( Stage::GetCurrent().GetRootLayer() );
+
+ DALI_TEST_CHECK( true ); // For Coverage
+
END_TEST;
}
projects / platform / core / uifw / dali-toolkit.git / blobdiff