From c5015fd94aa766b0c8aa652dbfc7ad3e24758199 Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Tue, 2 Jun 2020 17:15:31 +0100 Subject: [PATCH] Further Setter/Getter public API removal from Dali::Actor Change-Id: I121380ad068c2825957405652331597769fb0bc7 --- .../src/dali-internal/utc-Dali-Internal-Core.cpp | 4 +- .../utc-Dali-Internal-FrustumCulling.cpp | 10 +- .../dali-test-suite-utils/test-actor-utils.cpp | 2 +- automated-tests/src/dali/utc-Dali-Actor.cpp | 224 ++++++++++----------- automated-tests/src/dali/utc-Dali-Animation.cpp | 48 ++--- automated-tests/src/dali/utc-Dali-BaseHandle.cpp | 4 +- automated-tests/src/dali/utc-Dali-CameraActor.cpp | 32 +-- automated-tests/src/dali/utc-Dali-Constraint.cpp | 6 +- automated-tests/src/dali/utc-Dali-Context.cpp | 2 +- automated-tests/src/dali/utc-Dali-CustomActor.cpp | 30 +-- .../src/dali/utc-Dali-FrameCallbackInterface.cpp | 44 ++-- automated-tests/src/dali/utc-Dali-Geometry.cpp | 10 +- .../src/dali/utc-Dali-HitTestAlgorithm.cpp | 30 +-- .../src/dali/utc-Dali-HoverProcessing.cpp | 68 +++---- automated-tests/src/dali/utc-Dali-Layer.cpp | 4 +- .../src/dali/utc-Dali-LongPressGestureDetector.cpp | 50 ++--- .../dali/utc-Dali-LongPressGestureRecognizer.cpp | 20 +- automated-tests/src/dali/utc-Dali-NativeImage.cpp | 2 +- .../src/dali/utc-Dali-PanGestureDetector.cpp | 98 ++++----- .../src/dali/utc-Dali-PanGestureRecognizer.cpp | 32 +-- .../src/dali/utc-Dali-PinchGestureDetector.cpp | 50 ++--- .../src/dali/utc-Dali-PinchGestureRecognizer.cpp | 36 ++-- .../src/dali/utc-Dali-PropertyBuffer.cpp | 4 +- .../src/dali/utc-Dali-PropertyNotification.cpp | 90 ++++----- automated-tests/src/dali/utc-Dali-RenderTask.cpp | 54 ++--- automated-tests/src/dali/utc-Dali-Renderer.cpp | 84 ++++---- .../src/dali/utc-Dali-RotationGestureDetector.cpp | 50 ++--- .../dali/utc-Dali-RotationGestureRecognizer.cpp | 4 +- automated-tests/src/dali/utc-Dali-Sampler.cpp | 6 +- automated-tests/src/dali/utc-Dali-Scene.cpp | 11 +- automated-tests/src/dali/utc-Dali-Scripting.cpp | 6 +- automated-tests/src/dali/utc-Dali-Shader.cpp | 8 +- automated-tests/src/dali/utc-Dali-Stage.cpp | 8 +- .../src/dali/utc-Dali-TapGestureDetector.cpp | 50 ++--- .../src/dali/utc-Dali-TapGestureRecognizer.cpp | 24 +-- automated-tests/src/dali/utc-Dali-TextureSet.cpp | 4 +- .../src/dali/utc-Dali-TouchDataProcessing.cpp | 106 +++++----- .../src/dali/utc-Dali-TouchProcessing.cpp | 90 ++++----- automated-tests/src/dali/utc-Dali-TypeRegistry.cpp | 10 +- automated-tests/src/dali/utc-Dali-WheelEvent.cpp | 2 +- dali/internal/event/actors/actor-impl.cpp | 32 ++- dali/public-api/actors/actor.cpp | 65 ------ dali/public-api/actors/actor.h | 175 +--------------- 43 files changed, 744 insertions(+), 945 deletions(-) diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-Core.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-Core.cpp index 99c55b8..571c4b2 100644 --- a/automated-tests/src/dali-internal/utc-Dali-Internal-Core.cpp +++ b/automated-tests/src/dali-internal/utc-Dali-Internal-Core.cpp @@ -76,8 +76,8 @@ int UtcDaliCoreProcessEvents(void) Actor actor = Actor::New(); actor.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); - actor.SetSize( size ); - actor.SetPosition( position ); + actor.SetProperty( Actor::Property::SIZE, size ); + actor.SetProperty( Actor::Property::POSITION, position ); Stage::GetCurrent().Add( actor ); RelayoutSignalHandler relayoutSignal( application ); diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-FrustumCulling.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-FrustumCulling.cpp index e53f0f1..4054920 100644 --- a/automated-tests/src/dali-internal/utc-Dali-Internal-FrustumCulling.cpp +++ b/automated-tests/src/dali-internal/utc-Dali-Internal-FrustumCulling.cpp @@ -70,7 +70,7 @@ Actor CreateMeshActorToStage( TestApplication& application, Vector3 parentOrigin Actor meshActor = Actor::New(); meshActor.AddRenderer( renderer ); - meshActor.SetSize( Vector3( 400.0f, 400.0f, 0.1f ) ); + meshActor.SetProperty( Actor::Property::SIZE, Vector3( 400.0f, 400.0f, 0.1f ) ); meshActor.SetProperty( Actor::Property::PARENT_ORIGIN, parentOrigin ); meshActor.SetProperty( Actor::Property::ANCHOR_POINT, anchorPoint ); Stage::GetCurrent().Add( meshActor ); @@ -321,7 +321,7 @@ int UtcFrustumNearCullP(void) float radius = meshActor.GetTargetSize().Length() * 0.5f; float offset = radius + 0.1f; meshPosition.z = cameraDepth - nearPlane + offset; - meshActor.SetPosition( meshPosition ); + meshActor.SetProperty( Actor::Property::POSITION, meshPosition ); drawTrace.Reset(); application.SendNotification(); @@ -348,7 +348,7 @@ int UtcFrustumNearCullN(void) float offset = meshActor.GetTargetSize().z - 0.1f; meshPosition.z = cameraDepth - nearPlane + offset; - meshActor.SetPosition( meshPosition ); + meshActor.SetProperty( Actor::Property::POSITION, meshPosition ); drawTrace.Reset(); application.SendNotification(); @@ -375,7 +375,7 @@ int UtcFrustumFarCullP(void) float radius = meshActor.GetTargetSize().Length() * 0.5f; float offset = radius + 0.1f; meshPosition.z = cameraDepth - farPlane - offset; - meshActor.SetPosition( meshPosition ); + meshActor.SetProperty( Actor::Property::POSITION, meshPosition ); drawTrace.Reset(); application.SendNotification(); @@ -402,7 +402,7 @@ int UtcFrustumFarCullN(void) float offset = meshActor.GetTargetSize().z - 0.1f; meshPosition.z = cameraDepth - farPlane - offset; - meshActor.SetPosition( meshPosition ); + meshActor.SetProperty( Actor::Property::POSITION, meshPosition ); drawTrace.Reset(); application.SendNotification(); diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-actor-utils.cpp b/automated-tests/src/dali/dali-test-suite-utils/test-actor-utils.cpp index 38eb0b2..4387ba7 100644 --- a/automated-tests/src/dali/dali-test-suite-utils/test-actor-utils.cpp +++ b/automated-tests/src/dali/dali-test-suite-utils/test-actor-utils.cpp @@ -88,7 +88,7 @@ Actor CreateRenderableActor( Image texture, const std::string& vertexShader, con renderer.SetTextures( textureSet ); // Set actor to the size of the texture if set - actor.SetSize( texture.GetWidth(), texture.GetHeight() ); + actor.SetProperty( Actor::Property::SIZE, Vector2( texture.GetWidth(), texture.GetHeight() ) ); } return actor; diff --git a/automated-tests/src/dali/utc-Dali-Actor.cpp b/automated-tests/src/dali/utc-Dali-Actor.cpp index c0ae406..55f2ac1 100644 --- a/automated-tests/src/dali/utc-Dali-Actor.cpp +++ b/automated-tests/src/dali/utc-Dali-Actor.cpp @@ -916,7 +916,6 @@ int UtcDaliActorGetCurrentAnchorPoint(void) END_TEST; } -// SetSize(float width, float height) int UtcDaliActorSetSize01(void) { TestApplication application; @@ -926,7 +925,7 @@ int UtcDaliActorSetSize01(void) DALI_TEST_CHECK(vector != actor.GetCurrentProperty< Vector3 >( Actor::Property::SIZE )); - actor.SetSize(vector.x, vector.y); + actor.SetProperty( Actor::Property::SIZE, Vector2( vector.x, vector.y ) ); // Immediately retrieve the size after setting Vector3 currentSize = actor.GetProperty( Actor::Property::SIZE ).Get< Vector3 >(); @@ -962,7 +961,7 @@ int UtcDaliActorSetSize01(void) DALI_TEST_EQUALS( currentSize, vector, Math::MACHINE_EPSILON_0, TEST_LOCATION ); // Set a new size after resize policy is changed and check the new size - actor.SetSize( Vector3( 0.1f, 0.2f, 0.0f ) ); + actor.SetProperty( Actor::Property::SIZE, Vector3( 0.1f, 0.2f, 0.0f ) ); currentSize = actor.GetProperty( Actor::Property::SIZE ).Get< Vector3 >(); DALI_TEST_EQUALS( currentSize, Vector3( 0.1f, 0.2f, 0.0f ), Math::MACHINE_EPSILON_0, TEST_LOCATION ); @@ -974,7 +973,7 @@ int UtcDaliActorSetSize01(void) DALI_TEST_EQUALS( currentSize, Vector3( 0.1f, 0.2f, 0.0f ), Math::MACHINE_EPSILON_0, TEST_LOCATION ); // Set another new size after resize policy is changed and check the new size - actor.SetSize( Vector3( 50.0f, 60.0f, 0.0f ) ); + actor.SetProperty( Actor::Property::SIZE, Vector3( 50.0f, 60.0f, 0.0f ) ); currentSize = actor.GetProperty( Actor::Property::SIZE ).Get< Vector3 >(); DALI_TEST_EQUALS( currentSize, Vector3( 50.0f, 60.0f, 0.0f ), Math::MACHINE_EPSILON_0, TEST_LOCATION ); @@ -982,7 +981,6 @@ int UtcDaliActorSetSize01(void) END_TEST; } -// SetSize(float width, float height, float depth) int UtcDaliActorSetSize02(void) { TestApplication application; @@ -992,7 +990,7 @@ int UtcDaliActorSetSize02(void) DALI_TEST_CHECK(vector != actor.GetCurrentProperty< Vector3 >( Actor::Property::SIZE )); - actor.SetSize(vector.x, vector.y, vector.z); + actor.SetProperty( Actor::Property::SIZE, Vector3( vector.x, vector.y, vector.z ) ); // Immediately check the size after setting Vector3 currentSize = actor.GetProperty( Actor::Property::SIZE ).Get< Vector3 >(); @@ -1021,7 +1019,7 @@ int UtcDaliActorSetSize03(void) DALI_TEST_CHECK(vector != actor.GetCurrentProperty< Vector3 >( Actor::Property::SIZE )); - actor.SetSize(Vector2(vector.x, vector.y)); + actor.SetProperty( Actor::Property::SIZE,Vector2(vector.x, vector.y)); // Immediately check the size after setting Vector3 currentSize = actor.GetProperty( Actor::Property::SIZE ).Get< Vector3 >(); @@ -1050,7 +1048,7 @@ int UtcDaliActorSetSize04(void) DALI_TEST_CHECK(vector != actor.GetCurrentProperty< Vector3 >( Actor::Property::SIZE )); - actor.SetSize(vector); + actor.SetProperty( Actor::Property::SIZE,vector); // Immediately check the size after setting Vector3 currentSize = actor.GetProperty( Actor::Property::SIZE ).Get< Vector3 >(); @@ -1064,7 +1062,7 @@ int UtcDaliActorSetSize04(void) DALI_TEST_CHECK(vector == actor.GetCurrentProperty< Vector3 >( Actor::Property::SIZE )); Stage::GetCurrent().Add( actor ); - actor.SetSize( Vector3( 0.1f, 0.2f, 0.3f ) ); + actor.SetProperty( Actor::Property::SIZE, Vector3( 0.1f, 0.2f, 0.3f ) ); // Immediately check the size after setting currentSize = actor.GetProperty( Actor::Property::SIZE ).Get< Vector3 >(); @@ -1209,7 +1207,7 @@ int UtcDaliActorGetCurrentSize(void) DALI_TEST_CHECK(vector != actor.GetCurrentProperty< Vector3 >( Actor::Property::SIZE )); - actor.SetSize(vector); + actor.SetProperty( Actor::Property::SIZE,vector); // flush the queue and render once application.SendNotification(); @@ -1241,7 +1239,7 @@ int UtcDaliActorGetCurrentSizeImmediate(void) DALI_TEST_CHECK(vector != actor.GetTargetSize()); DALI_TEST_CHECK(vector != actor.GetCurrentProperty< Vector3 >( Actor::Property::SIZE )); - actor.SetSize(vector); + actor.SetProperty( Actor::Property::SIZE,vector); DALI_TEST_CHECK(vector == actor.GetTargetSize()); DALI_TEST_CHECK(vector != actor.GetCurrentProperty< Vector3 >( Actor::Property::SIZE )); @@ -1279,8 +1277,8 @@ int UtcDaliActorCalculateScreenExtents(void) Actor actor = Actor::New(); - actor.SetPosition(Vector3(2.0f, 2.0f, 16.0f)); - actor.SetSize(Vector3{ 1.0f, 1.0f, 1.0f }); + actor.SetProperty( Actor::Property::POSITION, Vector3(2.0f, 2.0f, 16.0f)); + actor.SetProperty( Actor::Property::SIZE,Vector3{ 1.0f, 1.0f, 1.0f }); application.SendNotification(); application.Render(); @@ -1304,28 +1302,28 @@ int UtcDaliActorSetPosition01(void) Actor actor = Actor::New(); // Set to random to start off with - actor.SetPosition(Vector3(120.0f, 120.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(120.0f, 120.0f, 0.0f)); Vector3 vector(100.0f, 100.0f, 0.0f); DALI_TEST_CHECK(vector != actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION )); - actor.SetPosition(vector.x, vector.y); + actor.SetProperty( Actor::Property::POSITION, Vector2(vector.x, vector.y)); // flush the queue and render once application.SendNotification(); application.Render(); DALI_TEST_CHECK(vector == actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION )); Stage::GetCurrent().Add( actor ); - actor.SetPosition( Vector3( 0.1f, 0.2f, 0.3f ) ); + actor.SetProperty( Actor::Property::POSITION, Vector3( 0.1f, 0.2f, 0.3f ) ); // flush the queue and render once application.SendNotification(); application.Render(); DALI_TEST_EQUALS( Vector3( 0.1f, 0.2f, 0.3f ), actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), TEST_LOCATION ); - actor.SetX( 1.0f ); - actor.SetY( 1.1f ); - actor.SetZ( 1.2f ); + actor.SetProperty( Actor::Property::POSITION_X, 1.0f ); + actor.SetProperty( Actor::Property::POSITION_Y, 1.1f ); + actor.SetProperty( Actor::Property::POSITION_Z, 1.2f ); // flush the queue and render once application.SendNotification(); application.Render(); @@ -1349,13 +1347,13 @@ int UtcDaliActorSetPosition02(void) Actor actor = Actor::New(); // Set to random to start off with - actor.SetPosition(Vector3(120.0f, 120.0f, 120.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(120.0f, 120.0f, 120.0f)); Vector3 vector(100.0f, 100.0f, 100.0f); DALI_TEST_CHECK(vector != actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION )); - actor.SetPosition(vector.x, vector.y, vector.z); + actor.SetProperty( Actor::Property::POSITION, Vector3(vector.x, vector.y, vector.z)); // flush the queue and render once application.SendNotification(); @@ -1373,13 +1371,13 @@ int UtcDaliActorSetPosition03(void) Actor actor = Actor::New(); // Set to random to start off with - actor.SetPosition(Vector3(120.0f, 120.0f, 120.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(120.0f, 120.0f, 120.0f)); Vector3 vector(100.0f, 100.0f, 100.0f); DALI_TEST_CHECK(vector != actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION )); - actor.SetPosition(vector); + actor.SetProperty( Actor::Property::POSITION, vector); // flush the queue and render once application.SendNotification(); @@ -1399,7 +1397,7 @@ int UtcDaliActorSetX(void) DALI_TEST_CHECK(vector != actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION )); - actor.SetX(100.0f); + actor.SetProperty( Actor::Property::POSITION_X, 100.0f); // flush the queue and render once application.SendNotification(); @@ -1419,7 +1417,7 @@ int UtcDaliActorSetY(void) DALI_TEST_CHECK(vector != actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION )); - actor.SetY(100.0f); + actor.SetProperty( Actor::Property::POSITION_Y, 100.0f); // flush the queue and render once application.SendNotification(); @@ -1439,7 +1437,7 @@ int UtcDaliActorSetZ(void) DALI_TEST_CHECK(vector != actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION )); - actor.SetZ(100.0f); + actor.SetProperty( Actor::Property::POSITION_Z, 100.0f); // flush the queue and render once application.SendNotification(); @@ -1512,7 +1510,7 @@ int UtcDaliActorTranslateBy(void) DALI_TEST_CHECK(vector != actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION )); - actor.SetPosition(vector); + actor.SetProperty( Actor::Property::POSITION, vector); // flush the queue and render once application.SendNotification(); @@ -1536,7 +1534,7 @@ int UtcDaliActorGetCurrentPosition(void) Actor actor = Actor::New(); Vector3 setVector(100.0f, 100.0f, 0.0f); - actor.SetPosition(setVector); + actor.SetProperty( Actor::Property::POSITION, setVector); // flush the queue and render once application.SendNotification(); @@ -1552,7 +1550,7 @@ int UtcDaliActorGetCurrentWorldPosition(void) Actor parent = Actor::New(); Vector3 parentPosition( 1.0f, 2.0f, 3.0f ); - parent.SetPosition( parentPosition ); + parent.SetProperty( Actor::Property::POSITION, parentPosition ); parent.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); parent.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); Stage::GetCurrent().Add( parent ); @@ -1561,7 +1559,7 @@ int UtcDaliActorGetCurrentWorldPosition(void) child.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); child.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); Vector3 childPosition( 6.0f, 6.0f, 6.0f ); - child.SetPosition( childPosition ); + child.SetProperty( Actor::Property::POSITION, childPosition ); parent.Add( child ); // The actors should not have a world position yet @@ -1587,7 +1585,7 @@ int UtcDaliActorSetInheritPosition(void) Actor parent = Actor::New(); Vector3 parentPosition( 1.0f, 2.0f, 3.0f ); - parent.SetPosition( parentPosition ); + parent.SetProperty( Actor::Property::POSITION, parentPosition ); parent.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); parent.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); Stage::GetCurrent().Add( parent ); @@ -1596,7 +1594,7 @@ int UtcDaliActorSetInheritPosition(void) child.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); child.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); Vector3 childPosition( 10.0f, 11.0f, 12.0f ); - child.SetPosition( childPosition ); + child.SetProperty( Actor::Property::POSITION, childPosition ); parent.Add( child ); // The actors should not have a world position yet @@ -1614,7 +1612,7 @@ int UtcDaliActorSetInheritPosition(void) //Change child position Vector3 childOffset( -1.0f, 1.0f, 0.0f ); - child.SetPosition( childOffset ); + child.SetProperty( Actor::Property::POSITION, childOffset ); // Use local position as world postion child.SetProperty( Actor::Property::INHERIT_POSITION, false ); @@ -1861,12 +1859,12 @@ int UtcDaliActorSetScale01(void) Actor actor = Actor::New(); // Set to random value first -.GetCurrentProperty< Vector3 >( Actor::Property::SCALE ) asserts if called before SetScale() - actor.SetScale(0.25f); + actor.SetProperty( Actor::Property::SCALE,0.25f); Vector3 scale(10.0f, 10.0f, 10.0f); DALI_TEST_CHECK(actor.GetCurrentProperty< Vector3 >( Actor::Property::SCALE ) != scale); - actor.SetScale(scale.x); + actor.SetProperty( Actor::Property::SCALE,scale.x); // flush the queue and render once application.SendNotification(); @@ -1885,11 +1883,11 @@ int UtcDaliActorSetScale02(void) Actor actor = Actor::New(); // Set to random value first -.GetCurrentProperty< Vector3 >( Actor::Property::SCALE ) asserts if called before SetScale() - actor.SetScale(Vector3(12.0f, 1.0f, 2.0f)); + actor.SetProperty( Actor::Property::SCALE, Vector3( 12.0f, 1.0f, 2.0f ) ); DALI_TEST_CHECK(actor.GetCurrentProperty< Vector3 >( Actor::Property::SCALE ) != scale); - actor.SetScale(scale.x, scale.y, scale.z); + actor.SetProperty( Actor::Property::SCALE, Vector3( scale.x, scale.y, scale.z ) ); // flush the queue and render once application.SendNotification(); application.Render(); @@ -1897,7 +1895,7 @@ int UtcDaliActorSetScale02(void) // add to stage and test Stage::GetCurrent().Add( actor ); - actor.SetScale( 2.0f, 2.0f, 2.0f ); + actor.SetProperty( Actor::Property::SCALE, Vector3( 2.0f, 2.0f, 2.0f ) ); // flush the queue and render once application.SendNotification(); application.Render(); @@ -1917,11 +1915,11 @@ int UtcDaliActorSetScale03(void) Actor actor = Actor::New(); // Set to random value first -.GetCurrentProperty< Vector3 >( Actor::Property::SCALE ) asserts if called before SetScale() - actor.SetScale(Vector3(12.0f, 1.0f, 2.0f)); + actor.SetProperty( Actor::Property::SCALE, Vector3(12.0f, 1.0f, 2.0f)); DALI_TEST_CHECK(actor.GetCurrentProperty< Vector3 >( Actor::Property::SCALE ) != scale); - actor.SetScale(scale); + actor.SetProperty( Actor::Property::SCALE,scale); // flush the queue and render once application.SendNotification(); @@ -1987,7 +1985,7 @@ int UtcDaliActorScaleBy(void) DALI_TEST_CHECK(vector != actor.GetCurrentProperty< Vector3 >( Actor::Property::SCALE )); - actor.SetScale(vector); + actor.SetProperty( Actor::Property::SCALE,vector); // flush the queue and render once application.SendNotification(); @@ -2012,7 +2010,7 @@ int UtcDaliActorGetCurrentScale(void) Actor actor = Actor::New(); - actor.SetScale(scale); + actor.SetProperty( Actor::Property::SCALE,scale); // flush the queue and render once application.SendNotification(); @@ -2028,12 +2026,12 @@ int UtcDaliActorGetCurrentWorldScale(void) Actor parent = Actor::New(); Vector3 parentScale( 1.0f, 2.0f, 3.0f ); - parent.SetScale( parentScale ); + parent.SetProperty( Actor::Property::SCALE, parentScale ); Stage::GetCurrent().Add( parent ); Actor child = Actor::New(); Vector3 childScale( 2.0f, 2.0f, 2.0f ); - child.SetScale( childScale ); + child.SetProperty( Actor::Property::SCALE, childScale ); parent.Add( child ); // The actors should not have a scale yet @@ -2063,12 +2061,12 @@ int UtcDaliActorInheritScale(void) Actor parent = Actor::New(); Vector3 parentScale( 1.0f, 2.0f, 3.0f ); - parent.SetScale( parentScale ); + parent.SetProperty( Actor::Property::SCALE, parentScale ); Stage::GetCurrent().Add( parent ); Actor child = Actor::New(); Vector3 childScale( 2.0f, 2.0f, 2.0f ); - child.SetScale( childScale ); + child.SetProperty( Actor::Property::SCALE, childScale ); parent.Add( child ); application.SendNotification(); @@ -2420,8 +2418,8 @@ int UtcDaliActorScreenToLocal(void) TestApplication application; Actor actor = Actor::New(); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - actor.SetSize(100.0f, 100.0f); - actor.SetPosition(10.0f, 10.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); + actor.SetProperty( Actor::Property::POSITION, Vector2(10.0f, 10.0f)); Stage::GetCurrent().Add(actor); // flush the queue and render once @@ -2845,8 +2843,8 @@ int UtcDaliActorHitTest(void) unsigned int index = 0; while( NULL != hitTestData[index] ) { - actor.SetSize( 1.f, 1.f ); - actor.SetScale( hitTestData[index]->mScale.x, hitTestData[index]->mScale.y, hitTestData[index]->mScale.z ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 1.f, 1.f ) ); + actor.SetProperty( Actor::Property::SCALE, Vector3( hitTestData[index]->mScale.x, hitTestData[index]->mScale.y, hitTestData[index]->mScale.z ) ); // flush the queue and render once application.SendNotification(); @@ -2994,9 +2992,9 @@ int UtcDaliActorGetCurrentWorldMatrix(void) Radian rotationAngle(Degree(85.0f)); Quaternion parentRotation(rotationAngle, Vector3::ZAXIS); Vector3 parentScale( 1.0f, 2.0f, 3.0f ); - parent.SetPosition( parentPosition ); + parent.SetProperty( Actor::Property::POSITION, parentPosition ); parent.SetProperty( Actor::Property::ORIENTATION, parentRotation ); - parent.SetScale( parentScale ); + parent.SetProperty( Actor::Property::SCALE, parentScale ); Stage::GetCurrent().Add( parent ); Actor child = Actor::New(); @@ -3005,9 +3003,9 @@ int UtcDaliActorGetCurrentWorldMatrix(void) Radian childRotationAngle(Degree(23.0f)); Quaternion childRotation( childRotationAngle, Vector3::YAXIS ); Vector3 childScale( 2.0f, 2.0f, 2.0f ); - child.SetPosition( childPosition ); + child.SetProperty( Actor::Property::POSITION, childPosition ); child.SetProperty( Actor::Property::ORIENTATION, childRotation ); - child.SetScale( childScale ); + child.SetProperty( Actor::Property::SCALE, childScale ); parent.Add( child ); app.SendNotification(); @@ -3044,9 +3042,9 @@ int UtcDaliActorConstrainedToWorldMatrix(void) Radian rotationAngle(Degree(85.0f)); Quaternion parentRotation(rotationAngle, Vector3::ZAXIS); Vector3 parentScale( 1.0f, 2.0f, 3.0f ); - parent.SetPosition( parentPosition ); + parent.SetProperty( Actor::Property::POSITION, parentPosition ); parent.SetProperty( Actor::Property::ORIENTATION, parentRotation ); - parent.SetScale( parentScale ); + parent.SetProperty( Actor::Property::SCALE, parentScale ); Stage::GetCurrent().Add( parent ); Actor child = Actor::New(); @@ -3082,9 +3080,9 @@ int UtcDaliActorConstrainedToOrientation(void) Radian rotationAngle(Degree(85.0f)); Quaternion parentRotation(rotationAngle, Vector3::ZAXIS); Vector3 parentScale( 1.0f, 2.0f, 3.0f ); - parent.SetPosition( parentPosition ); + parent.SetProperty( Actor::Property::POSITION, parentPosition ); parent.SetProperty( Actor::Property::ORIENTATION, parentRotation ); - parent.SetScale( parentScale ); + parent.SetProperty( Actor::Property::SCALE, parentScale ); Stage::GetCurrent().Add( parent ); Actor child = Actor::New(); @@ -3504,7 +3502,7 @@ int UtcDaliActorGetRelayoutSize(void) DALI_TEST_EQUALS( actor.GetRelayoutSize( Dimension::WIDTH ), 0.0f, TEST_LOCATION ); actor.SetResizePolicy( ResizePolicy::FIXED, Dimension::WIDTH ); - actor.SetSize( Vector2( 1.0f, 0.0f ) ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 1.0f, 0.0f ) ); // Flush the queue and render once app.SendNotification(); @@ -3607,7 +3605,7 @@ int UtcDaliActorOnRelayoutSignal(void) Stage::GetCurrent().Add( actor ); actor.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); - actor.SetSize( Vector2( 1.0f, 2.0 ) ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 1.0f, 2.0 ) ); // Flush the queue and render once application.SendNotification(); @@ -4038,7 +4036,7 @@ Actor CreateActorWithContent( uint32_t width, uint32_t height) // Setup dimensions and position so actor is not skipped by culling. actor.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); - actor.SetSize( width, height ); + actor.SetProperty( Actor::Property::SIZE, Vector2( width, height ) ); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); @@ -4346,7 +4344,7 @@ int UtcDaliActorPropertyClippingActorDrawOrder(void) // Setup dimensions and position so actor is not skipped by culling. actor.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); - actor.SetSize( 16.0f, 16.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 16.0f, 16.0f ) ); if( i == 0 ) { @@ -4490,8 +4488,8 @@ int UtcDaliActorPropertyScissorClippingActorSiblings(void) clippingActorB.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER_LEFT ); clippingActorB.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_TO_BOUNDING_BOX ); - clippingActorA.SetPosition( 0.0f, -200.0f, 0.0f ); - clippingActorB.SetPosition( 0.0f, 0.0f, 0.0f ); + clippingActorA.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, -200.0f, 0.0f )); + clippingActorB.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f )); Stage::GetCurrent().Add( clippingActorA ); Stage::GetCurrent().Add( clippingActorB ); @@ -4573,7 +4571,7 @@ int UtcDaliActorPropertyScissorClippingActorNested01(void) { // Position the child clipping actor so it intersects with the 1st clipping actor. This changes each loop. const Vector2 position = ( imageSize / 2.0f ) * positionModifiers[test]; - clippingActorB.SetPosition( position.x, position.y ); + clippingActorB.SetProperty( Actor::Property::POSITION, Vector2( position.x, position.y )); // Gather the call trace. GenerateTrace( application, enabledDisableTrace, scissorTrace ); @@ -4647,11 +4645,11 @@ int UtcDaliActorPropertyScissorClippingActorNested02(void) clippingActorE.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER_LEFT ); clippingActorE.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER_LEFT ); - clippingActorA.SetPosition( 0.0f, -200.0f, 0.0f ); - clippingActorB.SetPosition( 0.0f, 0.0f, 0.0f ); - clippingActorC.SetPosition( 0.0f, 100.0f, 0.0f ); - clippingActorD.SetPosition( 0.0f, 0.0f, 0.0f ); - clippingActorE.SetPosition( 0.0f, 0.0f, 0.0f ); + clippingActorA.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, -200.0f, 0.0f )); + clippingActorB.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f )); + clippingActorC.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 100.0f, 0.0f )); + clippingActorD.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f )); + clippingActorE.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f )); Stage::GetCurrent().Add( clippingActorA ); clippingActorA.Add( clippingActorB ); @@ -6001,9 +5999,9 @@ int UtcDaliActorGetScreenPosition(void) actorA.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); Vector2 size2( 10.0f, 20.0f ); - actorA.SetSize( size2 ); + actorA.SetProperty( Actor::Property::SIZE, size2 ); - actorA.SetPosition( 0.f, 0.f ); + actorA.SetProperty( Actor::Property::POSITION, Vector2( 0.f, 0.f )); tet_infoline( "UtcDaliActorGetScreenPosition Center Anchor Point and 0,0 position \n" ); @@ -6055,7 +6053,7 @@ int UtcDaliActorGetScreenPosition(void) tet_infoline( "UtcDaliActorGetScreenPosition Bottom right Anchor Point and 30,0 position \n" ); - actorA.SetPosition( 30.0, 0.0 ); + actorA.SetProperty( Actor::Property::POSITION, Vector2( 30.0, 0.0 )); application.SendNotification(); application.Render(); @@ -6071,7 +6069,7 @@ int UtcDaliActorGetScreenPosition(void) tet_infoline( "UtcDaliActorGetScreenPosition Bottom right Anchor Point and 30,420 position \n" ); - actorA.SetPosition( 30.0, 420.0 ); + actorA.SetProperty( Actor::Property::POSITION, Vector2( 30.0, 420.0 )); application.SendNotification(); application.Render(); @@ -6088,15 +6086,15 @@ int UtcDaliActorGetScreenPosition(void) tet_infoline( "UtcDaliActorGetScreenPosition Scale parent and check child's screen position \n" ); actorA.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - actorA.SetPosition( 30.0, 30.0 ); + actorA.SetProperty( Actor::Property::POSITION, Vector2( 30.0, 30.0 )); Actor actorB = Actor::New(); actorB.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - actorB.SetSize( size2 ); - actorB.SetPosition( 10.f, 10.f ); + actorB.SetProperty( Actor::Property::SIZE, size2 ); + actorB.SetProperty( Actor::Property::POSITION, Vector2( 10.f, 10.f )); actorA.Add( actorB ); - actorA.SetScale( 2.0f ); + actorA.SetProperty( Actor::Property::SCALE, 2.0f ); application.SendNotification(); application.Render(); @@ -6121,9 +6119,9 @@ int UtcDaliActorGetScreenPositionAfterScaling(void) actorA.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Vector2 size2( 10.0f, 20.0f ); - actorA.SetSize( size2 ); - actorA.SetScale( 1.5f ); - actorA.SetPosition( 0.f, 0.f ); + actorA.SetProperty( Actor::Property::SIZE, size2 ); + actorA.SetProperty( Actor::Property::SCALE, 1.5f ); + actorA.SetProperty( Actor::Property::POSITION, Vector2( 0.f, 0.f )); tet_infoline( "UtcDaliActorGetScreenPositionAfterScaling TopRight Anchor Point, scale 1.5f and 0,0 position \n" ); @@ -6172,8 +6170,8 @@ int UtcDaliActorGetScreenPositionWithDifferentParentOrigin(void) actorA.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); actorA.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Vector2 size2( 10.0f, 20.0f ); - actorA.SetSize( size2 ); - actorA.SetPosition( 0.f, 0.f ); + actorA.SetProperty( Actor::Property::SIZE, size2 ); + actorA.SetProperty( Actor::Property::POSITION, Vector2( 0.f, 0.f )); tet_infoline( " TOP_LEFT Anchor Point, ParentOrigin::CENTER and 0,0 position \n" ); @@ -6226,8 +6224,8 @@ int UtcDaliActorGetScreenPositionWithChildActors(void) actorA.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); actorA.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Vector2 size1( 10.0f, 20.0f ); - actorA.SetSize( size1 ); - actorA.SetPosition( 0.f, 0.f ); + actorA.SetProperty( Actor::Property::SIZE, size1 ); + actorA.SetProperty( Actor::Property::POSITION, Vector2( 0.f, 0.f )); tet_infoline( "Create Parent Actor 1 TOP_LEFT Anchor Point, ParentOrigin::CENTER and 0,0 position \n" ); @@ -6235,8 +6233,8 @@ int UtcDaliActorGetScreenPositionWithChildActors(void) parentActorA.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); parentActorA.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Vector2 size2( 30.0f, 60.0f ); - parentActorA.SetSize( size2 ); - parentActorA.SetPosition( 0.f, 0.f ); + parentActorA.SetProperty( Actor::Property::SIZE, size2 ); + parentActorA.SetProperty( Actor::Property::POSITION, Vector2( 0.f, 0.f )); tet_infoline( "Add child 1 to Parent 1 and check screen position \n" ); @@ -6291,8 +6289,8 @@ int UtcDaliActorGetScreenPositionWithChildActors02(void) actorA.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); actorA.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Vector2 size1( 10.0f, 20.0f ); - actorA.SetSize( size1 ); - actorA.SetPosition( 0.f, 0.f ); + actorA.SetProperty( Actor::Property::SIZE, size1 ); + actorA.SetProperty( Actor::Property::POSITION, Vector2( 0.f, 0.f )); tet_infoline( "Create Parent Actor 1 TOP_LEFT Anchor Point, ParentOrigin::CENTER and 0,0 position \n" ); @@ -6300,8 +6298,8 @@ int UtcDaliActorGetScreenPositionWithChildActors02(void) parentActorA.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); parentActorA.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Vector2 size2( 30.0f, 60.0f ); - parentActorA.SetSize( size2 ); - parentActorA.SetPosition( 0.f, 0.f ); + parentActorA.SetProperty( Actor::Property::SIZE, size2 ); + parentActorA.SetProperty( Actor::Property::POSITION, Vector2( 0.f, 0.f )); tet_infoline( "Create Grand Parent Actor 1 BOTTOM_LEFT Anchor Point, ParentOrigin::BOTTOM_LEFT and 0,0 position \n" ); @@ -6309,8 +6307,8 @@ int UtcDaliActorGetScreenPositionWithChildActors02(void) grandParentActorA.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_LEFT ); grandParentActorA.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_LEFT ); Vector2 size3( 60.0f, 120.0f ); - grandParentActorA.SetSize( size3 ); - grandParentActorA.SetPosition( 0.f, 0.f ); + grandParentActorA.SetProperty( Actor::Property::SIZE, size3 ); + grandParentActorA.SetProperty( Actor::Property::POSITION, Vector2( 0.f, 0.f )); tet_infoline( "Add Parent 1 to Grand Parent 1 \n" ); @@ -6350,7 +6348,7 @@ int UtcDaliActorGetScreenPositionPositionUsesAnchorPointFalse(void) actorA.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); actorA.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); actorA.SetProperty( DevelActor::Property::POSITION_USES_ANCHOR_POINT, false ); - actorA.SetSize( 10.0f, 20.0f ); + actorA.SetProperty( Actor::Property::SIZE, Vector2( 10.0f, 20.0f ) ); stage.Add( actorA ); tet_infoline( "Create an Actor with AnchorPoint::BOTTOM_RIGHT, ParentOrigin::CENTER and 0,0 position, POSITION_USES_ANCHOR false" ); @@ -6360,7 +6358,7 @@ int UtcDaliActorGetScreenPositionPositionUsesAnchorPointFalse(void) actorB.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); actorB.SetProperty( DevelActor::Property::POSITION_USES_ANCHOR_POINT, false ); Vector2 actorBSize( 30.0f, 60.0f ); - actorB.SetSize( actorBSize ); + actorB.SetProperty( Actor::Property::SIZE, actorBSize ); stage.Add( actorB ); tet_infoline( "Create an actor with AnchorPoint::CENTER, ParentOrigin::CENTER and 0,0 position, POSITION_USES_ANCHOR false" ); @@ -6370,7 +6368,7 @@ int UtcDaliActorGetScreenPositionPositionUsesAnchorPointFalse(void) actorC.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); actorC.SetProperty( DevelActor::Property::POSITION_USES_ANCHOR_POINT, false ); Vector2 actorCSize( 60.0f, 120.0f ); - actorC.SetSize( actorCSize ); + actorC.SetProperty( Actor::Property::SIZE, actorCSize ); stage.Add( actorC ); application.SendNotification(); @@ -6386,9 +6384,9 @@ int UtcDaliActorGetScreenPositionPositionUsesAnchorPointFalse(void) tet_infoline( "Add scale to all actors" ); - actorA.SetScale( 2.0f ); - actorB.SetScale( 2.0f ); - actorC.SetScale( 2.0f ); + actorA.SetProperty( Actor::Property::SCALE, 2.0f ); + actorB.SetProperty( Actor::Property::SCALE, 2.0f ); + actorC.SetProperty( Actor::Property::SCALE, 2.0f ); application.SendNotification(); application.Render(); @@ -6408,7 +6406,7 @@ int utcDaliActorPositionUsesAnchorPoint(void) Actor actor = Actor::New(); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); Stage::GetCurrent().Add( actor ); application.SendNotification(); @@ -6437,8 +6435,8 @@ int utcDaliActorPositionUsesAnchorPointCheckScale(void) Actor actor = Actor::New(); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); - actor.SetSize( 100.0f, 100.0f ); - actor.SetScale( 2.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); + actor.SetProperty( Actor::Property::SCALE, 2.0f ); actor.SetProperty( DevelActor::Property::POSITION_USES_ANCHOR_POINT, false ); Stage::GetCurrent().Add( actor ); @@ -6471,7 +6469,7 @@ int utcDaliActorPositionUsesAnchorPointCheckRotation(void) Actor actor = Actor::New(); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ORIENTATION, Quaternion( Degree( 90.0f), Vector3::ZAXIS ) ); actor.SetProperty( DevelActor::Property::POSITION_USES_ANCHOR_POINT, false ); Stage::GetCurrent().Add( actor ); @@ -6505,9 +6503,9 @@ int utcDaliActorPositionUsesAnchorPointCheckScaleAndRotation(void) Actor actor = Actor::New(); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ORIENTATION, Quaternion( Degree( 90.0f), Vector3::ZAXIS ) ); - actor.SetScale( 2.0f ); + actor.SetProperty( Actor::Property::SCALE, 2.0f ); actor.SetProperty( DevelActor::Property::POSITION_USES_ANCHOR_POINT, false ); Stage::GetCurrent().Add( actor ); @@ -6545,7 +6543,7 @@ int utcDaliActorPositionUsesAnchorPointOnlyInheritPosition(void) Actor actor = Actor::New(); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::INHERIT_SCALE, false ); actor.SetProperty( Actor::Property::INHERIT_ORIENTATION, false ); actor.SetProperty( DevelActor::Property::POSITION_USES_ANCHOR_POINT, false ); @@ -7171,7 +7169,7 @@ int utcDaliActorCulled(void) tet_infoline( "Check that the actor is culled if the actor is out of the screen" ); Actor actor = Actor::New(); - actor.SetSize( 10.0f, 10.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 10.0f, 10.0f ) ); Geometry geometry = CreateQuadGeometry(); Shader shader = CreateShader(); @@ -7194,7 +7192,7 @@ int utcDaliActorCulled(void) CulledPropertyNotificationFunctor f( propertyNotificationSignal, source ); notification.NotifySignal().Connect( &application, f ) ; - actor.SetPosition( 1000.0f, 1000.0f ); + actor.SetProperty( Actor::Property::POSITION, Vector2( 1000.0f, 1000.0f )); application.SendNotification(); application.Render(); @@ -7218,7 +7216,7 @@ int utcDaliEnsureRenderWhenRemovingLastRenderableActor(void) tet_infoline( "Ensure we clear the screen when the last actor is removed" ); Actor actor = CreateRenderableActor(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); stage.Add( actor ); application.SendNotification(); @@ -7245,7 +7243,7 @@ int utcDaliEnsureRenderWhenMakingLastActorInvisible(void) tet_infoline( "Ensure we clear the screen when the last actor is made invisible" ); Actor actor = CreateRenderableActor(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); stage.Add( actor ); application.SendNotification(); @@ -7272,7 +7270,7 @@ int utcDaliActorGetSizeAfterAnimation(void) Vector3 actorSize( 100.0f, 100.0f, 0.0f ); Actor actor = Actor::New(); - actor.SetSize( actorSize ); + actor.SetProperty( Actor::Property::SIZE, actorSize ); actor.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); Stage::GetCurrent().Add( actor ); @@ -7298,7 +7296,7 @@ int utcDaliActorGetSizeAfterAnimation(void) // Set size again actorSize = Vector3( 200.0f, 200.0f, 0.0f ); - actor.SetSize( actorSize ); + actor.SetProperty( Actor::Property::SIZE, actorSize ); size = actor.GetProperty( Actor::Property::SIZE ).Get< Vector3 >(); DALI_TEST_EQUALS( size, actorSize, Math::MACHINE_EPSILON_0, TEST_LOCATION ); @@ -7442,7 +7440,7 @@ int utcDaliActorGetSizeAfterAnimation(void) // Set size again actorSize = Vector3( 300.0f, 300.0f, 0.0f ); - actor.SetSize( actorSize ); + actor.SetProperty( Actor::Property::SIZE, actorSize ); size = actor.GetProperty( Actor::Property::SIZE ).Get< Vector3 >(); DALI_TEST_EQUALS( size, actorSize, Math::MACHINE_EPSILON_0, TEST_LOCATION ); diff --git a/automated-tests/src/dali/utc-Dali-Animation.cpp b/automated-tests/src/dali/utc-Dali-Animation.cpp index 6a67e8d..3ccf8a6 100644 --- a/automated-tests/src/dali/utc-Dali-Animation.cpp +++ b/automated-tests/src/dali/utc-Dali-Animation.cpp @@ -272,7 +272,7 @@ int UtcDaliAnimationSetDurationP(void) // Restart the animation, with a different duration finishCheck.Reset(); - actor.SetPosition(Vector3::ZERO); + actor.SetProperty( Actor::Property::POSITION, Vector3::ZERO ); durationSeconds = 3.5f; animation.SetDuration(durationSeconds); DALI_TEST_EQUALS(animation.GetDuration(), durationSeconds, TEST_LOCATION); @@ -847,7 +847,7 @@ int UtcDaliAnimationSetEndActionN(void) DALI_TEST_EQUALS( targetPosition, actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), TEST_LOCATION ); // Go back to the start - actor.SetPosition(Vector3::ZERO); + actor.SetProperty( Actor::Property::POSITION, Vector3::ZERO ); application.SendNotification(); application.Render(0); DALI_TEST_EQUALS( Vector3::ZERO, actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), TEST_LOCATION ); @@ -874,7 +874,7 @@ int UtcDaliAnimationSetEndActionN(void) DALI_TEST_EQUALS( targetPosition, actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), TEST_LOCATION ); // Go back to the start - actor.SetPosition(Vector3::ZERO); + actor.SetProperty( Actor::Property::POSITION, Vector3::ZERO ); application.SendNotification(); application.Render(0); DALI_TEST_EQUALS( Vector3::ZERO, actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), TEST_LOCATION ); @@ -1664,7 +1664,7 @@ int UtcDaliAnimationSetSpeedFactorAndRange(void) for( unsigned int actorIndex = 0; actorIndex < NUM_ENTRIES; ++actorIndex ) { Actor actor = Actor::New(); - actor.SetPosition( Vector3( testData[actorIndex].startX, 0, 0 ) ); + actor.SetProperty( Actor::Property::POSITION, Vector3( testData[actorIndex].startX, 0, 0 ) ); actors.push_back(actor); Stage::GetCurrent().Add(actor); @@ -1761,7 +1761,7 @@ int UtcDaliAnimationSetSpeedFactorRangeAndLoopCount01(void) std::vector actors; Actor actor = Actor::New(); - actor.SetPosition( Vector3( testData.startX, 0, 0 ) ); + actor.SetProperty( Actor::Property::POSITION, Vector3( testData.startX, 0, 0 ) ); actors.push_back(actor); Stage::GetCurrent().Add(actor); @@ -1843,7 +1843,7 @@ int UtcDaliAnimationSetSpeedFactorRangeAndLoopCount02(void) std::vector actors; Actor actor = Actor::New(); - actor.SetPosition( Vector3( testData.startX, 0, 0 ) ); + actor.SetProperty( Actor::Property::POSITION, Vector3( testData.startX, 0, 0 ) ); actors.push_back(actor); Stage::GetCurrent().Add(actor); @@ -2929,7 +2929,7 @@ int UtcDaliAnimationStopSetPositionP(void) // Stop the animation animation.Stop(); Vector3 positionSet(2.0f, 3.0f, 4.0f); - actor.SetPosition(positionSet); + actor.SetProperty( Actor::Property::POSITION, positionSet ); application.SendNotification(); // Loop 5 times @@ -2988,7 +2988,7 @@ int UtcDaliAnimationClearP(void) // Restart as a scale animation; this should not move the actor's position finishCheck.Reset(); - actor.SetPosition(Vector3::ZERO); + actor.SetProperty( Actor::Property::POSITION, Vector3::ZERO ); Vector3 targetScale(3.0f, 3.0f, 3.0f); animation.AnimateTo( Property( actor, Actor::Property::SCALE ), targetScale, AlphaFunction::LINEAR ); animation.Play(); @@ -4563,7 +4563,7 @@ int UtcDaliAnimationAnimateByActorPositionP(void) Actor actor = Actor::New(); Vector3 startPosition(10.0f, 10.0f, 10.0f); - actor.SetPosition(startPosition); + actor.SetProperty( Actor::Property::POSITION, startPosition ); Stage::GetCurrent().Add(actor); application.SendNotification(); application.Render(0); @@ -4657,7 +4657,7 @@ int UtcDaliAnimationAnimateByActorPositionAlphaFunctionP(void) Actor actor = Actor::New(); Vector3 startPosition(10.0f, 10.0f, 10.0f); - actor.SetPosition(startPosition); + actor.SetProperty( Actor::Property::POSITION, startPosition ); Stage::GetCurrent().Add(actor); application.SendNotification(); application.Render(0); @@ -4714,7 +4714,7 @@ int UtcDaliAnimationAnimateByActorPositionTimePeriodP(void) Actor actor = Actor::New(); Vector3 startPosition(10.0f, 10.0f, 10.0f); - actor.SetPosition(startPosition); + actor.SetProperty( Actor::Property::POSITION, startPosition ); Stage::GetCurrent().Add(actor); application.SendNotification(); application.Render(0); @@ -4769,7 +4769,7 @@ int UtcDaliAnimationAnimateByActorPositionAlphaFunctionTimePeriodP(void) Actor actor = Actor::New(); Vector3 startPosition(10.0f, 10.0f, 10.0f); - actor.SetPosition(startPosition); + actor.SetProperty( Actor::Property::POSITION, startPosition ); Stage::GetCurrent().Add(actor); application.SendNotification(); application.Render(0); @@ -5168,7 +5168,7 @@ int UtcDaliAnimationAnimateByActorScaleP(void) // Reset everything finishCheck.Reset(); - actor.SetScale(Vector3::ONE); + actor.SetProperty( Actor::Property::SCALE,Vector3::ONE); application.SendNotification(); application.Render(0); DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::SCALE ), Vector3::ONE, TEST_LOCATION ); @@ -5205,7 +5205,7 @@ int UtcDaliAnimationAnimateByActorScaleP(void) // Reset everything finishCheck.Reset(); - actor.SetScale(Vector3::ONE); + actor.SetProperty( Actor::Property::SCALE,Vector3::ONE); application.SendNotification(); application.Render(0); DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::SCALE ), Vector3::ONE, TEST_LOCATION ); @@ -7113,7 +7113,7 @@ int UtcDaliAnimationAnimateToActorSizeP(void) // Reset everything finishCheck.Reset(); - actor.SetSize(Vector3::ZERO); + actor.SetProperty( Actor::Property::SIZE,Vector3::ZERO); application.SendNotification(); application.Render(0); DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), Vector3::ZERO, TEST_LOCATION ); @@ -7150,7 +7150,7 @@ int UtcDaliAnimationAnimateToActorSizeP(void) // Reset everything finishCheck.Reset(); - actor.SetSize(Vector3::ZERO); + actor.SetProperty( Actor::Property::SIZE,Vector3::ZERO); application.SendNotification(); application.Render(0); DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), Vector3::ZERO, TEST_LOCATION ); @@ -7377,7 +7377,7 @@ int UtcDaliAnimationAnimateToActorSizeWidthHeightP(void) // Reset everything finishCheck.Reset(); - actor.SetSize(Vector3::ZERO); + actor.SetProperty( Actor::Property::SIZE,Vector3::ZERO); application.SendNotification(); application.Render(0); DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), Vector3::ZERO, TEST_LOCATION ); @@ -7414,7 +7414,7 @@ int UtcDaliAnimationAnimateToActorSizeWidthHeightP(void) // Reset everything finishCheck.Reset(); - actor.SetSize(Vector3::ZERO); + actor.SetProperty( Actor::Property::SIZE,Vector3::ZERO); application.SendNotification(); application.Render(0); DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), Vector3::ZERO, TEST_LOCATION ); @@ -8165,7 +8165,7 @@ int UtcDaliAnimationAnimateToActorScaleP(void) // Reset everything finishCheck.Reset(); - actor.SetScale(Vector3::ONE); + actor.SetProperty( Actor::Property::SCALE,Vector3::ONE); application.SendNotification(); application.Render(0); DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::SCALE ), Vector3::ONE, TEST_LOCATION ); @@ -8202,7 +8202,7 @@ int UtcDaliAnimationAnimateToActorScaleP(void) // Reset everything finishCheck.Reset(); - actor.SetScale(Vector3::ONE); + actor.SetProperty( Actor::Property::SCALE,Vector3::ONE); application.SendNotification(); application.Render(0); DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::SCALE ), Vector3::ONE, TEST_LOCATION ); @@ -11200,7 +11200,7 @@ int UtcDaliAnimationTimePeriodOrder(void) tet_infoline( "Same animation again but in a different order - should yield the same result" ); - actor.SetX( 0.0f ); + actor.SetProperty( Actor::Property::POSITION_X, 0.0f ); DALI_TEST_EQUALS( actor.GetProperty< Vector3 >( Actor::Property::POSITION ), Vector3::ZERO, TEST_LOCATION ); DALI_TEST_EQUALS( actor.GetProperty< float >( Actor::Property::POSITION_X ), 0.0f, TEST_LOCATION ); @@ -11276,7 +11276,7 @@ int UtcDaliAnimationTimePeriodOrderSeveralAnimateToCalls(void) tet_infoline( "Same animation again but in a different order - should end up at the same point" ); - actor.SetX( 0.0f ); + actor.SetProperty( Actor::Property::POSITION_X, 0.0f ); DALI_TEST_EQUALS( actor.GetProperty< Vector3 >( Actor::Property::POSITION ), Vector3::ZERO, TEST_LOCATION ); DALI_TEST_EQUALS( actor.GetProperty< float >( Actor::Property::POSITION_X ), 0.0f, TEST_LOCATION ); @@ -13501,7 +13501,7 @@ int UtcDaliAnimationCombineToAndByWithStop(void) TestApplication application; auto actor = Actor::New(); - actor.SetPosition( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::POSITION, Vector2( 100.0f, 100.0f )); Stage::GetCurrent().Add( actor ); auto animation = Animation::New( 1.0f ); @@ -13536,7 +13536,7 @@ int UtcDaliAnimationCountAndGetAnimationAt(void) TestApplication application; auto actor = Actor::New(); - actor.SetPosition( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::POSITION, Vector2( 100.0f, 100.0f )); Stage::GetCurrent().Add( actor ); auto animation = Animation::New( 1.0f ); diff --git a/automated-tests/src/dali/utc-Dali-BaseHandle.cpp b/automated-tests/src/dali/utc-Dali-BaseHandle.cpp index 94a5b4b..8bf71c4 100644 --- a/automated-tests/src/dali/utc-Dali-BaseHandle.cpp +++ b/automated-tests/src/dali/utc-Dali-BaseHandle.cpp @@ -420,8 +420,8 @@ int UtcDaliBaseHandleConnectSignal(void) Actor actor = Actor::New(); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); - actor.SetPosition( 240, 400 ); - actor.SetSize( 100, 100 ); + actor.SetProperty( Actor::Property::POSITION, Vector2( 240, 400 )); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100, 100 ) ); Stage::GetCurrent().Add( actor ); diff --git a/automated-tests/src/dali/utc-Dali-CameraActor.cpp b/automated-tests/src/dali/utc-Dali-CameraActor.cpp index a2335c9..5767315 100644 --- a/automated-tests/src/dali/utc-Dali-CameraActor.cpp +++ b/automated-tests/src/dali/utc-Dali-CameraActor.cpp @@ -1465,8 +1465,8 @@ int UtcDaliCameraActorModelView(void) BufferImage image = CreateBufferImage(); Actor actor = CreateRenderableActor(image); - actor.SetSize( 100.0f, 100.0f ); - actor.SetPosition( 20.0f, 30.0f, 40.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); + actor.SetProperty( Actor::Property::POSITION, Vector3( 20.0f, 30.0f, 40.0f )); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Stage::GetCurrent().Add( actor ); @@ -1501,7 +1501,7 @@ int UtcDaliCameraActorReadProjectionMatrix(void) application.SendNotification(); Image image = CreateBufferImage(); Actor actor = CreateRenderableActor( image, RENDER_SHADOW_VERTEX_SOURCE, RENDER_SHADOW_FRAGMENT_SOURCE ); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); Stage::GetCurrent().Add( actor ); Matrix projectionMatrix; @@ -1541,14 +1541,14 @@ int UtcDaliCameraActorAnimatedProperties(void) CameraActor camera = Stage::GetCurrent().GetRenderTaskList().GetTask( 0u ).GetCameraActor(); Actor actor = Actor::New(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); Stage::GetCurrent().Add( actor ); Constraint constraint = Constraint::New( actor, Actor::Property::POSITION, EqualToConstraint() ); constraint.AddSource( Source( camera, Actor::Property::POSITION ) ); constraint.Apply(); - camera.SetPosition( 100.0f, 200.0f, 300.0f ); + camera.SetProperty( Actor::Property::POSITION, Vector3( 100.0f, 200.0f, 300.0f )); application.SendNotification(); application.Render(); @@ -1582,7 +1582,7 @@ int UtcDaliCameraActorCheckLookAtAndFreeLookViews01(void) Vector3 targetPosition( 30.0f, 240.0f, -256.0f ); Actor target = Actor::New(); target.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - target.SetPosition( targetPosition ); + target.SetProperty( Actor::Property::POSITION, targetPosition ); Constraint cameraOrientationConstraint = Constraint::New ( freeLookCameraActor, Actor::Property::ORIENTATION, &LookAt ); cameraOrientationConstraint.AddSource( Source( target, Actor::Property::WORLD_POSITION ) ); @@ -1610,8 +1610,8 @@ int UtcDaliCameraActorCheckLookAtAndFreeLookViews01(void) position.Normalize(); position *= 200.0f; - freeLookCameraActor.SetPosition( position ); - lookAtCameraActor.SetPosition( position ); + freeLookCameraActor.SetProperty( Actor::Property::POSITION, position ); + lookAtCameraActor.SetProperty( Actor::Property::POSITION, position ); application.SendNotification(); application.Render(); @@ -1642,7 +1642,7 @@ int UtcDaliCameraActorCheckLookAtAndFreeLookViews02(void) Vector3 targetPosition( 30.0f, 240.0f, -256.0f ); Actor target = Actor::New(); target.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - target.SetPosition( targetPosition ); + target.SetProperty( Actor::Property::POSITION, targetPosition ); Constraint cameraOrientationConstraint = Constraint::New ( freeLookCameraActor, Actor::Property::ORIENTATION, &LookAt ); cameraOrientationConstraint.AddSource( Source( target, Actor::Property::WORLD_POSITION ) ); @@ -1671,8 +1671,8 @@ int UtcDaliCameraActorCheckLookAtAndFreeLookViews02(void) position.Normalize(); position *= 200.0f; - freeLookCameraActor.SetPosition( position ); - lookAtCameraActor.SetPosition( position ); + freeLookCameraActor.SetProperty( Actor::Property::POSITION, position ); + lookAtCameraActor.SetProperty( Actor::Property::POSITION, position ); application.SendNotification(); application.Render(); @@ -1707,7 +1707,7 @@ int UtcDaliCameraActorCheckLookAtAndFreeLookViews03(void) freeLookCameraActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Quaternion cameraOrientation( Radian( Degree( 180.0f ) ), Vector3::YAXIS ); - freeLookCameraActor.SetPosition( cameraOffset ); + freeLookCameraActor.SetProperty( Actor::Property::POSITION, cameraOffset ); freeLookCameraActor.SetProperty( Actor::Property::ORIENTATION, cameraOrientation ); Actor cameraAnchor = Actor::New(); @@ -1719,7 +1719,7 @@ int UtcDaliCameraActorCheckLookAtAndFreeLookViews03(void) { Quaternion rotation( Radian( Degree( angle ) ), Vector3::YAXIS ); - freeLookCameraActor.SetPosition( rotation.Rotate( cameraOffset ) ); + freeLookCameraActor.SetProperty( Actor::Property::POSITION, rotation.Rotate( cameraOffset ) ); cameraAnchor.SetProperty( Actor::Property::ORIENTATION, rotation ); application.SendNotification(); @@ -1751,9 +1751,9 @@ int UtcDaliCameraActorReflectionByPlane(void) CameraActor freeLookCameraActor = stage.GetRenderTaskList().GetTask(0).GetCameraActor(); freeLookCameraActor.SetType(Camera::LOOK_AT_TARGET); freeLookCameraActor.SetTargetPosition( targetPosition ); - freeLookCameraActor.SetPosition(cameraOffset); + freeLookCameraActor.SetProperty( Actor::Property::POSITION, cameraOffset ); - stage.GetRootLayer().SetPosition( 1, 0 ); + stage.GetRootLayer().SetProperty( Actor::Property::POSITION, Vector2( 1, 0 )); application.SendNotification(); application.Render(); @@ -1763,7 +1763,7 @@ int UtcDaliCameraActorReflectionByPlane(void) Matrix matrixBefore, matrixAfter; freeLookCameraActor.GetProperty( CameraActor::CameraActor::Property::VIEW_MATRIX ).Get( matrixBefore ); freeLookCameraActor.SetProperty( Dali::DevelCameraActor::Property::REFLECTION_PLANE, Vector4( 0.0f, 1.0f, 0.0f, 0.0f)); - stage.GetRootLayer().SetPosition( 0, 0 ); + stage.GetRootLayer().SetProperty( Actor::Property::POSITION, Vector2( 0, 0 )); application.SendNotification(); application.Render(); application.SendNotification(); diff --git a/automated-tests/src/dali/utc-Dali-Constraint.cpp b/automated-tests/src/dali/utc-Dali-Constraint.cpp index b741255..0b786c9 100644 --- a/automated-tests/src/dali/utc-Dali-Constraint.cpp +++ b/automated-tests/src/dali/utc-Dali-Constraint.cpp @@ -418,8 +418,8 @@ int UtcDaliConstraintCloneP(void) calledCount = 0; // Change the position of both actors - actor.SetPosition( 100.0f, 100.0f ); - clone.SetPosition( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::POSITION, Vector2( 100.0f, 100.0f )); + clone.SetProperty( Actor::Property::POSITION, Vector2( 100.0f, 100.0f )); application.SendNotification(); application.Render(); @@ -1037,7 +1037,7 @@ int UtcDaliConstraintApplySeveralTimes(void) count = 0; // Change the position property, apply again - actor.SetPosition( 10.0f, 10.0f ); + actor.SetProperty( Actor::Property::POSITION, Vector2( 10.0f, 10.0f )); constraint.Apply(); application.SendNotification(); diff --git a/automated-tests/src/dali/utc-Dali-Context.cpp b/automated-tests/src/dali/utc-Dali-Context.cpp index 1a6f094..b76be32 100644 --- a/automated-tests/src/dali/utc-Dali-Context.cpp +++ b/automated-tests/src/dali/utc-Dali-Context.cpp @@ -47,7 +47,7 @@ static Actor CreateBitmapActor() { BufferImage image = BufferImage::New(4,4,Pixel::RGBA8888); Actor actor = CreateRenderableActor( image ); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::NAME,"Test Image Rendering Actor"); return actor; } diff --git a/automated-tests/src/dali/utc-Dali-CustomActor.cpp b/automated-tests/src/dali/utc-Dali-CustomActor.cpp index e109d49..34d0fce 100644 --- a/automated-tests/src/dali/utc-Dali-CustomActor.cpp +++ b/automated-tests/src/dali/utc-Dali-CustomActor.cpp @@ -889,15 +889,17 @@ int UtcDaliCustomActorOnSizeSet(void) Test::TestCustomActor custom = Test::TestCustomActor::New(); DALI_TEST_EQUALS( 0, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION ); - custom.SetSize( Vector2( 9.0f, 10.0f ) ); - DALI_TEST_EQUALS( 1, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION ); + custom.SetProperty( Actor::Property::SIZE, Vector2( 9.0f, 10.0f ) ); + DALI_TEST_EQUALS( 2, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION ); DALI_TEST_EQUALS( "OnSizeSet", custom.GetMethodsCalled()[ 0 ], TEST_LOCATION ); + DALI_TEST_EQUALS( "OnPropertySet", custom.GetMethodsCalled()[ 1 ], TEST_LOCATION ); DALI_TEST_EQUALS( 9.0f, custom.GetSize().width, TEST_LOCATION ); DALI_TEST_EQUALS( 10.0f, custom.GetSize().height, TEST_LOCATION ); - custom.SetSize( Vector3( 4.0f, 5.0f, 6.0f ) ); - DALI_TEST_EQUALS( 2, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION ); - DALI_TEST_EQUALS( "OnSizeSet", custom.GetMethodsCalled()[ 1 ], TEST_LOCATION ); + custom.SetProperty( Actor::Property::SIZE, Vector3( 4.0f, 5.0f, 6.0f ) ); + DALI_TEST_EQUALS( 4, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION ); + DALI_TEST_EQUALS( "OnSizeSet", custom.GetMethodsCalled()[ 2 ], TEST_LOCATION ); + DALI_TEST_EQUALS( "OnPropertySet", custom.GetMethodsCalled()[ 3 ], TEST_LOCATION ); DALI_TEST_EQUALS( 4.0f, custom.GetSize().width, TEST_LOCATION ); DALI_TEST_EQUALS( 5.0f, custom.GetSize().height, TEST_LOCATION ); DALI_TEST_EQUALS( 6.0f, custom.GetSize().depth, TEST_LOCATION ); @@ -936,24 +938,24 @@ int UtcDaliCustomActorSizeComponentAnimation(void) float intialWidth( 10.0f ); DALI_TEST_EQUALS( 0, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION ); - custom.SetSize( intialWidth, 10.0f); // First method + custom.SetProperty( Actor::Property::SIZE, Vector2( intialWidth, 10.0f) ); // First method Animation anim = Animation::New( 1.0f ); - DALI_TEST_EQUALS( 1, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION ); + DALI_TEST_EQUALS( 2, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION ); anim.AnimateTo( Property( custom, Actor::Property::SIZE_WIDTH ), 20.0f ); - DALI_TEST_EQUALS( 1, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION ); + DALI_TEST_EQUALS( 2, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION ); anim.Play(); // Triggers second method ( OnSizeAnimation ) application.SendNotification(); application.Render( static_cast( 1000.0f ) ); - DALI_TEST_EQUALS( 2, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION ); + DALI_TEST_EQUALS( 3, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION ); - DALI_TEST_EQUALS( "OnSizeAnimation", custom.GetMethodsCalled()[ 1 ], TEST_LOCATION ); + DALI_TEST_EQUALS( "OnSizeAnimation", custom.GetMethodsCalled()[ 2 ], TEST_LOCATION ); END_TEST; @@ -968,7 +970,7 @@ int UtcDaliCustomActorOnTouchEvent(void) DALI_TEST_EQUALS( 0, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION ); // set size for custom actor - custom.SetSize( 100, 100 ); + custom.SetProperty( Actor::Property::SIZE, Vector2( 100, 100 ) ); // add the custom actor to stage Stage::GetCurrent().Add( custom ); custom.ResetCallStack(); @@ -1001,7 +1003,7 @@ int UtcDaliCustomActorOnHoverEvent(void) DALI_TEST_EQUALS( 0, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION ); // set size for custom actor - custom.SetSize( 100, 100 ); + custom.SetProperty( Actor::Property::SIZE, Vector2( 100, 100 ) ); // add the custom actor to stage Stage::GetCurrent().Add( custom ); custom.ResetCallStack(); @@ -1034,7 +1036,7 @@ int UtcDaliCustomActorOnWheelEvent(void) DALI_TEST_EQUALS( 0, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION ); // set size for custom actor - custom.SetSize( 100, 100 ); + custom.SetProperty( Actor::Property::SIZE, Vector2( 100, 100 ) ); // add the custom actor to stage Stage::GetCurrent().Add( custom ); custom.ResetCallStack(); @@ -1201,7 +1203,7 @@ int UtcDaliCustomActorImplCalculateChildSizeBase(void) Actor child = Actor::New(); child.SetResizePolicy(Dali::ResizePolicy::FIXED, Dali::Dimension::ALL_DIMENSIONS); - child.SetSize(150, 150); + child.SetProperty( Actor::Property::SIZE, Vector2( 150, 150 ) ); application.SendNotification(); application.Render(); diff --git a/automated-tests/src/dali/utc-Dali-FrameCallbackInterface.cpp b/automated-tests/src/dali/utc-Dali-FrameCallbackInterface.cpp index 85dae6a..a714083 100644 --- a/automated-tests/src/dali/utc-Dali-FrameCallbackInterface.cpp +++ b/automated-tests/src/dali/utc-Dali-FrameCallbackInterface.cpp @@ -313,10 +313,10 @@ int UtcDaliFrameCallbackGetters(void) Actor actor = Actor::New(); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - actor.SetSize( actorSize ); + actor.SetProperty( Actor::Property::SIZE, actorSize ); actor.SetProperty( Actor::Property::COLOR, color ); - actor.SetPosition( position ); - actor.SetScale( scale ); + actor.SetProperty( Actor::Property::POSITION, position ); + actor.SetProperty( Actor::Property::SCALE, scale ); Stage stage = Stage::GetCurrent(); stage.Add( actor ); @@ -348,7 +348,7 @@ int UtcDaliFrameCallbackSetters(void) Actor actor = Actor::New(); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - actor.SetSize( actorSize ); + actor.SetProperty( Actor::Property::SIZE, actorSize ); Stage stage = Stage::GetCurrent(); stage.Add( actor ); @@ -412,7 +412,7 @@ int UtcDaliFrameCallbackBake(void) Actor actor = Actor::New(); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - actor.SetSize( actorSize ); + actor.SetProperty( Actor::Property::SIZE, actorSize ); Stage stage = Stage::GetCurrent(); stage.Add( actor ); @@ -508,57 +508,57 @@ int UtcDaliFrameCallbackMultipleActors(void) Actor actorA = Actor::New(); actorA.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); actorA.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - actorA.SetSize( sizes['A'] ); - actorA.SetPosition( positions['A'] ); + actorA.SetProperty( Actor::Property::SIZE, sizes['A'] ); + actorA.SetProperty( Actor::Property::POSITION, positions['A'] ); stage.Add( actorA ); Actor actorB = Actor::New(); actorB.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_RIGHT ); actorB.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - actorB.SetSize( sizes['B'] ); - actorB.SetPosition( positions['B'] ); + actorB.SetProperty( Actor::Property::SIZE, sizes['B'] ); + actorB.SetProperty( Actor::Property::POSITION, positions['B'] ); actorA.Add( actorB ); Actor actorC = Actor::New(); actorC.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER ); actorC.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER ); - actorC.SetSize( sizes['C'] ); - actorC.SetPosition( positions['C'] ); + actorC.SetProperty( Actor::Property::SIZE, sizes['C'] ); + actorC.SetProperty( Actor::Property::POSITION, positions['C'] ); actorB.Add( actorC ); Actor actorD = Actor::New(); actorD.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER_RIGHT ); actorD.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER_LEFT ); - actorD.SetSize( sizes['D'] ); - actorD.SetPosition( positions['D'] ); + actorD.SetProperty( Actor::Property::SIZE, sizes['D'] ); + actorD.SetProperty( Actor::Property::POSITION, positions['D'] ); actorA.Add( actorD ); Actor actorE = Actor::New(); actorE.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_LEFT ); actorE.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_LEFT ); - actorE.SetSize( sizes['E'] ); - actorE.SetPosition( positions['E'] ); + actorE.SetProperty( Actor::Property::SIZE, sizes['E'] ); + actorE.SetProperty( Actor::Property::POSITION, positions['E'] ); stage.Add( actorE ); Actor actorF = Actor::New(); actorF.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER ); actorF.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER ); - actorF.SetSize( sizes['F'] ); - actorF.SetPosition( positions['F'] ); + actorF.SetProperty( Actor::Property::SIZE, sizes['F'] ); + actorF.SetProperty( Actor::Property::POSITION, positions['F'] ); actorE.Add( actorF ); Actor actorG = Actor::New(); actorG.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER_RIGHT ); actorG.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER_LEFT ); - actorG.SetSize( sizes['G'] ); - actorG.SetPosition( positions['G'] ); + actorG.SetProperty( Actor::Property::SIZE, sizes['G'] ); + actorG.SetProperty( Actor::Property::POSITION, positions['G'] ); actorE.Add( actorG ); Actor actorH = Actor::New(); actorH.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_RIGHT ); actorH.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_LEFT ); - actorH.SetSize( sizes['H'] ); - actorH.SetPosition( positions['H'] ); + actorH.SetProperty( Actor::Property::SIZE, sizes['H'] ); + actorH.SetProperty( Actor::Property::POSITION, positions['H'] ); actorG.Add( actorH ); std::map< char, unsigned int > actorIds; @@ -614,7 +614,7 @@ int UtcDaliFrameCallbackCheckActorNotAdded(void) Actor actor = Actor::New(); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - actor.SetSize( 200, 300 ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 200, 300 ) ); Stage stage = Stage::GetCurrent(); FrameCallbackOneActor frameCallback( actor.GetId() ); diff --git a/automated-tests/src/dali/utc-Dali-Geometry.cpp b/automated-tests/src/dali/utc-Dali-Geometry.cpp index 6fb9b80..ab99c59 100644 --- a/automated-tests/src/dali/utc-Dali-Geometry.cpp +++ b/automated-tests/src/dali/utc-Dali-Geometry.cpp @@ -140,7 +140,7 @@ int UtcDaliGeometryAddVertexBuffer(void) Shader shader = CreateShader(); Renderer renderer = Renderer::New(geometry, shader); Actor actor = Actor::New(); - actor.SetSize(Vector3::ONE * 100.f); + actor.SetProperty( Actor::Property::SIZE,Vector3::ONE * 100.f); actor.AddRenderer(renderer); Stage::GetCurrent().Add(actor); @@ -218,7 +218,7 @@ int UtcDaliGeometryRemoveVertexBuffer(void) Shader shader = CreateShader(); Renderer renderer = Renderer::New(geometry, shader); Actor actor = Actor::New(); - actor.SetSize(Vector3::ONE * 100.f); + actor.SetProperty( Actor::Property::SIZE,Vector3::ONE * 100.f); actor.AddRenderer(renderer); Stage::GetCurrent().Add(actor); @@ -251,7 +251,7 @@ int UtcDaliGeometrySetIndexBuffer(void) Shader shader = CreateShader(); Renderer renderer = Renderer::New(geometry, shader); Actor actor = Actor::New(); - actor.SetSize(Vector3::ONE * 100.f); + actor.SetProperty( Actor::Property::SIZE,Vector3::ONE * 100.f); actor.AddRenderer(renderer); Stage::GetCurrent().Add(actor); @@ -309,7 +309,7 @@ int UtcDaliGeometrySetGetGeometryType01(void) Shader shader = CreateShader(); Renderer renderer = Renderer::New(geometry, shader); Actor actor = Actor::New(); - actor.SetSize(Vector3::ONE * 100.f); + actor.SetProperty( Actor::Property::SIZE,Vector3::ONE * 100.f); actor.AddRenderer(renderer); Stage::GetCurrent().Add(actor); @@ -441,7 +441,7 @@ int UtcDaliGeometrySetGetGeometryType02(void) Shader shader = CreateShader(); Renderer renderer = Renderer::New(geometry, shader); Actor actor = Actor::New(); - actor.SetSize(Vector3::ONE * 100.f); + actor.SetProperty( Actor::Property::SIZE,Vector3::ONE * 100.f); actor.AddRenderer(renderer); Stage::GetCurrent().Add(actor); diff --git a/automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp b/automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp index cec4044..c948356 100644 --- a/automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp +++ b/automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp @@ -115,7 +115,7 @@ int UtcDaliHitTestAlgorithmWithFunctor(void) Stage stage = Stage::GetCurrent(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); actor.SetProperty( Actor::Property::NAME,"NonHittableActor"); stage.Add(actor); @@ -157,7 +157,7 @@ int UtcDaliHitTestAlgorithmOrtho01(void) Vector2 stageSize ( stage.GetSize() ); cameraActor.SetOrthographicProjection( stageSize ); - cameraActor.SetPosition(0.0f, 0.0f, 1600.0f); + cameraActor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 0.0f, 1600.0f)); Vector2 actorSize( stageSize * 0.5f ); // Create two actors with half the size of the stage and set them to be partially overlapping @@ -165,14 +165,14 @@ int UtcDaliHitTestAlgorithmOrtho01(void) blue.SetProperty( Actor::Property::NAME, "Blue" ); blue.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); blue.SetProperty( Actor::Property::PARENT_ORIGIN, Vector3(1.0f/3.0f, 1.0f/3.0f, 0.5f) ); - blue.SetSize( actorSize ); - blue.SetZ(30.0f); + blue.SetProperty( Actor::Property::SIZE, actorSize ); + blue.SetProperty( Actor::Property::POSITION_Z, 30.0f); Actor green = Actor::New( ); green.SetProperty( Actor::Property::NAME, "Green" ); green.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); green.SetProperty( Actor::Property::PARENT_ORIGIN, Vector3(2.0f/3.0f, 2.0f/3.0f, 0.5f) ); - green.SetSize( actorSize ); + green.SetProperty( Actor::Property::SIZE, actorSize ); // Add the actors to the view stage.Add( blue ); @@ -213,7 +213,7 @@ int UtcDaliHitTestAlgorithmOrtho02(void) cameraActor.SetOrthographicProjection(-stageSize.x * 0.3f, stageSize.x * 0.7f, stageSize.y * 0.3f, -stageSize.y * 0.7f, 800.0f, 4895.0f); - cameraActor.SetPosition(0.0f, 0.0f, 1600.0f); + cameraActor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 0.0f, 1600.0f)); Vector2 actorSize( stageSize * 0.5f ); // Create two actors with half the size of the stage and set them to be partially overlapping @@ -221,14 +221,14 @@ int UtcDaliHitTestAlgorithmOrtho02(void) blue.SetProperty( Actor::Property::NAME, "Blue" ); blue.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); blue.SetProperty( Actor::Property::PARENT_ORIGIN, Vector3(0.2f, 0.2f, 0.5f) ); - blue.SetSize( actorSize ); - blue.SetZ(30.0f); + blue.SetProperty( Actor::Property::SIZE, actorSize ); + blue.SetProperty( Actor::Property::POSITION_Z, 30.0f); Actor green = Actor::New( ); green.SetProperty( Actor::Property::NAME, "Green" ); green.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); green.SetProperty( Actor::Property::PARENT_ORIGIN, Vector3(0.4f, 0.4f, 0.5f) ); - green.SetSize( actorSize ); + green.SetProperty( Actor::Property::SIZE, actorSize ); // Add the actors to the view stage.Add( blue ); @@ -291,14 +291,14 @@ int UtcDaliHitTestAlgorithmClippingActor(void) Actor clippingActor = CreateRenderableActor( Dali::BufferImage::WHITE() ); clippingActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); clippingActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); - clippingActor.SetSize( 50.0f, 50.0f ); + clippingActor.SetProperty( Actor::Property::SIZE, Vector2( 50.0f, 50.0f ) ); clippingActor.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN ); clippingActor.SetProperty( Actor::Property::NAME, "clippingActor" ); layer.Add( clippingActor ); // Create a renderable actor and add it to the clipping actor. Actor childActor = CreateRenderableActor( Dali::BufferImage::WHITE() ); - childActor.SetSize( 100.0f, 100.0f ); + childActor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); childActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); childActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); childActor.SetProperty( Actor::Property::NAME, "childActor" ); @@ -334,7 +334,7 @@ int UtcDaliHitTestAlgorithmOverlay(void) Vector2 stageSize ( stage.GetSize() ); cameraActor.SetOrthographicProjection( stageSize ); - cameraActor.SetPosition(0.0f, 0.0f, 1600.0f); + cameraActor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 0.0f, 1600.0f)); Vector2 actorSize( stageSize * 0.5f ); // Create two actors with half the size of the stage and set them to be partially overlapping @@ -343,14 +343,14 @@ int UtcDaliHitTestAlgorithmOverlay(void) blue.SetProperty( Actor::Property::NAME, "Blue" ); blue.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); blue.SetProperty( Actor::Property::PARENT_ORIGIN, Vector3(1.0f/3.0f, 1.0f/3.0f, 0.5f) ); - blue.SetSize( actorSize ); - blue.SetZ(30.0f); + blue.SetProperty( Actor::Property::SIZE, actorSize ); + blue.SetProperty( Actor::Property::POSITION_Z, 30.0f); Actor green = Actor::New( ); green.SetProperty( Actor::Property::NAME, "Green" ); green.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); green.SetProperty( Actor::Property::PARENT_ORIGIN, Vector3(2.0f/3.0f, 2.0f/3.0f, 0.5f) ); - green.SetSize( actorSize ); + green.SetProperty( Actor::Property::SIZE, actorSize ); // Add the actors to the view stage.Add( blue ); diff --git a/automated-tests/src/dali/utc-Dali-HoverProcessing.cpp b/automated-tests/src/dali/utc-Dali-HoverProcessing.cpp index 9e543ac..fb3e839 100644 --- a/automated-tests/src/dali/utc-Dali-HoverProcessing.cpp +++ b/automated-tests/src/dali/utc-Dali-HoverProcessing.cpp @@ -136,7 +136,7 @@ int UtcDaliHoverNormalProcessing(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -205,7 +205,7 @@ int UtcDaliHoverOutsideCameraNearFarPlanes(void) Vector2 stageSize = stage.GetSize(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER); actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); stage.Add(actor); @@ -238,7 +238,7 @@ int UtcDaliHoverOutsideCameraNearFarPlanes(void) data.Reset(); // Emit a started signal where actor is just at the camera's near plane - actor.SetZ(distance - nearPlane); + actor.SetProperty( Actor::Property::POSITION_Z, distance - nearPlane); // Render and notify application.SendNotification(); @@ -249,7 +249,7 @@ int UtcDaliHoverOutsideCameraNearFarPlanes(void) data.Reset(); // Emit a started signal where actor is closer than the camera's near plane - actor.SetZ((distance - nearPlane) + 1.0f); + actor.SetProperty( Actor::Property::POSITION_Z, (distance - nearPlane) + 1.0f); // Render and notify application.SendNotification(); @@ -260,7 +260,7 @@ int UtcDaliHoverOutsideCameraNearFarPlanes(void) data.Reset(); // Emit a started signal where actor is just at the camera's far plane - actor.SetZ(distance - farPlane); + actor.SetProperty( Actor::Property::POSITION_Z, distance - farPlane); // Render and notify application.SendNotification(); @@ -271,7 +271,7 @@ int UtcDaliHoverOutsideCameraNearFarPlanes(void) data.Reset(); // Emit a started signal where actor is further than the camera's far plane - actor.SetZ((distance - farPlane) - 1.0f); + actor.SetProperty( Actor::Property::POSITION_Z, (distance - farPlane) - 1.0f); // Render and notify application.SendNotification(); @@ -306,7 +306,7 @@ int UtcDaliHoverInterrupted(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -343,7 +343,7 @@ int UtcDaliHoverParentConsumer(void) Actor rootActor( Stage::GetCurrent().GetRootLayer() ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -443,7 +443,7 @@ int UtcDaliHoverInterruptedParentConsumer(void) Actor rootActor( Stage::GetCurrent().GetRootLayer() ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -520,7 +520,7 @@ int UtcDaliHoverLeave(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -575,7 +575,7 @@ int UtcDaliHoverLeaveParentConsumer(void) Actor rootActor( Stage::GetCurrent().GetRootLayer() ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -656,7 +656,7 @@ int UtcDaliHoverActorBecomesInsensitive(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -692,7 +692,7 @@ int UtcDaliHoverActorBecomesInsensitiveParentConsumer(void) Actor rootActor( Stage::GetCurrent().GetRootLayer() ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -749,14 +749,14 @@ int UtcDaliHoverMultipleLayers(void) HoverEventFunctor functor( data ); Layer layer1 ( Layer::New() ); - layer1.SetSize(100.0f, 100.0f); + layer1.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); layer1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add( layer1 ); Actor actor1 ( Actor::New() ); - actor1.SetSize( 100.0f, 100.0f ); + actor1.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - actor1.SetZ( 1.0f ); // Should hit actor1 in this layer + actor1.SetProperty( Actor::Property::POSITION_Z, 1.0f ); // Should hit actor1 in this layer layer1.Add( actor1 ); // Render and notify @@ -797,13 +797,13 @@ int UtcDaliHoverMultipleLayers(void) // Add another layer Layer layer2 ( Layer::New() ); - layer2.SetSize(100.0f, 100.0f ); + layer2.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); layer2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - layer2.SetZ( 10.0f ); // Should hit layer2 in this layer rather than actor2 + layer2.SetProperty( Actor::Property::POSITION_Z, 10.0f ); // Should hit layer2 in this layer rather than actor2 Stage::GetCurrent().Add( layer2 ); Actor actor2 ( Actor::New() ); - actor2.SetSize(100.0f, 100.0f); + actor2.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); layer2.Add( actor2 ); @@ -865,7 +865,7 @@ int UtcDaliHoverMultipleRenderTasks(void) Vector2 stageSize ( stage.GetSize() ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); stage.Add(actor); @@ -909,12 +909,12 @@ int UtcDaliHoverMultipleRenderTasksWithChildLayer(void) Vector2 stageSize ( stage.GetSize() ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); stage.Add(actor); Layer layer = Layer::New(); - layer.SetSize(100.0f, 100.0f); + layer.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); layer.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); actor.Add(layer); @@ -965,12 +965,12 @@ int UtcDaliHoverOffscreenRenderTasks(void) // Create a renderable actor to display the FrameBufferImage Actor renderableActor = CreateRenderableActor( frameBufferImage ); renderableActor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); - renderableActor.SetSize( stageSize.x, stageSize.y ); + renderableActor.SetProperty( Actor::Property::SIZE, Vector2( stageSize.x, stageSize.y ) ); renderableActor.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); // FIXME stage.Add( renderableActor ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); stage.Add( actor ); application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); // Ensure framebuffer connects @@ -1010,12 +1010,12 @@ int UtcDaliHoverMultipleRenderableActors(void) Vector2 stageSize ( stage.GetSize() ); Actor parent = CreateRenderableActor(); - parent.SetSize( 100.0f, 100.0f ); + parent.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); parent.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); stage.Add(parent); Actor actor = CreateRenderableActor(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); parent.Add(actor); @@ -1041,7 +1041,7 @@ int UtcDaliHoverActorRemovedInSignal(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1110,7 +1110,7 @@ int UtcDaliHoverActorSignalNotConsumed(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1134,7 +1134,7 @@ int UtcDaliHoverActorUnStaged(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1172,7 +1172,7 @@ int UtcDaliHoverLeaveActorReadded(void) Stage stage = Stage::GetCurrent(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); stage.Add(actor); @@ -1218,20 +1218,20 @@ int UtcDaliHoverClippingActor(void) Stage stage = Stage::GetCurrent(); Actor actor = Actor::New(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); stage.Add( actor ); Actor clippingActor = Actor::New(); - clippingActor.SetSize( 50.0f, 50.0f ); + clippingActor.SetProperty( Actor::Property::SIZE, Vector2( 50.0f, 50.0f ) ); clippingActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); clippingActor.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN ); stage.Add( clippingActor ); // Add a child to the clipped region. Actor clippingChild = Actor::New(); - clippingChild.SetSize( 50.0f, 50.0f ); - clippingChild.SetPosition( 25.0f, 25.0f ); + clippingChild.SetProperty( Actor::Property::SIZE, Vector2( 50.0f, 50.0f ) ); + clippingChild.SetProperty( Actor::Property::POSITION, Vector2( 25.0f, 25.0f )); clippingChild.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); clippingActor.Add( clippingChild ); diff --git a/automated-tests/src/dali/utc-Dali-Layer.cpp b/automated-tests/src/dali/utc-Dali-Layer.cpp index 65abc00..f71b499 100644 --- a/automated-tests/src/dali/utc-Dali-Layer.cpp +++ b/automated-tests/src/dali/utc-Dali-Layer.cpp @@ -264,9 +264,9 @@ int UtcDaliLayerSetSortFunction(void) // create two transparent actors so there is something to sort Actor actor = CreateRenderableActor( img ); Actor actor2 = CreateRenderableActor( img ); - actor.SetSize(1,1); + actor.SetProperty( Actor::Property::SIZE, Vector2( 1, 1 ) ); actor.SetProperty( Actor::Property::COLOR, Vector4(1, 1, 1, 0.5f ) ); // 50% transparent - actor2.SetSize(1,1); + actor2.SetProperty( Actor::Property::SIZE, Vector2( 1, 1 ) ); actor2.SetProperty( Actor::Property::COLOR, Vector4(1, 1, 1, 0.5f ) ); // 50% transparent // add to stage diff --git a/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp index 21869c5..d9fb1c8 100644 --- a/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp @@ -196,7 +196,7 @@ int UtcDaliLongPressGestureDetectorNew(void) // Attach an actor and emit a touch event on the actor to ensure complete line coverage Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -277,7 +277,7 @@ int UtcDaliLongPressGestureSignalReceptionNegative(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -305,7 +305,7 @@ int UtcDaliLongPressGestureSignalReceptionPositive(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -334,7 +334,7 @@ int UtcDaliLongPressGestureSignalReceptionDetach(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -389,7 +389,7 @@ int UtcDaliLongPressGestureSignalReceptionActorDestroyedDuringLongPress(void) // Actor lifetime is scoped { Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -424,7 +424,7 @@ int UtcDaliLongPressGestureSignalReceptionRotatedActor(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ORIENTATION, Quaternion( Dali::Degree(90.0f), Vector3::ZAXIS ) ); Stage::GetCurrent().Add(actor); @@ -477,7 +477,7 @@ int UtcDaliLongPressGestureSignalReceptionChildHit(void) TestApplication application; Actor parent = Actor::New(); - parent.SetSize(100.0f, 100.0f); + parent.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); parent.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(parent); @@ -485,7 +485,7 @@ int UtcDaliLongPressGestureSignalReceptionChildHit(void) // Change rotation of child to be different from parent so that we can check if our local coordinate // conversion of the parent actor is correct. Actor child = Actor::New(); - child.SetSize(100.0f, 100.0f); + child.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); child.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER); child.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); child.SetProperty( Actor::Property::ORIENTATION, Quaternion(Dali::Degree(90.0f), Vector3::ZAXIS) ); @@ -532,13 +532,13 @@ int UtcDaliLongPressGestureSignalReceptionAttachDetachMany(void) TestApplication application; Actor first = Actor::New(); - first.SetSize(100.0f, 100.0f); + first.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); first.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(first); Actor second = Actor::New(); - second.SetSize(100.0f, 100.0f); - second.SetX(100.0f); + second.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); + second.SetProperty( Actor::Property::POSITION_X, 100.0f); second.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(second); @@ -589,7 +589,7 @@ int UtcDaliLongPressGestureSignalReceptionActorBecomesUntouchable(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -629,7 +629,7 @@ int UtcDaliLongPressGestureSignalReceptionMultipleDetectorsOnActor(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -663,7 +663,7 @@ int UtcDaliLongPressGestureSignalReceptionDifferentPossible(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -683,7 +683,7 @@ int UtcDaliLongPressGestureSignalReceptionDifferentPossible(void) DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION); // Move actor somewhere else - actor.SetPosition( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::POSITION, Vector2( 100.0f, 100.0f )); // Render and notify application.SendNotification(); @@ -699,7 +699,7 @@ int UtcDaliLongPressGestureSignalReceptionDifferentPossible(void) DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION); // Move actor in to the long press position. - actor.SetPosition( 0.0f, 0.0f ); + actor.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f )); // Render and notify application.SendNotification(); @@ -722,7 +722,7 @@ int UtcDaliLongPressGesturePossibleCancelled(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -750,7 +750,7 @@ int UtcDaliLongPressGestureDetachAfterStarted(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -784,7 +784,7 @@ int UtcDaliLongPressGestureActorUnstaged(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -838,14 +838,14 @@ int UtcDaliLongPressGestureActorStagedAndDestroyed(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); // Create and add a second actor so that GestureDetector destruction does not come into play. Actor dummyActor( Actor::New() ); - dummyActor.SetSize( 100.0f, 100.0f ); - dummyActor.SetPosition( 100.0f, 100.0f ); + dummyActor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); + dummyActor.SetProperty( Actor::Property::POSITION, Vector2( 100.0f, 100.0f )); dummyActor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(dummyActor); @@ -918,7 +918,7 @@ int UtcDaliLongPressGestureLayerConsumesTouch(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -931,7 +931,7 @@ int UtcDaliLongPressGestureLayerConsumesTouch(void) // Add a layer to overlap the actor Layer layer = Layer::New(); - layer.SetSize(100.0f, 100.0f); + layer.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); layer.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add( layer ); layer.RaiseToTop(); @@ -972,7 +972,7 @@ int UtcDaliLongPressGestureSetMinimumHoldingTime(void) Integration::SetLongPressMinimumHoldingTime( kMinumumHolding1 ); Actor actor = Actor::New(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Stage::GetCurrent().Add( actor ); diff --git a/automated-tests/src/dali/utc-Dali-LongPressGestureRecognizer.cpp b/automated-tests/src/dali/utc-Dali-LongPressGestureRecognizer.cpp index 0611107..d623e28 100644 --- a/automated-tests/src/dali/utc-Dali-LongPressGestureRecognizer.cpp +++ b/automated-tests/src/dali/utc-Dali-LongPressGestureRecognizer.cpp @@ -122,7 +122,7 @@ int UtcDaliLongPressGestureRecognizerBasicNoAction(void) LongPressGestureDetector detector = LongPressGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -154,7 +154,7 @@ int UtcDaliLongPressGestureRecognizerBasic(void) LongPressGestureDetector detector = LongPressGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -186,7 +186,7 @@ int UtcDaliLongPressGestureRecognizerTooShortWait(void) LongPressGestureDetector detector = LongPressGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -218,7 +218,7 @@ int UtcDaliLongPressGestureRecognizerTooFewPoints(void) detector.SetTouchesRequired(2,2); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -251,7 +251,7 @@ int UtcDaliLongPressGestureRecognizerTooManyPoints(void) LongPressGestureDetector detector = LongPressGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -287,7 +287,7 @@ int UtcDaliLongPressGestureRecognizerMultiplePointsMoving(void) detector.SetTouchesRequired(2,2); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -327,7 +327,7 @@ int UtcDaliLongPressGestureRecognizerMultiplePointsLongPress(void) detector.SetTouchesRequired(2,2); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -361,14 +361,14 @@ int UtcDaliLongPressGestureRecognizerMultipleDetectors(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); Actor actor2 = Actor::New(); - actor2.SetSize(100.0f, 100.0f); + actor2.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - actor2.SetX(100.0f); + actor2.SetProperty( Actor::Property::POSITION_X, 100.0f); Stage::GetCurrent().Add(actor2); // Render and notify diff --git a/automated-tests/src/dali/utc-Dali-NativeImage.cpp b/automated-tests/src/dali/utc-Dali-NativeImage.cpp index 94636d7..c575879 100644 --- a/automated-tests/src/dali/utc-Dali-NativeImage.cpp +++ b/automated-tests/src/dali/utc-Dali-NativeImage.cpp @@ -193,7 +193,7 @@ int UtcDaliNativeImageTestCreationFailure(void) drawTrace.Reset(); nativeImageInterface->SetGlExtensionCreateResult( true ); - actor.SetPosition( 0, 0, 1 ); + actor.SetProperty( Actor::Property::POSITION, Vector3( 0, 0, 1 )); application.SendNotification(); application.Render(); diff --git a/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp index a1d65da..49709dc 100644 --- a/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp @@ -255,7 +255,7 @@ int UtcDaliPanGestureDetectorNew(void) // Attach an actor and emit a touch event on the actor to ensure complete line coverage Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); detector.Attach(actor); @@ -316,7 +316,7 @@ int UtcDaliPanGestureSetMinimumTouchesRequired(void) // Attach an actor and change the minimum touches Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -358,7 +358,7 @@ int UtcDaliPanGestureSetMaximumTouchesRequired(void) // Attach an actor and change the maximum touches Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -402,7 +402,7 @@ int UtcDaliPanGestureSignalReceptionNegative(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -442,7 +442,7 @@ int UtcDaliPanGestureSignalReceptionDownMotionLeave(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -517,7 +517,7 @@ int UtcDaliPanGestureSignalReceptionDownMotionUp(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -578,7 +578,7 @@ int UtcDaliPanGestureSignalReceptionDetach(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -634,7 +634,7 @@ int UtcDaliPanGestureSignalReceptionDetachWhilePanning(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -689,7 +689,7 @@ int UtcDaliPanGestureSignalReceptionActorDestroyedWhilePanning(void) // Attach a temporary actor to stop detector being removed from PanGestureProcessor when main actor // is destroyed. Actor tempActor = Actor::New(); - tempActor.SetSize(100.0f, 100.0f); + tempActor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); tempActor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::BOTTOM_RIGHT); Stage::GetCurrent().Add(tempActor); detector.Attach(tempActor); @@ -699,7 +699,7 @@ int UtcDaliPanGestureSignalReceptionActorDestroyedWhilePanning(void) // Actor lifetime is scoped { Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -746,7 +746,7 @@ int UtcDaliPanGestureSignalReceptionRotatedActor(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ORIENTATION, Quaternion(Dali::Degree(90.0f), Vector3::ZAXIS) ); Stage::GetCurrent().Add(actor); @@ -809,7 +809,7 @@ int UtcDaliPanGestureSignalReceptionChildHit(void) TestApplication application; Actor parent = Actor::New(); - parent.SetSize(100.0f, 100.0f); + parent.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); parent.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(parent); @@ -817,7 +817,7 @@ int UtcDaliPanGestureSignalReceptionChildHit(void) // Change rotation of child to be different from parent so that we can check if our local coordinate // conversion of the parent actor is correct. Actor child = Actor::New(); - child.SetSize(100.0f, 100.0f); + child.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); child.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER); child.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); child.SetProperty( Actor::Property::ORIENTATION, Quaternion(Dali::Degree(90.0f), Vector3::ZAXIS) ); @@ -872,13 +872,13 @@ int UtcDaliPanGestureSignalReceptionAttachDetachMany(void) TestApplication application; Actor first = Actor::New(); - first.SetSize(100.0f, 100.0f); + first.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); first.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(first); Actor second = Actor::New(); - second.SetSize(100.0f, 100.0f); - second.SetX(100.0f); + second.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); + second.SetProperty( Actor::Property::POSITION_X, 100.0f); second.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(second); @@ -935,7 +935,7 @@ int UtcDaliPanGestureSignalReceptionActorBecomesUntouchable(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -985,12 +985,12 @@ int UtcDaliPanGestureSignalReceptionMultipleDetectorsOnActor(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); Actor actor2 = Actor::New(); - actor2.SetSize(100.0f, 100.0f); + actor2.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::BOTTOM_RIGHT); Stage::GetCurrent().Add(actor2); @@ -1071,7 +1071,7 @@ int UtcDaliPanGestureSignalReceptionEnsureCorrectSignalling(void) TestApplication application; Actor actor1 = Actor::New(); - actor1.SetSize(100.0f, 100.0f); + actor1.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor1); SignalData data1; @@ -1081,7 +1081,7 @@ int UtcDaliPanGestureSignalReceptionEnsureCorrectSignalling(void) detector1.DetectedSignal().Connect(&application, functor1); Actor actor2 = Actor::New(); - actor2.SetSize(100.0f, 100.0f); + actor2.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::BOTTOM_RIGHT); actor2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::BOTTOM_RIGHT); Stage::GetCurrent().Add(actor2); @@ -1111,7 +1111,7 @@ int UtcDaliPanGestureSignalReceptionAttachActorAfterDown(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1159,12 +1159,12 @@ int UtcDaliPanGestureSignalReceptionAttachActorAfterDownAfterInitialPanToAnother TestApplication application; Actor parent = Actor::New(); - parent.SetSize(100.0f, 100.0f); + parent.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); parent.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add( parent ); Actor child = Actor::New(); - child.SetSize(100.0f, 100.0f); + child.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); child.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER); child.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); parent.Add( child ); @@ -1231,7 +1231,7 @@ int UtcDaliPanGestureSignalReceptionDifferentPossible(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1254,7 +1254,7 @@ int UtcDaliPanGestureSignalReceptionDifferentPossible(void) DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION); // Move actor somewhere else - actor.SetPosition( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::POSITION, Vector2( 100.0f, 100.0f )); // Render and notify application.SendNotification(); @@ -1274,7 +1274,7 @@ int UtcDaliPanGestureSignalReceptionDifferentPossible(void) DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION); // Move actor in to the long press position. - actor.SetPosition( 0.0f, 0.0f ); + actor.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f )); // Render and notify application.SendNotification(); @@ -1300,7 +1300,7 @@ int UtcDaliPanGestureActorUnstaged(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1400,14 +1400,14 @@ int UtcDaliPanGestureActorStagedAndDestroyed(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); // Create and add a second actor so that GestureDetector destruction does not come into play. Actor dummyActor( Actor::New() ); - dummyActor.SetSize( 100.0f, 100.0f ); - dummyActor.SetPosition( 100.0f, 100.0f ); + dummyActor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); + dummyActor.SetProperty( Actor::Property::POSITION, Vector2( 100.0f, 100.0f )); dummyActor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(dummyActor); @@ -1641,12 +1641,12 @@ int UtcDaliPanGestureAngleProcessing(void) TestApplication application; Actor parent = Actor::New(); - parent.SetSize(100.0f, 100.0f); + parent.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); parent.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(parent); Actor child = Actor::New(); - child.SetSize(100.0f, 100.0f); + child.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); child.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); parent.Add(child); @@ -1774,12 +1774,12 @@ int UtcDaliPanGestureDirectionProcessing(void) TestApplication application; Actor parent = Actor::New(); - parent.SetSize(100.0f, 100.0f); + parent.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); parent.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(parent); Actor child = Actor::New(); - child.SetSize(100.0f, 100.0f); + child.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); child.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); parent.Add(child); @@ -1889,7 +1889,7 @@ int UtcDaliPanGestureNoPredictionNoSmoothing(void) Integration::SetPanGestureSmoothingMode(0); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1952,7 +1952,7 @@ int UtcDaliPanGestureNoPredictionSmoothing(void) Integration::SetPanGestureSmoothingMode(1); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -2016,7 +2016,7 @@ int UtcDaliPanGesturePredictionNoSmoothing(void) Integration::SetPanGestureSmoothingMode(0); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -2079,7 +2079,7 @@ int UtcDaliPanGesturePredictionSmoothing01(void) Integration::SetPanGestureSmoothingMode(1); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -2145,7 +2145,7 @@ int UtcDaliPanGesturePredictionSmoothing02(void) Integration::SetPanGestureSmoothingAmount( 0.25f ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -2252,7 +2252,7 @@ int UtcDaliPanGesturePrediction2SmoothingMultiTap01(void) Integration::SetPanGestureMultitapSmoothingRange( 34 ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -2326,7 +2326,7 @@ int UtcDaliPanGesturePrediction2SmoothingMultiTap02(void) Integration::EnableProfiling( Integration::PROFILING_TYPE_PAN_GESTURE ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -2431,7 +2431,7 @@ int UtcDaliPanGesturePrediction2Smoothing(void) Integration::SetPanGestureMultitapSmoothingRange( 34 ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -2526,7 +2526,7 @@ int UtcDaliPanGestureSetProperties(void) Integration::SetPanGestureSmoothingMode(0); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -2590,7 +2590,7 @@ int UtcDaliPanGestureSetPropertiesAlreadyPanning(void) Integration::SetPanGesturePredictionMode(0); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -2721,7 +2721,7 @@ int UtcDaliPanGestureGetPropertyWithSceneObject(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -2757,7 +2757,7 @@ int UtcDaliPanGestureLayerConsumesTouch(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -2770,7 +2770,7 @@ int UtcDaliPanGestureLayerConsumesTouch(void) // Add a layer to overlap the actor Layer layer = Layer::New(); - layer.SetSize(100.0f, 100.0f); + layer.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); layer.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add( layer ); layer.RaiseToTop(); @@ -2810,7 +2810,7 @@ int UtcDaliPanGestureNoTimeDiff(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); diff --git a/automated-tests/src/dali/utc-Dali-PanGestureRecognizer.cpp b/automated-tests/src/dali/utc-Dali-PanGestureRecognizer.cpp index 3292daf..c4f5917 100644 --- a/automated-tests/src/dali/utc-Dali-PanGestureRecognizer.cpp +++ b/automated-tests/src/dali/utc-Dali-PanGestureRecognizer.cpp @@ -118,7 +118,7 @@ int UtcDaliPanGestureRecognizerBasicNoAction(void) PanGestureDetector detector = PanGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -150,7 +150,7 @@ int UtcDaliPanGestureRecognizerBasic(void) PanGestureDetector detector = PanGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -182,7 +182,7 @@ int UtcDaliPanGestureRecognizerBasicInterrupted(void) PanGestureDetector detector = PanGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -214,7 +214,7 @@ int UtcDaliPanGestureRecognizerBasicShortest(void) PanGestureDetector detector = PanGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -246,7 +246,7 @@ int UtcDaliPanGestureRecognizerBasicFailToStart(void) PanGestureDetector detector = PanGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -278,7 +278,7 @@ int UtcDaliPanGestureRecognizerBasicStationary(void) PanGestureDetector detector = PanGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -315,7 +315,7 @@ int UtcDaliPanGestureRecognizerNewParametersFail(void) detector.SetMinimumTouchesRequired(2); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -350,7 +350,7 @@ int UtcDaliPanGestureRecognizerNewParametersSuccess(void) detector.SetMinimumTouchesRequired(2); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -385,7 +385,7 @@ int UtcDaliPanGestureRecognizerNewParametersEndFewerTouches01(void) detector.SetMinimumTouchesRequired(2); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -421,7 +421,7 @@ int UtcDaliPanGestureRecognizerNewParametersEndFewerTouches02(void) detector.SetMinimumTouchesRequired(2); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -457,7 +457,7 @@ int UtcDaliPanGestureRecognizerNewParametersNoStart(void) detector.SetMinimumTouchesRequired(2); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -492,7 +492,7 @@ int UtcDaliPanGestureRecognizerNewParametersSlowRelease(void) detector.SetMinimumTouchesRequired(2); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -527,7 +527,7 @@ int UtcDaliPanGestureRecognizerOtherEvent(void) PanGestureDetector detector = PanGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -561,7 +561,7 @@ int UtcDaliPanGestureRecognizerSlowMoving(void) PanGestureDetector detector = PanGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -599,7 +599,7 @@ int UtcDaliPanGestureRecognizerNewParamsMinNum(void) PanGestureDetector detector = PanGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -636,7 +636,7 @@ int UtcDaliPanGestureRecognizerNewParamsMinDistance(void) PanGestureDetector detector = PanGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); diff --git a/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp index 9cdf967..72bcb92 100644 --- a/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp @@ -168,7 +168,7 @@ int UtcDaliPinchGestureDetectorNew(void) // Attach an actor and emit a touch event on the actor to ensure complete line coverage Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -229,7 +229,7 @@ int UtcDaliPinchGestureSignalReceptionNegative(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -271,7 +271,7 @@ int UtcDaliPinchGestureSignalReceptionDownMotionLeave(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -332,7 +332,7 @@ int UtcDaliPinchGestureSignalReceptionDownMotionUp(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -383,7 +383,7 @@ int UtcDaliPinchGestureSignalReceptionDetach(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -434,7 +434,7 @@ int UtcDaliPinchGestureSignalReceptionDetachWhilePinching(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -486,7 +486,7 @@ int UtcDaliPinchGestureSignalReceptionActorDestroyedWhilePinching(void) // Attach a temporary actor to stop detector being removed from PinchGestureProcessor when main actor // is destroyed. Actor tempActor = Actor::New(); - tempActor.SetSize(100.0f, 100.0f); + tempActor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); tempActor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::BOTTOM_RIGHT); Stage::GetCurrent().Add(tempActor); detector.Attach(tempActor); @@ -494,7 +494,7 @@ int UtcDaliPinchGestureSignalReceptionActorDestroyedWhilePinching(void) // Actor lifetime is scoped { Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -540,7 +540,7 @@ int UtcDaliPinchGestureSignalReceptionRotatedActor(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ORIENTATION, Quaternion(Dali::Degree(90.0f), Vector3::ZAXIS) ); Stage::GetCurrent().Add(actor); @@ -605,7 +605,7 @@ int UtcDaliPinchGestureSignalReceptionChildHit(void) TestApplication application; Actor parent = Actor::New(); - parent.SetSize(100.0f, 100.0f); + parent.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); parent.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(parent); @@ -613,7 +613,7 @@ int UtcDaliPinchGestureSignalReceptionChildHit(void) // Change rotation of child to be different from parent so that we can check if our local coordinate // conversion of the parent actor is correct. Actor child = Actor::New(); - child.SetSize(100.0f, 100.0f); + child.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); child.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER); child.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); child.SetProperty( Actor::Property::ORIENTATION, Quaternion(Dali::Degree(90.0f), Vector3::ZAXIS) ); @@ -669,13 +669,13 @@ int UtcDaliPinchGestureSignalReceptionAttachDetachMany(void) TestApplication application; Actor first = Actor::New(); - first.SetSize(100.0f, 100.0f); + first.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); first.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(first); Actor second = Actor::New(); - second.SetSize(100.0f, 100.0f); - second.SetX(100.0f); + second.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); + second.SetProperty( Actor::Property::POSITION_X, 100.0f); second.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(second); @@ -720,7 +720,7 @@ int UtcDaliPinchGestureSignalReceptionActorBecomesUntouchable(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -766,12 +766,12 @@ int UtcDaliPinchGestureSignalReceptionMultipleDetectorsOnActor(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); Actor actor2 = Actor::New(); - actor2.SetSize(100.0f, 100.0f); + actor2.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::BOTTOM_RIGHT); Stage::GetCurrent().Add(actor2); @@ -845,7 +845,7 @@ int UtcDaliPinchGestureSignalReceptionEnsureCorrectSignalling(void) TestApplication application; Actor actor1 = Actor::New(); - actor1.SetSize(100.0f, 100.0f); + actor1.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor1); SignalData data1; @@ -855,7 +855,7 @@ int UtcDaliPinchGestureSignalReceptionEnsureCorrectSignalling(void) detector1.DetectedSignal().Connect(&application, functor1); Actor actor2 = Actor::New(); - actor2.SetSize(100.0f, 100.0f); + actor2.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::BOTTOM_RIGHT); actor2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::BOTTOM_RIGHT); Stage::GetCurrent().Add(actor2); @@ -882,7 +882,7 @@ int UtcDaliPinchGestureActorUnstaged(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -973,14 +973,14 @@ int UtcDaliPinchGestureActorStagedAndDestroyed(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); // Create and add a second actor so that GestureDetector destruction does not come into play. Actor dummyActor( Actor::New() ); - dummyActor.SetSize( 100.0f, 100.0f ); - dummyActor.SetPosition( 100.0f, 100.0f ); + dummyActor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); + dummyActor.SetProperty( Actor::Property::POSITION, Vector2( 100.0f, 100.0f )); dummyActor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(dummyActor); @@ -1065,7 +1065,7 @@ int UtcDaliPinchGestureLayerConsumesTouch(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1078,7 +1078,7 @@ int UtcDaliPinchGestureLayerConsumesTouch(void) // Add a layer to overlap the actor Layer layer = Layer::New(); - layer.SetSize(100.0f, 100.0f); + layer.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); layer.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add( layer ); layer.RaiseToTop(); diff --git a/automated-tests/src/dali/utc-Dali-PinchGestureRecognizer.cpp b/automated-tests/src/dali/utc-Dali-PinchGestureRecognizer.cpp index 97db383..820f7ef 100644 --- a/automated-tests/src/dali/utc-Dali-PinchGestureRecognizer.cpp +++ b/automated-tests/src/dali/utc-Dali-PinchGestureRecognizer.cpp @@ -118,7 +118,7 @@ int UtcDaliPinchGestureRecognizerBasicNoAction(void) PinchGestureDetector detector = PinchGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -150,7 +150,7 @@ int UtcDaliPinchGestureRecognizerBasic(void) PinchGestureDetector detector = PinchGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -184,7 +184,7 @@ int UtcDaliPinchGestureRecognizerEndEarly01(void) PinchGestureDetector detector = PinchGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -219,7 +219,7 @@ int UtcDaliPinchGestureRecognizerEndEarly02(void) PinchGestureDetector detector = PinchGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -255,7 +255,7 @@ int UtcDaliPinchGestureRecognizerRealistic01(void) PinchGestureDetector detector = PinchGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -296,7 +296,7 @@ int UtcDaliPinchGestureRecognizerRealistic02(void) PinchGestureDetector detector = PinchGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -336,7 +336,7 @@ int UtcDaliPinchGestureRecognizerRealistic03(void) PinchGestureDetector detector = PinchGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -379,14 +379,14 @@ int UtcDaliPinchGestureRecognizerMultipleDetectors(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); Actor actor2 = Actor::New(); - actor2.SetSize(100.0f, 100.0f); + actor2.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - actor2.SetX(100.0f); + actor2.SetProperty( Actor::Property::POSITION_X, 100.0f); Stage::GetCurrent().Add(actor2); // Render and notify @@ -446,7 +446,7 @@ int UtcDaliPinchGestureRecognizerShortDistance01(void) PinchGestureDetector detector = PinchGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -480,7 +480,7 @@ int UtcDaliPinchGestureRecognizerShortDistance02(void) PinchGestureDetector detector = PinchGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -518,7 +518,7 @@ int UtcDaliPinchGestureRecognizerLongDistance01(void) PinchGestureDetector detector = PinchGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -553,7 +553,7 @@ int UtcDaliPinchGestureRecognizerLongDistance02(void) PinchGestureDetector detector = PinchGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -587,7 +587,7 @@ int UtcDaliPinchGestureRecognizerLongDistance03(void) PinchGestureDetector detector = PinchGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -622,7 +622,7 @@ int UtcDaliPinchGestureRecognizerLongDistance04(void) PinchGestureDetector detector = PinchGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -658,7 +658,7 @@ int UtcDaliPinchGestureRecognizerMinimumTouchEvents(void) PinchGestureDetector detector = PinchGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Stage::GetCurrent().Add( actor ); @@ -701,7 +701,7 @@ int UtcDaliPinchGestureRecognizerMinimumTouchEventsAfterStart(void) PinchGestureDetector detector = PinchGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Stage::GetCurrent().Add( actor ); diff --git a/automated-tests/src/dali/utc-Dali-PropertyBuffer.cpp b/automated-tests/src/dali/utc-Dali-PropertyBuffer.cpp index 3d70484..c5c8301 100644 --- a/automated-tests/src/dali/utc-Dali-PropertyBuffer.cpp +++ b/automated-tests/src/dali/utc-Dali-PropertyBuffer.cpp @@ -138,7 +138,7 @@ int UtcDaliPropertyBufferSetData01(void) Shader shader = CreateShader(); Renderer renderer = Renderer::New(geometry, shader); Actor actor = Actor::New(); - actor.SetSize(Vector3::ONE * 100.f); + actor.SetProperty( Actor::Property::SIZE,Vector3::ONE * 100.f); actor.AddRenderer(renderer); Stage::GetCurrent().Add(actor); @@ -189,7 +189,7 @@ int UtcDaliPropertyBufferSetData02(void) Shader shader = CreateShader(); Renderer renderer = Renderer::New(geometry, shader); Actor actor = Actor::New(); - actor.SetSize(Vector3::ONE * 100.f); + actor.SetProperty( Actor::Property::SIZE,Vector3::ONE * 100.f); actor.AddRenderer(renderer); Stage::GetCurrent().Add(actor); diff --git a/automated-tests/src/dali/utc-Dali-PropertyNotification.cpp b/automated-tests/src/dali/utc-Dali-PropertyNotification.cpp index 74919df..1281713 100644 --- a/automated-tests/src/dali/utc-Dali-PropertyNotification.cpp +++ b/automated-tests/src/dali/utc-Dali-PropertyNotification.cpp @@ -187,7 +187,7 @@ int UtcDaliAddPropertyNotificationCallback(void) gCallBackCalled = false; tet_infoline(" UtcDaliAddPropertyNotificationCallback - Forcing notification condition true, should receive a notification"); - object->mActor.SetPosition(Vector3(200.0f, 0.0f, 0.0f)); + object->mActor.SetProperty( Actor::Property::POSITION, Vector3(200.0f, 0.0f, 0.0f)); application.Render(RENDER_FRAME_INTERVAL); application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); @@ -196,7 +196,7 @@ int UtcDaliAddPropertyNotificationCallback(void) gCallBackCalled = false; tet_infoline(" UtcDaliAddPropertyNotificationCallback - Forcing notification condition false, should not receive a notification"); - object->mActor.SetPosition(Vector3(0.0f, 0.0f, 0.0f)); + object->mActor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f)); application.Render(RENDER_FRAME_INTERVAL); application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); @@ -205,7 +205,7 @@ int UtcDaliAddPropertyNotificationCallback(void) gCallBackCalled = false; tet_infoline(" UtcDaliAddPropertyNotificationCallback - Deleting notification and it's owning object, should not receive a notification"); - object->mActor.SetPosition(Vector3(200.0f, 0.0f, 0.0f)); + object->mActor.SetProperty( Actor::Property::POSITION, Vector3(200.0f, 0.0f, 0.0f)); application.Render(RENDER_FRAME_INTERVAL); application.SendNotification(); object->Terminate(); @@ -221,7 +221,7 @@ int UtcDaliAddPropertyNotificationCallback(void) object->RemovePropertyNotification(); - object->mActor.SetPosition(Vector3(200.0f, 0.0f, 0.0f)); + object->mActor.SetProperty( Actor::Property::POSITION, Vector3(200.0f, 0.0f, 0.0f)); application.Render(RENDER_FRAME_INTERVAL); application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); @@ -236,7 +236,7 @@ int UtcDaliAddPropertyNotificationCallback(void) object->RemovePropertyNotifications(); - object->mActor.SetPosition(Vector3(200.0f, 0.0f, 0.0f)); + object->mActor.SetProperty( Actor::Property::POSITION, Vector3(200.0f, 0.0f, 0.0f)); application.Render(RENDER_FRAME_INTERVAL); application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); @@ -409,7 +409,7 @@ int UtcDaliPropertyNotificationGetNotifyResultP(void) gCallBackCalled = false; notification.NotifySignal().Connect( &TestCallback ); - actor.SetPosition(Vector3(0.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f)); application.Render(RENDER_FRAME_INTERVAL); application.SendNotification(); @@ -434,25 +434,25 @@ int UtcDaliPropertyNotificationGreaterThan(void) PropertyNotification notification = actor.AddPropertyNotification( Actor::Property::POSITION_X, GreaterThanCondition(100.0f) ); notification.NotifySignal().Connect( &TestCallback ); - actor.SetPosition(Vector3(0.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); // Move right to satisfy condition gCallBackCalled = false; - actor.SetPosition(Vector3(200.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(200.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); // Move left to un-satisfy condition gCallBackCalled = false; - actor.SetPosition(Vector3(0.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( !gCallBackCalled ); // Move right to satisfy condition again. gCallBackCalled = false; Wait(application, DEFAULT_WAIT_PERIOD); - actor.SetPosition(Vector3(200.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(200.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); END_TEST; @@ -469,25 +469,25 @@ int UtcDaliPropertyNotificationLessThan(void) PropertyNotification notification = actor.AddPropertyNotification( Actor::Property::POSITION_X, LessThanCondition(100.0f ) ); notification.NotifySignal().Connect( &TestCallback ); - actor.SetPosition(Vector3(200.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(200.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); // Move left to satisfy condition gCallBackCalled = false; - actor.SetPosition(Vector3(0.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); // Move right to un-satisfy condition gCallBackCalled = false; - actor.SetPosition(Vector3(200.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(200.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( !gCallBackCalled ); // Move left to satisfy condition again. gCallBackCalled = false; Wait(application, DEFAULT_WAIT_PERIOD); - actor.SetPosition(Vector3(0.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); END_TEST; @@ -504,25 +504,25 @@ int UtcDaliPropertyNotificationInside(void) PropertyNotification notification = actor.AddPropertyNotification( Actor::Property::POSITION_X, InsideCondition(100.0f, 200.0f) ); notification.NotifySignal().Connect( &TestCallback ); - actor.SetPosition(Vector3(0.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); // Move inside to satisfy condition gCallBackCalled = false; - actor.SetPosition(Vector3(150.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(150.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); // Move outside (right) to un-satisfy condition gCallBackCalled = false; - actor.SetPosition(Vector3(300.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(300.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( !gCallBackCalled ); // Move inside to satisfy condition again. gCallBackCalled = false; Wait(application, DEFAULT_WAIT_PERIOD); - actor.SetPosition(Vector3(150.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(150.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); END_TEST; @@ -539,25 +539,25 @@ int UtcDaliPropertyNotificationOutside(void) PropertyNotification notification = actor.AddPropertyNotification( Actor::Property::POSITION_X, OutsideCondition(100.0f, 200.0f) ); notification.NotifySignal().Connect( &TestCallback ); - actor.SetPosition(Vector3(150.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(150.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); // Move outside (left) to satisfy condition gCallBackCalled = false; - actor.SetPosition(Vector3(0.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); // Move inside to un-satisfy condition gCallBackCalled = false; - actor.SetPosition(Vector3(150.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(150.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( !gCallBackCalled ); // Move outside (right) to satisfy condition again. gCallBackCalled = false; Wait(application, DEFAULT_WAIT_PERIOD); - actor.SetPosition(Vector3(300.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(300.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); END_TEST; @@ -580,26 +580,26 @@ int UtcDaliPropertyNotificationVectorComponentGreaterThan(void) notification = actor.AddPropertyNotification( Actor::Property::COLOR, 3, GreaterThanCondition(0.5f) ); notification.NotifySignal().Connect( &TestCallback ); - actor.SetPosition(Vector3(0.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f)); actor.SetProperty( Actor::Property::COLOR,Vector4(0.0f, 0.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); // Move right to satisfy XAxis condition gCallBackCalled = false; - actor.SetPosition(Vector3(200.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(200.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); // Move down to satisfy YAxis condition gCallBackCalled = false; - actor.SetPosition(Vector3(200.0f, 200.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(200.0f, 200.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); // Move forward to satisfy ZAxis gCallBackCalled = false; Wait(application, DEFAULT_WAIT_PERIOD); - actor.SetPosition(Vector3(200.0f, 200.0f, 200.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(200.0f, 200.0f, 200.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); @@ -629,26 +629,26 @@ int UtcDaliPropertyNotificationVectorComponentLessThan(void) notification = actor.AddPropertyNotification( Actor::Property::COLOR, 3, LessThanCondition(0.5f) ); notification.NotifySignal().Connect( &TestCallback ); - actor.SetPosition(Vector3(0.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f)); actor.SetProperty( Actor::Property::COLOR,Vector4(0.0f, 0.0f, 0.0f, 1.0f)); Wait(application, DEFAULT_WAIT_PERIOD); // Move left to satisfy XAxis condition gCallBackCalled = false; - actor.SetPosition(Vector3(-200.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(-200.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); // Move up to satisfy YAxis condition gCallBackCalled = false; - actor.SetPosition(Vector3(-200.0f, -200.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(-200.0f, -200.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); // Move back to satisfy ZAxis gCallBackCalled = false; Wait(application, DEFAULT_WAIT_PERIOD); - actor.SetPosition(Vector3(-200.0f, -200.0f, -200.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(-200.0f, -200.0f, -200.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); @@ -679,26 +679,26 @@ int UtcDaliPropertyNotificationVectorComponentInside(void) notification.NotifySignal().Connect( &TestCallback ); // set outside all conditions - actor.SetPosition(Vector3(200.0f, 200.0f, 200.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(200.0f, 200.0f, 200.0f)); actor.SetProperty( Actor::Property::COLOR,Vector4(0.0f, 0.0f, 0.0f, 1.0f)); Wait(application, DEFAULT_WAIT_PERIOD); // Move x to inside condition gCallBackCalled = false; - actor.SetPosition(Vector3(0.0f, 200.0f, 200.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 200.0f, 200.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); // Move y to inside condition gCallBackCalled = false; - actor.SetPosition(Vector3(0.0f, 0.0f, 200.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 0.0f, 200.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); // Move z to inside condition gCallBackCalled = false; Wait(application, DEFAULT_WAIT_PERIOD); - actor.SetPosition(Vector3(0.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); @@ -729,26 +729,26 @@ int UtcDaliPropertyNotificationVectorComponentOutside(void) notification.NotifySignal().Connect( &TestCallback ); // set inside all conditions - actor.SetPosition(Vector3(0.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f)); actor.SetProperty( Actor::Property::COLOR,Vector4(0.0f, 0.0f, 0.0f, 0.5f)); Wait(application, DEFAULT_WAIT_PERIOD); // Move x to outside condition gCallBackCalled = false; - actor.SetPosition(Vector3(200.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(200.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); // Move y to outside condition gCallBackCalled = false; - actor.SetPosition(Vector3(200.0f, 200.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(200.0f, 200.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); // Move z to outside condition gCallBackCalled = false; Wait(application, DEFAULT_WAIT_PERIOD); - actor.SetPosition(Vector3(200.0f, 200.0f, 200.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(200.0f, 200.0f, 200.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); @@ -774,7 +774,7 @@ int UtcDaliPropertyNotificationSetSizeResultP(void) gCallBackCalled = false; notification.NotifySignal().Connect( &TestCallback ); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f) ); application.Render(RENDER_FRAME_INTERVAL); application.SendNotification(); @@ -787,7 +787,7 @@ int UtcDaliPropertyNotificationSetSizeResultP(void) gCallBackCalled = false; - actor.SetSize(200.0f, 200.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) ); application.Render(RENDER_FRAME_INTERVAL); application.SendNotification(); @@ -836,7 +836,7 @@ int UtcDaliPropertyNotificationStep(void) notification.NotifySignal().Connect( &TestCallback ); // set initial position - actor.SetPosition(Vector3(0.0f, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); // test both directions @@ -844,7 +844,7 @@ int UtcDaliPropertyNotificationStep(void) { // Move x to negative position gCallBackCalled = false; - actor.SetPosition(Vector3((i * step), 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3((i * step), 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); } @@ -853,7 +853,7 @@ int UtcDaliPropertyNotificationStep(void) { // Move x to negative position gCallBackCalled = false; - actor.SetPosition(Vector3(-(i * step), 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(-(i * step), 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); } @@ -881,7 +881,7 @@ int UtcDaliPropertyNotificationVariableStep(void) notification.NotifySignal().Connect( &TestCallback ); // set initial position lower than first position in list - actor.SetPosition(Vector3(values[0] - averageStep, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(values[0] - averageStep, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); for( unsigned int i = 0 ; i < values.Count() - 1 ; ++i ) @@ -889,7 +889,7 @@ int UtcDaliPropertyNotificationVariableStep(void) gCallBackCalled = false; // set position half way between the current values float position = values[i] + (0.5f * (values[i + 1] - values[i])); - actor.SetPosition(Vector3(position, 0.0f, 0.0f)); + actor.SetProperty( Actor::Property::POSITION, Vector3(position, 0.0f, 0.0f)); Wait(application, DEFAULT_WAIT_PERIOD); DALI_TEST_CHECK( gCallBackCalled ); } diff --git a/automated-tests/src/dali/utc-Dali-RenderTask.cpp b/automated-tests/src/dali/utc-Dali-RenderTask.cpp index 045e20f..ea71224 100644 --- a/automated-tests/src/dali/utc-Dali-RenderTask.cpp +++ b/automated-tests/src/dali/utc-Dali-RenderTask.cpp @@ -174,7 +174,7 @@ Actor CreateRenderableActorSuccess(TestApplication& application, std::string fil PrepareResourceImage( application, 80u, 80u, Pixel::RGBA8888 ); Image image = ResourceImage::New(filename); Actor actor = CreateRenderableActor(image); - actor.SetSize( 80, 80 ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 80.0f, 80.0f ) ); return actor; } @@ -183,7 +183,7 @@ Actor CreateRenderableActorFailed(TestApplication& application, std::string file Image image = ResourceImage::New(filename); DALI_TEST_CHECK( image ); Actor actor = CreateRenderableActor(image); - actor.SetSize( 80, 80 ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 80.0f, 80.0f ) ); return actor; } @@ -363,7 +363,7 @@ int UtcDaliRenderTaskSetSourceActorP01(void) BufferImage img = BufferImage::New( 1,1 ); Actor newActor = CreateRenderableActor( img ); - newActor.SetSize(1,1); + newActor.SetProperty( Actor::Property::SIZE, Vector2( 1.0f, 1.0f ) ); stage.Add( newActor ); Actor nonRenderableActor = Actor::New(); @@ -409,7 +409,7 @@ int UtcDaliRenderTaskSetSourceActorP02(void) BufferImage img = BufferImage::New( 1,1 ); Actor newActor = CreateRenderableActor( img ); - newActor.SetSize(1,1); + newActor.SetProperty( Actor::Property::SIZE, Vector2( 1.0f, 1.0f ) ); stage.Add( newActor ); Actor nonRenderableActor = Actor::New(); @@ -468,7 +468,7 @@ int UtcDaliRenderTaskSetSourceActorOffStage(void) BufferImage img = BufferImage::New( 1,1 ); Actor newActor = CreateRenderableActor( img ); - newActor.SetSize(1,1); + newActor.SetProperty( Actor::Property::SIZE, Vector2( 1.0f, 1.0f ) ); task.SetSourceActor( newActor ); // Don't add newActor to stage yet //' @@ -517,7 +517,7 @@ int UtcDaliRenderTaskSetSourceActorEmpty(void) BufferImage img = BufferImage::New( 1,1 ); Actor newActor = CreateRenderableActor( img ); - newActor.SetSize(1,1); + newActor.SetProperty( Actor::Property::SIZE, Vector2( 1.0f, 1.0f ) ); stage.Add( newActor ); Actor nonRenderableActor = Actor::New(); @@ -567,7 +567,7 @@ int UtcDaliRenderTaskSetSourceActorDestroyed(void) BufferImage img = BufferImage::New( 1,1 ); Actor newActor = CreateRenderableActor( img ); - newActor.SetSize(1,1); + newActor.SetProperty( Actor::Property::SIZE, Vector2( 1.0f, 1.0f ) ); stage.Add( newActor ); task.SetSourceActor( newActor ); @@ -661,7 +661,7 @@ int UtcDaliRenderTaskSetExclusive(void) BufferImage img1 = BufferImage::New( 1,1 ); Actor actor1 = CreateRenderableActor( img1 ); - actor1.SetSize(1,1); + actor1.SetProperty( Actor::Property::SIZE, Vector2( 1.0f, 1.0f ) ); Stage::GetCurrent().Add( actor1 ); // Update & Render actor1 @@ -684,7 +684,7 @@ int UtcDaliRenderTaskSetExclusive(void) BufferImage img2 = BufferImage::New( 1,1 ); Actor actor2 = CreateRenderableActor( img2 ); - actor2.SetSize(1,1); + actor2.SetProperty( Actor::Property::SIZE, Vector2( 1.0f, 1.0f ) ); // Force actor2 to be rendered before actor1 Layer layer = Layer::New(); @@ -713,7 +713,7 @@ int UtcDaliRenderTaskSetExclusive(void) BufferImage img3 = BufferImage::New( 1,1 ); Actor actor3 = CreateRenderableActor( img3 ); - actor3.SetSize(1,1); + actor3.SetProperty( Actor::Property::SIZE, Vector2( 1.0f, 1.0f ) ); // Force actor3 to be rendered before actor2 layer = Layer::New(); @@ -813,7 +813,7 @@ int UtcDaliRenderTaskSetExclusive02(void) BufferImage img1 = BufferImage::New( 1,1 ); Actor actor1 = CreateRenderableActor( img1 ); - actor1.SetSize(1,1); + actor1.SetProperty( Actor::Property::SIZE, Vector2( 1.0f, 1.0f ) ); Stage::GetCurrent().Add( actor1 ); RenderTaskList taskList = Stage::GetCurrent().GetRenderTaskList(); @@ -1884,7 +1884,7 @@ int UtcDaliRenderTaskSignalFinished(void) BufferImage image = BufferImage::New( 10, 10 ); image.Update(); Actor rootActor = CreateRenderableActor( image ); - rootActor.SetSize( 10, 10 ); + rootActor.SetProperty( Actor::Property::SIZE, Vector2( 10.0f, 10.0f ) ); Stage::GetCurrent().Add( rootActor ); RenderTaskList taskList = Stage::GetCurrent().GetRenderTaskList(); @@ -2155,7 +2155,7 @@ int UtcDaliRenderTaskOnce02(void) renderer.SetTextures( textureSet ); Actor secondRootActor = Actor::New(); secondRootActor.AddRenderer(renderer); - secondRootActor.SetSize(100, 100); + secondRootActor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); Stage::GetCurrent().Add(secondRootActor); RenderTask newTask = CreateRenderTask(application, offscreenCameraActor, rootActor, secondRootActor, RenderTask::REFRESH_ONCE, true); @@ -2248,7 +2248,7 @@ int UtcDaliRenderTaskOnce04(void) renderer.SetTextures( textureSet ); Actor secondRootActor = Actor::New(); secondRootActor.AddRenderer(renderer); - secondRootActor.SetSize(100, 100); + secondRootActor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); Stage::GetCurrent().Add(secondRootActor); RenderTask newTask = CreateRenderTask(application, offscreenCameraActor, rootActor, secondRootActor, RenderTask::REFRESH_ALWAYS, true); @@ -2330,7 +2330,7 @@ int UtcDaliRenderTaskOnceNoSync02(void) renderer.SetTextures( textureSet ); Actor secondRootActor = Actor::New(); secondRootActor.AddRenderer(renderer); - secondRootActor.SetSize(100, 100); + secondRootActor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); Stage::GetCurrent().Add(secondRootActor); RenderTask newTask = CreateRenderTask(application, offscreenCameraActor, rootActor, secondRootActor, RenderTask::REFRESH_ONCE, false); @@ -2411,7 +2411,7 @@ int UtcDaliRenderTaskOnceNoSync04(void) renderer.SetTextures( textureSet ); Actor secondRootActor = Actor::New(); secondRootActor.AddRenderer(renderer); - secondRootActor.SetSize(100, 100); + secondRootActor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); Stage::GetCurrent().Add(secondRootActor); @@ -2557,7 +2557,7 @@ int UtcDaliRenderTaskFinishInvisibleSourceActor(void) BufferImage image = BufferImage::New( 10, 10 ); Actor rootActor = CreateRenderableActor( image ); - rootActor.SetSize( 10, 10 ); + rootActor.SetProperty( Actor::Property::SIZE, Vector2( 10.0f, 10.0f ) ); rootActor.SetProperty( Actor::Property::VISIBLE,false); Stage::GetCurrent().Add( rootActor ); @@ -2638,11 +2638,11 @@ int UtcDaliRenderTaskFinishMissingImage(void) BufferImage image = BufferImage::New( 10, 10 ); Actor rootActor = CreateRenderableActor( image ); - rootActor.SetSize( 10, 10 ); + rootActor.SetProperty( Actor::Property::SIZE, Vector2( 10.0f, 10.0f ) ); stage.Add( rootActor ); Actor actorWithMissingImage = CreateRenderableActor( Image() ); - actorWithMissingImage.SetSize( 10, 10 ); + actorWithMissingImage.SetProperty( Actor::Property::SIZE, Vector2( 10.0f, 10.0f ) ); stage.Add( actorWithMissingImage ); RenderTaskList taskList = Stage::GetCurrent().GetRenderTaskList(); @@ -2675,8 +2675,8 @@ int UtcDaliRenderTaskWorldToViewport(void) RenderTaskList taskList = Stage::GetCurrent().GetRenderTaskList(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); - actor.SetPosition( Vector3(0.0, 0.0, 0.0) ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); + actor.SetProperty( Actor::Property::POSITION, Vector3(0.0, 0.0, 0.0) ); actor.SetProperty( Actor::Property::PARENT_ORIGIN, Vector3(0.5, 0.5, 0.5) ); actor.SetProperty( Actor::Property::ANCHOR_POINT, Vector3(0.5, 0.5, 0.5) ); @@ -2704,8 +2704,8 @@ int UtcDaliRenderTaskWorldToViewport(void) Actor actor2 = Actor::New(); float actor2Size = 100.f; - actor2.SetSize( actor2Size, actor2Size ); - actor2.SetPosition( Vector3(0.0, 0.0, 0.0) ); + actor2.SetProperty( Actor::Property::SIZE, Vector2( actor2Size, actor2Size ) ); + actor2.SetProperty( Actor::Property::POSITION, Vector3(0.0, 0.0, 0.0) ); actor2.SetProperty( Actor::Property::PARENT_ORIGIN, Vector3(0.5, 0.5, 0.0) ); actor2.SetProperty( Actor::Property::ANCHOR_POINT, Vector3(0.5, 0.5, 0.0) ); Stage::GetCurrent().Add( actor2 ); @@ -2731,8 +2731,8 @@ int UtcDaliRenderTaskViewportToLocal(void) TestApplication application; Actor actor = Actor::New(); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - actor.SetSize(100.0f, 100.0f); - actor.SetPosition(10.0f, 10.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); + actor.SetProperty( Actor::Property::POSITION, Vector2(10.0f, 10.0f)); Stage::GetCurrent().Add(actor); RenderTaskList taskList = Stage::GetCurrent().GetRenderTaskList(); @@ -2769,8 +2769,8 @@ int UtcDaliRenderTaskOffscreenViewportToLocal(void) TestApplication application; Actor actor = Actor::New(); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - actor.SetSize( 100.0f, 100.0f ); - actor.SetPosition( 10.0f, 10.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); + actor.SetProperty( Actor::Property::POSITION, Vector2( 10.0f, 10.0f )); Stage::GetCurrent().Add( actor ); RenderTaskList taskList = Stage::GetCurrent().GetRenderTaskList(); diff --git a/automated-tests/src/dali/utc-Dali-Renderer.cpp b/automated-tests/src/dali/utc-Dali-Renderer.cpp index 222885a..3d70c11 100644 --- a/automated-tests/src/dali/utc-Dali-Renderer.cpp +++ b/automated-tests/src/dali/utc-Dali-Renderer.cpp @@ -255,7 +255,7 @@ int UtcDaliRendererSetGetGeometry(void) Renderer renderer = Renderer::New(geometry1, shader); Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); application.SendNotification(); @@ -290,7 +290,7 @@ int UtcDaliRendererSetGetShader(void) Renderer renderer = Renderer::New(geometry, shader1); Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); TestGlAbstraction& gl = application.GetGlAbstraction(); @@ -330,7 +330,7 @@ int UtcDaliRendererSetGetDepthIndex(void) Renderer renderer = Renderer::New(geometry, shader); Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); application.SendNotification(); @@ -369,7 +369,7 @@ int UtcDaliRendererSetGetFaceCullingMode(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); // By default, none of the faces should be culled @@ -456,7 +456,7 @@ int UtcDaliRendererBlendOptions01(void) // set a transparent actor color so that blending is enabled actor.SetProperty( DevelActor::Property::OPACITY, 0.5f ); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); renderer.SetProperty( Renderer::Property::BLEND_FACTOR_SRC_RGB, BlendFactor::ONE_MINUS_SRC_COLOR ); @@ -501,7 +501,7 @@ int UtcDaliRendererBlendOptions02(void) Actor actor = Actor::New(); actor.SetProperty( DevelActor::Property::OPACITY, 0.5f ); // enable blending actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); renderer.SetProperty( Renderer::Property::BLEND_FACTOR_SRC_RGB, BlendFactor::CONSTANT_COLOR ); @@ -546,7 +546,7 @@ int UtcDaliRendererBlendOptions03(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); // Test the defaults as documented in blending.h @@ -572,7 +572,7 @@ int UtcDaliRendererBlendOptions04(void) Actor actor = Actor::New(); actor.SetProperty( DevelActor::Property::OPACITY, 0.1f ); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); // Test the single blending equation setting @@ -617,7 +617,7 @@ int UtcDaliRendererSetBlendMode01(void) Actor actor = Actor::New(); actor.SetProperty( DevelActor::Property::OPACITY, 0.98f ); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON); @@ -649,7 +649,7 @@ int UtcDaliRendererSetBlendMode01b(void) Actor actor = Actor::New(); actor.SetProperty( DevelActor::Property::OPACITY, 0.0f ); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON); @@ -684,7 +684,7 @@ int UtcDaliRendererSetBlendMode02(void) Actor actor = Actor::New(); actor.SetProperty( DevelActor::Property::OPACITY, 0.15f ); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::OFF); @@ -716,7 +716,7 @@ int UtcDaliRendererSetBlendMode03(void) Actor actor = Actor::New(); actor.SetProperty( DevelActor::Property::OPACITY, 0.75f ); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::AUTO); @@ -747,7 +747,7 @@ int UtcDaliRendererSetBlendMode04(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::AUTO); @@ -778,7 +778,7 @@ int UtcDaliRendererSetBlendMode04b(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); actor.SetProperty( Actor::Property::COLOR, Vector4(1.0f, 0.0f, 1.0f, 0.5f) ); Stage::GetCurrent().Add(actor); @@ -810,7 +810,7 @@ int UtcDaliRendererSetBlendMode04c(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); actor.SetProperty( Actor::Property::COLOR, Color::MAGENTA ); Stage::GetCurrent().Add(actor); @@ -846,7 +846,7 @@ int UtcDaliRendererSetBlendMode05(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::AUTO); @@ -877,7 +877,7 @@ int UtcDaliRendererSetBlendMode06(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::AUTO); @@ -911,7 +911,7 @@ int UtcDaliRendererSetBlendMode07(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::AUTO); @@ -971,7 +971,7 @@ int UtcDaliRendererSetBlendColor(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); TestGlAbstraction& glAbstraction = application.GetGlAbstraction(); @@ -1043,7 +1043,7 @@ int UtcDaliRendererPreMultipledAlpha(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); actor.SetProperty( Actor::Property::COLOR, Vector4(1.0f, 0.0f, 1.0f, 0.5f) ); Stage::GetCurrent().Add(actor); @@ -1139,7 +1139,7 @@ int UtcDaliRendererConstraint01(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); Vector4 initialColor = Color::WHITE; @@ -1181,7 +1181,7 @@ int UtcDaliRendererConstraint02(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); application.SendNotification(); application.Render(0); @@ -1235,7 +1235,7 @@ int UtcDaliRendererAnimatedProperty01(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); Vector4 initialColor = Color::WHITE; @@ -1276,7 +1276,7 @@ int UtcDaliRendererAnimatedProperty02(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); application.SendNotification(); application.Render(0); @@ -1330,7 +1330,7 @@ int UtcDaliRendererUniformMapPrecendence01(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); application.SendNotification(); application.Render(0); @@ -1387,7 +1387,7 @@ int UtcDaliRendererUniformMapPrecendence02(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); application.SendNotification(); application.Render(0); @@ -1445,7 +1445,7 @@ int UtcDaliRendererUniformMapPrecendence03(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); application.SendNotification(); application.Render(0); @@ -1483,7 +1483,7 @@ int UtcDaliRendererUniformMapMultipleUniforms01(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); application.SendNotification(); application.Render(0); @@ -1530,7 +1530,7 @@ int UtcDaliRendererUniformMapMultipleUniforms02(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); application.SendNotification(); application.Render(0); @@ -1583,8 +1583,8 @@ Actor CreateActor( Actor parent, int siblingOrder, const char* location ) Actor actor = Actor::New(); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER); actor.SetProperty( Actor::Property::PARENT_ORIGIN,AnchorPoint::CENTER); - actor.SetPosition(0.0f,0.0f); - actor.SetSize(100, 100); + actor.SetProperty( Actor::Property::POSITION, Vector2(0.0f,0.0f)); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); parent.Add(actor); actor.SetProperty( Dali::DevelActor::Property::SIBLING_ORDER, siblingOrder ); DALI_TEST_EQUALS( actor.GetProperty( Dali::DevelActor::Property::SIBLING_ORDER), siblingOrder, TEST_INNER_LOCATION(location) ); @@ -1948,7 +1948,7 @@ int UtcDaliRendererSetIndexRange(void) gl.EnableDrawCallTrace( true ); Actor actor = Actor::New(); - actor.SetSize( 100, 100 ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); // create geometry Geometry geometry = Geometry::New(); @@ -2081,7 +2081,7 @@ int UtcDaliRendererSetDepthFunction(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage stage = Stage::GetCurrent(); stage.GetRootLayer().SetBehavior( Layer::LAYER_3D ); stage.Add(actor); @@ -2254,7 +2254,7 @@ int UtcDaliRendererEnumProperties(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); /* @@ -2290,7 +2290,7 @@ Renderer RendererTestFixture( TestApplication& application ) Actor actor = Actor::New(); actor.AddRenderer( renderer ); - actor.SetSize( 400.0f, 400.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage stage = Stage::GetCurrent(); stage.GetRootLayer().SetBehavior( Layer::LAYER_3D ); stage.Add( actor ); @@ -2784,8 +2784,8 @@ int UtcDaliRendererWrongNumberOfTextures(void) Actor actor= Actor::New(); actor.AddRenderer(renderer); - actor.SetPosition(0.0f,0.0f); - actor.SetSize(100, 100); + actor.SetProperty( Actor::Property::POSITION, Vector2(0.0f,0.0f)); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); Stage::GetCurrent().Add(actor); TestGlAbstraction& gl = application.GetGlAbstraction(); @@ -2826,7 +2826,7 @@ int UtcDaliRendererOpacity(void) Actor actor = Actor::New(); actor.AddRenderer( renderer ); - actor.SetSize( 400, 400 ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); actor.SetProperty( Actor::Property::COLOR, Vector4( 1.0f, 0.0f, 1.0f, 1.0f ) ); Stage::GetCurrent().Add( actor ); @@ -2874,7 +2874,7 @@ int UtcDaliRendererOpacityAnimation(void) Actor actor = Actor::New(); actor.AddRenderer( renderer ); - actor.SetSize( 400, 400 ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); actor.SetProperty( Actor::Property::COLOR, Vector4( 1.0f, 0.0f, 1.0f, 1.0f ) ); Stage::GetCurrent().Add( actor ); @@ -2927,7 +2927,7 @@ int UtcDaliRendererInvalidProperty(void) Actor actor = Actor::New(); actor.AddRenderer( renderer ); - actor.SetSize( 400, 400 ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add( actor ); application.SendNotification(); @@ -2954,7 +2954,7 @@ int UtcDaliRendererRenderingBehavior(void) Actor actor = Actor::New(); actor.AddRenderer( renderer ); - actor.SetSize( 400, 400 ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); actor.SetProperty( Actor::Property::COLOR, Vector4( 1.0f, 0.0f, 1.0f, 1.0f ) ); Stage::GetCurrent().Add( actor ); @@ -3022,7 +3022,7 @@ int UtcDaliRendererRegenerateUniformMap(void) Actor actor = Actor::New(); actor.AddRenderer( renderer ); - actor.SetSize( 400, 400 ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); actor.SetProperty( Actor::Property::COLOR, Vector4( 1.0f, 0.0f, 1.0f, 1.0f ) ); Stage::GetCurrent().Add( actor ); diff --git a/automated-tests/src/dali/utc-Dali-RotationGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-RotationGestureDetector.cpp index 68029e7..77c7a8b 100644 --- a/automated-tests/src/dali/utc-Dali-RotationGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-RotationGestureDetector.cpp @@ -170,7 +170,7 @@ int UtcDaliRotationGestureDetectorNew(void) // Attach an actor and emit a touch event on the actor to ensure complete line coverage Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -231,7 +231,7 @@ int UtcDaliRotationGestureSignalReceptionNegative(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -273,7 +273,7 @@ int UtcDaliRotationGestureSignalReceptionDownMotionLeave(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -330,7 +330,7 @@ int UtcDaliRotationGestureSignalReceptionDownMotionUp(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -378,7 +378,7 @@ int UtcDaliRotationGestureSignalReceptionDetach(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -429,7 +429,7 @@ int UtcDaliRotationGestureSignalReceptionDetachWhileRotationing(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -481,7 +481,7 @@ int UtcDaliRotationGestureSignalReceptionActorDestroyedWhileRotationing(void) // Attach a temporary actor to stop detector being removed from RotationGestureProcessor when main actor // is destroyed. Actor tempActor = Actor::New(); - tempActor.SetSize(100.0f, 100.0f); + tempActor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); tempActor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::BOTTOM_RIGHT); Stage::GetCurrent().Add(tempActor); detector.Attach(tempActor); @@ -489,7 +489,7 @@ int UtcDaliRotationGestureSignalReceptionActorDestroyedWhileRotationing(void) // Actor lifetime is scoped { Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -535,7 +535,7 @@ int UtcDaliRotationGestureSignalReceptionRotatedActor(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ORIENTATION, Quaternion(Dali::Degree(90.0f), Vector3::ZAXIS) ); Stage::GetCurrent().Add(actor); @@ -597,7 +597,7 @@ int UtcDaliRotationGestureSignalReceptionChildHit(void) TestApplication application; Actor parent = Actor::New(); - parent.SetSize(100.0f, 100.0f); + parent.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); parent.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(parent); @@ -605,7 +605,7 @@ int UtcDaliRotationGestureSignalReceptionChildHit(void) // Change rotation of child to be different from parent so that we can check if our local coordinate // conversion of the parent actor is correct. Actor child = Actor::New(); - child.SetSize(100.0f, 100.0f); + child.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); child.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER); child.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); child.SetProperty( Actor::Property::ORIENTATION, Quaternion(Dali::Degree(90.0f), Vector3::ZAXIS) ); @@ -659,13 +659,13 @@ int UtcDaliRotationGestureSignalReceptionAttachDetachMany(void) TestApplication application; Actor first = Actor::New(); - first.SetSize(100.0f, 100.0f); + first.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); first.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(first); Actor second = Actor::New(); - second.SetSize(100.0f, 100.0f); - second.SetX(100.0f); + second.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); + second.SetProperty( Actor::Property::POSITION_X, 100.0f); second.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(second); @@ -710,7 +710,7 @@ int UtcDaliRotationGestureSignalReceptionActorBecomesUntouchable(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -756,12 +756,12 @@ int UtcDaliRotationGestureSignalReceptionMultipleDetectorsOnActor(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); Actor actor2 = Actor::New(); - actor2.SetSize(100.0f, 100.0f); + actor2.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::BOTTOM_RIGHT); Stage::GetCurrent().Add(actor2); @@ -835,7 +835,7 @@ int UtcDaliRotationGestureSignalReceptionEnsureCorrectSignalling(void) TestApplication application; Actor actor1 = Actor::New(); - actor1.SetSize(100.0f, 100.0f); + actor1.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor1); SignalData data1; @@ -845,7 +845,7 @@ int UtcDaliRotationGestureSignalReceptionEnsureCorrectSignalling(void) detector1.DetectedSignal().Connect(&application, functor1); Actor actor2 = Actor::New(); - actor2.SetSize(100.0f, 100.0f); + actor2.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::BOTTOM_RIGHT); actor2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::BOTTOM_RIGHT); Stage::GetCurrent().Add(actor2); @@ -872,7 +872,7 @@ int UtcDaliRotationGestureActorUnstaged(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -963,14 +963,14 @@ int UtcDaliRotationGestureActorStagedAndDestroyed(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); // Create and add a second actor so that GestureDetector destruction does not come into play. Actor dummyActor( Actor::New() ); - dummyActor.SetSize( 100.0f, 100.0f ); - dummyActor.SetPosition( 100.0f, 100.0f ); + dummyActor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); + dummyActor.SetProperty( Actor::Property::POSITION, Vector2( 100.0f, 100.0f )); dummyActor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(dummyActor); @@ -1055,7 +1055,7 @@ int UtcDaliRotationGestureLayerConsumesTouch(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1068,7 +1068,7 @@ int UtcDaliRotationGestureLayerConsumesTouch(void) // Add a layer to overlap the actor Layer layer = Layer::New(); - layer.SetSize(100.0f, 100.0f); + layer.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); layer.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add( layer ); layer.RaiseToTop(); diff --git a/automated-tests/src/dali/utc-Dali-RotationGestureRecognizer.cpp b/automated-tests/src/dali/utc-Dali-RotationGestureRecognizer.cpp index 7b4d06b..04d723c 100644 --- a/automated-tests/src/dali/utc-Dali-RotationGestureRecognizer.cpp +++ b/automated-tests/src/dali/utc-Dali-RotationGestureRecognizer.cpp @@ -115,7 +115,7 @@ int UtcDaliRotationGestureRecognizerMinimumTouchEvents(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Stage::GetCurrent().Add( actor ); @@ -156,7 +156,7 @@ int UtcDaliRotationGestureRecognizerMinimumTouchEventsAfterStart(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Stage::GetCurrent().Add( actor ); diff --git a/automated-tests/src/dali/utc-Dali-Sampler.cpp b/automated-tests/src/dali/utc-Dali-Sampler.cpp index d403a29..b8797b3 100644 --- a/automated-tests/src/dali/utc-Dali-Sampler.cpp +++ b/automated-tests/src/dali/utc-Dali-Sampler.cpp @@ -134,7 +134,7 @@ int UtcSamplerSetFilterMode(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add( actor ); @@ -265,7 +265,7 @@ int UtcSamplerSetWrapMode1(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add( actor ); TestGlAbstraction& gl = application.GetGlAbstraction(); @@ -354,7 +354,7 @@ int UtcSamplerSetWrapMode2(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - actor.SetSize( 400, 400 ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add( actor ); TestGlAbstraction& gl = application.GetGlAbstraction(); diff --git a/automated-tests/src/dali/utc-Dali-Scene.cpp b/automated-tests/src/dali/utc-Dali-Scene.cpp index b52e2c2..d4125b2 100644 --- a/automated-tests/src/dali/utc-Dali-Scene.cpp +++ b/automated-tests/src/dali/utc-Dali-Scene.cpp @@ -670,7 +670,7 @@ int UtcDaliSceneTouchSignalP(void) // Add an actor to the scene. Actor actor = Actor::New(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); actor.TouchedSignal().Connect( &DummyTouchCallback ); @@ -793,7 +793,7 @@ int UtcDaliSceneTouchSignalN(void) // Add an actor to the scene. Actor actor = Actor::New(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); actor.TouchedSignal().Connect( &DummyTouchCallback ); @@ -915,7 +915,7 @@ int UtcDaliSceneSurfaceResizedDefaultSceneViewport(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); // Render before resizing surface @@ -969,7 +969,7 @@ int UtcDaliSceneSurfaceResizedMultipleRenderTasks(void) actor.AddRenderer(renderer); int testWidth = 400; int testHeight = 400; - actor.SetSize(testWidth, testHeight); + actor.SetProperty( Actor::Property::SIZE, Vector2( testWidth, testHeight) ); stage.Add(actor); CameraActor offscreenCameraActor = CameraActor::New( Size( testWidth, testHeight ) ); @@ -1189,7 +1189,8 @@ int UtcDaliSceneEmptySceneRendering(void) Actor actor = Actor::New(); actor.AddRenderer( renderer ); - actor.SetSize( 400, 400 ); + + actor.SetProperty( Actor::Property::SIZE, Vector2( 400, 400 ) ); Stage::GetCurrent().Add( actor ); // Render diff --git a/automated-tests/src/dali/utc-Dali-Scripting.cpp b/automated-tests/src/dali/utc-Dali-Scripting.cpp index 39cbb19..a911567 100644 --- a/automated-tests/src/dali/utc-Dali-Scripting.cpp +++ b/automated-tests/src/dali/utc-Dali-Scripting.cpp @@ -664,9 +664,9 @@ int UtcDaliScriptingCreatePropertyMapActor(void) // Default properties { Actor actor = Actor::New(); - actor.SetSize( Vector3::ONE ); - actor.SetPosition( Vector3::XAXIS ); - actor.SetScale( Vector3::ZAXIS ); + actor.SetProperty( Actor::Property::SIZE, Vector3::ONE ); + actor.SetProperty( Actor::Property::POSITION, Vector3::XAXIS ); + actor.SetProperty( Actor::Property::SCALE, Vector3::ZAXIS ); actor.SetProperty( Actor::Property::VISIBLE, false ); actor.SetProperty( Actor::Property::COLOR, Color::MAGENTA ); actor.SetProperty( Actor::Property::NAME, "MyActor" ); diff --git a/automated-tests/src/dali/utc-Dali-Shader.cpp b/automated-tests/src/dali/utc-Dali-Shader.cpp index 5923a46..3336e20 100644 --- a/automated-tests/src/dali/utc-Dali-Shader.cpp +++ b/automated-tests/src/dali/utc-Dali-Shader.cpp @@ -147,7 +147,7 @@ int UtcDaliShaderConstraint01(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); Vector4 initialColor = Color::WHITE; @@ -189,7 +189,7 @@ int UtcDaliShaderConstraint02(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); application.SendNotification(); application.Render(0); @@ -243,7 +243,7 @@ int UtcDaliShaderAnimatedProperty01(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); Vector4 initialColor = Color::WHITE; @@ -284,7 +284,7 @@ int UtcDaliShaderAnimatedProperty02(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add(actor); application.SendNotification(); application.Render(0); diff --git a/automated-tests/src/dali/utc-Dali-Stage.cpp b/automated-tests/src/dali/utc-Dali-Stage.cpp index 3cf546a..592453d 100755 --- a/automated-tests/src/dali/utc-Dali-Stage.cpp +++ b/automated-tests/src/dali/utc-Dali-Stage.cpp @@ -1028,7 +1028,7 @@ int UtcDaliStageTouchedSignalP(void) // Add an actor to the scene. Actor actor = Actor::New(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); actor.TouchedSignal().Connect( &DummyTouchCallback ); @@ -1153,7 +1153,7 @@ int UtcDaliStageTouchedSignalN(void) // Add an actor to the scene. Actor actor = Actor::New(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); actor.TouchedSignal().Connect( &DummyTouchCallback ); @@ -1243,7 +1243,7 @@ int UtcDaliStageTouchSignalP(void) // Add an actor to the scene. Actor actor = Actor::New(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); actor.TouchedSignal().Connect( &DummyTouchCallback ); @@ -1374,7 +1374,7 @@ int UtcDaliStageTouchSignalN(void) // Add an actor to the scene. Actor actor = Actor::New(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); actor.TouchedSignal().Connect( &DummyTouchCallback ); diff --git a/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp index 8394587..67e60c2 100644 --- a/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp @@ -177,7 +177,7 @@ int UtcDaliTapGestureDetectorNew(void) // Attach an actor and emit a touch event on the actor to ensure complete line coverage Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -242,7 +242,7 @@ int UtcDaliTapGestureSetTapsRequiredMinMaxCheck(void) // Attach an actor and change the required touches Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -283,7 +283,7 @@ int UtcDaliTapGestureSignalReceptionNegative(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -309,7 +309,7 @@ int UtcDaliTapGestureSignalReceptionPositive(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -338,7 +338,7 @@ int UtcDaliTapGestureSignalReceptionDetach(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -393,7 +393,7 @@ int UtcDaliTapGestureSignalReceptionActorDestroyedWhileTapping(void) // Actor lifetime is scoped { Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -428,7 +428,7 @@ int UtcDaliTapGestureSignalReceptionRotatedActor(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ORIENTATION, Quaternion(Dali::Degree(90.0f), Vector3::ZAXIS) ); Stage::GetCurrent().Add(actor); @@ -480,7 +480,7 @@ int UtcDaliTapGestureSignalReceptionChildHit(void) TestApplication application; Actor parent = Actor::New(); - parent.SetSize(100.0f, 100.0f); + parent.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); parent.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(parent); @@ -488,7 +488,7 @@ int UtcDaliTapGestureSignalReceptionChildHit(void) // Change rotation of child to be different from parent so that we can check if our local coordinate // conversion of the parent actor is correct. Actor child = Actor::New(); - child.SetSize(100.0f, 100.0f); + child.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); child.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER); child.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); child.SetProperty( Actor::Property::ORIENTATION, Quaternion(Dali::Degree(90.0f), Vector3::ZAXIS) ); @@ -533,13 +533,13 @@ int UtcDaliTapGestureSignalReceptionAttachDetachMany(void) TestApplication application; Actor first = Actor::New(); - first.SetSize(100.0f, 100.0f); + first.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); first.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(first); Actor second = Actor::New(); - second.SetSize(100.0f, 100.0f); - second.SetX(100.0f); + second.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); + second.SetProperty( Actor::Property::POSITION_X, 100.0f); second.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(second); @@ -586,7 +586,7 @@ int UtcDaliTapGestureSignalReceptionActorBecomesUntouchable(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -624,14 +624,14 @@ int UtcDaliTapGestureSignalReceptionMultipleGestureDetectors(void) TestApplication application; Actor first = Actor::New(); - first.SetSize(100.0f, 100.0f); + first.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); first.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(first); Actor second = Actor::New(); - second.SetSize(100.0f, 100.0f); + second.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); second.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - second.SetX(100.0f); + second.SetProperty( Actor::Property::POSITION_X, 100.0f); first.Add(second); // Render and notify @@ -685,7 +685,7 @@ int UtcDaliTapGestureSignalReceptionMultipleDetectorsOnActor(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -719,7 +719,7 @@ int UtcDaliTapGestureSignalReceptionDifferentPossible(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -739,7 +739,7 @@ int UtcDaliTapGestureSignalReceptionDifferentPossible(void) DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION); // Move actor somewhere else - actor.SetPosition( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::POSITION, Vector2( 100.0f, 100.0f )); // Render and notify application.SendNotification(); @@ -754,7 +754,7 @@ int UtcDaliTapGestureSignalReceptionDifferentPossible(void) DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION); // Move actor in to the tap position. - actor.SetPosition( 0.0f, 0.0f ); + actor.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f )); // Render and notify application.SendNotification(); @@ -775,7 +775,7 @@ int UtcDaliTapGestureActorUnstaged(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -801,7 +801,7 @@ int UtcDaliTapGestureDetectorRemovedWhilePossible(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -831,7 +831,7 @@ int UtcDaliTapGestureActorRemovedWhilePossible(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -866,7 +866,7 @@ int UtcDaliTapGestureLayerConsumesTouch(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -879,7 +879,7 @@ int UtcDaliTapGestureLayerConsumesTouch(void) // Add a layer to overlap the actor Layer layer = Layer::New(); - layer.SetSize(100.0f, 100.0f); + layer.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); layer.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add( layer ); layer.RaiseToTop(); diff --git a/automated-tests/src/dali/utc-Dali-TapGestureRecognizer.cpp b/automated-tests/src/dali/utc-Dali-TapGestureRecognizer.cpp index ccdefa3..3e130b0 100644 --- a/automated-tests/src/dali/utc-Dali-TapGestureRecognizer.cpp +++ b/automated-tests/src/dali/utc-Dali-TapGestureRecognizer.cpp @@ -116,7 +116,7 @@ int UtcDaliTapGestureRecognizerBasic(void) TapGestureDetector detector = TapGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -149,7 +149,7 @@ int UtcDaliTapGestureRecognizerGapTooLong(void) TapGestureDetector detector = TapGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -182,7 +182,7 @@ int UtcDaliTapGestureRecognizerInterrupted(void) TapGestureDetector detector = TapGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -217,7 +217,7 @@ int UtcDaliTapGestureRecognizerMoveTooFar(void) TapGestureDetector detector = TapGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -250,7 +250,7 @@ int UtcDaliTapGestureRecognizerStartDouble(void) TapGestureDetector detector = TapGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -283,7 +283,7 @@ int UtcDaliTapGestureRecognizerEndDouble(void) TapGestureDetector detector = TapGestureDetector::New(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -318,7 +318,7 @@ int UtcDaliTapGestureRecognizerDoubleTap(void) TapGestureDetector detector = TapGestureDetector::New(2); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -359,7 +359,7 @@ int UtcDaliTapGestureRecognizerDoubleTapMoveTooFar(void) TapGestureDetector detector = TapGestureDetector::New(2); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -412,7 +412,7 @@ int UtcDaliTapGestureRecognizerDoubleTapWaitTooLong(void) TapGestureDetector detector = TapGestureDetector::New(2); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -463,14 +463,14 @@ int UtcDaliTapGestureRecognizerMultipleDetectors(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); Actor actor2 = Actor::New(); - actor2.SetSize(100.0f, 100.0f); + actor2.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - actor2.SetX(100.0f); + actor2.SetProperty( Actor::Property::POSITION_X, 100.0f); Stage::GetCurrent().Add(actor2); // Render and notify diff --git a/automated-tests/src/dali/utc-Dali-TextureSet.cpp b/automated-tests/src/dali/utc-Dali-TextureSet.cpp index a8f33fd..e0af59b 100644 --- a/automated-tests/src/dali/utc-Dali-TextureSet.cpp +++ b/automated-tests/src/dali/utc-Dali-TextureSet.cpp @@ -56,7 +56,7 @@ Actor CreateActor( SetSampler setSamplerOption ) Actor actor = Actor::New(); actor.AddRenderer(renderer); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); return actor; } @@ -254,7 +254,7 @@ int UtcDaliTextureSetSetSampler(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - actor.SetSize(400, 400); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); Stage::GetCurrent().Add( actor ); diff --git a/automated-tests/src/dali/utc-Dali-TouchDataProcessing.cpp b/automated-tests/src/dali/utc-Dali-TouchDataProcessing.cpp index 4019cbd..76cb868 100755 --- a/automated-tests/src/dali/utc-Dali-TouchDataProcessing.cpp +++ b/automated-tests/src/dali/utc-Dali-TouchDataProcessing.cpp @@ -300,7 +300,7 @@ int UtcDaliTouchDataNormalProcessing01(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -364,7 +364,7 @@ int UtcDaliTouchDataNormalProcessing02(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -398,7 +398,7 @@ int UtcDaliTouchDataAPINegative(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -437,7 +437,7 @@ int UtcDaliTouchDataOutsideCameraNearFarPlanes(void) Vector2 stageSize = stage.GetSize(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER); actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); stage.Add(actor); @@ -470,7 +470,7 @@ int UtcDaliTouchDataOutsideCameraNearFarPlanes(void) data.Reset(); // Emit a down signal where actor is just at the camera's near plane - actor.SetZ(distance - nearPlane); + actor.SetProperty( Actor::Property::POSITION_Z, distance - nearPlane); // Render and notify application.SendNotification(); @@ -481,7 +481,7 @@ int UtcDaliTouchDataOutsideCameraNearFarPlanes(void) data.Reset(); // Emit a down signal where actor is closer than the camera's near plane - actor.SetZ((distance - nearPlane) + 1.0f); + actor.SetProperty( Actor::Property::POSITION_Z, (distance - nearPlane) + 1.0f); // Render and notify application.SendNotification(); @@ -492,7 +492,7 @@ int UtcDaliTouchDataOutsideCameraNearFarPlanes(void) data.Reset(); // Emit a down signal where actor is just at the camera's far plane - actor.SetZ(distance - farPlane); + actor.SetProperty( Actor::Property::POSITION_Z, distance - farPlane); // Render and notify application.SendNotification(); @@ -503,7 +503,7 @@ int UtcDaliTouchDataOutsideCameraNearFarPlanes(void) data.Reset(); // Emit a down signal where actor is further than the camera's far plane - actor.SetZ((distance - farPlane) - 1.0f); + actor.SetProperty( Actor::Property::POSITION_Z, (distance - farPlane) - 1.0f); // Render and notify application.SendNotification(); @@ -538,7 +538,7 @@ int UtcDaliTouchDataInterrupted(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -575,7 +575,7 @@ int UtcDaliTouchDataParentConsumer(void) Actor rootActor( Stage::GetCurrent().GetRootLayer() ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -675,7 +675,7 @@ int UtcDaliTouchDataInterruptedParentConsumer(void) Actor rootActor( Stage::GetCurrent().GetRootLayer() ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -754,7 +754,7 @@ int UtcDaliTouchDataLeave(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -809,7 +809,7 @@ int UtcDaliTouchDataLeaveParentConsumer(void) Actor rootActor( Stage::GetCurrent().GetRootLayer() ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -890,7 +890,7 @@ int UtcDaliTouchDataActorBecomesInsensitive(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -926,7 +926,7 @@ int UtcDaliTouchDataActorBecomesInsensitiveParentConsumer(void) Actor rootActor( Stage::GetCurrent().GetRootLayer() ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -981,14 +981,14 @@ int UtcDaliTouchDataMultipleLayers(void) TouchDataFunctor functor( data ); Layer layer1 ( Layer::New() ); - layer1.SetSize(100.0f, 100.0f); + layer1.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); layer1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add( layer1 ); Actor actor1 ( Actor::New() ); - actor1.SetSize( 100.0f, 100.0f ); + actor1.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - actor1.SetZ( 1.0f ); // Should hit actor1 in this layer + actor1.SetProperty( Actor::Property::POSITION_Z, 1.0f ); // Should hit actor1 in this layer layer1.Add( actor1 ); // Render and notify @@ -1029,13 +1029,13 @@ int UtcDaliTouchDataMultipleLayers(void) // Add another layer Layer layer2 ( Layer::New() ); - layer2.SetSize(100.0f, 100.0f ); + layer2.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); layer2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - layer2.SetZ( 10.0f ); // Should hit layer2 in this layer rather than actor2 + layer2.SetProperty( Actor::Property::POSITION_Z, 10.0f ); // Should hit layer2 in this layer rather than actor2 Stage::GetCurrent().Add( layer2 ); Actor actor2 ( Actor::New() ); - actor2.SetSize(100.0f, 100.0f); + actor2.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); layer2.Add( actor2 ); @@ -1097,7 +1097,7 @@ int UtcDaliTouchDataMultipleRenderTasks(void) Vector2 stageSize ( stage.GetSize() ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); stage.Add(actor); @@ -1141,12 +1141,12 @@ int UtcDaliTouchDataMultipleRenderTasksWithChildLayer(void) Vector2 stageSize ( stage.GetSize() ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); stage.Add(actor); Layer layer = Layer::New(); - layer.SetSize(100.0f, 100.0f); + layer.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); layer.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); actor.Add(layer); @@ -1197,12 +1197,12 @@ int UtcDaliTouchDataOffscreenRenderTasks(void) // Create a renderable actor to display the FrameBufferImage Actor renderableActor = CreateRenderableActor( frameBufferImage ); renderableActor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); - renderableActor.SetSize( stageSize.x, stageSize.y ); + renderableActor.SetProperty( Actor::Property::SIZE, Vector2( stageSize.x, stageSize.y ) ); renderableActor.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); // FIXME stage.Add( renderableActor ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); stage.Add( actor ); application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); // Ensure framebuffer connects @@ -1242,12 +1242,12 @@ int UtcDaliTouchDataMultipleRenderableActors(void) Vector2 stageSize ( stage.GetSize() ); Actor parent = CreateRenderableActor(); - parent.SetSize(100.0f, 100.0f); + parent.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); parent.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); stage.Add(parent); Actor actor = CreateRenderableActor(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); parent.Add(actor); @@ -1273,7 +1273,7 @@ int UtcDaliTouchDataActorRemovedInSignal(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1342,7 +1342,7 @@ int UtcDaliTouchDataActorSignalNotConsumed(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1366,7 +1366,7 @@ int UtcDaliTouchDataActorUnStaged(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1404,7 +1404,7 @@ int UtcDaliTouchDataLayerConsumesTouch(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1419,7 +1419,7 @@ int UtcDaliTouchDataLayerConsumesTouch(void) // Add a layer to overlap the actor Layer layer = Layer::New(); - layer.SetSize(100.0f, 100.0f); + layer.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); layer.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add( layer ); layer.RaiseToTop(); @@ -1456,7 +1456,7 @@ int UtcDaliTouchDataLeaveActorReadded(void) Stage stage = Stage::GetCurrent(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); stage.Add(actor); @@ -1502,20 +1502,20 @@ int UtcDaliTouchDataClippedActor(void) Stage stage = Stage::GetCurrent(); Actor actor = Actor::New(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); stage.Add( actor ); Actor clippingActor = Actor::New(); - clippingActor.SetSize( 50.0f, 50.0f ); + clippingActor.SetProperty( Actor::Property::SIZE, Vector2( 50.0f, 50.0f ) ); clippingActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); clippingActor.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN ); stage.Add( clippingActor ); // Add a child to the clipped region. Actor clippingChild = Actor::New(); - clippingChild.SetSize( 50.0f, 50.0f ); - clippingChild.SetPosition( 25.0f, 25.0f ); + clippingChild.SetProperty( Actor::Property::SIZE, Vector2( 50.0f, 50.0f ) ); + clippingChild.SetProperty( Actor::Property::POSITION, Vector2( 25.0f, 25.0f )); clippingChild.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); clippingActor.Add( clippingChild ); @@ -1553,7 +1553,7 @@ int UtcDaliTouchDataActorUnstaged(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1591,12 +1591,12 @@ int UtcDaliTouchDataParentUnstaged(void) TestApplication application; Actor parent = Actor::New(); - parent.SetSize(100.0f, 100.0f); + parent.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); parent.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(parent); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); parent.Add(actor); @@ -1634,12 +1634,12 @@ int UtcDaliTouchDataActorUnstagedDifferentConsumer(void) TestApplication application; Actor parent = Actor::New(); - parent.SetSize(100.0f, 100.0f); + parent.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); parent.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(parent); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); parent.Add(actor); @@ -1727,12 +1727,12 @@ int UtcDaliTouchDataInterruptedDifferentConsumer(void) Actor rootActor( Stage::GetCurrent().GetRootLayer() ); Actor parent = Actor::New(); - parent.SetSize(100.0f, 100.0f); + parent.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); parent.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(parent); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); parent.Add(actor); @@ -1798,7 +1798,7 @@ int UtcDaliTouchDataGetRadius(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1829,7 +1829,7 @@ int UtcDaliTouchDataGetEllipseRadius(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1860,7 +1860,7 @@ int UtcDaliTouchDataGetAngle(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1889,7 +1889,7 @@ int UtcDaliTouchDataGetPressure(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1918,7 +1918,7 @@ int UtcDaliTouchDataAndEventUsage(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1949,7 +1949,7 @@ int UtcDaliTouchDataGetDeviceAPINegative(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1980,7 +1980,7 @@ int UtcDaliTouchDataGetMouseButtonPositive(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -2009,7 +2009,7 @@ int UtcDaliTouchDataGetMouseButtonNagative(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); diff --git a/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp b/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp index a139394..89eff0e 100755 --- a/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp +++ b/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp @@ -137,7 +137,7 @@ int UtcDaliTouchNormalProcessing(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -206,7 +206,7 @@ int UtcDaliTouchOutsideCameraNearFarPlanes(void) Vector2 stageSize = stage.GetSize(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER); actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); stage.Add(actor); @@ -239,7 +239,7 @@ int UtcDaliTouchOutsideCameraNearFarPlanes(void) data.Reset(); // Emit a down signal where actor is just at the camera's near plane - actor.SetZ(distance - nearPlane); + actor.SetProperty( Actor::Property::POSITION_Z, distance - nearPlane); // Render and notify application.SendNotification(); @@ -250,7 +250,7 @@ int UtcDaliTouchOutsideCameraNearFarPlanes(void) data.Reset(); // Emit a down signal where actor is closer than the camera's near plane - actor.SetZ((distance - nearPlane) + 1.0f); + actor.SetProperty( Actor::Property::POSITION_Z, (distance - nearPlane) + 1.0f); // Render and notify application.SendNotification(); @@ -261,7 +261,7 @@ int UtcDaliTouchOutsideCameraNearFarPlanes(void) data.Reset(); // Emit a down signal where actor is just at the camera's far plane - actor.SetZ(distance - farPlane); + actor.SetProperty( Actor::Property::POSITION_Z, distance - farPlane); // Render and notify application.SendNotification(); @@ -272,7 +272,7 @@ int UtcDaliTouchOutsideCameraNearFarPlanes(void) data.Reset(); // Emit a down signal where actor is further than the camera's far plane - actor.SetZ((distance - farPlane) - 1.0f); + actor.SetProperty( Actor::Property::POSITION_Z, (distance - farPlane) - 1.0f); // Render and notify application.SendNotification(); @@ -307,7 +307,7 @@ int UtcDaliTouchInterrupted(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -344,7 +344,7 @@ int UtcDaliTouchParentConsumer(void) Actor rootActor( Stage::GetCurrent().GetRootLayer() ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -444,7 +444,7 @@ int UtcDaliTouchInterruptedParentConsumer(void) Actor rootActor( Stage::GetCurrent().GetRootLayer() ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -523,7 +523,7 @@ int UtcDaliTouchLeave(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -578,7 +578,7 @@ int UtcDaliTouchLeaveParentConsumer(void) Actor rootActor( Stage::GetCurrent().GetRootLayer() ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -659,7 +659,7 @@ int UtcDaliTouchActorBecomesInsensitive(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -695,7 +695,7 @@ int UtcDaliTouchActorBecomesInsensitiveParentConsumer(void) Actor rootActor( Stage::GetCurrent().GetRootLayer() ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -750,14 +750,14 @@ int UtcDaliTouchMultipleLayers(void) TouchEventFunctor functor( data ); Layer layer1 ( Layer::New() ); - layer1.SetSize(100.0f, 100.0f); + layer1.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); layer1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add( layer1 ); Actor actor1 ( Actor::New() ); - actor1.SetSize( 100.0f, 100.0f ); + actor1.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - actor1.SetZ( 1.0f ); // Should hit actor1 in this layer + actor1.SetProperty( Actor::Property::POSITION_Z, 1.0f ); // Should hit actor1 in this layer layer1.Add( actor1 ); // Render and notify @@ -798,13 +798,13 @@ int UtcDaliTouchMultipleLayers(void) // Add another layer Layer layer2 ( Layer::New() ); - layer2.SetSize(100.0f, 100.0f ); + layer2.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); layer2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - layer2.SetZ( 10.0f ); // Should hit layer2 in this layer rather than actor2 + layer2.SetProperty( Actor::Property::POSITION_Z, 10.0f ); // Should hit layer2 in this layer rather than actor2 Stage::GetCurrent().Add( layer2 ); Actor actor2 ( Actor::New() ); - actor2.SetSize(100.0f, 100.0f); + actor2.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); layer2.Add( actor2 ); @@ -866,7 +866,7 @@ int UtcDaliTouchMultipleRenderTasks(void) Vector2 stageSize ( stage.GetSize() ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); stage.Add(actor); @@ -910,12 +910,12 @@ int UtcDaliTouchMultipleRenderTasksWithChildLayer(void) Vector2 stageSize ( stage.GetSize() ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); stage.Add(actor); Layer layer = Layer::New(); - layer.SetSize(100.0f, 100.0f); + layer.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); layer.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); actor.Add(layer); @@ -966,12 +966,12 @@ int UtcDaliTouchOffscreenRenderTasks(void) // Create a renderable actor to display the FrameBufferImage Actor renderableActor = CreateRenderableActor( frameBufferImage ); renderableActor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); - renderableActor.SetSize( stageSize.x, stageSize.y ); + renderableActor.SetProperty( Actor::Property::SIZE, Vector2( stageSize.x, stageSize.y ) ); renderableActor.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); // FIXME stage.Add( renderableActor ); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); stage.Add( actor ); application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); // Ensure framebuffer connects @@ -1011,7 +1011,7 @@ int UtcDaliTouchRenderTaskWithExclusiveActor(void) auto stageSize( stage.GetSize() ); auto actor = CreateRenderableActor(); - actor.SetSize( stageSize.x, stageSize.y ); + actor.SetProperty( Actor::Property::SIZE, Vector2( stageSize.x, stageSize.y ) ); stage.Add( actor ); auto renderTask = stage.GetRenderTaskList().CreateTask(); @@ -1042,12 +1042,12 @@ int UtcDaliTouchMultipleRenderableActors(void) Vector2 stageSize ( stage.GetSize() ); Actor parent = CreateRenderableActor(); - parent.SetSize(100.0f, 100.0f); + parent.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); parent.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); stage.Add(parent); Actor actor = CreateRenderableActor(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); parent.Add(actor); @@ -1073,7 +1073,7 @@ int UtcDaliTouchActorRemovedInSignal(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1142,7 +1142,7 @@ int UtcDaliTouchActorSignalNotConsumed(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1166,7 +1166,7 @@ int UtcDaliTouchActorUnStaged(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1204,7 +1204,7 @@ int UtcDaliTouchLayerConsumesTouch(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1219,7 +1219,7 @@ int UtcDaliTouchLayerConsumesTouch(void) // Add a layer to overlap the actor Layer layer = Layer::New(); - layer.SetSize(100.0f, 100.0f); + layer.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); layer.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add( layer ); layer.RaiseToTop(); @@ -1256,7 +1256,7 @@ int UtcDaliTouchLeaveActorReadded(void) Stage stage = Stage::GetCurrent(); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); stage.Add(actor); @@ -1302,20 +1302,20 @@ int UtcDaliTouchClippingActor(void) Stage stage = Stage::GetCurrent(); Actor actor = Actor::New(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); stage.Add( actor ); Actor clippingActor = Actor::New(); - clippingActor.SetSize( 50.0f, 50.0f ); + clippingActor.SetProperty( Actor::Property::SIZE, Vector2( 50.0f, 50.0f ) ); clippingActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); clippingActor.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN ); stage.Add( clippingActor ); // Add a child to the clipped region. Actor clippingChild = Actor::New(); - clippingChild.SetSize( 50.0f, 50.0f ); - clippingChild.SetPosition( 25.0f, 25.0f ); + clippingChild.SetProperty( Actor::Property::SIZE, Vector2( 50.0f, 50.0f ) ); + clippingChild.SetProperty( Actor::Property::POSITION, Vector2( 25.0f, 25.0f )); clippingChild.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); clippingActor.Add( clippingChild ); @@ -1353,7 +1353,7 @@ int UtcDaliTouchActorUnstaged(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -1391,12 +1391,12 @@ int UtcDaliTouchParentUnstaged(void) TestApplication application; Actor parent = Actor::New(); - parent.SetSize(100.0f, 100.0f); + parent.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); parent.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(parent); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); parent.Add(actor); @@ -1434,12 +1434,12 @@ int UtcDaliTouchActorUnstagedDifferentConsumer(void) TestApplication application; Actor parent = Actor::New(); - parent.SetSize(100.0f, 100.0f); + parent.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); parent.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(parent); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); parent.Add(actor); @@ -1527,12 +1527,12 @@ int UtcDaliTouchInterruptedDifferentConsumer(void) Actor rootActor( Stage::GetCurrent().GetRootLayer() ); Actor parent = Actor::New(); - parent.SetSize(100.0f, 100.0f); + parent.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); parent.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(parent); Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); parent.Add(actor); @@ -1598,7 +1598,7 @@ int UtcDaliTouchDataConvert(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); diff --git a/automated-tests/src/dali/utc-Dali-TypeRegistry.cpp b/automated-tests/src/dali/utc-Dali-TypeRegistry.cpp index 5b3c990..a94fe9b 100644 --- a/automated-tests/src/dali/utc-Dali-TypeRegistry.cpp +++ b/automated-tests/src/dali/utc-Dali-TypeRegistry.cpp @@ -2065,7 +2065,7 @@ int UtcDaliLongPressGestureDetectorTypeRegistry(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -2103,7 +2103,7 @@ int UtcDaliPanGestureDetectorTypeRegistry(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -2139,7 +2139,7 @@ int UtcDaliPinchGestureDetectorTypeRegistry(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -2176,7 +2176,7 @@ int UtcDaliRotationGestureDetectorTypeRegistry(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); @@ -2213,7 +2213,7 @@ int UtcDaliTapGestureDetectorTypeRegistry(void) TestApplication application; Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); diff --git a/automated-tests/src/dali/utc-Dali-WheelEvent.cpp b/automated-tests/src/dali/utc-Dali-WheelEvent.cpp index 9c7c223..ccc16a4 100644 --- a/automated-tests/src/dali/utc-Dali-WheelEvent.cpp +++ b/automated-tests/src/dali/utc-Dali-WheelEvent.cpp @@ -214,7 +214,7 @@ int UtcDaliWheelEventSignalling(void) TestApplication application; // Reset all test adapter return codes Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(actor); diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp index f5dfba6..ebc19f0 100644 --- a/dali/internal/event/actors/actor-impl.cpp +++ b/dali/internal/event/actors/actor-impl.cpp @@ -2441,7 +2441,15 @@ void Actor::SetDefaultProperty( Property::Index index, const Property::Value& pr case Dali::Actor::Property::SIZE: { - SetSize( property.Get< Vector3 >() ); + Property::Type type = property.GetType(); + if( type == Property::VECTOR2 ) + { + SetSize( property.Get< Vector2 >() ); + } + else if ( type == Property::VECTOR3 ) + { + SetSize( property.Get< Vector3 >() ); + } break; } @@ -2465,7 +2473,16 @@ void Actor::SetDefaultProperty( Property::Index index, const Property::Value& pr case Dali::Actor::Property::POSITION: { - SetPosition( property.Get< Vector3 >() ); + Property::Type type = property.GetType(); + if( type == Property::VECTOR2 ) + { + Vector2 position = property.Get< Vector2 >(); + SetPosition( Vector3( position.x, position.y, 0.0f ) ); + } + else if ( type == Property::VECTOR3 ) + { + SetPosition( property.Get< Vector3 >() ); + } break; } @@ -2495,7 +2512,16 @@ void Actor::SetDefaultProperty( Property::Index index, const Property::Value& pr case Dali::Actor::Property::SCALE: { - SetScale( property.Get< Vector3 >() ); + Property::Type type = property.GetType(); + if( type == Property::FLOAT ) + { + float scale = property.Get< float >(); + SetScale( scale, scale, scale ); + } + else if ( type == Property::VECTOR3 ) + { + SetScale( property.Get< Vector3 >() ); + } break; } diff --git a/dali/public-api/actors/actor.cpp b/dali/public-api/actors/actor.cpp index 4e50bea..f131dbd 100644 --- a/dali/public-api/actors/actor.cpp +++ b/dali/public-api/actors/actor.cpp @@ -135,26 +135,6 @@ Actor Actor::GetParent() const return Actor(parent); } -void Actor::SetSize(float width, float height) -{ - GetImplementation(*this).SetSize(width, height); -} - -void Actor::SetSize(float width, float height, float depth) -{ - GetImplementation(*this).SetSize(width, height, depth); -} - -void Actor::SetSize(const Vector2& size) -{ - GetImplementation(*this).SetSize( size ); -} - -void Actor::SetSize(const Vector3& size) -{ - GetImplementation(*this).SetSize( size ); -} - Vector3 Actor::GetTargetSize() const { return GetImplementation(*this).GetTargetSize(); @@ -165,36 +145,6 @@ Vector3 Actor::GetNaturalSize() const return GetImplementation(*this).GetNaturalSize(); } -void Actor::SetPosition(float x, float y) -{ - GetImplementation(*this).SetPosition(x, y); -} - -void Actor::SetPosition(float x, float y, float z) -{ - GetImplementation(*this).SetPosition(x, y, z); -} - -void Actor::SetPosition(const Vector3& position) -{ - GetImplementation(*this).SetPosition(position); -} - -void Actor::SetX(float x) -{ - GetImplementation(*this).SetX(x); -} - -void Actor::SetY(float y) -{ - GetImplementation(*this).SetY(y); -} - -void Actor::SetZ(float z) -{ - GetImplementation(*this).SetZ(z); -} - void Actor::TranslateBy(const Vector3& distance) { GetImplementation(*this).TranslateBy(distance); @@ -210,21 +160,6 @@ void Actor::RotateBy(const Quaternion& relativeRotation) GetImplementation(*this).RotateBy(relativeRotation); } -void Actor::SetScale(float scale) -{ - GetImplementation(*this).SetScale(scale); -} - -void Actor::SetScale(float scaleX, float scaleY, float scaleZ) -{ - GetImplementation(*this).SetScale(scaleX, scaleY, scaleZ); -} - -void Actor::SetScale(const Vector3& scale) -{ - GetImplementation(*this).SetScale(scale); -} - void Actor::ScaleBy(const Vector3& relativeScale) { GetImplementation(*this).ScaleBy(relativeScale); diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h index 9be506d..7b3cb73 100644 --- a/dali/public-api/actors/actor.h +++ b/dali/public-api/actors/actor.h @@ -315,9 +315,9 @@ public: /** * @brief The size of an actor. - * @details Name "size", type Property::VECTOR3, animatable / constraint-input + * @details Name "size", type Property::VECTOR3 or Property::VECTOR2, animatable / constraint-input + * @note Only Property::VECTOR3 can be animated or used as constraint-input * @SINCE_1_0.0 - * @see Actor::SetSize() */ SIZE, @@ -325,7 +325,6 @@ public: * @brief The width of an actor. * @details Name "sizeWidth", type Property::FLOAT, animatable / constraint-input * @SINCE_1_0.0 - * @see Actor::SetSize() */ SIZE_WIDTH, @@ -333,7 +332,6 @@ public: * @brief The height of an actor. * @details Name "sizeHeight", type Property::FLOAT, animatable / constraint-input * @SINCE_1_0.0 - * @see Actor::SetSize() */ SIZE_HEIGHT, @@ -341,15 +339,14 @@ public: * @brief The depth of an actor. * @details Name "sizeDepth", type Property::FLOAT, animatable / constraint-input * @SINCE_1_0.0 - * @see Actor::SetSize() */ SIZE_DEPTH, /** * @brief The position of an actor. - * @details Name "position", type Property::VECTOR3, animatable / constraint-input + * @details Name "position", type Property::VECTOR3 or Property::VECTOR2, animatable / constraint-input + * @note Only Property::VECTOR3 can be animated or used as constraint-input * @SINCE_1_0.0 - * @see Actor::SetPosition() */ POSITION, @@ -357,7 +354,6 @@ public: * @brief The x position of an actor. * @details Name "positionX", type Property::FLOAT, animatable / constraint-input * @SINCE_1_0.0 - * @see Actor::SetX() */ POSITION_X, @@ -365,7 +361,6 @@ public: * @brief The y position of an actor. * @details Name "positionY", type Property::FLOAT, animatable / constraint-input * @SINCE_1_0.0 - * @see Actor::SetY() */ POSITION_Y, @@ -373,7 +368,6 @@ public: * @brief The z position of an actor. * @details Name "positionZ", type Property::FLOAT, animatable / constraint-input * @SINCE_1_0.0 - * @see Actor::SetZ() */ POSITION_Z, @@ -421,9 +415,9 @@ public: /** * @brief The scale factor applied to an actor. - * @details Name "scale", type Property::VECTOR3, animatable / constraint-input + * @details Name "scale", type Property::VECTOR3 or Property::FLOAT, animatable / constraint-input + * @note Only Property::VECTOR3 can be animated or used as constraint-input * @SINCE_1_0.0 - * @see Actor::SetScale() */ SCALE, @@ -431,7 +425,6 @@ public: * @brief The x scale factor applied to an actor. * @details Name "scaleX", type Property::FLOAT, animatable / constraint-input * @SINCE_1_0.0 - * @see Actor::SetScale() */ SCALE_X, @@ -439,7 +432,6 @@ public: * @brief The y scale factor applied to an actor. * @details Name "scaleY", type Property::FLOAT, animatable / constraint-input * @SINCE_1_0.0 - * @see Actor::SetScale() */ SCALE_Y, @@ -447,7 +439,6 @@ public: * @brief The x scale factor applied to an actor. * @details Name "scaleZ", type Property::FLOAT, animatable / constraint-input * @SINCE_1_0.0 - * @see Actor::SetScale() */ SCALE_Z, @@ -874,55 +865,6 @@ public: // Positioning /** - * @brief Sets the size of an actor. - * - * Geometry can be scaled to fit within this area. - * This does not interfere with the actors scale factor. - * The actors default depth is the minimum of width & height. - * @SINCE_1_0.0 - * @param [in] width The new width - * @param [in] height The new height - * @pre The actor has been initialized. - */ - void SetSize(float width, float height); - - /** - * @brief Sets the size of an actor. - * - * Geometry can be scaled to fit within this area. - * This does not interfere with the actors scale factor. - * @SINCE_1_0.0 - * @param[in] width The size of the actor along the x-axis - * @param[in] height The size of the actor along the y-axis - * @param[in] depth The size of the actor along the z-axis - * @pre The actor has been initialized. - */ - void SetSize(float width, float height, float depth); - - /** - * @brief Sets the size of an actor. - * - * Geometry can be scaled to fit within this area. - * This does not interfere with the actors scale factor. - * The actors default depth is the minimum of width & height. - * @SINCE_1_0.0 - * @param[in] size The new size - * @pre The actor has been initialized. - */ - void SetSize(const Vector2& size); - - /** - * @brief Sets the size of an actor. - * - * Geometry can be scaled to fit within this area. - * This does not interfere with the actors scale factor. - * @SINCE_1_0.0 - * @param [in] size The new size - * @pre The actor has been initialized. - */ - void SetSize(const Vector3& size); - - /** * @brief Retrieves the actor's size. * * @SINCE_1_0.0 @@ -944,79 +886,6 @@ public: Vector3 GetNaturalSize() const; /** - * @brief Sets the position of the Actor. - * - * By default, sets the position vector between the parent origin and anchor point (default). - * - * If Position inheritance if disabled, sets the world position. @see Actor::Property::INHERIT_POSITION - * - * @image html actor-position.png - * The Actor's z position will be set to 0.0f. - * @SINCE_1_0.0 - * @param[in] x The new x position - * @param[in] y The new y position - * @pre The Actor has been initialized. - */ - void SetPosition(float x, float y); - - /** - * @brief Sets the position of the Actor. - * - * By default, sets the position vector between the parent origin and anchor point (default). - * - * If Position inheritance if disabled, sets the world position. @see Actor::Property::INHERIT_POSITION - * - * @image html actor-position.png - * @SINCE_1_0.0 - * @param[in] x The new x position - * @param[in] y The new y position - * @param[in] z The new z position - * @pre The Actor has been initialized. - */ - void SetPosition(float x, float y, float z); - - /** - * @brief Sets the position of the Actor. - * - * By default, sets the position vector between the parent origin and anchor point (default). - * - * If Position inheritance if disabled, sets the world position. @see Actor::Property::INHERIT_POSITION - * - * @image html actor-position.png - * @SINCE_1_0.0 - * @param[in] position The new position - * @pre The Actor has been initialized. - */ - void SetPosition(const Vector3& position); - - /** - * @brief Sets the position of an actor along the X-axis. - * - * @SINCE_1_0.0 - * @param[in] x The new x position - * @pre The Actor has been initialized. - */ - void SetX(float x); - - /** - * @brief Sets the position of an actor along the Y-axis. - * - * @SINCE_1_0.0 - * @param[in] y The new y position - * @pre The Actor has been initialized. - */ - void SetY(float y); - - /** - * @brief Sets the position of an actor along the Z-axis. - * - * @SINCE_1_0.0 - * @param[in] z The new z position - * @pre The Actor has been initialized. - */ - void SetZ(float z); - - /** * @brief Translates an actor relative to its existing position. * * @SINCE_1_0.0 @@ -1058,38 +927,6 @@ public: void RotateBy(const Quaternion& relativeRotation); /** - * @brief Sets the scale factor applied to an actor. - * - * @SINCE_1_0.0 - * @param[in] scale The scale factor applied on all axes - * @pre The Actor has been initialized. - * @note This is an asynchronous method; the value written may not match a value subsequently read with GetCurrentScale(). - */ - void SetScale(float scale); - - /** - * @brief Sets the scale factor applied to an actor. - * - * @SINCE_1_0.0 - * @param[in] scaleX The scale factor applied along the x-axis - * @param[in] scaleY The scale factor applied along the y-axis - * @param[in] scaleZ The scale factor applied along the z-axis - * @pre The Actor has been initialized. - * @note This is an asynchronous method; the value written may not match a value subsequently read with GetCurrentScale(). - */ - void SetScale(float scaleX, float scaleY, float scaleZ); - - /** - * @brief Sets the scale factor applied to an actor. - * - * @SINCE_1_0.0 - * @param[in] scale A vector representing the scale factor for each axis - * @pre The Actor has been initialized. - * @note This is an asynchronous method; the value written may not match a value subsequently read with GetCurrentScale(). - */ - void SetScale(const Vector3& scale); - - /** * @brief Applies a relative scale to an actor. * * @SINCE_1_0.0 -- 2.7.4