From: David Steele Date: Wed, 16 Feb 2022 16:25:51 +0000 (+0000) Subject: Updated visuals to use VisualRenderer X-Git-Tag: dali_2.1.13~3^2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=6ebbbf8ac1bc813b1f34950e4f76d6f55b304495 Updated visuals to use VisualRenderer TODO: remove cached values from visual-base-data-impl as VisualRenderer now caches event side values. TODO: Check that renderer.GetPropertyIndex isn't used in NUI with VisualProperty keys. Change-Id: I3f4417e3444d894fd455f40896f2ea07bbd8516a --- diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp index e99de5c..e6416e3 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -140,6 +140,8 @@ void TestGlAbstraction::Initialize() {"uViewMatrix", GL_FLOAT_MAT4, 1}, {"uLightCameraProjectionMatrix", GL_FLOAT_MAT4, 1}, {"uLightCameraViewMatrix", GL_FLOAT_MAT4, 1}}; + + // WARNING: IF YOU CHANGE THIS LIST, ALSO CHANGE UNIFORMS IN test-graphics-reflection.cpp } void TestGlAbstraction::PreRender() diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp index 83b7899..8f9b9fc 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ TestGraphicsBuffer::TestGraphicsBuffer(TraceCallStack& callStack, TestGlAbstract mUsage(usage) { memory.resize(size); - mGl.GetBufferTrace().EnableLogging(true); + mGl.GetBufferTrace().EnableLogging(false); } void TestGraphicsBuffer::Bind() diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.cpp index 3ed6b56..bedce18 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.cpp @@ -584,15 +584,15 @@ public: }; TestGraphicsController::TestGraphicsController() -: mCallStack(true, "TestGraphicsController."), - mCommandBufferCallStack(true, "TestCommandBuffer."), - mFrameBufferCallStack(true, "TestFrameBuffer.") +: mCallStack(false, "TestGraphicsController."), + mCommandBufferCallStack(false, "TestCommandBuffer."), + mFrameBufferCallStack(false, "TestFrameBuffer.") { mCallStack.Enable(true); mCommandBufferCallStack.Enable(true); auto& trace = mGl.GetTextureTrace(); trace.Enable(true); - trace.EnableLogging(true); + trace.EnableLogging(false); } void TestGraphicsController::SubmitCommandBuffers(const Graphics::SubmitInfo& submitInfo) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-reflection.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-reflection.cpp index 25c09b5..6971b71 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-reflection.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-reflection.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,6 +50,8 @@ static const std::vector UNIFORMS = UniformData("uViewMatrix", Property::Type::MATRIX), UniformData("uLightCameraProjectionMatrix", Property::Type::MATRIX), UniformData("uLightCameraViewMatrix", Property::Type::MATRIX), + + // WARNING: IF YOU CHANGE THIS LIST, ALSO CHANGE mActiveUniforms IN test-gl-abstraction, Initialize }; } diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp index 7f2de63..2316036 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -146,7 +146,26 @@ bool TraceCallStack::FindMethodAndGetParameters(std::string method, std::string& } if(!found) { - fprintf(stderr, "Search for %s(%s) failed\n", method.c_str(), params.c_str()); + fprintf(stderr, "Search for %s() failed\n", method.c_str()); + } + return found; +} + +bool TraceCallStack::FindMethodAndGetParameters(std::string method, NamedParams& params) const +{ + bool found = false; + for(size_t i = 0; i < mCallStack.size(); i++) + { + if(0 == mCallStack[i].method.compare(method)) + { + found = true; + params = mCallStack[i].namedParams; + break; + } + } + if(!found) + { + fprintf(stderr, "Search for %s() failed\n", method.c_str()); } return found; } diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.h index 6f720c5..c2d0a49 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.h @@ -207,6 +207,14 @@ public: bool FindMethodAndGetParameters(std::string method, std::string& params) const; /** + * Search for a method in the stack and return its parameters if found + * @param[in] method The name of the method + * @param[out] params of the method + * @return true if the method was in the stack + */ + bool FindMethodAndGetParameters(std::string method, NamedParams& params) const; + + /** * Count how many times a method was called * @param[in] method The name of the method * @return The number of times it was called diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp index 51b9923..4622431 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,20 +14,23 @@ * limitations under the License. */ -#include #include +#include #include + #include -#include + #include +#include + +#include +#include +#include #include #include -#include #include -#include -#include #include -#include +#include #include #include "dummy-control.h" @@ -48,23 +51,22 @@ void dali_image_visual_cleanup(void) namespace { -const char* TEST_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/gallery-small-1.jpg"; -const char* TEST_BROKEN_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/a-random-nonimage.jpg"; -const char* TEST_LARGE_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/tbcol.png"; -const char* TEST_SMALL_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/icon-edit.png"; -const char* TEST_REMOTE_IMAGE_FILE_NAME = "https://www.tizen.org/sites/all/themes/tizen_theme/logo.png"; -const char* TEST_INVALID_FILE_NAME = TEST_RESOURCE_DIR "/invalid.jpg"; +const char* TEST_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/gallery-small-1.jpg"; +const char* TEST_BROKEN_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/a-random-nonimage.jpg"; +const char* TEST_LARGE_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/tbcol.png"; +const char* TEST_SMALL_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/icon-edit.png"; +const char* TEST_REMOTE_IMAGE_FILE_NAME = "https://www.tizen.org/sites/all/themes/tizen_theme/logo.png"; +const char* TEST_INVALID_FILE_NAME = TEST_RESOURCE_DIR "/invalid.jpg"; const char* TEST_REMOTE_INVALID_FILE_NAME = "https://www.tizen.org/invalid.png"; -const char* TEST_MASK_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/mask.png"; -const char* TEST_ROTATED_IMAGE = TEST_RESOURCE_DIR "/keyboard-Landscape.jpg"; - +const char* TEST_MASK_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/mask.png"; +const char* TEST_ROTATED_IMAGE = TEST_RESOURCE_DIR "/keyboard-Landscape.jpg"; -bool gResourceReadySignalFired = false; -std::vector gReadyIds = {}; -void ResourceReadySignal( Control control ) +bool gResourceReadySignalFired = false; +std::vector gReadyIds = {}; +void ResourceReadySignal(Control control) { gResourceReadySignalFired = true; - gReadyIds.push_back(control.GetProperty< int >( Actor::Property::ID )); + gReadyIds.push_back(control.GetProperty(Actor::Property::ID)); } void ClearReadyIds() { @@ -73,351 +75,345 @@ void ClearReadyIds() Actor CreateActorWithImageVisual(const Property::Map& map) { - VisualFactory factory = VisualFactory::Get(); - DummyControl actor = DummyControl::New(); + VisualFactory factory = VisualFactory::Get(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - Visual::Base visual = factory.CreateVisual( map ); - DALI_TEST_CHECK( visual ); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + Visual::Base visual = factory.CreateVisual(map); + DALI_TEST_CHECK(visual); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); return actor; } - -Visual::Base CreateVisualWithPolicy( const char* url, Property::Index key, const Property::Value& value ) +Visual::Base CreateVisualWithPolicy(const char* url, Property::Index key, const Property::Value& value) { VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, url ); - propertyMap.Insert( ImageVisual::Property::DESIRED_WIDTH, 20 ); - propertyMap.Insert( ImageVisual::Property::DESIRED_HEIGHT, 30 ); - propertyMap.Insert( key , value ); + propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, url); + propertyMap.Insert(ImageVisual::Property::DESIRED_WIDTH, 20); + propertyMap.Insert(ImageVisual::Property::DESIRED_HEIGHT, 30); + propertyMap.Insert(key, value); - return factory.CreateVisual( propertyMap ); + return factory.CreateVisual(propertyMap); } } // namespace -void TestVisualRender( ToolkitTestApplication& application, - DummyControl& actor, - Visual::Base& visual, - std::size_t expectedSamplers = 0, - ImageDimensions imageDimensions = ImageDimensions(), - Integration::ResourcePointer resourcePtr = Integration::ResourcePointer()) +void TestVisualRender(ToolkitTestApplication& application, + DummyControl& actor, + Visual::Base& visual, + std::size_t expectedSamplers = 0, + ImageDimensions imageDimensions = ImageDimensions(), + Integration::ResourcePointer resourcePtr = Integration::ResourcePointer()) { DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); - if( resourcePtr ) + if(resourcePtr) { // set the image size, for test case, this needs to be set before loading started - application.GetPlatform().SetClosestImageSize( Vector2(imageDimensions.GetWidth(), imageDimensions.GetHeight()) ); + application.GetPlatform().SetClosestImageSize(Vector2(imageDimensions.GetWidth(), imageDimensions.GetHeight())); } - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); application.SendNotification(); // Send messages to update application.Render(); // process update and render application.SendNotification(); // process any signals to event - if( resourcePtr ) + if(resourcePtr) { - DALI_TEST_EQUALS( application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceSynchronouslyFunc ), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceSynchronouslyFunc), true, TEST_LOCATION); } - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); } -static void TestMixColor( Visual::Base visual, Property::Index mixColorIndex, const Vector4& testColor ) +static void TestMixColor(Visual::Base visual, Property::Index mixColorIndex, const Vector4& testColor) { Property::Map map; visual.CreatePropertyMap(map); - Property::Value* value = map.Find( mixColorIndex ); - DALI_TEST_CHECK( value ); + Property::Value* value = map.Find(mixColorIndex); + DALI_TEST_CHECK(value); Vector3 mixColor1; - DALI_TEST_CHECK( value->Get( mixColor1 ) ); - DALI_TEST_EQUALS( mixColor1, Vector3(testColor), 0.001, TEST_LOCATION ); + DALI_TEST_CHECK(value->Get(mixColor1)); + DALI_TEST_EQUALS(mixColor1, Vector3(testColor), 0.001, TEST_LOCATION); - value = map.Find( Visual::Property::MIX_COLOR ); - DALI_TEST_CHECK( value ); + value = map.Find(Visual::Property::MIX_COLOR); + DALI_TEST_CHECK(value); Vector4 mixColor2; - DALI_TEST_CHECK( value->Get( mixColor2 ) ); - DALI_TEST_EQUALS( mixColor2, testColor, 0.001, TEST_LOCATION ); + DALI_TEST_CHECK(value->Get(mixColor2)); + DALI_TEST_EQUALS(mixColor2, testColor, 0.001, TEST_LOCATION); - value = map.Find( Visual::Property::OPACITY ); - DALI_TEST_CHECK( value ); + value = map.Find(Visual::Property::OPACITY); + DALI_TEST_CHECK(value); float opacity; - DALI_TEST_CHECK( value->Get( opacity ) ); - DALI_TEST_EQUALS( opacity, testColor.a, 0.001, TEST_LOCATION ); + DALI_TEST_CHECK(value->Get(opacity)); + DALI_TEST_EQUALS(opacity, testColor.a, 0.001, TEST_LOCATION); } - - int UtcDaliImageVisualPropertyMap(void) { ToolkitTestApplication application; - tet_infoline( "Request image visual with a Property::Map" ); + tet_infoline("Request image visual with a Property::Map"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); - factory.SetPreMultiplyOnLoad( true ); + DALI_TEST_CHECK(factory); + factory.SetPreMultiplyOnLoad(true); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied. // Image with a size smaller than 512*512 will be uploaded as a part of the atlas. - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - DummyControl actor = DummyControl::New(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - auto renderer = actor.GetRendererAt(0); - auto preMultipliedIndex = renderer.GetPropertyIndex( "preMultipliedAlpha" ); - DALI_TEST_CHECK( preMultipliedIndex != Property::INVALID_INDEX ); - auto preMultipliedAlpha = renderer.GetProperty( preMultipliedIndex ); - auto preMultipliedAlpha2 = renderer.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA ); - DALI_TEST_EQUALS( preMultipliedAlpha, 1.0f, TEST_LOCATION ); - DALI_TEST_EQUALS( preMultipliedAlpha2, true, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + auto renderer = actor.GetRendererAt(0); + auto preMultipliedIndex = renderer.GetPropertyIndex("preMultipliedAlpha"); + DALI_TEST_CHECK(preMultipliedIndex != Property::INVALID_INDEX); + auto preMultipliedAlpha = renderer.GetProperty(preMultipliedIndex); + auto preMultipliedAlpha2 = renderer.GetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA); + DALI_TEST_EQUALS(preMultipliedAlpha, 1.0f, TEST_LOCATION); + DALI_TEST_EQUALS(preMultipliedAlpha2, true, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - application.GetScene().Remove( actor ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + application.GetScene().Remove(actor); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); END_TEST; } - int UtcDaliImageVisualNoPremultipliedAlpha01(void) { ToolkitTestApplication application; - tet_infoline( "Request image visual without pre-multiplied alpha" ); + tet_infoline("Request image visual without pre-multiplied alpha"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); - factory.SetPreMultiplyOnLoad( false ); + DALI_TEST_CHECK(factory); + factory.SetPreMultiplyOnLoad(false); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied. // Image with a size smaller than 512*512 will be uploaded as a part of the atlas. - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - DummyControl actor = DummyControl::New(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - auto renderer = actor.GetRendererAt(0); - auto preMultipliedIndex = renderer.GetPropertyIndex( "preMultipliedAlpha" ); - DALI_TEST_CHECK( preMultipliedIndex != Property::INVALID_INDEX ); - auto preMultipliedAlpha = renderer.GetProperty( preMultipliedIndex ); - auto preMultipliedAlpha2 = renderer.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + auto renderer = actor.GetRendererAt(0); + auto preMultipliedIndex = renderer.GetPropertyIndex("preMultipliedAlpha"); + DALI_TEST_CHECK(preMultipliedIndex != Property::INVALID_INDEX); + auto preMultipliedAlpha = renderer.GetProperty(preMultipliedIndex); + auto preMultipliedAlpha2 = renderer.GetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA); - DALI_TEST_EQUALS( preMultipliedAlpha, false, TEST_LOCATION ); - DALI_TEST_EQUALS( preMultipliedAlpha2, false, TEST_LOCATION ); + DALI_TEST_EQUALS(preMultipliedAlpha, false, TEST_LOCATION); + DALI_TEST_EQUALS(preMultipliedAlpha2, false, TEST_LOCATION); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - application.GetScene().Remove( actor ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + application.GetScene().Remove(actor); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); END_TEST; } - int UtcDaliImageVisualNoPremultipliedAlpha02(void) { ToolkitTestApplication application; - tet_infoline( "Request image visual with no alpha channel" ); + tet_infoline("Request image visual with no alpha channel"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied. // Image with a size smaller than 512*512 will be uploaded as a part of the atlas. - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - DummyControl actor = DummyControl::New(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - auto renderer = actor.GetRendererAt(0); - auto preMultipliedIndex = renderer.GetPropertyIndex( "preMultipliedAlpha" ); - DALI_TEST_CHECK( preMultipliedIndex != Property::INVALID_INDEX ); - auto preMultipliedAlpha = renderer.GetProperty( preMultipliedIndex ); - auto preMultipliedAlpha2 = renderer.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + auto renderer = actor.GetRendererAt(0); + auto preMultipliedIndex = renderer.GetPropertyIndex("preMultipliedAlpha"); + DALI_TEST_CHECK(preMultipliedIndex != Property::INVALID_INDEX); + auto preMultipliedAlpha = renderer.GetProperty(preMultipliedIndex); + auto preMultipliedAlpha2 = renderer.GetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA); - DALI_TEST_EQUALS( preMultipliedAlpha, false, TEST_LOCATION ); - DALI_TEST_EQUALS( preMultipliedAlpha2, false, TEST_LOCATION ); + DALI_TEST_EQUALS(preMultipliedAlpha, false, TEST_LOCATION); + DALI_TEST_EQUALS(preMultipliedAlpha2, false, TEST_LOCATION); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - int srcFactorRgb = renderer.GetProperty( Renderer::Property::BLEND_FACTOR_SRC_RGB ); - int destFactorRgb = renderer.GetProperty( Renderer::Property::BLEND_FACTOR_DEST_RGB ); - int srcFactorAlpha = renderer.GetProperty( Renderer::Property::BLEND_FACTOR_SRC_ALPHA ); - int destFactorAlpha = renderer.GetProperty( Renderer::Property::BLEND_FACTOR_DEST_ALPHA ); - DALI_TEST_CHECK( srcFactorRgb == BlendFactor::SRC_ALPHA ); - DALI_TEST_CHECK( destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA ); - DALI_TEST_CHECK( srcFactorAlpha == BlendFactor::ONE ); - DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA ); + int srcFactorRgb = renderer.GetProperty(Renderer::Property::BLEND_FACTOR_SRC_RGB); + int destFactorRgb = renderer.GetProperty(Renderer::Property::BLEND_FACTOR_DEST_RGB); + int srcFactorAlpha = renderer.GetProperty(Renderer::Property::BLEND_FACTOR_SRC_ALPHA); + int destFactorAlpha = renderer.GetProperty(Renderer::Property::BLEND_FACTOR_DEST_ALPHA); + DALI_TEST_CHECK(srcFactorRgb == BlendFactor::SRC_ALPHA); + DALI_TEST_CHECK(destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA); + DALI_TEST_CHECK(srcFactorAlpha == BlendFactor::ONE); + DALI_TEST_CHECK(destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA); textureTrace.Reset(); // Make a new visual with the same image - Visual::Base newVisual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( newVisual ); + Visual::Base newVisual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(newVisual); // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied. // Image with a size smaller than 512*512 will be uploaded as a part of the atlas. - DummyControl newActor = DummyControl::New(); - DummyControlImpl& newDummyImpl = static_cast< DummyControlImpl& >( newActor.GetImplementation() ); - newDummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, newVisual ); + DummyControl newActor = DummyControl::New(); + DummyControlImpl& newDummyImpl = static_cast(newActor.GetImplementation()); + newDummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, newVisual); - newActor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - DALI_TEST_EQUALS( newActor.GetRendererCount(), 0u, TEST_LOCATION ); + newActor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(newActor.GetRendererCount(), 0u, TEST_LOCATION); - application.GetScene().Add( newActor ); + application.GetScene().Add(newActor); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( newActor.GetRendererCount(), 1u, TEST_LOCATION ); - auto newRenderer = newActor.GetRendererAt( 0 ); - preMultipliedIndex = newRenderer.GetPropertyIndex( "preMultipliedAlpha" ); - DALI_TEST_CHECK( preMultipliedIndex != Property::INVALID_INDEX ); - preMultipliedAlpha = newRenderer.GetProperty< bool >( preMultipliedIndex ); - preMultipliedAlpha2 = newRenderer.GetProperty< bool >( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA ); + DALI_TEST_EQUALS(newActor.GetRendererCount(), 1u, TEST_LOCATION); + auto newRenderer = newActor.GetRendererAt(0); + preMultipliedIndex = newRenderer.GetPropertyIndex("preMultipliedAlpha"); + DALI_TEST_CHECK(preMultipliedIndex != Property::INVALID_INDEX); + preMultipliedAlpha = newRenderer.GetProperty(preMultipliedIndex); + preMultipliedAlpha2 = newRenderer.GetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA); - DALI_TEST_EQUALS( preMultipliedAlpha, false, TEST_LOCATION ); - DALI_TEST_EQUALS( preMultipliedAlpha2, false, TEST_LOCATION ); + DALI_TEST_EQUALS(preMultipliedAlpha, false, TEST_LOCATION); + DALI_TEST_EQUALS(preMultipliedAlpha2, false, TEST_LOCATION); - srcFactorRgb = newRenderer.GetProperty( Renderer::Property::BLEND_FACTOR_SRC_RGB ); - destFactorRgb = newRenderer.GetProperty( Renderer::Property::BLEND_FACTOR_DEST_RGB ); - srcFactorAlpha = newRenderer.GetProperty( Renderer::Property::BLEND_FACTOR_SRC_ALPHA ); - destFactorAlpha = newRenderer.GetProperty( Renderer::Property::BLEND_FACTOR_DEST_ALPHA ); - DALI_TEST_CHECK( srcFactorRgb == BlendFactor::SRC_ALPHA ); - DALI_TEST_CHECK( destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA ); - DALI_TEST_CHECK( srcFactorAlpha == BlendFactor::ONE ); - DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA ); + srcFactorRgb = newRenderer.GetProperty(Renderer::Property::BLEND_FACTOR_SRC_RGB); + destFactorRgb = newRenderer.GetProperty(Renderer::Property::BLEND_FACTOR_DEST_RGB); + srcFactorAlpha = newRenderer.GetProperty(Renderer::Property::BLEND_FACTOR_SRC_ALPHA); + destFactorAlpha = newRenderer.GetProperty(Renderer::Property::BLEND_FACTOR_DEST_ALPHA); + DALI_TEST_CHECK(srcFactorRgb == BlendFactor::SRC_ALPHA); + DALI_TEST_CHECK(destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA); + DALI_TEST_CHECK(srcFactorAlpha == BlendFactor::ONE); + DALI_TEST_CHECK(destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA); - application.GetScene().Remove( actor ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + application.GetScene().Remove(actor); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); END_TEST; } - int UtcDaliImageVisualRemoteImageLoad(void) { ToolkitTestApplication application; - tet_infoline( "Request remote image visual with a Property::Map" ); + tet_infoline("Request remote image visual with a Property::Map"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_REMOTE_IMAGE_FILE_NAME ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_REMOTE_IMAGE_FILE_NAME); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - DummyControl actor = DummyControl::New(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); application.SendNotification(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - application.GetScene().Remove( actor ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + application.GetScene().Remove(actor); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); END_TEST; } @@ -425,44 +421,44 @@ int UtcDaliImageVisualRemoteImageLoad(void) int UtcDaliImageVisualWithNativeImage(void) { ToolkitTestApplication application; - tet_infoline( "Use Native Image as url" ); + tet_infoline("Use Native Image as url"); NativeImageSourcePtr nativeImageSource = NativeImageSource::New(500, 500, NativeImageSource::COLOR_DEPTH_DEFAULT); - ImageUrl imageUrl = Dali::Toolkit::Image::GenerateUrl(nativeImageSource); - std::string url = imageUrl.GetUrl(); + ImageUrl imageUrl = Dali::Toolkit::Image::GenerateUrl(nativeImageSource); + std::string url = imageUrl.GetUrl(); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, url ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, url); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); - DummyControl actor = DummyControl::New(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); Renderer renderer = actor.GetRendererAt(0); - Shader shader = renderer.GetShader(); + Shader shader = renderer.GetShader(); Property::Value value = shader.GetProperty(Shader::Property::PROGRAM); DALI_TEST_CHECK(value.GetType() == Property::MAP); - const Property::Map* outMap = value.GetMap(); - std::string fragmentShader = (*outMap)["fragment"].Get(); + const Property::Map* outMap = value.GetMap(); + std::string fragmentShader = (*outMap)["fragment"].Get(); const char* fragmentPrefix = Dali::NativeImageSourceTest::GetCustomFragmentPrefix(); - size_t pos = fragmentShader.find(fragmentPrefix); + size_t pos = fragmentShader.find(fragmentPrefix); - DALI_TEST_EQUALS( pos != std::string::npos, true, TEST_LOCATION ); + DALI_TEST_EQUALS(pos != std::string::npos, true, TEST_LOCATION); END_TEST; } @@ -470,64 +466,64 @@ int UtcDaliImageVisualWithNativeImage(void) int UtcDaliImageVisualWithNativeImageCustomShader(void) { ToolkitTestApplication application; - tet_infoline( "Use Native Image as url and Use custom shader" ); + tet_infoline("Use Native Image as url and Use custom shader"); NativeImageSourcePtr nativeImageSource = NativeImageSource::New(500, 500, NativeImageSource::COLOR_DEPTH_DEFAULT); - ImageUrl imageUrl = Dali::Toolkit::Image::GenerateUrl(nativeImageSource); - std::string url = imageUrl.GetUrl(); + ImageUrl imageUrl = Dali::Toolkit::Image::GenerateUrl(nativeImageSource); + std::string url = imageUrl.GetUrl(); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); - Property::Map propertyMap; - Property::Map shaderMap; - const std::string customVertexShaderSource = "Foobar"; - const std::string customFragmentShaderSource = "Foobar"; + Property::Map propertyMap; + Property::Map shaderMap; + const std::string customVertexShaderSource = "Foobar"; + const std::string customFragmentShaderSource = "Foobar"; shaderMap[Toolkit::Visual::Shader::Property::FRAGMENT_SHADER] = customFragmentShaderSource; - shaderMap[Toolkit::Visual::Shader::Property::VERTEX_SHADER] = customVertexShaderSource; + shaderMap[Toolkit::Visual::Shader::Property::VERTEX_SHADER] = customVertexShaderSource; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( Toolkit::Visual::Property::SHADER, shaderMap ); - propertyMap.Insert( ImageVisual::Property::URL, url ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(Toolkit::Visual::Property::SHADER, shaderMap); + propertyMap.Insert(ImageVisual::Property::URL, url); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); - DummyControl actor = DummyControl::New(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); application.SendNotification(); application.Render(16); Renderer renderer = actor.GetRendererAt(0); - Shader shader = renderer.GetShader(); + Shader shader = renderer.GetShader(); Property::Value value = shader.GetProperty(Shader::Property::PROGRAM); DALI_TEST_CHECK(value.GetType() == Property::MAP); - const Property::Map* outMap = value.GetMap(); - std::string fragmentShaderSource = (*outMap)["fragment"].Get(); - std::string vertexShaderSource = (*outMap)["vertex"].Get(); + const Property::Map* outMap = value.GetMap(); + std::string fragmentShaderSource = (*outMap)["fragment"].Get(); + std::string vertexShaderSource = (*outMap)["vertex"].Get(); // Compare vertex shader is equal - DALI_TEST_EQUALS( customVertexShaderSource, vertexShaderSource, TEST_LOCATION ); + DALI_TEST_EQUALS(customVertexShaderSource, vertexShaderSource, TEST_LOCATION); // Check fragment shader changed const char* fragmentPrefix = Dali::NativeImageSourceTest::GetCustomFragmentPrefix(); - size_t pos = fragmentShaderSource.find(fragmentPrefix); + size_t pos = fragmentShaderSource.find(fragmentPrefix); - DALI_TEST_EQUALS( pos != std::string::npos, true, TEST_LOCATION ); + DALI_TEST_EQUALS(pos != std::string::npos, true, TEST_LOCATION); - DALI_TEST_EQUALS( std::string(fragmentPrefix) + customFragmentShaderSource, fragmentShaderSource, TEST_LOCATION ); + DALI_TEST_EQUALS(std::string(fragmentPrefix) + customFragmentShaderSource, fragmentShaderSource, TEST_LOCATION); END_TEST; } @@ -535,55 +531,55 @@ int UtcDaliImageVisualWithNativeImageCustomShader(void) int UtcDaliImageVisualWithNativeImageRemoved(void) { ToolkitTestApplication application; - tet_infoline( "Use Native Image as url" ); + tet_infoline("Use Native Image as url"); - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); NativeImageSourcePtr nativeImageSource = NativeImageSource::New(500, 500, NativeImageSource::COLOR_DEPTH_DEFAULT); - ImageUrl imageUrl = Dali::Toolkit::Image::GenerateUrl(nativeImageSource); - std::string url = imageUrl.GetUrl(); + ImageUrl imageUrl = Dali::Toolkit::Image::GenerateUrl(nativeImageSource); + std::string url = imageUrl.GetUrl(); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, url ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, url); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); - DummyControl actor = DummyControl::New(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION); - tet_infoline( "No delete texture because reference count is not zero" ); + tet_infoline("No delete texture because reference count is not zero"); imageUrl.Reset(); - application.GetScene().Remove( actor ); - dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL ); + application.GetScene().Remove(actor); + dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION); - tet_infoline( "Delete texture because reference count is zero" ); + tet_infoline("Delete texture because reference count is zero"); visual.Reset(); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION); END_TEST; } @@ -591,45 +587,45 @@ int UtcDaliImageVisualWithNativeImageRemoved(void) int UtcDaliImageVisualWithEncodedImageBuffer(void) { ToolkitTestApplication application; - tet_infoline( "Use Encoded Image Buffer as url" ); + tet_infoline("Use Encoded Image Buffer as url"); EncodedImageBuffer rawBuffer = ConvertFileToEncodedImageBuffer(TEST_LARGE_IMAGE_FILE_NAME); - ImageUrl url = Dali::Toolkit::Image::GenerateUrl(rawBuffer); + ImageUrl url = Dali::Toolkit::Image::GenerateUrl(rawBuffer); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, url.GetUrl() ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, url.GetUrl()); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - DummyControl actor = DummyControl::New(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); application.SendNotification(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - application.GetScene().Remove( actor ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + application.GetScene().Remove(actor); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); END_TEST; } @@ -637,53 +633,53 @@ int UtcDaliImageVisualWithEncodedImageBuffer(void) int UtcDaliImageVisualWithEncodedImageBufferRemoved(void) { ToolkitTestApplication application; - tet_infoline( "Use Encoded Image Buffer as url" ); + tet_infoline("Use Encoded Image Buffer as url"); - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); EncodedImageBuffer rawBuffer = ConvertFileToEncodedImageBuffer(TEST_LARGE_IMAGE_FILE_NAME); - ImageUrl imageUrl = Dali::Toolkit::Image::GenerateUrl(rawBuffer); - std::string url = imageUrl.GetUrl(); + ImageUrl imageUrl = Dali::Toolkit::Image::GenerateUrl(rawBuffer); + std::string url = imageUrl.GetUrl(); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, url ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, url); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); - DummyControl actor = DummyControl::New(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); application.SendNotification(); // Wait for decode buffer and make texture. - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION); - tet_infoline( "Delete texture because there is no actor to use decoded texture" ); + tet_infoline("Delete texture because there is no actor to use decoded texture"); imageUrl.Reset(); - application.GetScene().Remove( actor ); - dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL ); + application.GetScene().Remove(actor); + dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION); END_TEST; } @@ -691,241 +687,241 @@ int UtcDaliImageVisualWithEncodedImageBufferRemoved(void) int UtcDaliImageVisualTextureReuse1(void) { ToolkitTestApplication application; - tet_infoline( "Request remote image visual with a Property::Map; request a second visual with the same property map - should reuse texture" ); + tet_infoline("Request remote image visual with a Property::Map; request a second visual with the same property map - should reuse texture"); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME ); - propertyMap.Insert( ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DETACHED ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DETACHED); - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); TraceCallStack& drawTrace = gl.GetDrawTrace(); drawTrace.Enable(true); - Actor actor = CreateActorWithImageVisual( propertyMap ); - application.GetScene().Add( actor ); + Actor actor = CreateActorWithImageVisual(propertyMap); + application.GetScene().Add(actor); application.SendNotification(); // Wait for image to load - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); - DALI_TEST_EQUALS( drawTrace.FindMethod("DrawArrays"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + DALI_TEST_EQUALS(drawTrace.FindMethod("DrawArrays"), true, TEST_LOCATION); textureTrace.Reset(); drawTrace.Reset(); - Actor actor2 = CreateActorWithImageVisual( propertyMap ); + Actor actor2 = CreateActorWithImageVisual(propertyMap); application.GetScene().Add(actor2); application.SendNotification(); // Send messages to update application.Render(); // process update and render application.SendNotification(); // process any signals to event - DALI_TEST_EQUALS( actor2.GetRendererCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS(actor2.GetRendererCount(), 1u, TEST_LOCATION); - tet_infoline("Test that 2 draw calls occur with no new texture gens/binds, i.e. both\n" - "draw calls use the same texture as the previous draw call\n" ); + tet_infoline( + "Test that 2 draw calls occur with no new texture gens/binds, i.e. both\n" + "draw calls use the same texture as the previous draw call\n"); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION ); - DALI_TEST_EQUALS( drawTrace.CountMethod("DrawArrays"), 2, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION); + DALI_TEST_EQUALS(drawTrace.CountMethod("DrawArrays"), 2, TEST_LOCATION); // TODO: Temporarily commented out the line below when caching is disabled. Will need to add it back. -// DALI_TEST_EQUALS( textureTrace.CountMethod("BindTexture"), 0, TEST_LOCATION ); + // DALI_TEST_EQUALS( textureTrace.CountMethod("BindTexture"), 0, TEST_LOCATION ); tet_infoline("Test that removing 1 actor doesn't delete the texture\n"); - application.GetScene().Remove( actor ); + application.GetScene().Remove(actor); application.SendNotification(); application.Render(); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION); tet_infoline("Test that removing last actor does delete the texture\n"); - application.GetScene().Remove( actor2 ); // Detaches remaining ImageVisual + application.GetScene().Remove(actor2); // Detaches remaining ImageVisual application.SendNotification(); application.Render(); - DALI_TEST_CHECK( actor2.GetRendererCount() == 0u ); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION ); + DALI_TEST_CHECK(actor2.GetRendererCount() == 0u); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION); END_TEST; } - int UtcDaliImageVisualTextureReuse2(void) { ToolkitTestApplication application; - tet_infoline( "Request remote image visual with a Property::Map; request a second visual with the same url but different property map - should create new texture" ); + tet_infoline("Request remote image visual with a Property::Map; request a second visual with the same url but different property map - should create new texture"); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_REMOTE_IMAGE_FILE_NAME ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_REMOTE_IMAGE_FILE_NAME); - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); TraceCallStack& drawTrace = gl.GetDrawTrace(); drawTrace.Enable(true); - Actor actor = CreateActorWithImageVisual( propertyMap ); - application.GetScene().Add( actor ); + Actor actor = CreateActorWithImageVisual(propertyMap); + application.GetScene().Add(actor); application.SendNotification(); // Wait for image to load - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); - DALI_TEST_EQUALS( drawTrace.FindMethod("DrawArrays"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + DALI_TEST_EQUALS(drawTrace.FindMethod("DrawArrays"), true, TEST_LOCATION); textureTrace.Reset(); drawTrace.Reset(); - propertyMap.Insert( ImageVisual::Property::SAMPLING_MODE, Dali::SamplingMode::NEAREST ); - propertyMap.Insert( ImageVisual::Property::DESIRED_WIDTH, 100 ); - propertyMap.Insert( ImageVisual::Property::DESIRED_HEIGHT, 100 ); - Actor actor2 = CreateActorWithImageVisual( propertyMap ); + propertyMap.Insert(ImageVisual::Property::SAMPLING_MODE, Dali::SamplingMode::NEAREST); + propertyMap.Insert(ImageVisual::Property::DESIRED_WIDTH, 100); + propertyMap.Insert(ImageVisual::Property::DESIRED_HEIGHT, 100); + Actor actor2 = CreateActorWithImageVisual(propertyMap); application.GetScene().Add(actor2); application.SendNotification(); // Wait for image to load - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor2.GetRendererCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS(actor2.GetRendererCount(), 1u, TEST_LOCATION); - tet_infoline("Test that 2 draw calls occur with 1 new texture gen/bind, i.e. both " - "renderers are using different textures\n" ); + tet_infoline( + "Test that 2 draw calls occur with 1 new texture gen/bind, i.e. both " + "renderers are using different textures\n"); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); - DALI_TEST_EQUALS( drawTrace.CountMethod("DrawArrays"), 2, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); + DALI_TEST_EQUALS(drawTrace.CountMethod("DrawArrays"), 2, TEST_LOCATION); TraceCallStack::NamedParams tex1; tex1["texture"] << 1; TraceCallStack::NamedParams tex2; tex2["texture"] << 2; - DALI_TEST_EQUALS( textureTrace.FindMethodAndParams("BindTexture", tex1), true, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethodAndParams("BindTexture", tex2), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethodAndParams("BindTexture", tex1), true, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethodAndParams("BindTexture", tex2), true, TEST_LOCATION); tet_infoline("Test that removing 1 actor deletes it's texture\n"); - application.GetScene().Remove( actor ); + application.GetScene().Remove(actor); application.SendNotification(); application.Render(); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION); tet_infoline("Test that removing last actor deletes it's texture\n"); - application.GetScene().Remove( actor2 ); + application.GetScene().Remove(actor2); application.SendNotification(); application.Render(); - DALI_TEST_CHECK( actor2.GetRendererCount() == 0u ); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 2, TEST_LOCATION ); + DALI_TEST_CHECK(actor2.GetRendererCount() == 0u); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 2, TEST_LOCATION); END_TEST; } - int UtcDaliImageVisualCustomWrapModePixelArea(void) { ToolkitTestApplication application; - tet_infoline( "Request image visual with a Property::Map, test custom wrap mode and pixel area with atlasing" ); + tet_infoline("Request image visual with a Property::Map, test custom wrap mode and pixel area with atlasing"); static std::vector customUniforms = - { - UniformData("pixelArea", Property::Type::VECTOR4), - UniformData("wrapMode", Property::Type::VECTOR2), - }; + { + UniformData("pixelArea", Property::Type::VECTOR4), + UniformData("wrapMode", Property::Type::VECTOR2), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); // Test wrap mode with atlasing. Image with a size smaller than 512*512 will be uploaded as a part of the atlas. - const int width=34; - const int height=34; + const int width = 34; + const int height = 34; const Vector4 pixelArea(-0.5f, -0.5f, 2.f, 2.f); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_SMALL_IMAGE_FILE_NAME ); - propertyMap.Insert( ImageVisual::Property::DESIRED_WIDTH, width ); - propertyMap.Insert( ImageVisual::Property::DESIRED_HEIGHT, height ); - propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true ); - propertyMap.Insert( ImageVisual::Property::PIXEL_AREA, pixelArea ); - propertyMap.Insert( ImageVisual::Property::WRAP_MODE_U, WrapMode::MIRRORED_REPEAT ); - propertyMap.Insert( ImageVisual::Property::WRAP_MODE_V, WrapMode::REPEAT ); - propertyMap.Insert( ImageVisual::Property::ATLASING, true ); - - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); - - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_SMALL_IMAGE_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::DESIRED_WIDTH, width); + propertyMap.Insert(ImageVisual::Property::DESIRED_HEIGHT, height); + propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true); + propertyMap.Insert(ImageVisual::Property::PIXEL_AREA, pixelArea); + propertyMap.Insert(ImageVisual::Property::WRAP_MODE_U, WrapMode::MIRRORED_REPEAT); + propertyMap.Insert(ImageVisual::Property::WRAP_MODE_V, WrapMode::REPEAT); + propertyMap.Insert(ImageVisual::Property::ATLASING, true); + + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); TraceCallStack& texParameterTrace = gl.GetTexParameterTrace(); - texParameterTrace.Enable( true ); + texParameterTrace.Enable(true); - DummyControl actor = DummyControl::New(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); - actor.SetProperty( Actor::Property::SIZE, Vector2(2000, 2000) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); - application.GetScene().Add( actor ); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000, 2000)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(actor); // loading started application.SendNotification(); application.Render(); - DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 1u); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); // WITH atlasing, the wrapping is handled manually in shader, so the following gl function should not be called std::stringstream out; out << std::hex << GL_TEXTURE_2D << ", " << GL_TEXTURE_WRAP_S << ", " << GL_MIRRORED_REPEAT; - DALI_TEST_CHECK( !texParameterTrace.FindMethodAndParams("TexParameteri", out.str()) ); + DALI_TEST_CHECK(!texParameterTrace.FindMethodAndParams("TexParameteri", out.str())); out.str(""); out << std::hex << GL_TEXTURE_2D << ", " << GL_TEXTURE_WRAP_T << ", " << GL_REPEAT; - DALI_TEST_CHECK( !texParameterTrace.FindMethodAndParams("TexParameteri", out.str()) ); + DALI_TEST_CHECK(!texParameterTrace.FindMethodAndParams("TexParameteri", out.str())); // test the uniforms which used to handle the wrap mode - Renderer renderer = actor.GetRendererAt( 0u ); - DALI_TEST_CHECK( renderer ); + Renderer renderer = actor.GetRendererAt(0u); + DALI_TEST_CHECK(renderer); - Property::Value pixelAreaValue = renderer.GetProperty( renderer.GetPropertyIndex( "pixelArea" ) ); - DALI_TEST_EQUALS( pixelAreaValue.Get(), pixelArea, TEST_LOCATION ); + Property::Value pixelAreaValue = renderer.GetProperty(renderer.GetPropertyIndex("pixelArea")); + DALI_TEST_EQUALS(pixelAreaValue.Get(), pixelArea, TEST_LOCATION); Vector4 pixelAreaUniform; - DALI_TEST_CHECK( gl.GetUniformValue( "pixelArea", pixelAreaUniform ) ); - DALI_TEST_EQUALS( pixelArea, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_CHECK(gl.GetUniformValue("pixelArea", pixelAreaUniform)); + DALI_TEST_EQUALS(pixelArea, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION); - Property::Value wrapModeValue = renderer.GetProperty( renderer.GetPropertyIndex( "wrapMode" ) ); - Vector2 wrapMode( WrapMode::MIRRORED_REPEAT-1, WrapMode::REPEAT-1 ); - DALI_TEST_EQUALS( wrapModeValue.Get(), wrapMode, TEST_LOCATION ); + Property::Value wrapModeValue = renderer.GetProperty(renderer.GetPropertyIndex("wrapMode")); + Vector2 wrapMode(WrapMode::MIRRORED_REPEAT - 1, WrapMode::REPEAT - 1); + DALI_TEST_EQUALS(wrapModeValue.Get(), wrapMode, TEST_LOCATION); Vector2 wrapModeUniform; - DALI_TEST_CHECK( gl.GetUniformValue( "wrapMode", wrapModeUniform ) ); - DALI_TEST_EQUALS( wrapMode, wrapModeUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_CHECK(gl.GetUniformValue("wrapMode", wrapModeUniform)); + DALI_TEST_EQUALS(wrapMode, wrapModeUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION); - actor.Unparent( ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + actor.Unparent(); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); END_TEST; } @@ -933,84 +929,84 @@ int UtcDaliImageVisualCustomWrapModePixelArea(void) int UtcDaliImageVisualCustomWrapModeNoAtlas(void) { ToolkitTestApplication application; - tet_infoline( "Request image visual with a Property::Map, test custom wrap mode and pixel area without atlasing" ); + tet_infoline("Request image visual with a Property::Map, test custom wrap mode and pixel area without atlasing"); static std::vector customUniforms = - { - UniformData("pixelArea", Property::Type::VECTOR4), - }; + { + UniformData("pixelArea", Property::Type::VECTOR4), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); // Test wrap mode without atlasing. Image with a size bigger than 512*512 will NOT be uploaded as a part of the atlas. - const int width=600; - const int height=600; + const int width = 600; + const int height = 600; const Vector4 pixelArea(-0.5f, -0.5f, 2.f, 2.f); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME ); - propertyMap.Insert( ImageVisual::Property::DESIRED_WIDTH, width ); - propertyMap.Insert( ImageVisual::Property::DESIRED_HEIGHT, height ); - propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true ); - propertyMap.Insert( ImageVisual::Property::PIXEL_AREA, pixelArea ); - propertyMap.Insert( ImageVisual::Property::WRAP_MODE_U, WrapMode::MIRRORED_REPEAT ); - propertyMap.Insert( ImageVisual::Property::WRAP_MODE_V, WrapMode::REPEAT ); - - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); - - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::DESIRED_WIDTH, width); + propertyMap.Insert(ImageVisual::Property::DESIRED_HEIGHT, height); + propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true); + propertyMap.Insert(ImageVisual::Property::PIXEL_AREA, pixelArea); + propertyMap.Insert(ImageVisual::Property::WRAP_MODE_U, WrapMode::MIRRORED_REPEAT); + propertyMap.Insert(ImageVisual::Property::WRAP_MODE_V, WrapMode::REPEAT); + + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); textureTrace.EnableLogging(true); TraceCallStack& texParameterTrace = gl.GetTexParameterTrace(); - texParameterTrace.Enable( true ); - texParameterTrace.EnableLogging( true ); + texParameterTrace.Enable(true); + texParameterTrace.EnableLogging(true); - DummyControl actor = DummyControl::New(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); - actor.SetProperty( Actor::Property::SIZE, Vector2(2000, 2000) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); - application.GetScene().Add( actor ); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000, 2000)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(actor); // loading started application.SendNotification(); application.Render(); application.SendNotification(); - DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 1u); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); // WITHOUT atlasing, the wrapping is handled by setting gl texture parameters std::stringstream out; out << std::hex << GL_TEXTURE_2D << ", " << GL_TEXTURE_WRAP_S << ", " << GL_MIRRORED_REPEAT; - DALI_TEST_CHECK( texParameterTrace.FindMethodAndParams("TexParameteri", out.str()) ); + DALI_TEST_CHECK(texParameterTrace.FindMethodAndParams("TexParameteri", out.str())); out.str(""); out << std::hex << GL_TEXTURE_2D << ", " << GL_TEXTURE_WRAP_T << ", " << GL_REPEAT; - DALI_TEST_CHECK( texParameterTrace.FindMethodAndParams("TexParameteri", out.str()) ); + DALI_TEST_CHECK(texParameterTrace.FindMethodAndParams("TexParameteri", out.str())); // test the uniforms which used to handle the wrap mode - Renderer renderer = actor.GetRendererAt( 0u ); - DALI_TEST_CHECK( renderer ); + Renderer renderer = actor.GetRendererAt(0u); + DALI_TEST_CHECK(renderer); - Property::Value pixelAreaValue = renderer.GetProperty( renderer.GetPropertyIndex( "pixelArea" ) ); - DALI_TEST_EQUALS( pixelAreaValue.Get(), pixelArea, TEST_LOCATION ); + Property::Value pixelAreaValue = renderer.GetProperty(renderer.GetPropertyIndex("pixelArea")); + DALI_TEST_EQUALS(pixelAreaValue.Get(), pixelArea, TEST_LOCATION); Vector4 pixelAreaUniform; - DALI_TEST_CHECK( gl.GetUniformValue( "pixelArea", pixelAreaUniform ) ); - DALI_TEST_EQUALS( pixelArea, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_CHECK(gl.GetUniformValue("pixelArea", pixelAreaUniform)); + DALI_TEST_EQUALS(pixelArea, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION); - Property::Index wrapModeIndex = renderer.GetPropertyIndex( "wrapMode" ); + Property::Index wrapModeIndex = renderer.GetPropertyIndex("wrapMode"); DALI_TEST_CHECK(wrapModeIndex == Property::INVALID_INDEX); actor.Unparent(); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); END_TEST; } @@ -1018,96 +1014,99 @@ int UtcDaliImageVisualCustomWrapModeNoAtlas(void) int UtcDaliImageVisualAnimateMixColor(void) { ToolkitTestApplication application; - tet_infoline( "Animate mix color" ); + tet_infoline("Animate mix color"); static std::vector customUniforms = - { - UniformData("mixColor", Property::Type::VECTOR3), - }; + { + UniformData("mixColor", Property::Type::VECTOR3), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); - application.GetPlatform().SetClosestImageSize( Vector2(100, 100) ); + application.GetPlatform().SetClosestImageSize(Vector2(100, 100)); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE); - propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME ); + propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME); propertyMap.Insert("mixColor", Color::BLUE); propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true); - Visual::Base visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual(propertyMap); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - actor.SetProperty( Actor::Property::SIZE, Vector2(2000, 2000) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); - actor.SetProperty( Actor::Property::COLOR,Color::BLACK); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000, 2000)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + actor.SetProperty(Actor::Property::COLOR, Color::BLACK); application.GetScene().Add(actor); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); Renderer renderer = actor.GetRendererAt(0); - Property::Index index = renderer.GetPropertyIndex( Visual::Property::MIX_COLOR ); - Property::Value blendModeValue = renderer.GetProperty( Renderer::Property::BLEND_MODE ); - DALI_TEST_EQUALS( blendModeValue.Get(), (int)BlendMode::AUTO, TEST_LOCATION ); - tet_infoline("Test that the renderer has the mixColor property"); - DALI_TEST_CHECK( index != Property::INVALID_INDEX ); + // @todo Should we add API to make this code work again? + // Property::Index index = renderer.GetPropertyIndex( Visual::Property::MIX_COLOR ); - const Vector4 TARGET_MIX_COLOR( 1.0f, 0.0f, 0.0f, 0.5f ); + Property::Value blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE); + DALI_TEST_EQUALS(blendModeValue.Get(), (int)BlendMode::AUTO, TEST_LOCATION); + + const Vector4 TARGET_MIX_COLOR(1.0f, 0.0f, 0.0f, 0.5f); Property::Map map; - map["target"] = "testVisual"; - map["property"] = "mixColor"; + map["target"] = "testVisual"; + map["property"] = "mixColor"; map["initialValue"] = Color::MAGENTA; - map["targetValue"] = TARGET_MIX_COLOR; - map["animator"] = Property::Map() - .Add("alphaFunction", "LINEAR") - .Add("timePeriod", Property::Map() - .Add("delay", 0.0f) - .Add("duration", 4.0f)); + map["targetValue"] = TARGET_MIX_COLOR; + map["animator"] = Property::Map() + .Add("alphaFunction", "LINEAR") + .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 4.0f)); - Dali::Toolkit::TransitionData transition = TransitionData::New( map ); + Dali::Toolkit::TransitionData transition = TransitionData::New(map); - Animation animation = dummyImpl.CreateTransition( transition ); + Animation animation = dummyImpl.CreateTransition(transition); - animation.AnimateTo( Property(actor, Actor::Property::COLOR), Color::WHITE ); + animation.AnimateTo(Property(actor, Actor::Property::COLOR), Color::WHITE); animation.Play(); TestGlAbstraction& glAbstraction = application.GetGlAbstraction(); - glAbstraction.EnableEnableDisableCallTrace( true ); - TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace(); + glAbstraction.EnableEnableDisableCallTrace(true); + TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace(); std::ostringstream blendStr; blendStr << std::hex << GL_BLEND; application.SendNotification(); - application.Render(0); // Ensure animation starts + application.Render(0); // Ensure animation starts application.Render(2000u); // Halfway point - Vector3 testColor( 1.0f, 0.0f, 0.5f ); + Vector3 testColor(1.0f, 0.0f, 0.5f); // uColor.a should be actor's alpha * mixColor.a. - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue( "uColor", Vector4( 0.5f, 0.5f, 0.5f, 0.75f ) ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue( "mixColor", testColor ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("uColor", Vector4(0.5f, 0.5f, 0.5f, 0.75f)), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("mixColor", testColor), true, TEST_LOCATION); - DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) ); + DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Enable", blendStr.str())); glEnableStack.Reset(); - application.Render(2000u); // Halfway point between blue and white + application.SendNotification(); + application.Render(2000u); - DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), Color::WHITE, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue( "uColor", Vector4( 1.0f, 1.0f, 1.0f, 0.5f ) ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue( "mixColor", Vector3( TARGET_MIX_COLOR ) ), true, TEST_LOCATION ); + application.SendNotification(); + application.Render(); + application.SendNotification(); + + DALI_TEST_EQUALS(actor.GetCurrentProperty(Actor::Property::COLOR), Color::WHITE, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("uColor", Vector4(1.0f, 1.0f, 1.0f, 0.5f)), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("mixColor", Vector3(TARGET_MIX_COLOR)), true, TEST_LOCATION); // GL_BLEND should not be changed: Keep enabled // TODO: Temporarily commented out the line below when caching is disabled. Will need to add it back. -// DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str().c_str() ) ); - DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Disable", blendStr.str() ) ); + // DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str().c_str() ) ); + DALI_TEST_CHECK(!glEnableStack.FindMethodAndParams("Disable", blendStr.str())); - TestMixColor( visual, Visual::Property::MIX_COLOR, TARGET_MIX_COLOR ); + TestMixColor(visual, Visual::Property::MIX_COLOR, TARGET_MIX_COLOR); END_TEST; } @@ -1115,95 +1114,90 @@ int UtcDaliImageVisualAnimateMixColor(void) int UtcDaliImageVisualAnimateOpacity(void) { ToolkitTestApplication application; - tet_infoline( "Animate image visual opacity" ); + tet_infoline("Animate image visual opacity"); - application.GetPlatform().SetClosestImageSize( Vector2(100, 100) ); + application.GetPlatform().SetClosestImageSize(Vector2(100, 100)); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE); - propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME ); + propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME); propertyMap.Insert("opacity", 0.5f); propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true); - Visual::Base visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual(propertyMap); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - actor.SetProperty( Actor::Property::SIZE, Vector2(2000, 2000) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); - actor.SetProperty( Actor::Property::COLOR,Color::BLACK); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000, 2000)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + actor.SetProperty(Actor::Property::COLOR, Color::BLACK); application.GetScene().Add(actor); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); TestGlAbstraction& glAbstraction = application.GetGlAbstraction(); - glAbstraction.EnableEnableDisableCallTrace( true ); - TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace(); + glAbstraction.EnableEnableDisableCallTrace(true); + TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace(); std::ostringstream blendStr; blendStr << std::hex << GL_BLEND; application.SendNotification(); application.Render(); - DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Enable", blendStr.str()) ); + DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Enable", blendStr.str())); { - tet_infoline( "Test that the opacity can be increased to full via animation, and that the blend mode is set appropriately at the start and end of the animation." ); + tet_infoline("Test that the opacity can be increased to full via animation, and that the blend mode is set appropriately at the start and end of the animation."); Property::Map map; - map["target"] = "testVisual"; - map["property"] = "opacity"; + map["target"] = "testVisual"; + map["property"] = "opacity"; map["targetValue"] = 1.0f; - map["animator"] = Property::Map() - .Add("alphaFunction", "LINEAR") - .Add("timePeriod", Property::Map() - .Add("delay", 0.0f) - .Add("duration", 4.0f)); - - Dali::Toolkit::TransitionData transition = TransitionData::New( map ); - Animation animation = dummyImpl.CreateTransition( transition ); + map["animator"] = Property::Map() + .Add("alphaFunction", "LINEAR") + .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 4.0f)); + + Dali::Toolkit::TransitionData transition = TransitionData::New(map); + Animation animation = dummyImpl.CreateTransition(transition); animation.Play(); glEnableStack.Reset(); application.SendNotification(); - application.Render(0); // Ensure animation starts - application.Render(2000u); // Halfway point through animation + application.Render(0); // Ensure animation starts + application.Render(2000u); // Halfway point through animation application.SendNotification(); // Handle any signals Vector4 color; - DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue< Vector4 >( "uColor", color ) ); - DALI_TEST_EQUALS( color.a, 0.75f, TEST_LOCATION ); + DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue("uColor", color)); + DALI_TEST_EQUALS(color.a, 0.75f, TEST_LOCATION); - application.Render(2001u); // end + application.Render(2001u); // end application.SendNotification(); // ensure animation finished signal is sent - DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue< Vector4 >( "uColor", color ) ); - DALI_TEST_EQUALS( color.a, 1.0f, TEST_LOCATION ); + DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue("uColor", color)); + DALI_TEST_EQUALS(color.a, 1.0f, TEST_LOCATION); // TODO: Temporarily commented out the line below when caching is disabled. Will need to add it back. -// DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str().c_str() ) ); - DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Disable", blendStr.str() ) ); + // DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str().c_str() ) ); + DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Disable", blendStr.str())); } - { - tet_infoline( "Test that the opacity can be reduced via animation, and that the blend mode is set appropriately at the start and end of the animation." ); + tet_infoline("Test that the opacity can be reduced via animation, and that the blend mode is set appropriately at the start and end of the animation."); Property::Map map; - map["target"] = "testVisual"; - map["property"] = Visual::Property::OPACITY; + map["target"] = "testVisual"; + map["property"] = Visual::Property::OPACITY; map["targetValue"] = 0.1f; - map["animator"] = Property::Map() - .Add("alphaFunction", "LINEAR") - .Add("timePeriod", Property::Map() - .Add("delay", 0.0f) - .Add("duration", 4.0f)); - - Dali::Toolkit::TransitionData transition = TransitionData::New( map ); - Animation animation = dummyImpl.CreateTransition( transition ); + map["animator"] = Property::Map() + .Add("alphaFunction", "LINEAR") + .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 4.0f)); + + Dali::Toolkit::TransitionData transition = TransitionData::New(map); + Animation animation = dummyImpl.CreateTransition(transition); animation.Play(); glEnableStack.Reset(); @@ -1214,191 +1208,183 @@ int UtcDaliImageVisualAnimateOpacity(void) application.SendNotification(); Vector4 color; - DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue< Vector4 >( "uColor", color ) ); - DALI_TEST_EQUALS( color.a, 0.55f, TEST_LOCATION ); + DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue("uColor", color)); + DALI_TEST_EQUALS(color.a, 0.55f, TEST_LOCATION); - DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) ); + DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Enable", blendStr.str())); glEnableStack.Reset(); application.Render(2016u); // end application.SendNotification(); - DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue< Vector4 >( "uColor", color ) ); - DALI_TEST_EQUALS( color.a, 0.1f, TEST_LOCATION ); + DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue("uColor", color)); + DALI_TEST_EQUALS(color.a, 0.1f, TEST_LOCATION); // GL_BLEND should not be changed: Keep enabled -// @todo -// TODO: Temporarily commented out the line below when caching is disabled. Will need to add it back. -// DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) ); - DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Disable", blendStr.str() ) ); + // @todo + // TODO: Temporarily commented out the line below when caching is disabled. Will need to add it back. + // DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) ); + DALI_TEST_CHECK(!glEnableStack.FindMethodAndParams("Disable", blendStr.str())); } END_TEST; } - - int UtcDaliImageVisualAnimateOpacity02(void) { ToolkitTestApplication application; - tet_infoline( "Animate image visual opacity" ); + tet_infoline("Animate image visual opacity"); - application.GetPlatform().SetClosestImageSize( Vector2(100, 100) ); + application.GetPlatform().SetClosestImageSize(Vector2(100, 100)); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE); - propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME ); + propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME); propertyMap.Insert("opacity", 0.5f); propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true); - Visual::Base visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual(propertyMap); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - actor.SetProperty( Actor::Property::SIZE, Vector2(2000, 2000) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); - actor.SetProperty( Actor::Property::COLOR,Color::BLACK); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000, 2000)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + actor.SetProperty(Actor::Property::COLOR, Color::BLACK); - tet_infoline( "Test that the opacity doesn't animate when actor not staged" ); + tet_infoline("Test that the opacity doesn't animate when actor not staged"); Property::Array array; Property::Map map; - map["target"] = "testVisual"; - map["property"] = "opacity"; + map["target"] = "testVisual"; + map["property"] = "opacity"; map["initialValue"] = 0.0f; - map["targetValue"] = 1.0f; - map["animator"] = Property::Map() - .Add("alphaFunction", "LINEAR") - .Add("timePeriod", Property::Map() - .Add("delay", 0.0f) - .Add("duration", 4.0f)); + map["targetValue"] = 1.0f; + map["animator"] = Property::Map() + .Add("alphaFunction", "LINEAR") + .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 4.0f)); Property::Map map2; - map2["target"] = "testVisual"; - map2["property"] = "size"; + map2["target"] = "testVisual"; + map2["property"] = "size"; map2["targetValue"] = Vector2(1.0f, 1.0f); - array.Add( map ).Add(map2); + array.Add(map).Add(map2); - Dali::Toolkit::TransitionData transition = TransitionData::New( array ); - Animation animation = dummyImpl.CreateTransition( transition ); + Dali::Toolkit::TransitionData transition = TransitionData::New(array); + Animation animation = dummyImpl.CreateTransition(transition); application.GetScene().Add(actor); application.SendNotification(); - application.Render(0); // Ensure animation starts + application.Render(0); // Ensure animation starts - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); - Renderer renderer = actor.GetRendererAt(0); - Property::Value blendModeValue = renderer.GetProperty( Renderer::Property::BLEND_MODE ); - DALI_TEST_EQUALS( blendModeValue.Get(), (int)BlendMode::AUTO, TEST_LOCATION ); + Renderer renderer = actor.GetRendererAt(0); + Property::Value blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE); + DALI_TEST_EQUALS(blendModeValue.Get(), (int)BlendMode::AUTO, TEST_LOCATION); - animation = dummyImpl.CreateTransition( transition ); + animation = dummyImpl.CreateTransition(transition); animation.Play(); TestGlAbstraction& glAbstraction = application.GetGlAbstraction(); - glAbstraction.EnableEnableDisableCallTrace( true ); - TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace(); + glAbstraction.EnableEnableDisableCallTrace(true); + TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace(); std::ostringstream blendStr; blendStr << std::hex << GL_BLEND; application.SendNotification(); - application.Render(0); // Ensure animation starts - application.Render(2000u); // Halfway point through animation + application.Render(0); // Ensure animation starts + application.Render(2000u); // Halfway point through animation application.SendNotification(); // Handle any signals - DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) ); + DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Enable", blendStr.str())); Vector4 color; - DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue< Vector4 >( "uColor", color ) ); - DALI_TEST_EQUALS( color.a, 0.5f, TEST_LOCATION ); + DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue("uColor", color)); + DALI_TEST_EQUALS(color.a, 0.5f, TEST_LOCATION); glEnableStack.Reset(); - application.Render(2001u); // end + application.Render(2001u); // end application.SendNotification(); // ensure animation finished signal is sent - DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue< Vector4 >( "uColor", color ) ); - DALI_TEST_EQUALS( color.a, 1.0f, TEST_LOCATION ); + DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue("uColor", color)); + DALI_TEST_EQUALS(color.a, 1.0f, TEST_LOCATION); - DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Disable", blendStr.str() ) ); + DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Disable", blendStr.str())); END_TEST; } - - int UtcDaliImageVisualAnimatePixelArea(void) { ToolkitTestApplication application; - tet_infoline( "ImageVisual animate pixel area" ); + tet_infoline("ImageVisual animate pixel area"); static std::vector customUniforms = - { - UniformData("pixelArea", Property::Type::VECTOR4), - }; + { + UniformData("pixelArea", Property::Type::VECTOR4), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); - application.GetPlatform().SetClosestImageSize( Vector2(100, 100) ); + application.GetPlatform().SetClosestImageSize(Vector2(100, 100)); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE); - propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME ); + propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME); propertyMap.Insert("mixColor", Color::BLUE); propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true); - Visual::Base visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual(propertyMap); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - actor.SetProperty( Actor::Property::SIZE, Vector2(2000, 2000) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); - actor.SetProperty( Actor::Property::COLOR,Color::BLACK); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000, 2000)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + actor.SetProperty(Actor::Property::COLOR, Color::BLACK); application.GetScene().Add(actor); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); Renderer renderer = actor.GetRendererAt(0); - Property::Index index = renderer.GetPropertyIndex( Visual::Property::MIX_COLOR ); - - tet_infoline("Test that the renderer has the mixColor property"); - DALI_TEST_CHECK( index != Property::INVALID_INDEX ); + // @todo Implement this feature? + //Property::Index index = renderer.GetPropertyIndex( Visual::Property::MIX_COLOR ); + //tet_infoline("Test that the renderer has the mixColor property"); + //DALI_TEST_CHECK( index != Property::INVALID_INDEX ); // TransitionData only takes string keys Property::Map map; - map["target"] = "testVisual"; - map["property"] = "pixelArea"; - map["initialValue"] = Vector4( 0,0,0,1 ); - map["targetValue"] = Vector4( 0,0,1,1 ); // Animate width from zero to full - map["animator"] = Property::Map() - .Add("alphaFunction", "LINEAR") - .Add("timePeriod", Property::Map() - .Add("delay", 0.0f) - .Add("duration", 4.0f)); - - Dali::Toolkit::TransitionData transition = TransitionData::New( map ); - - Animation animation = dummyImpl.CreateTransition( transition ); - animation.AnimateTo( Property(actor, Actor::Property::COLOR), Color::WHITE ); + map["target"] = "testVisual"; + map["property"] = "pixelArea"; + map["initialValue"] = Vector4(0, 0, 0, 1); + map["targetValue"] = Vector4(0, 0, 1, 1); // Animate width from zero to full + map["animator"] = Property::Map() + .Add("alphaFunction", "LINEAR") + .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 4.0f)); + + Dali::Toolkit::TransitionData transition = TransitionData::New(map); + + Animation animation = dummyImpl.CreateTransition(transition); + animation.AnimateTo(Property(actor, Actor::Property::COLOR), Color::WHITE); animation.Play(); application.SendNotification(); application.Render(0); // Ensure animation starts application.Render(2000u); // Halfway point - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue("pixelArea", Vector4(0.0f, 0.0f, 0.5f, 1.0f )), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("pixelArea", Vector4(0.0f, 0.0f, 0.5f, 1.0f)), true, TEST_LOCATION); application.Render(2000u); // End of animation - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue("pixelArea", Vector4( 0.0f, 0.0f, 1.0f, 1.0f )), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("pixelArea", Vector4(0.0f, 0.0f, 1.0f, 1.0f)), true, TEST_LOCATION); END_TEST; } @@ -1406,29 +1392,29 @@ int UtcDaliImageVisualAnimatePixelArea(void) int UtcDaliImageVisualTextureCancelRemoteLoad(void) { ToolkitTestApplication application; - tet_infoline( "Request remote image visual, then destroy visual to cancel load" ); + tet_infoline("Request remote image visual, then destroy visual to cancel load"); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_REMOTE_IMAGE_FILE_NAME ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_REMOTE_IMAGE_FILE_NAME); - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); TraceCallStack& drawTrace = gl.GetDrawTrace(); drawTrace.Enable(true); - Actor actor = CreateActorWithImageVisual( propertyMap ); - application.GetScene().Add( actor ); + Actor actor = CreateActorWithImageVisual(propertyMap); + application.GetScene().Add(actor); application.SendNotification(); - application.GetScene().Remove( actor ); + application.GetScene().Remove(actor); application.SendNotification(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), false, TEST_LOCATION ); - DALI_TEST_EQUALS( drawTrace.FindMethod("DrawArrays"), false, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), false, TEST_LOCATION); + DALI_TEST_EQUALS(drawTrace.FindMethod("DrawArrays"), false, TEST_LOCATION); END_TEST; } @@ -1436,51 +1422,51 @@ int UtcDaliImageVisualTextureCancelRemoteLoad(void) int UtcDaliImageVisualTextureCancelAsyncLoad(void) { ToolkitTestApplication application; - tet_infoline( "Load image asynchronously, cancel loading, then load again" ); + tet_infoline("Load image asynchronously, cancel loading, then load again"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); - textureTrace.Enable( true ); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); TraceCallStack& drawTrace = gl.GetDrawTrace(); - drawTrace.Enable( true ); + drawTrace.Enable(true); - DummyControl actor = DummyControl::New(); - DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() ); - dummyImpl.RegisterVisual( Control::Property::BACKGROUND, visual ); + DummyControl actor = DummyControl::New(); + DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); + dummyImpl.RegisterVisual(Control::Property::BACKGROUND, visual); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); // Cancel loading - application.GetScene().Remove( actor ); + application.GetScene().Remove(actor); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); // Create another visual with the same image - visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); - dummyImpl.RegisterVisual( Control::Property::BACKGROUND, visual ); + dummyImpl.RegisterVisual(Control::Property::BACKGROUND, visual); application.SendNotification(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); - DALI_TEST_EQUALS( drawTrace.FindMethod("DrawArrays"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + DALI_TEST_EQUALS(drawTrace.FindMethod("DrawArrays"), true, TEST_LOCATION); END_TEST; } @@ -1488,42 +1474,42 @@ int UtcDaliImageVisualTextureCancelAsyncLoad(void) int UtcDaliImageVisualSetInvalidAsyncImage(void) { ToolkitTestApplication application; - tet_infoline( "Request image visual with invalid images - should draw broken.png" ); + tet_infoline("Request image visual with invalid images - should draw broken.png"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_INVALID_FILE_NAME ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_INVALID_FILE_NAME); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - DummyControl actor = DummyControl::New(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); application.SendNotification(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - application.GetScene().Remove( actor ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + application.GetScene().Remove(actor); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); END_TEST; } @@ -1531,31 +1517,31 @@ int UtcDaliImageVisualSetInvalidAsyncImage(void) int UtcDaliImageVisualSetInvalidSyncImage(void) { ToolkitTestApplication application; - tet_infoline( "Request image visual with invalid images - should draw broken.png" ); + tet_infoline("Request image visual with invalid images - should draw broken.png"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_INVALID_FILE_NAME ); - propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_INVALID_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - DummyControl actor = DummyControl::New(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); application.SendNotification(); application.Render(); @@ -1565,11 +1551,11 @@ int UtcDaliImageVisualSetInvalidSyncImage(void) DALI_TEST_EQUALS(status, Visual::ResourceStatus::FAILED, TEST_LOCATION); // The broken image should be shown. - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - application.GetScene().Remove( actor ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + application.GetScene().Remove(actor); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); END_TEST; } @@ -1577,43 +1563,43 @@ int UtcDaliImageVisualSetInvalidSyncImage(void) int UtcDaliImageVisualSetInvalidRemoteImage(void) { ToolkitTestApplication application; - tet_infoline( "Request image visual with invalid images - should draw broken.png" ); + tet_infoline("Request image visual with invalid images - should draw broken.png"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); // Local invalid file, asynchronous loading Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_REMOTE_INVALID_FILE_NAME ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_REMOTE_INVALID_FILE_NAME); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - DummyControl actor = DummyControl::New(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); application.SendNotification(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - application.GetScene().Remove( actor ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + application.GetScene().Remove(actor); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); END_TEST; } @@ -1621,53 +1607,53 @@ int UtcDaliImageVisualSetInvalidRemoteImage(void) int UtcDaliImageVisualAlphaMask(void) { ToolkitTestApplication application; - tet_infoline( "Request image visual with a Property::Map containing an Alpha mask" ); + tet_infoline("Request image visual with a Property::Map containing an Alpha mask"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME ); - propertyMap.Insert( ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); Property::Map testMap; visual.CreatePropertyMap(testMap); - DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL),Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION ); + DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL), Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION); // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied. // Image with a size smaller than 512*512 will be uploaded as a part of the atlas. - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - DummyControl actor = DummyControl::New(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); - DALI_TEST_EQUALS( actor.IsResourceReady(), false, TEST_LOCATION ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.IsResourceReady(), false, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); - DALI_TEST_EQUALS( actor.IsResourceReady(), true, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION); - dummyImpl.UnregisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1 ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + dummyImpl.UnregisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); END_TEST; } @@ -1675,52 +1661,52 @@ int UtcDaliImageVisualAlphaMask(void) int UtcDaliImageVisualSynchronousLoadAlphaMask(void) { ToolkitTestApplication application; - tet_infoline( "Request image visual with a Property::Map containing an Alpha mask with synchronous loading" ); + tet_infoline("Request image visual with a Property::Map containing an Alpha mask with synchronous loading"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME ); - propertyMap.Insert( ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME ); - propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); Property::Map testMap; visual.CreatePropertyMap(testMap); - DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL),Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION ); + DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL), Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION); // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied. // Image with a size smaller than 512*512 will be uploaded as a part of the atlas. - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - DummyControl actor = DummyControl::New(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); - DALI_TEST_EQUALS( actor.IsResourceReady(), false, TEST_LOCATION ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.IsResourceReady(), false, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); // Do not wait for any EventThreadTrigger in synchronous alpha mask. application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); - DALI_TEST_EQUALS( actor.IsResourceReady(), true, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION); - dummyImpl.UnregisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1 ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + dummyImpl.UnregisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); END_TEST; } @@ -1728,54 +1714,54 @@ int UtcDaliImageVisualSynchronousLoadAlphaMask(void) int UtcDaliImageVisualRemoteAlphaMask(void) { ToolkitTestApplication application; - tet_infoline( "Request image visual with a Property::Map containing an Alpha mask" ); + tet_infoline("Request image visual with a Property::Map containing an Alpha mask"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); const std::string MASK_IMAGE = TEST_REMOTE_IMAGE_FILE_NAME; Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME ); - propertyMap.Insert( ImageVisual::Property::ALPHA_MASK_URL, MASK_IMAGE ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, MASK_IMAGE); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); Property::Map testMap; visual.CreatePropertyMap(testMap); - DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL),Property::Value(MASK_IMAGE), TEST_LOCATION ); + DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL), Property::Value(MASK_IMAGE), TEST_LOCATION); // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied. // Image with a size smaller than 512*512 will be uploaded as a part of the atlas. - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - DummyControl actor = DummyControl::New(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); - DALI_TEST_EQUALS( actor.IsResourceReady(), false, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.IsResourceReady(), false, TEST_LOCATION); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); - DALI_TEST_EQUALS( actor.IsResourceReady(), true, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION); END_TEST; } @@ -1783,47 +1769,47 @@ int UtcDaliImageVisualRemoteAlphaMask(void) int UtcDaliImageVisualAlphaMaskCrop(void) { ToolkitTestApplication application; - tet_infoline( "Request image visual with an Alpha mask and scale/cropping" ); + tet_infoline("Request image visual with an Alpha mask and scale/cropping"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME ); - propertyMap.Insert( ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME ); - propertyMap.Insert( ImageVisual::Property::MASK_CONTENT_SCALE, 1.6f ); - propertyMap.Insert( ImageVisual::Property::CROP_TO_MASK, true ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::MASK_CONTENT_SCALE, 1.6f); + propertyMap.Insert(ImageVisual::Property::CROP_TO_MASK, true); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); Property::Map testMap; visual.CreatePropertyMap(testMap); - DALI_TEST_EQUALS( *testMap.Find(ImageVisual::Property::ALPHA_MASK_URL),Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION ); - DALI_TEST_EQUALS( *testMap.Find(ImageVisual::Property::MASK_CONTENT_SCALE), Property::Value(1.6f), TEST_LOCATION ); - DALI_TEST_EQUALS( *testMap.Find(ImageVisual::Property::CROP_TO_MASK),Property::Value(true), TEST_LOCATION ); + DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL), Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION); + DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::MASK_CONTENT_SCALE), Property::Value(1.6f), TEST_LOCATION); + DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::CROP_TO_MASK), Property::Value(true), TEST_LOCATION); // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied. // Image with a size smaller than 512*512 will be uploaded as a part of the atlas. - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - DummyControl actor = DummyControl::New(); + DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); - DALI_TEST_EQUALS( actor.IsResourceReady(), false, TEST_LOCATION ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.IsResourceReady(), false, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION); application.SendNotification(); application.Render(); @@ -1831,10 +1817,10 @@ int UtcDaliImageVisualAlphaMaskCrop(void) Vector2 size; visual.GetNaturalSize(size); - DALI_TEST_EQUALS( size, Vector2( 100.0f, 100.0f ), 0.001f, TEST_LOCATION ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); - DALI_TEST_EQUALS( actor.IsResourceReady(), true, TEST_LOCATION ); + DALI_TEST_EQUALS(size, Vector2(100.0f, 100.0f), 0.001f, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION); END_TEST; } @@ -1842,49 +1828,49 @@ int UtcDaliImageVisualAlphaMaskCrop(void) int UtcDaliImageVisualReleasePolicy01(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliImageVisualReleasePolicy01 Detached Policy, disabling visual with this policy deletes texture" ); + tet_infoline("UtcDaliImageVisualReleasePolicy01 Detached Policy, disabling visual with this policy deletes texture"); - Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DETACHED ); - DALI_TEST_CHECK( imageVisual ); + Visual::Base imageVisual = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DETACHED); + DALI_TEST_CHECK(imageVisual); // Set up debug trace - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - tet_infoline( "Register visual with control and ensure it has the only handle" ); - DummyControl actor = DummyControl::New(true); + tet_infoline("Register visual with control and ensure it has the only handle"); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual); imageVisual.Reset(); - actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); application.SendNotification(); application.Render(0); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); // Wait for image to load - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(0); // Test renderer and texture created - tet_infoline( "Confirm texture created" ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); + tet_infoline("Confirm texture created"); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); - tet_infoline( "Disable visual causing the texture to be deleted" ); - dummyImpl.EnableVisual( DummyControl::Property::TEST_VISUAL, false ); + tet_infoline("Disable visual causing the texture to be deleted"); + dummyImpl.EnableVisual(DummyControl::Property::TEST_VISUAL, false); application.SendNotification(); application.Render(0); // Test renderer and textures removed. - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION); END_TEST; } @@ -1892,51 +1878,50 @@ int UtcDaliImageVisualReleasePolicy01(void) int UtcDaliImageVisualReleasePolicy02(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliImageVisualReleasePolicy02 Destroyed Policy, Texture should be deleted when visual destroyed" ); + tet_infoline("UtcDaliImageVisualReleasePolicy02 Destroyed Policy, Texture should be deleted when visual destroyed"); - Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED ); - DALI_TEST_CHECK( imageVisual ); + Visual::Base imageVisual = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED); + DALI_TEST_CHECK(imageVisual); // Setup debug trace - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - tet_infoline( "Register visual with control and ensure it has the only handle" ); - DummyControl actor = DummyControl::New(true); + tet_infoline("Register visual with control and ensure it has the only handle"); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual); imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive. - actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); application.SendNotification(); application.Render(0); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); // Wait for image to load - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(0); // Test renderer and texture created - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); - + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); - DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); - tet_infoline( "Destroy visual by UnRegistering visual with control, check renderer is destroyed" ); - dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 1u); + tet_infoline("Destroy visual by UnRegistering visual with control, check renderer is destroyed"); + dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); application.SendNotification(); application.Render(); // Test texture removed after visual destroyed. - tet_infoline( "Ensure texture is deleted after visual destroyed" ); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION ); + tet_infoline("Ensure texture is deleted after visual destroyed"); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION); END_TEST; } @@ -1944,48 +1929,48 @@ int UtcDaliImageVisualReleasePolicy02(void) int UtcDaliImageVisualReleasePolicy03(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliImageVisualReleasePolicy03 Never Policy, texture should not be deleted after visual destroyed" ); + tet_infoline("UtcDaliImageVisualReleasePolicy03 Never Policy, texture should not be deleted after visual destroyed"); - Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER ); - DALI_TEST_CHECK( imageVisual ); + Visual::Base imageVisual = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER); + DALI_TEST_CHECK(imageVisual); - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - tet_infoline( "Register visual with control and ensure it has the only handle" ); - DummyControl actor = DummyControl::New(true); + tet_infoline("Register visual with control and ensure it has the only handle"); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual); imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive. - actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); application.SendNotification(); application.Render(0); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); // Wait for image to load - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(0); // Test renderer and texture created - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); - tet_infoline( "Destroy visual by UnRegistering visual with control, check renderer is destroyed" ); - DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); - dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + tet_infoline("Destroy visual by UnRegistering visual with control, check renderer is destroyed"); + DALI_TEST_CHECK(actor.GetRendererCount() == 1u); + dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); application.SendNotification(); application.Render(); - tet_infoline( "Ensure texture is not deleted as policy is set to NEVER" ); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION ); + tet_infoline("Ensure texture is not deleted as policy is set to NEVER"); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION); END_TEST; } @@ -1993,64 +1978,64 @@ int UtcDaliImageVisualReleasePolicy03(void) int UtcDaliImageVisualReleasePolicy04(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliImageVisualReleasePolicy04 Two visuals with different policies sharing a texture" ); + tet_infoline("UtcDaliImageVisualReleasePolicy04 Two visuals with different policies sharing a texture"); - tet_infoline( "Create first visual with Never release policy" ); - Visual::Base imageVisualNever = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER ); + tet_infoline("Create first visual with Never release policy"); + Visual::Base imageVisualNever = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER); - tet_infoline( "Create second visual with Destroyed release policy"); - Visual::Base imageVisualDestroyed = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED ); + tet_infoline("Create second visual with Destroyed release policy"); + Visual::Base imageVisualDestroyed = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED); // Set up trace debug - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - tet_infoline( "Register visuals with control and ensure it has the only handles" ); - DummyControl actor = DummyControl::New(true); + tet_infoline("Register visuals with control and ensure it has the only handles"); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisualNever ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL2, imageVisualDestroyed ); - imageVisualNever.Reset(); // reduce ref count so only the control keeps the visual alive. + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisualNever); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL2, imageVisualDestroyed); + imageVisualNever.Reset(); // reduce ref count so only the control keeps the visual alive. imageVisualDestroyed.Reset(); // reduce ref count so only the control keeps the visual alive. - actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); // Test initially zero renderers application.SendNotification(); application.Render(0); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); // Wait for image to load - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(0); - tet_infoline( "Ensure a texture is created, shared amongst both visuals. Each visual has its own renderer" ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 2u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); + tet_infoline("Ensure a texture is created, shared amongst both visuals. Each visual has its own renderer"); + DALI_TEST_EQUALS(actor.GetRendererCount(), 2u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); // Test renderer removed when visual destroyed - DALI_TEST_CHECK( actor.GetRendererCount() == 2u ); - dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL2 ); // TEST_VISUAL2 no longer requires the texture as release policy DESTROYED - DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 2u); + dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL2); // TEST_VISUAL2 no longer requires the texture as release policy DESTROYED + DALI_TEST_CHECK(actor.GetRendererCount() == 1u); application.SendNotification(); application.Render(); // Test texture was not deleted as TEST_VISUAL release policy is NEVER so it is still required. - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION); - dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); application.SendNotification(); application.Render(); - tet_infoline( "Ensure a texture is not deleted as second visual used the NEVER release policy" ); + tet_infoline("Ensure a texture is not deleted as second visual used the NEVER release policy"); // Test texture was not deleted as TEST_VISUAL release policy is NEVER so it is still required. - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION); END_TEST; } @@ -2058,24 +2043,24 @@ int UtcDaliImageVisualReleasePolicy04(void) int UtcDaliImageVisualReleasePolicy05(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliImageVisualReleasePolicy05 Testing settung by string currents correct enum" ); + tet_infoline("UtcDaliImageVisualReleasePolicy05 Testing settung by string currents correct enum"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMapNeverReleasePolicy; - propertyMapNeverReleasePolicy.Insert( Visual::Property::TYPE, Visual::IMAGE ); - propertyMapNeverReleasePolicy.Insert( ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME ); - propertyMapNeverReleasePolicy.Insert( ImageVisual::Property::DESIRED_WIDTH, 20 ); - propertyMapNeverReleasePolicy.Insert( ImageVisual::Property::DESIRED_HEIGHT, 30 ); - propertyMapNeverReleasePolicy.Insert( "releasePolicy" , "never" ); + propertyMapNeverReleasePolicy.Insert(Visual::Property::TYPE, Visual::IMAGE); + propertyMapNeverReleasePolicy.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME); + propertyMapNeverReleasePolicy.Insert(ImageVisual::Property::DESIRED_WIDTH, 20); + propertyMapNeverReleasePolicy.Insert(ImageVisual::Property::DESIRED_HEIGHT, 30); + propertyMapNeverReleasePolicy.Insert("releasePolicy", "never"); - Visual::Base imageVisualNever = factory.CreateVisual( propertyMapNeverReleasePolicy ); + Visual::Base imageVisualNever = factory.CreateVisual(propertyMapNeverReleasePolicy); Property::Map resultMap; - imageVisualNever.CreatePropertyMap( resultMap ); - DALI_TEST_CHECK( ! resultMap.Empty() ); + imageVisualNever.CreatePropertyMap(resultMap); + DALI_TEST_CHECK(!resultMap.Empty()); - DALI_TEST_EQUALS( ( resultMap.Find( ImageVisual::Property::RELEASE_POLICY ) )->Get(), (int)ImageVisual::ReleasePolicy::NEVER, TEST_LOCATION ); + DALI_TEST_EQUALS((resultMap.Find(ImageVisual::Property::RELEASE_POLICY))->Get(), (int)ImageVisual::ReleasePolicy::NEVER, TEST_LOCATION); END_TEST; } @@ -2083,58 +2068,58 @@ int UtcDaliImageVisualReleasePolicy05(void) int UtcDaliImageVisualReleasePolicy06(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliImageVisualReleasePolicy06 Never Policy, texture should not be affected by Disabling and Enabling visual" ); + tet_infoline("UtcDaliImageVisualReleasePolicy06 Never Policy, texture should not be affected by Disabling and Enabling visual"); - Visual::Base imageVisual= CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER ); - DALI_TEST_CHECK( imageVisual ); + Visual::Base imageVisual = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER); + DALI_TEST_CHECK(imageVisual); - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - tet_infoline( "Register visual with control and ensure it has the only handle" ); - DummyControl actor = DummyControl::New(true); + tet_infoline("Register visual with control and ensure it has the only handle"); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual); imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive. - actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); application.SendNotification(); application.Render(0); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); // Wait for image to load - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(0); // Test renderer and texture created - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); textureTrace.Reset(); - tet_infoline( "Disable Visual and check texture not affected" ); - dummyImpl.EnableVisual( DummyControl::Property::TEST_VISUAL, false ); + tet_infoline("Disable Visual and check texture not affected"); + dummyImpl.EnableVisual(DummyControl::Property::TEST_VISUAL, false); application.SendNotification(); application.Render(0); - tet_infoline( "Check renderer is destroyed when visual off stage" ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION ); + tet_infoline("Check renderer is destroyed when visual off stage"); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION); textureTrace.Reset(); - tet_infoline( "Re-enable Visual and check texture not affected" ); - dummyImpl.EnableVisual( DummyControl::Property::TEST_VISUAL, true ); + tet_infoline("Re-enable Visual and check texture not affected"); + dummyImpl.EnableVisual(DummyControl::Property::TEST_VISUAL, true); application.SendNotification(); application.Render(0); - tet_infoline( "Check texture not affected and renderer is destroyed when visual off stage" ); - DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION ); + tet_infoline("Check texture not affected and renderer is destroyed when visual off stage"); + DALI_TEST_CHECK(actor.GetRendererCount() == 1u); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION); END_TEST; } @@ -2142,64 +2127,63 @@ int UtcDaliImageVisualReleasePolicy06(void) int UtcDaliImageVisualReleasePolicy07(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliImageVisualReleasePolicy07 Two visuals with different policies sharing a texture DETACHED and DESTROYED" ); + tet_infoline("UtcDaliImageVisualReleasePolicy07 Two visuals with different policies sharing a texture DETACHED and DESTROYED"); - tet_infoline( "Create first visual with DESTROYED release policy" ); - Visual::Base imageVisualDestroyed = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED ); + tet_infoline("Create first visual with DESTROYED release policy"); + Visual::Base imageVisualDestroyed = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED); - - tet_infoline( "Create second visual with DETACHED release policy"); - Visual::Base imageVisualDetached = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DETACHED ); + tet_infoline("Create second visual with DETACHED release policy"); + Visual::Base imageVisualDetached = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DETACHED); // Set up trace debug - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - tet_infoline( "Register visuals with control and ensure it has the only handles" ); - DummyControl actor = DummyControl::New(true); + tet_infoline("Register visuals with control and ensure it has the only handles"); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisualDestroyed ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL2, imageVisualDetached ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisualDestroyed); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL2, imageVisualDetached); imageVisualDestroyed.Reset(); // reduce ref count so only the control keeps the visual alive. - imageVisualDetached.Reset(); // reduce ref count so only the control keeps the visual alive. + imageVisualDetached.Reset(); // reduce ref count so only the control keeps the visual alive. - actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); // Test initially zero renderers application.SendNotification(); application.Render(0); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); // Wait for image to load - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(0); - tet_infoline( "Ensure a texture is created, shared amongst both visuals. Each visual has its own renderer" ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 2u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); + tet_infoline("Ensure a texture is created, shared amongst both visuals. Each visual has its own renderer"); + DALI_TEST_EQUALS(actor.GetRendererCount(), 2u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); // Test renderer removed when visual destroyed - DALI_TEST_CHECK( actor.GetRendererCount() == 2u ); - dummyImpl.EnableVisual( DummyControl::Property::TEST_VISUAL2, false ); // TEST_VISUAL2 no longer requires the texture as release policy DETACHED - DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 2u); + dummyImpl.EnableVisual(DummyControl::Property::TEST_VISUAL2, false); // TEST_VISUAL2 no longer requires the texture as release policy DETACHED + DALI_TEST_CHECK(actor.GetRendererCount() == 1u); application.SendNotification(); application.Render(); // Test texture was not deleted as TEST_VISUAL release policy is DESTROYED and is still required. - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION); - dummyImpl.EnableVisual( DummyControl::Property::TEST_VISUAL, false ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + dummyImpl.EnableVisual(DummyControl::Property::TEST_VISUAL, false); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); application.SendNotification(); application.Render(); - tet_infoline( "Ensure a texture is not deleted as second visual used the DESTROYED release policy" ); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION ); + tet_infoline("Ensure a texture is not deleted as second visual used the DESTROYED release policy"); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION); END_TEST; } @@ -2207,80 +2191,80 @@ int UtcDaliImageVisualReleasePolicy07(void) int UtcDaliImageVisualReleasePolicy08(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliImageVisualReleasePolicy08 Ensure TextureSet is same after detach/attach on stage when texture used the DESTROYED release policy" ); + tet_infoline("UtcDaliImageVisualReleasePolicy08 Ensure TextureSet is same after detach/attach on stage when texture used the DESTROYED release policy"); - tet_infoline( "Create first visual with DESTROYED release policy" ); - Visual::Base imageVisualDestroyed = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED ); + tet_infoline("Create first visual with DESTROYED release policy"); + Visual::Base imageVisualDestroyed = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED); // Set up trace debug - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - tet_infoline( "Register visuals with control and ensure it has the only handles" ); - DummyControl actor = DummyControl::New(true); + tet_infoline("Register visuals with control and ensure it has the only handles"); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisualDestroyed ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisualDestroyed); imageVisualDestroyed.Reset(); // reduce ref count so only the control keeps the visual alive. - actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); // Test initially zero renderers application.SendNotification(); application.Render(0); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION); textureTrace.Reset(); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); // Wait for image to load - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(0); - tet_infoline( "Ensure a texture is created" ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); + tet_infoline("Ensure a texture is created"); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); textureTrace.Reset(); // Ensure TextureSet is same after detach/attach on stage when texture used the DESTROYED release policy // 1. Get TextureSet - TextureSet textureSetBefore = actor.GetRendererAt( 0u ).GetTextures(); + TextureSet textureSetBefore = actor.GetRendererAt(0u).GetTextures(); // 2.Remove actor from stage. In this case, renderer also is deleted. - tet_infoline( "Remove actor from stage" ); - application.GetScene().Remove( actor ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + tet_infoline("Remove actor from stage"); + application.GetScene().Remove(actor); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); application.SendNotification(); application.Render(); - tet_infoline( "Ensure a texture is not deleted as visual used the DESTROYED release policy" ); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION ); + tet_infoline("Ensure a texture is not deleted as visual used the DESTROYED release policy"); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION); textureTrace.Reset(); // 3.Add actor in stage. In this case, renderer is created. - tet_infoline( "Add actor in stage" ); - application.GetScene().Add( actor ); - DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); + tet_infoline("Add actor in stage"); + application.GetScene().Add(actor); + DALI_TEST_CHECK(actor.GetRendererCount() == 1u); application.SendNotification(); application.Render(); - tet_infoline( "Ensure a texture is not created again" ); - DALI_TEST_EQUALS( textureTrace.CountMethod("GenTextures"), 0, TEST_LOCATION ); + tet_infoline("Ensure a texture is not created again"); + DALI_TEST_EQUALS(textureTrace.CountMethod("GenTextures"), 0, TEST_LOCATION); textureTrace.Reset(); // 4.Compare Texture with before and after. textureSet need to be same because release policy is the DESTROYED. - tet_infoline( "Ensure a textureSet is not deleted because it is used the DESTROYED release policy" ); - TextureSet textureSetAfter = actor.GetRendererAt( 0u ).GetTextures(); - DALI_TEST_CHECK( textureSetBefore == textureSetAfter ); + tet_infoline("Ensure a textureSet is not deleted because it is used the DESTROYED release policy"); + TextureSet textureSetAfter = actor.GetRendererAt(0u).GetTextures(); + DALI_TEST_CHECK(textureSetBefore == textureSetAfter); textureSetBefore.Reset(); textureSetAfter.Reset(); - dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION); END_TEST; } @@ -2288,66 +2272,66 @@ int UtcDaliImageVisualReleasePolicy08(void) int UtcDaliImageVisualLoadPolicy01(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliImageVisualLoadPolicy01 Load a visual image before attaching to stage" ); + tet_infoline("UtcDaliImageVisualLoadPolicy01 Load a visual image before attaching to stage"); // Set up trace debug - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - tet_infoline( "Create visual with IMMEDIATE load policy" ); + tet_infoline("Create visual with IMMEDIATE load policy"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME ); - propertyMap.Insert( ImageVisual::Property::DESIRED_WIDTH, 20 ); - propertyMap.Insert( ImageVisual::Property::DESIRED_HEIGHT, 30 ); - propertyMap.Insert( "loadPolicy" , ImageVisual::LoadPolicy::IMMEDIATE ); + propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::DESIRED_WIDTH, 20); + propertyMap.Insert(ImageVisual::Property::DESIRED_HEIGHT, 30); + propertyMap.Insert("loadPolicy", ImageVisual::LoadPolicy::IMMEDIATE); - Visual::Base imageVisual = factory.CreateVisual( propertyMap ); + Visual::Base imageVisual = factory.CreateVisual(propertyMap); Property::Map resultMap; - imageVisual.CreatePropertyMap( resultMap ); - DALI_TEST_CHECK( ! resultMap.Empty() ); - DALI_TEST_EQUALS( ( resultMap.Find( ImageVisual::Property::LOAD_POLICY ) )->Get(), (int)ImageVisual::LoadPolicy::IMMEDIATE, TEST_LOCATION ); + imageVisual.CreatePropertyMap(resultMap); + DALI_TEST_CHECK(!resultMap.Empty()); + DALI_TEST_EQUALS((resultMap.Find(ImageVisual::Property::LOAD_POLICY))->Get(), (int)ImageVisual::LoadPolicy::IMMEDIATE, TEST_LOCATION); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); // Ensure texture has been uploaded application.SendNotification(); application.Render(); - tet_infoline( "Ensure texture loading starts after visual created" ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); + tet_infoline("Ensure texture loading starts after visual created"); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); textureTrace.Reset(); - tet_infoline( "Register visuals with control and ensure it has the only handles" ); - DummyControl actor = DummyControl::New(true); + tet_infoline("Register visuals with control and ensure it has the only handles"); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual); imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive. - actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) ); - application.GetScene().Add( actor ); - tet_infoline( "Ensure nothing triggers another load as texure already loaded" ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + application.GetScene().Add(actor); + tet_infoline("Ensure nothing triggers another load as texure already loaded"); const unsigned int TIME_OUT_3_SECONDS = 3; - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1, TIME_OUT_3_SECONDS ), false, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, TIME_OUT_3_SECONDS), false, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION); // Ensure texture is deleted when no longer needed (ref count was correct ) - dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL ); + dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION); END_TEST; } @@ -2355,53 +2339,53 @@ int UtcDaliImageVisualLoadPolicy01(void) int UtcDaliImageVisualLoadPolicy02(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliImageVisualLoadPolicy01 Load a visual image only after attached to stage" ); + tet_infoline("UtcDaliImageVisualLoadPolicy01 Load a visual image only after attached to stage"); // Set up trace debug - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - tet_infoline( "Create visual with IMMEDIATE load policy" ); - Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::ATTACHED ); + tet_infoline("Create visual with IMMEDIATE load policy"); + Visual::Base imageVisual = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::ATTACHED); const unsigned int TIME_OUT_3_SECONDS = 3; - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1, TIME_OUT_3_SECONDS ), false, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, TIME_OUT_3_SECONDS), false, TEST_LOCATION); // Act on meeage queue even although nothing expected to load application.SendNotification(); application.Render(); - tet_infoline( "Ensure texture is not generated yet" ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION ); + tet_infoline("Ensure texture is not generated yet"); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION); textureTrace.Reset(); - tet_infoline( "Register visuals with control and ensure it has the only handles" ); - DummyControl actor = DummyControl::New(true); + tet_infoline("Register visuals with control and ensure it has the only handles"); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual); imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive. - actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) ); - application.GetScene().Add( actor ); - tet_infoline( "Allow image time to load" ); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + application.GetScene().Add(actor); + tet_infoline("Allow image time to load"); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - tet_infoline( "Ensure texture generated and renderer created" ); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); + tet_infoline("Ensure texture generated and renderer created"); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); // Ensure texture is delete when no longer needed - dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL ); + dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); - DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION); END_TEST; } @@ -2409,36 +2393,36 @@ int UtcDaliImageVisualLoadPolicy02(void) int UtcDaliImageVisualLoadPolicy03(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliImageVisualLoadPolicy03 Load a visual image and receive ResourceReady Signal when loaded" ); + tet_infoline("UtcDaliImageVisualLoadPolicy03 Load a visual image and receive ResourceReady Signal when loaded"); - const bool VISUAL_NOT_ENABLED( false ); // Instead of just passing 'false' into an API. + const bool VISUAL_NOT_ENABLED(false); // Instead of just passing 'false' into an API. // Set up trace debug - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - tet_infoline( "Create a control and connect to resource ready signal without adding to stage" ); + tet_infoline("Create a control and connect to resource ready signal without adding to stage"); DummyControl actor = DummyControl::New(true); - actor.ResourceReadySignal().Connect( &ResourceReadySignal); + actor.ResourceReadySignal().Connect(&ResourceReadySignal); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); - tet_infoline( "Create visual with IMMEDIATE load policy" ); - Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE ); + tet_infoline("Create visual with IMMEDIATE load policy"); + Visual::Base imageVisual = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE); - tet_infoline( "Registering visual allows control to get a signal once loaded even if visual not enabled( not staged )" ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual, VISUAL_NOT_ENABLED ); + tet_infoline("Registering visual allows control to get a signal once loaded even if visual not enabled( not staged )"); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual, VISUAL_NOT_ENABLED); imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive. - tet_infoline( "Allow image time to load resource" ); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + tet_infoline("Allow image time to load resource"); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); // Ensure texture has been uploaded - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); END_TEST; } @@ -2446,52 +2430,52 @@ int UtcDaliImageVisualLoadPolicy03(void) int UtcDaliImageVisualLoadPolicy04(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliImageVisualLoadPolicy04 First part Load a visual image before attaching to stage"); - tet_infoline( "Second part, Reuse the same image in aonther control and check resource ready signal fired" ); + tet_infoline("UtcDaliImageVisualLoadPolicy04 First part Load a visual image before attaching to stage"); + tet_infoline("Second part, Reuse the same image in aonther control and check resource ready signal fired"); - const bool VISUAL_NOT_ENABLED( false ); // Instead of just passing false into an API. + const bool VISUAL_NOT_ENABLED(false); // Instead of just passing false into an API. // Set up trace debug - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - tet_infoline( "Create a control and connect to resource ready signal" ); + tet_infoline("Create a control and connect to resource ready signal"); DummyControl actor = DummyControl::New(true); - actor.ResourceReadySignal().Connect( &ResourceReadySignal); + actor.ResourceReadySignal().Connect(&ResourceReadySignal); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); - tet_infoline( "Create visual with IMMEDIATE load policy" ); - Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE ); + tet_infoline("Create visual with IMMEDIATE load policy"); + Visual::Base imageVisual = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE); - tet_infoline( "Registering visual allows control to get a signal once loaded even if visual not enabled( staged )" ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual, VISUAL_NOT_ENABLED ); + tet_infoline("Registering visual allows control to get a signal once loaded even if visual not enabled( staged )"); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual, VISUAL_NOT_ENABLED); imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive. - tet_infoline( "Allow image time to load" ); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + tet_infoline("Allow image time to load"); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - tet_infoline( "Testing texture is loaded and resource ready signal fired" ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); + tet_infoline("Testing texture is loaded and resource ready signal fired"); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); - tet_infoline( "Original control correctly signalled, now testing for signal with new Control reusing the image" ); + tet_infoline("Original control correctly signalled, now testing for signal with new Control reusing the image"); - gResourceReadySignalFired = false; // Reset signal check ready for testing next Control - Visual::Base imageVisual2 = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE ); - DummyControl actor2 = DummyControl::New(true); - Impl::DummyControl& dummyImpl2 = static_cast(actor.GetImplementation()); - actor2.ResourceReadySignal().Connect( &ResourceReadySignal); + gResourceReadySignalFired = false; // Reset signal check ready for testing next Control + Visual::Base imageVisual2 = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE); + DummyControl actor2 = DummyControl::New(true); + Impl::DummyControl& dummyImpl2 = static_cast(actor.GetImplementation()); + actor2.ResourceReadySignal().Connect(&ResourceReadySignal); - tet_infoline( "Registering visual this should trigger the loading signal as is already image loaded for previous control" ); - dummyImpl2.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual2 ); + tet_infoline("Registering visual this should trigger the loading signal as is already image loaded for previous control"); + dummyImpl2.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual2); imageVisual2.Reset(); // reduce ref count so only the control keeps the visual alive. - actor2.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) ); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 0 ), true, TEST_LOCATION ); // Not expecting any further loading as texture is being reused. - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); + actor2.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(0), true, TEST_LOCATION); // Not expecting any further loading as texture is being reused. + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); END_TEST; } @@ -2499,109 +2483,108 @@ int UtcDaliImageVisualLoadPolicy04(void) int UtcDaliImageVisualLoadPolicy05(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliImageVisualLoadPolicy05 LoadPolicy::ATTACHED (default) First part Load a visual image before attaching to stage"); - tet_infoline( "Second part, Reuse the same image in aonther control and check resource ready signal fired" ); + tet_infoline("UtcDaliImageVisualLoadPolicy05 LoadPolicy::ATTACHED (default) First part Load a visual image before attaching to stage"); + tet_infoline("Second part, Reuse the same image in aonther control and check resource ready signal fired"); // Set up trace debug - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - tet_infoline( "Create a control and connect to resource ready signal" ); + tet_infoline("Create a control and connect to resource ready signal"); DummyControl actor = DummyControl::New(true); - actor.ResourceReadySignal().Connect( &ResourceReadySignal); + actor.ResourceReadySignal().Connect(&ResourceReadySignal); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) ); - application.GetScene().Add( actor ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + application.GetScene().Add(actor); - tet_infoline( "Create visual with ATTACHED load policy" ); - Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::ATTACHED ); + tet_infoline("Create visual with ATTACHED load policy"); + Visual::Base imageVisual = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::ATTACHED); - tet_infoline( "Registering visual allows control to get a signal once loaded" ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual ); + tet_infoline("Registering visual allows control to get a signal once loaded"); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual); imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive. - tet_infoline( "Allow image time to load" ); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + tet_infoline("Allow image time to load"); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - tet_infoline( "Testing texture is loaded and resource ready signal fired" ); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); + tet_infoline("Testing texture is loaded and resource ready signal fired"); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); - tet_infoline( "Original control correctly signalled, now testing for signal with new Control reusing the image" ); + tet_infoline("Original control correctly signalled, now testing for signal with new Control reusing the image"); - gResourceReadySignalFired = false; // Reset signal check ready for testing next Control - Visual::Base imageVisual2 = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::ATTACHED ); - DummyControl actor2 = DummyControl::New(true); - Impl::DummyControl& dummyImpl2 = static_cast(actor.GetImplementation()); - actor2.ResourceReadySignal().Connect( &ResourceReadySignal); + gResourceReadySignalFired = false; // Reset signal check ready for testing next Control + Visual::Base imageVisual2 = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::ATTACHED); + DummyControl actor2 = DummyControl::New(true); + Impl::DummyControl& dummyImpl2 = static_cast(actor.GetImplementation()); + actor2.ResourceReadySignal().Connect(&ResourceReadySignal); - tet_infoline( "Registering visual this should trigger the loading signal as is already image loaded for previous control" ); - dummyImpl2.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual2 ); + tet_infoline("Registering visual this should trigger the loading signal as is already image loaded for previous control"); + dummyImpl2.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual2); imageVisual2.Reset(); // reduce ref count so only the control keeps the visual alive. - actor2.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) ); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 0 ), true, TEST_LOCATION ); // Not expecting any further loading as texture is being reused. - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); + actor2.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(0), true, TEST_LOCATION); // Not expecting any further loading as texture is being reused. + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); END_TEST; } - int UtcDaliImageVisualOrientationCorrection(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliImageVisualOrientationCorrection Enabling OrientationCorrection should rotate an image with exif (90deg) orientation data with requested" ); + tet_infoline("UtcDaliImageVisualOrientationCorrection Enabling OrientationCorrection should rotate an image with exif (90deg) orientation data with requested"); VisualFactory factory = VisualFactory::Get(); - tet_infoline( "Create visual with Orientation correction set OFF" ); + tet_infoline("Create visual with Orientation correction set OFF"); Property::Map propertyMap; - propertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_ROTATED_IMAGE ); - propertyMap.Insert( "orientationCorrection", false ); - Visual::Base imageVisual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_ROTATED_IMAGE); + propertyMap.Insert("orientationCorrection", false); + Visual::Base imageVisual = factory.CreateVisual(propertyMap); - tet_infoline( "Create control for visual, need to loaded it" ); - DummyControl actor = DummyControl::New(true); + tet_infoline("Create control for visual, need to loaded it"); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual); // Wait for image to load - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); Vector2 originalImageSize; - tet_infoline( "Get size of original visual to compare later with rotated image" ); - imageVisual.GetNaturalSize( originalImageSize ); - DALI_TEST_GREATER( originalImageSize.width, originalImageSize.height, TEST_LOCATION ); // Width and Height must be different for this test. - imageVisual.Reset(); // remove handle so can unregister it and remove from cache - dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL ); + tet_infoline("Get size of original visual to compare later with rotated image"); + imageVisual.GetNaturalSize(originalImageSize); + DALI_TEST_GREATER(originalImageSize.width, originalImageSize.height, TEST_LOCATION); // Width and Height must be different for this test. + imageVisual.Reset(); // remove handle so can unregister it and remove from cache + dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL); application.SendNotification(); application.Render(); - tet_infoline( "Create visual with Orientation correction set ON " ); + tet_infoline("Create visual with Orientation correction set ON "); propertyMap.Clear(); - propertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_ROTATED_IMAGE ); - propertyMap.Insert( ImageVisual::Property::ORIENTATION_CORRECTION, true ); - imageVisual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_ROTATED_IMAGE); + propertyMap.Insert(ImageVisual::Property::ORIENTATION_CORRECTION, true); + imageVisual = factory.CreateVisual(propertyMap); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual); // Wait for image to load - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); Vector2 rotatedImageSize; - imageVisual.GetNaturalSize( rotatedImageSize ); - tet_infoline( "Confirm that visual has rotated" ); - DALI_TEST_EQUALS( originalImageSize.width, rotatedImageSize.height , TEST_LOCATION ); - DALI_TEST_EQUALS( originalImageSize.height, rotatedImageSize.width , TEST_LOCATION ); + imageVisual.GetNaturalSize(rotatedImageSize); + tet_infoline("Confirm that visual has rotated"); + DALI_TEST_EQUALS(originalImageSize.width, rotatedImageSize.height, TEST_LOCATION); + DALI_TEST_EQUALS(originalImageSize.height, rotatedImageSize.width, TEST_LOCATION); Property::Map resultMap; - imageVisual.CreatePropertyMap( resultMap ); + imageVisual.CreatePropertyMap(resultMap); // check the Property::ORIENTATION_CORRECTION value from the returned map - Property::Value* typeValue = resultMap.Find( ImageVisual::Property::ORIENTATION_CORRECTION, Property::BOOLEAN ); - DALI_TEST_EQUALS( typeValue->Get(), true, TEST_LOCATION ); + Property::Value* typeValue = resultMap.Find(ImageVisual::Property::ORIENTATION_CORRECTION, Property::BOOLEAN); + DALI_TEST_EQUALS(typeValue->Get(), true, TEST_LOCATION); END_TEST; } @@ -2609,100 +2592,99 @@ int UtcDaliImageVisualOrientationCorrection(void) int UtcDaliImageVisualCustomShader(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliImageVisualCustomShader Test custom shader" ); + tet_infoline("UtcDaliImageVisualCustomShader Test custom shader"); - VisualFactory factory = VisualFactory::Get(); - Property::Map properties; - Property::Map shader; - const std::string vertexShader = "Foobar"; - const std::string fragmentShader = "Foobar"; + VisualFactory factory = VisualFactory::Get(); + Property::Map properties; + Property::Map shader; + const std::string vertexShader = "Foobar"; + const std::string fragmentShader = "Foobar"; shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader; - shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; + shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; - properties[Visual::Property::TYPE] = Visual::IMAGE; - properties[Visual::Property::SHADER] = shader; + properties[Visual::Property::TYPE] = Visual::IMAGE; + properties[Visual::Property::SHADER] = shader; properties[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); - Renderer renderer = dummy.GetRendererAt( 0 ); - Shader shader2 = renderer.GetShader(); - Property::Value value = shader2.GetProperty( Shader::Property::PROGRAM ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); + Renderer renderer = dummy.GetRendererAt(0); + Shader shader2 = renderer.GetShader(); + Property::Value value = shader2.GetProperty(Shader::Property::PROGRAM); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), TEST_LOCATION ); + Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp + DALI_TEST_EQUALS(fragmentShader, fragment->Get(), TEST_LOCATION); - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION ); + Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp + DALI_TEST_EQUALS(vertexShader, vertex->Get(), TEST_LOCATION); shader.Clear(); shader[Visual::Shader::Property::HINTS] = Shader::Hint::OUTPUT_IS_TRANSPARENT; - properties[Visual::Property::SHADER] = shader; + properties[Visual::Property::SHADER] = shader; - Visual::Base visual1 = factory.CreateVisual( properties ); + Visual::Base visual1 = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy1 = DummyControl::New( true ); - Impl::DummyControl& dummyImpl1 = static_cast< Impl::DummyControl& >( dummy1.GetImplementation() ); - dummyImpl1.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual1 ); - dummy1.SetProperty( Actor::Property::SIZE, Vector2( 200, 200 ) ); - dummy1.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy1 ); + DummyControl dummy1 = DummyControl::New(true); + Impl::DummyControl& dummyImpl1 = static_cast(dummy1.GetImplementation()); + dummyImpl1.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual1); + dummy1.SetProperty(Actor::Property::SIZE, Vector2(200, 200)); + dummy1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy1); TestGlAbstraction& glAbstraction = application.GetGlAbstraction(); - glAbstraction.EnableEnableDisableCallTrace( true ); + glAbstraction.EnableEnableDisableCallTrace(true); application.SendNotification(); application.Render(); - TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace(); + TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace(); std::ostringstream blendStr; blendStr << std::hex << GL_BLEND; - DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) ); + DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Enable", blendStr.str())); END_TEST; } - -void ResourceReadyLoadNext( Control control ) +void ResourceReadyLoadNext(Control control) { static int callNumber = 0; gResourceReadySignalFired = true; - gReadyIds.push_back(control.GetProperty< int >( Actor::Property::ID )); + gReadyIds.push_back(control.GetProperty(Actor::Property::ID)); - if( callNumber == 0 ) + if(callNumber == 0) { - DALI_TEST_EQUALS( control.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL), Toolkit::Visual::ResourceStatus::FAILED, TEST_LOCATION ); + DALI_TEST_EQUALS(control.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL), Toolkit::Visual::ResourceStatus::FAILED, TEST_LOCATION); - tet_infoline( "Create visual with loaded image from within the signal handler" ); - VisualFactory factory = VisualFactory::Get(); - Visual::Base imageVisual = factory.CreateVisual( TEST_IMAGE_FILE_NAME, ImageDimensions{20,30} ); + tet_infoline("Create visual with loaded image from within the signal handler"); + VisualFactory factory = VisualFactory::Get(); + Visual::Base imageVisual = factory.CreateVisual(TEST_IMAGE_FILE_NAME, ImageDimensions{20, 30}); Impl::DummyControl& controlImpl = static_cast(control.GetImplementation()); - controlImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual ); // This should trigger another signal. + controlImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual); // This should trigger another signal. callNumber = 1; } else { - tet_infoline( "3rd signal called" ); + tet_infoline("3rd signal called"); DALI_TEST_CHECK(true); } } @@ -2710,66 +2692,64 @@ void ResourceReadyLoadNext( Control control ) int UtcDaliImageVisualLoadReady01(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliImageVisualLoadReady01"); - tet_infoline( "First part: Load an image visual for one resource, then another image visual for a second resource."); - tet_infoline( "Second part, In the ready signal for the second image visual, add a 3rd visual with the first URL" ); - tet_infoline( "Should get a ready signal for all three visuals"); + tet_infoline("UtcDaliImageVisualLoadReady01"); + tet_infoline("First part: Load an image visual for one resource, then another image visual for a second resource."); + tet_infoline("Second part, In the ready signal for the second image visual, add a 3rd visual with the first URL"); + tet_infoline("Should get a ready signal for all three visuals"); ClearReadyIds(); - tet_infoline( "Create a control and connect to resource ready signal" ); - DummyControl actor = DummyControl::New(true); - int actor1Id = actor.GetProperty< int >( Actor::Property::ID ); - actor.ResourceReadySignal().Connect( &ResourceReadySignal); + tet_infoline("Create a control and connect to resource ready signal"); + DummyControl actor = DummyControl::New(true); + int actor1Id = actor.GetProperty(Actor::Property::ID); + actor.ResourceReadySignal().Connect(&ResourceReadySignal); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); application.GetScene().Add(actor); - tet_infoline( "Create visual with IMMEDIATE load policy" ); - Visual::Base imageVisual1 = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE ); - - tet_infoline( "Registering visual allows control to get a signal once loaded even if visual not enabled( staged )" ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual1 ); + tet_infoline("Create visual with IMMEDIATE load policy"); + Visual::Base imageVisual1 = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE); + tet_infoline("Registering visual allows control to get a signal once loaded even if visual not enabled( staged )"); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual1); - tet_infoline( "Allow image time to load" ); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + tet_infoline("Allow image time to load"); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - tet_infoline( "Testing texture is loaded and resource ready signal fired" ); - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); - DALI_TEST_EQUALS( gReadyIds[0], actor1Id, TEST_LOCATION ); - + tet_infoline("Testing texture is loaded and resource ready signal fired"); + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); + DALI_TEST_EQUALS(gReadyIds[0], actor1Id, TEST_LOCATION); - tet_infoline( "Original control correctly signalled, now testing failing image" ); + tet_infoline("Original control correctly signalled, now testing failing image"); gResourceReadySignalFired = false; // Reset signal check ready for testing next Control ClearReadyIds(); - Visual::Base imageVisual2 = CreateVisualWithPolicy( TEST_BROKEN_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE ); + Visual::Base imageVisual2 = CreateVisualWithPolicy(TEST_BROKEN_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE); - DummyControl actor2 = DummyControl::New(true); - int actor2Id = actor2.GetProperty< int >( Actor::Property::ID ); + DummyControl actor2 = DummyControl::New(true); + int actor2Id = actor2.GetProperty(Actor::Property::ID); Impl::DummyControl& dummyImpl2 = static_cast(actor2.GetImplementation()); - actor2.ResourceReadySignal().Connect( &ResourceReadyLoadNext); + actor2.ResourceReadySignal().Connect(&ResourceReadyLoadNext); - tet_infoline( "Registering visual this should trigger the ready signal when the image fails to load" ); - dummyImpl2.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual2 ); + tet_infoline("Registering visual this should trigger the ready signal when the image fails to load"); + dummyImpl2.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual2); - actor2.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) ); + actor2.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); application.GetScene().Add(actor2); - tet_infoline( "Wait for loading thread to finish"); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); + tet_infoline("Wait for loading thread to finish"); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); - DALI_TEST_EQUALS( gReadyIds[0], actor2Id, TEST_LOCATION); + DALI_TEST_EQUALS(gReadyIds[0], actor2Id, TEST_LOCATION); - tet_infoline( "Check for 3rd signal"); + tet_infoline("Check for 3rd signal"); application.SendNotification(); - DALI_TEST_EQUALS( gReadyIds.size(), 2, TEST_LOCATION ); - DALI_TEST_EQUALS( gReadyIds[1], actor2Id, TEST_LOCATION); + DALI_TEST_EQUALS(gReadyIds.size(), 2, TEST_LOCATION); + DALI_TEST_EQUALS(gReadyIds[1], actor2Id, TEST_LOCATION); END_TEST; } diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TransitionData.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TransitionData.cpp index 439098f..fb7ecd2 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TransitionData.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TransitionData.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,20 +14,19 @@ * limitations under the License. */ -#include -#include #include -#include -#include #include #include #include +#include +#include +#include +#include #include "dummy-control.h" using namespace Dali; using namespace Toolkit; - void utc_dali_toolkit_transition_data_startup(void) { test_return_value = TET_UNDEF; @@ -42,60 +41,58 @@ Property::Map CreateMap() { Property::Map map; - map["target"] = "Actor1"; - map["property"] = "color"; + map["target"] = "Actor1"; + map["property"] = "color"; map["initialValue"] = Color::MAGENTA; - map["targetValue"] = Color::RED; - map["animator"] = Property::Map() - .Add("alphaFunction", "EASE_IN_OUT_BACK") - .Add("timePeriod", Property::Map() - .Add("delay", 0.5f) - .Add("duration", 1.0f)); + map["targetValue"] = Color::RED; + map["animator"] = Property::Map() + .Add("alphaFunction", "EASE_IN_OUT_BACK") + .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f)); return map; } -void CHECK_ARRAY_EQUALS( Property::Array test, Property::Value result ) +void CHECK_ARRAY_EQUALS(Property::Array test, Property::Value result) { - if( result.GetType() == Property::ARRAY ) + if(result.GetType() == Property::ARRAY) { // Compare arrays - Property::Array *resultArray = result.GetArray(); - DALI_TEST_EQUALS( test.Count(), resultArray->Count(), TEST_LOCATION ); - for( size_t i=0; i < std::min(test.Count(), resultArray->Count()); ++i ) + Property::Array* resultArray = result.GetArray(); + DALI_TEST_EQUALS(test.Count(), resultArray->Count(), TEST_LOCATION); + for(size_t i = 0; i < std::min(test.Count(), resultArray->Count()); ++i) { Property::Value a = test.GetElementAt(i); Property::Value b = resultArray->GetElementAt(i); - DALI_TEST_EQUALS( a.GetType(), b.GetType(), TEST_LOCATION ); - DALI_TEST_EQUALS( a, b, 0.001, TEST_LOCATION ); + DALI_TEST_EQUALS(a.GetType(), b.GetType(), TEST_LOCATION); + DALI_TEST_EQUALS(a, b, 0.001, TEST_LOCATION); } } - else if( result.GetType() == Property::VECTOR4 ) + else if(result.GetType() == Property::VECTOR4) { Vector4 value = result.Get(); - DALI_TEST_CHECK( test.Count() >= 4 ); - for( size_t i=0; i < 4; ++i ) + DALI_TEST_CHECK(test.Count() >= 4); + for(size_t i = 0; i < 4; ++i) { Property::Value a = test.GetElementAt(i); - DALI_TEST_EQUALS( a.GetType(), Property::FLOAT, TEST_LOCATION ); - DALI_TEST_EQUALS( a.Get(), value[i], 0.001, TEST_LOCATION ); + DALI_TEST_EQUALS(a.GetType(), Property::FLOAT, TEST_LOCATION); + DALI_TEST_EQUALS(a.Get(), value[i], 0.001, TEST_LOCATION); } } else { - DALI_TEST_CHECK( 0 ); + DALI_TEST_CHECK(0); } } -void CHECK_MAP_EQUALS( Property::Map test, Property::Map result ) +void CHECK_MAP_EQUALS(Property::Map test, Property::Map result) { DALI_TEST_EQUALS(test.Count(), result.Count(), TEST_LOCATION); - for( unsigned int i=0; i< test.Count(); ++i ) + for(unsigned int i = 0; i < test.Count(); ++i) { - KeyValuePair keyValue = test.GetKeyValue(i); + KeyValuePair keyValue = test.GetKeyValue(i); Property::Value* value; - if( keyValue.first.type == Property::Key::STRING ) + if(keyValue.first.type == Property::Key::STRING) { value = result.Find(keyValue.first.stringKey); } @@ -104,42 +101,41 @@ void CHECK_MAP_EQUALS( Property::Map test, Property::Map result ) value = result.Find(keyValue.first.indexKey); } - DALI_TEST_CHECK( value != NULL ); - if( value != NULL ) + DALI_TEST_CHECK(value != NULL); + if(value != NULL) { - if( keyValue.second.GetType() == Property::MAP ) + if(keyValue.second.GetType() == Property::MAP) { - DALI_TEST_EQUALS( keyValue.second.GetType(), value->GetType(), TEST_LOCATION ); - CHECK_MAP_EQUALS( *(keyValue.second.GetMap()), *(value->GetMap()) ); + DALI_TEST_EQUALS(keyValue.second.GetType(), value->GetType(), TEST_LOCATION); + CHECK_MAP_EQUALS(*(keyValue.second.GetMap()), *(value->GetMap())); } - else if( keyValue.second.GetType() == Property::ARRAY ) + else if(keyValue.second.GetType() == Property::ARRAY) { - CHECK_ARRAY_EQUALS( *(keyValue.second.GetArray()), *value ); + CHECK_ARRAY_EQUALS(*(keyValue.second.GetArray()), *value); } - else if( keyValue.second.GetType() == Property::STRING ) + else if(keyValue.second.GetType() == Property::STRING) { - DALI_TEST_EQUALS( keyValue.second.GetType(), value->GetType(), TEST_LOCATION ); + DALI_TEST_EQUALS(keyValue.second.GetType(), value->GetType(), TEST_LOCATION); std::string str; value->Get(str); - DALI_TEST_EQUALS( keyValue.second, str.c_str(), TEST_LOCATION ); + DALI_TEST_EQUALS(keyValue.second, str.c_str(), TEST_LOCATION); } else { - DALI_TEST_EQUALS( keyValue.second.GetType(), value->GetType(), TEST_LOCATION ); - DALI_TEST_EQUALS( keyValue.second, *value, 0.001f, TEST_LOCATION ); + DALI_TEST_EQUALS(keyValue.second.GetType(), value->GetType(), TEST_LOCATION); + DALI_TEST_EQUALS(keyValue.second, *value, 0.001f, TEST_LOCATION); } } } } - int UtcDaliTransitionDataNew(void) { ToolkitTestApplication application; - Property::Map map = CreateMap(); - Dali::Toolkit::TransitionData transition = TransitionData::New( map ); - DALI_TEST_CHECK( transition ); + Property::Map map = CreateMap(); + Dali::Toolkit::TransitionData transition = TransitionData::New(map); + DALI_TEST_CHECK(transition); END_TEST; } @@ -150,11 +146,11 @@ int UtcDaliTransitionDataDownCast(void) Property::Map map = CreateMap(); - BaseHandle handle = TransitionData::New( map ); - DALI_TEST_CHECK( handle ); + BaseHandle handle = TransitionData::New(map); + DALI_TEST_CHECK(handle); - TransitionData transitionData = TransitionData::DownCast( handle ); - DALI_TEST_CHECK( transitionData ); + TransitionData transitionData = TransitionData::DownCast(handle); + DALI_TEST_CHECK(transitionData); END_TEST; } @@ -164,12 +160,12 @@ int UtcDaliTransitionDataCopyConstructor(void) Property::Map map = CreateMap(); - TransitionData transitionData = TransitionData::New( map ); - DALI_TEST_CHECK( transitionData ); + TransitionData transitionData = TransitionData::New(map); + DALI_TEST_CHECK(transitionData); - TransitionData td2( transitionData ); - DALI_TEST_CHECK( td2 ); - DALI_TEST_EQUALS( td2.Count(), 1, TEST_LOCATION ); + TransitionData td2(transitionData); + DALI_TEST_CHECK(td2); + DALI_TEST_EQUALS(td2.Count(), 1, TEST_LOCATION); END_TEST; } @@ -179,16 +175,16 @@ int UtcDaliTransitionDataAssignmentOperator(void) Property::Map map = CreateMap(); - TransitionData transitionData = TransitionData::New( map ); - DALI_TEST_CHECK( transitionData ); + TransitionData transitionData = TransitionData::New(map); + DALI_TEST_CHECK(transitionData); TransitionData td2; - DALI_TEST_CHECK( !td2 ); + DALI_TEST_CHECK(!td2); td2 = transitionData; - DALI_TEST_CHECK( td2 ); + DALI_TEST_CHECK(td2); - DALI_TEST_EQUALS( td2.Count(), 1, TEST_LOCATION ); + DALI_TEST_EQUALS(td2.Count(), 1, TEST_LOCATION); END_TEST; } @@ -196,19 +192,19 @@ int UtcDaliTransitionDataCount(void) { ToolkitTestApplication application; - Property::Map map = CreateMap(); - TransitionData transitionData = TransitionData::New( map ); - DALI_TEST_CHECK( transitionData ); - DALI_TEST_EQUALS( transitionData.Count(), 1, TEST_LOCATION ); + Property::Map map = CreateMap(); + TransitionData transitionData = TransitionData::New(map); + DALI_TEST_CHECK(transitionData); + DALI_TEST_EQUALS(transitionData.Count(), 1, TEST_LOCATION); Property::Array array; - array.PushBack( map ); - array.PushBack( map ); - array.PushBack( map ); + array.PushBack(map); + array.PushBack(map); + array.PushBack(map); - TransitionData transitionData2 = TransitionData::New( array ); - DALI_TEST_CHECK( transitionData2 ); - DALI_TEST_EQUALS( transitionData2.Count(), 3, TEST_LOCATION ); + TransitionData transitionData2 = TransitionData::New(array); + DALI_TEST_CHECK(transitionData2); + DALI_TEST_EQUALS(transitionData2.Count(), 3, TEST_LOCATION); END_TEST; } @@ -220,47 +216,45 @@ int UtcDaliTransitionDataMap1P(void) tet_printf("Testing animation of a visual property using stylesheet equivalent maps\n"); Property::Map map; - map["target"] = "visual1"; - map["property"] = "mixColor"; + map["target"] = "visual1"; + map["property"] = "mixColor"; map["initialValue"] = Color::MAGENTA; - map["targetValue"] = Color::RED; - map["animator"] = Property::Map() - .Add("alphaFunction", "EASE_IN_OUT") - .Add("timePeriod", Property::Map() - .Add("delay", 0.5f) - .Add("duration", 1.0f)); + map["targetValue"] = Color::RED; + map["animator"] = Property::Map() + .Add("alphaFunction", "EASE_IN_OUT") + .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f)); - Dali::Toolkit::TransitionData transition = TransitionData::New( map ); + Dali::Toolkit::TransitionData transition = TransitionData::New(map); DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); - actor.SetProperty( Actor::Property::COLOR,Color::CYAN); + actor.SetProperty(Dali::Actor::Property::NAME, "Actor1"); + actor.SetProperty(Actor::Property::COLOR, Color::CYAN); application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); Property::Map visualMap; - visualMap[Visual::Property::TYPE] = Visual::COLOR; + visualMap[Visual::Property::TYPE] = Visual::COLOR; visualMap[ColorVisual::Property::MIX_COLOR] = Color::MAGENTA; - Visual::Base visual = VisualFactory::Get().CreateVisual( visualMap ); - visual.SetName( "visual1" ); + Visual::Base visual = VisualFactory::Get().CreateVisual(visualMap); + visual.SetName("visual1"); Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1; - dummyImpl.RegisterVisual( visualIndex, visual ); + dummyImpl.RegisterVisual(visualIndex, visual); - Animation anim = dummyImpl.CreateTransition( transition ); - DALI_TEST_CHECK( anim ); + Animation anim = dummyImpl.CreateTransition(transition); + DALI_TEST_CHECK(anim); - Renderer renderer = actor.GetRendererAt(0); - Property::Index mixColorIndex = renderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR ); + Renderer renderer = actor.GetRendererAt(0); + Property::Index mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR; application.SendNotification(); application.Render(0); - DALI_TEST_EQUALS( renderer.GetProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA), TEST_LOCATION ); - DALI_TEST_EQUALS( renderer.GetProperty( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION ); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION ); + DALI_TEST_EQUALS(renderer.GetProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetProperty(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION); anim.Play(); @@ -268,19 +262,17 @@ int UtcDaliTransitionDataMap1P(void) application.Render(500); // Start animation application.Render(500); // Halfway thru anim application.SendNotification(); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA+Color::RED)*0.5f, TEST_LOCATION); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION ); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(mixColorIndex), Vector3(Color::MAGENTA + Color::RED) * 0.5f, TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION); application.Render(500); // End of anim application.SendNotification(); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::RED), TEST_LOCATION ); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION ); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(mixColorIndex), Vector3(Color::RED), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION); END_TEST; } - - int UtcDaliTransitionDataMap2P(void) { ToolkitTestApplication application; @@ -288,47 +280,45 @@ int UtcDaliTransitionDataMap2P(void) tet_printf("Testing animation of a visual property using programmatic maps\n"); Property::Map map; - map["target"] = "visual1"; - map["property"] = ColorVisual::Property::MIX_COLOR; + map["target"] = "visual1"; + map["property"] = ColorVisual::Property::MIX_COLOR; map["initialValue"] = Color::MAGENTA; - map["targetValue"] = Color::RED; - map["animator"] = Property::Map() - .Add("alphaFunction", "LINEAR") - .Add("timePeriod", Property::Map() - .Add("delay", 0.5f) - .Add("duration", 1.0f)); + map["targetValue"] = Color::RED; + map["animator"] = Property::Map() + .Add("alphaFunction", "LINEAR") + .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f)); - Dali::Toolkit::TransitionData transition = TransitionData::New( map ); + Dali::Toolkit::TransitionData transition = TransitionData::New(map); DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); - actor.SetProperty( Actor::Property::COLOR,Color::CYAN); + actor.SetProperty(Dali::Actor::Property::NAME, "Actor1"); + actor.SetProperty(Actor::Property::COLOR, Color::CYAN); application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); Property::Map visualMap; - visualMap[Visual::Property::TYPE] = Visual::COLOR; + visualMap[Visual::Property::TYPE] = Visual::COLOR; visualMap[ColorVisual::Property::MIX_COLOR] = Color::MAGENTA; - Visual::Base visual = VisualFactory::Get().CreateVisual( visualMap ); - visual.SetName( "visual1" ); + Visual::Base visual = VisualFactory::Get().CreateVisual(visualMap); + visual.SetName("visual1"); Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1; - dummyImpl.RegisterVisual( visualIndex, visual ); + dummyImpl.RegisterVisual(visualIndex, visual); - Animation anim = dummyImpl.CreateTransition( transition ); - DALI_TEST_CHECK( anim ); + Animation anim = dummyImpl.CreateTransition(transition); + DALI_TEST_CHECK(anim); - Renderer renderer = actor.GetRendererAt(0); - Property::Index mixColorIndex = renderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR ); + Renderer renderer = actor.GetRendererAt(0); + Property::Index mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR; application.SendNotification(); application.Render(0); - DALI_TEST_EQUALS( renderer.GetProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA), TEST_LOCATION ); - DALI_TEST_EQUALS( renderer.GetProperty( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION ); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION ); + DALI_TEST_EQUALS(renderer.GetProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetProperty(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION); anim.Play(); @@ -337,18 +327,17 @@ int UtcDaliTransitionDataMap2P(void) application.Render(500); // Start animation application.Render(500); // Halfway thru anim application.SendNotification(); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA+Color::RED)*0.5f, TEST_LOCATION); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(mixColorIndex), Vector3(Color::MAGENTA + Color::RED) * 0.5f, TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION); application.Render(500); // End of anim application.SendNotification(); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::RED), TEST_LOCATION ); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(mixColorIndex), Vector3(Color::RED), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION); END_TEST; } - int UtcDaliTransitionDataMap2Pb(void) { ToolkitTestApplication application; @@ -356,51 +345,49 @@ int UtcDaliTransitionDataMap2Pb(void) tet_printf("Testing animation of a visual property using programmatic maps\n"); Property::Map map; - map["target"] = "visual1"; - map["property"] = PrimitiveVisual::Property::MIX_COLOR; + map["target"] = "visual1"; + map["property"] = PrimitiveVisual::Property::MIX_COLOR; map["initialValue"] = Color::MAGENTA; - map["targetValue"] = Color::RED; - map["animator"] = Property::Map() - .Add("alphaFunction", "LINEAR") - .Add("timePeriod", Property::Map() - .Add("delay", 0.5f) - .Add("duration", 1.0f)); + map["targetValue"] = Color::RED; + map["animator"] = Property::Map() + .Add("alphaFunction", "LINEAR") + .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f)); - Dali::Toolkit::TransitionData transition = TransitionData::New( map ); + Dali::Toolkit::TransitionData transition = TransitionData::New(map); DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); - actor.SetProperty( Actor::Property::COLOR,Color::CYAN); + actor.SetProperty(Dali::Actor::Property::NAME, "Actor1"); + actor.SetProperty(Actor::Property::COLOR, Color::CYAN); application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); Property::Map visualMap; - visualMap[Visual::Property::TYPE] = Visual::PRIMITIVE; + visualMap[Visual::Property::TYPE] = Visual::PRIMITIVE; visualMap[PrimitiveVisual::Property::MIX_COLOR] = Color::MAGENTA; - visualMap[ PrimitiveVisual::Property::SHAPE ] = PrimitiveVisual::Shape::SPHERE; - visualMap[ PrimitiveVisual::Property::SLICES ] = 10; - visualMap[ PrimitiveVisual::Property::STACKS ] = 10; + visualMap[PrimitiveVisual::Property::SHAPE] = PrimitiveVisual::Shape::SPHERE; + visualMap[PrimitiveVisual::Property::SLICES] = 10; + visualMap[PrimitiveVisual::Property::STACKS] = 10; - Visual::Base visual = VisualFactory::Get().CreateVisual( visualMap ); - visual.SetName( "visual1" ); + Visual::Base visual = VisualFactory::Get().CreateVisual(visualMap); + visual.SetName("visual1"); Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1; - dummyImpl.RegisterVisual( visualIndex, visual ); + dummyImpl.RegisterVisual(visualIndex, visual); - Animation anim = dummyImpl.CreateTransition( transition ); - DALI_TEST_CHECK( anim ); + Animation anim = dummyImpl.CreateTransition(transition); + DALI_TEST_CHECK(anim); - Renderer renderer = actor.GetRendererAt(0); - Property::Index mixColorIndex = renderer.GetPropertyIndex( PrimitiveVisual::Property::MIX_COLOR ); + Renderer renderer = actor.GetRendererAt(0); + Property::Index mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR; application.SendNotification(); application.Render(0); - DALI_TEST_EQUALS( renderer.GetProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA), TEST_LOCATION ); - DALI_TEST_EQUALS( renderer.GetProperty( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION ); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION ); + DALI_TEST_EQUALS(renderer.GetProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetProperty(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION); anim.Play(); @@ -409,18 +396,17 @@ int UtcDaliTransitionDataMap2Pb(void) application.Render(500); // Start animation application.Render(500); // Halfway thru anim application.SendNotification(); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA+Color::RED)*0.5f, TEST_LOCATION); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(mixColorIndex), Vector3(Color::MAGENTA + Color::RED) * 0.5f, TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION); application.Render(500); // End of anim application.SendNotification(); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::RED), TEST_LOCATION ); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(mixColorIndex), Vector3(Color::RED), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION); END_TEST; } - int UtcDaliTransitionDataMap3P(void) { ToolkitTestApplication application; @@ -428,30 +414,28 @@ int UtcDaliTransitionDataMap3P(void) tet_printf("Testing animation of an actor's position property using bezier curve\n"); Property::Map map; - map["target"] = "Actor1"; - map["property"] = "position"; + map["target"] = "Actor1"; + map["property"] = "position"; map["initialValue"] = Vector3(0, 0, 0); - map["targetValue"] = Vector3(100, 100, 0); - map["animator"] = Property::Map() - .Add("alphaFunction", Vector4(0.71, -0.57, 0.42, 1.38) ) - .Add("timePeriod", Property::Map() - .Add("delay", 0.0f) - .Add("duration", 1.0f)); + map["targetValue"] = Vector3(100, 100, 0); + map["animator"] = Property::Map() + .Add("alphaFunction", Vector4(0.71, -0.57, 0.42, 1.38)) + .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 1.0f)); - Dali::Toolkit::TransitionData transition = TransitionData::New( map ); + Dali::Toolkit::TransitionData transition = TransitionData::New(map); DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); + actor.SetProperty(Dali::Actor::Property::NAME, "Actor1"); application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - Animation anim = dummyImpl.CreateTransition( transition ); - DALI_TEST_CHECK( anim ); + Animation anim = dummyImpl.CreateTransition(transition); + DALI_TEST_CHECK(anim); application.SendNotification(); application.Render(0); - DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0,0,0), 0.001f, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetCurrentProperty(Actor::Property::POSITION), Vector3(0, 0, 0), 0.001f, TEST_LOCATION); anim.Play(); @@ -460,23 +444,22 @@ int UtcDaliTransitionDataMap3P(void) application.Render(250); // 25% application.SendNotification(); - DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(-10,-10,0), 1.0, TEST_LOCATION); // High epsilon as we don't have exact figure for bezier curve at 50% + DALI_TEST_EQUALS(actor.GetCurrentProperty(Actor::Property::POSITION), Vector3(-10, -10, 0), 1.0, TEST_LOCATION); // High epsilon as we don't have exact figure for bezier curve at 50% application.Render(250); // Halfway thru map1 anim application.SendNotification(); - DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(24,24,0), 1.0, TEST_LOCATION); // High epsilon as we don't have exact figure for bezier curve at 50% + DALI_TEST_EQUALS(actor.GetCurrentProperty(Actor::Property::POSITION), Vector3(24, 24, 0), 1.0, TEST_LOCATION); // High epsilon as we don't have exact figure for bezier curve at 50% application.Render(250); // End of map1 anim application.SendNotification(); - DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(100,100,0), 1.0, TEST_LOCATION); // High epsilon as we don't have exact figure for bezier curve + DALI_TEST_EQUALS(actor.GetCurrentProperty(Actor::Property::POSITION), Vector3(100, 100, 0), 1.0, TEST_LOCATION); // High epsilon as we don't have exact figure for bezier curve application.Render(250); // End of map1 anim application.SendNotification(); - DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(100,100,0), TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetCurrentProperty(Actor::Property::POSITION), Vector3(100, 100, 0), TEST_LOCATION); END_TEST; } - int UtcDaliTransitionDataMap4P(void) { ToolkitTestApplication application; @@ -484,54 +467,50 @@ int UtcDaliTransitionDataMap4P(void) tet_printf("Testing animation of a visual's transform property using programmatic maps\n"); Property::Map map1; - map1["target"] = "testVisual"; - map1["property"] = "offset"; + map1["target"] = "testVisual"; + map1["property"] = "offset"; map1["initialValue"] = Vector2(0.0f, 0.0f); - map1["targetValue"] = Vector2(100.0f, 100.0f); - map1["animator"] = Property::Map() - .Add("alphaFunction", "LINEAR") - .Add("timePeriod", Property::Map() - .Add("delay", 0.5f) - .Add("duration", 1.0f)); + map1["targetValue"] = Vector2(100.0f, 100.0f); + map1["animator"] = Property::Map() + .Add("alphaFunction", "LINEAR") + .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f)); Property::Map map2; - map2["target"] = "testVisual"; - map2["property"] = "size"; + map2["target"] = "testVisual"; + map2["property"] = "size"; map2["initialValue"] = Vector2(10.0f, 10.0f); - map2["targetValue"] = Vector2(110.0f, 110.0f); - map2["animator"] = Property::Map() - .Add("alphaFunction", "LINEAR") - .Add("timePeriod", Property::Map() - .Add("delay", 0.5f) - .Add("duration", 1.0f)); + map2["targetValue"] = Vector2(110.0f, 110.0f); + map2["animator"] = Property::Map() + .Add("alphaFunction", "LINEAR") + .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f)); - Dali::Toolkit::TransitionData transition = TransitionData::New( Property::Array().Add(map1).Add(map2) ); + Dali::Toolkit::TransitionData transition = TransitionData::New(Property::Array().Add(map1).Add(map2)); DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); + actor.SetProperty(Dali::Actor::Property::NAME, "Actor1"); application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); Property::Map visualMap; - visualMap[Visual::Property::TYPE] = Visual::COLOR; + visualMap[Visual::Property::TYPE] = Visual::COLOR; visualMap[ColorVisual::Property::MIX_COLOR] = Color::MAGENTA; - Visual::Base visual = VisualFactory::Get().CreateVisual( visualMap ); + Visual::Base visual = VisualFactory::Get().CreateVisual(visualMap); - visual.SetName( "testVisual" ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + visual.SetName("testVisual"); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - Animation anim = dummyImpl.CreateTransition( transition ); - DALI_TEST_CHECK( anim ); + Animation anim = dummyImpl.CreateTransition(transition); + DALI_TEST_CHECK(anim); - Renderer renderer = actor.GetRendererAt(0); - Property::Index sizeIndex = renderer.GetPropertyIndex( "size" ); + Renderer renderer = actor.GetRendererAt(0); + Property::Index sizeIndex = VisualRenderer::Property::TRANSFORM_SIZE; application.SendNotification(); application.Render(0); - DALI_TEST_EQUALS( renderer.GetProperty(sizeIndex), Vector2(10.0f, 10.0f), TEST_LOCATION); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector2 >( sizeIndex ), Vector2(10.0f, 10.0f), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetProperty(sizeIndex), Vector2(10.0f, 10.0f), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(sizeIndex), Vector2(10.0f, 10.0f), TEST_LOCATION); anim.Play(); @@ -540,11 +519,11 @@ int UtcDaliTransitionDataMap4P(void) application.Render(500); // Start animation application.Render(500); // Halfway thru anim application.SendNotification(); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector2 >( sizeIndex ), Vector2(60.0f, 60.0f), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(sizeIndex), Vector2(60.0f, 60.0f), TEST_LOCATION); application.Render(500); // End of anim application.SendNotification(); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector2 >( sizeIndex ), Vector2(110.0f, 110.0f), TEST_LOCATION ); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(sizeIndex), Vector2(110.0f, 110.0f), TEST_LOCATION); END_TEST; } @@ -556,58 +535,56 @@ int UtcDaliTransitionDataMap5P(void) tet_printf("Testing animation visual opacity using stylesheet equivalent maps\n"); Property::Map map; - map["target"] = "visual1"; - map["property"] = "opacity"; + map["target"] = "visual1"; + map["property"] = "opacity"; map["initialValue"] = 0.0f; - map["targetValue"] = 1.0f; - map["animator"] = Property::Map() - .Add("alphaFunction", "EASE_IN_OUT") - .Add("timePeriod", Property::Map() - .Add("delay", 0.5f) - .Add("duration", 1.0f)); + map["targetValue"] = 1.0f; + map["animator"] = Property::Map() + .Add("alphaFunction", "EASE_IN_OUT") + .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f)); - Dali::Toolkit::TransitionData transition = TransitionData::New( map ); + Dali::Toolkit::TransitionData transition = TransitionData::New(map); DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); - actor.SetProperty( Actor::Property::COLOR,Color::CYAN); + actor.SetProperty(Dali::Actor::Property::NAME, "Actor1"); + actor.SetProperty(Actor::Property::COLOR, Color::CYAN); application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); Property::Map visualMap; - visualMap[Visual::Property::TYPE] = Visual::COLOR; + visualMap[Visual::Property::TYPE] = Visual::COLOR; visualMap[ColorVisual::Property::MIX_COLOR] = Color::MAGENTA; - Visual::Base visual = VisualFactory::Get().CreateVisual( visualMap ); - visual.SetName( "visual1" ); + Visual::Base visual = VisualFactory::Get().CreateVisual(visualMap); + visual.SetName("visual1"); Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1; - dummyImpl.RegisterVisual( visualIndex, visual ); + dummyImpl.RegisterVisual(visualIndex, visual); - Animation anim = dummyImpl.CreateTransition( transition ); - DALI_TEST_CHECK( anim ); + Animation anim = dummyImpl.CreateTransition(transition); + DALI_TEST_CHECK(anim); TestGlAbstraction& glAbstraction = application.GetGlAbstraction(); - glAbstraction.EnableEnableDisableCallTrace( true ); - TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace(); + glAbstraction.EnableEnableDisableCallTrace(true); + TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace(); std::ostringstream blendStr; blendStr << std::hex << GL_BLEND; - Renderer renderer = actor.GetRendererAt(0); - Property::Index mixColorIndex = renderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR ); + Renderer renderer = actor.GetRendererAt(0); + Property::Index mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR; application.SendNotification(); application.Render(0); - DALI_TEST_EQUALS( renderer.GetProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); - DALI_TEST_EQUALS( renderer.GetProperty( DevelRenderer::Property::OPACITY ), 0.0f, 0.001f, TEST_LOCATION ); + DALI_TEST_EQUALS(renderer.GetProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetProperty(DevelRenderer::Property::OPACITY), 0.0f, 0.001f, TEST_LOCATION); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA), TEST_LOCATION); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 0.0f, 0.001f, TEST_LOCATION ); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(DevelRenderer::Property::OPACITY), 0.0f, 0.001f, TEST_LOCATION); // The Renderer is transparent. So rendering is skipped. The state should not be changed. - DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) ); - DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Disable", blendStr.str() ) ); + DALI_TEST_CHECK(!glEnableStack.FindMethodAndParams("Enable", blendStr.str())); + DALI_TEST_CHECK(!glEnableStack.FindMethodAndParams("Disable", blendStr.str())); anim.Play(); @@ -617,26 +594,25 @@ int UtcDaliTransitionDataMap5P(void) application.Render(500); // Start animation application.Render(500); // Halfway thru anim application.SendNotification(); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA), TEST_LOCATION); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 0.5f, 0.001f, TEST_LOCATION ); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(DevelRenderer::Property::OPACITY), 0.5f, 0.001f, TEST_LOCATION); // Should not be changed - DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) ); + DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Enable", blendStr.str())); glEnableStack.Reset(); application.Render(501); // End of anim application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA), TEST_LOCATION ); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION ); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION); - DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Disable", blendStr.str() ) ); + DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Disable", blendStr.str())); END_TEST; } - int UtcDaliTransitionDataMap6P(void) { ToolkitTestApplication application; @@ -644,56 +620,53 @@ int UtcDaliTransitionDataMap6P(void) tet_printf("Testing animation visual opacity using stylesheet equivalent maps\n"); Property::Map map; - map["target"] = "visual1"; - map["property"] = "opacity"; + map["target"] = "visual1"; + map["property"] = "opacity"; map["targetValue"] = 0.0f; - map["animator"] = Property::Map() - .Add("alphaFunction", "EASE_IN_OUT") - .Add("timePeriod", Property::Map() - .Add("delay", 0.5f) - .Add("duration", 1.0f)); + map["animator"] = Property::Map() + .Add("alphaFunction", "EASE_IN_OUT") + .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f)); - Dali::Toolkit::TransitionData transition = TransitionData::New( map ); + Dali::Toolkit::TransitionData transition = TransitionData::New(map); DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); - actor.SetProperty( Actor::Property::COLOR,Color::CYAN); + actor.SetProperty(Dali::Actor::Property::NAME, "Actor1"); + actor.SetProperty(Actor::Property::COLOR, Color::CYAN); application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); Property::Map visualMap; - visualMap[Visual::Property::TYPE] = Visual::COLOR; + visualMap[Visual::Property::TYPE] = Visual::COLOR; visualMap[ColorVisual::Property::MIX_COLOR] = Color::MAGENTA; - Visual::Base visual = VisualFactory::Get().CreateVisual( visualMap ); - visual.SetName( "visual1" ); + Visual::Base visual = VisualFactory::Get().CreateVisual(visualMap); + visual.SetName("visual1"); Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1; - dummyImpl.RegisterVisual( visualIndex, visual ); + dummyImpl.RegisterVisual(visualIndex, visual); - Animation anim = dummyImpl.CreateTransition( transition ); - DALI_TEST_CHECK( anim ); - - Renderer renderer = actor.GetRendererAt(0); - Property::Index mixColorIndex = renderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR ); + Animation anim = dummyImpl.CreateTransition(transition); + DALI_TEST_CHECK(anim); + Renderer renderer = actor.GetRendererAt(0); + Property::Index mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR; TestGlAbstraction& glAbstraction = application.GetGlAbstraction(); - glAbstraction.EnableEnableDisableCallTrace( true ); - TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace(); + glAbstraction.EnableEnableDisableCallTrace(true); + TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace(); std::ostringstream blendStr; blendStr << std::hex << GL_BLEND; application.SendNotification(); application.Render(0); - DALI_TEST_EQUALS( renderer.GetProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA), TEST_LOCATION); - DALI_TEST_EQUALS( renderer.GetProperty( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION ); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION ); + DALI_TEST_EQUALS(renderer.GetProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetProperty(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION); // Default state is disabled. So test if "Enabled" is not called. - DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) ); + DALI_TEST_CHECK(!glEnableStack.FindMethodAndParams("Enable", blendStr.str())); anim.Play(); @@ -704,54 +677,51 @@ int UtcDaliTransitionDataMap6P(void) application.Render(500); // Halfway thru anim application.SendNotification(); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA), TEST_LOCATION); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 0.5f, 0.001f, TEST_LOCATION ); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(DevelRenderer::Property::OPACITY), 0.5f, 0.001f, TEST_LOCATION); - DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) ); + DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Enable", blendStr.str())); glEnableStack.Reset(); application.Render(500); // End of anim application.SendNotification(); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA), TEST_LOCATION ); - DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 0.0f, 0.001f, TEST_LOCATION ); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetCurrentProperty(DevelRenderer::Property::OPACITY), 0.0f, 0.001f, TEST_LOCATION); // GL_BLEND should not be changed: Keep enabled - DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Disable", blendStr.str() ) ); + DALI_TEST_CHECK(!glEnableStack.FindMethodAndParams("Disable", blendStr.str())); END_TEST; } - int UtcDaliTransitionDataMap1N(void) { ToolkitTestApplication application; Property::Map map; - map["target"] = "Actor1"; - map["property"] = "randomProperty"; + map["target"] = "Actor1"; + map["property"] = "randomProperty"; map["initialValue"] = Color::MAGENTA; - map["targetValue"] = Color::RED; - map["animator"] = Property::Map() - .Add("alphaFunction", "EASE_OUT") - .Add("timePeriod", Property::Map() - .Add("delay", 0.5f) - .Add("duration", 1.0f)); + map["targetValue"] = Color::RED; + map["animator"] = Property::Map() + .Add("alphaFunction", "EASE_OUT") + .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f)); - Dali::Toolkit::TransitionData transition = TransitionData::New( map ); + Dali::Toolkit::TransitionData transition = TransitionData::New(map); DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); - actor.SetProperty( Actor::Property::COLOR,Color::CYAN); + actor.SetProperty(Dali::Actor::Property::NAME, "Actor1"); + actor.SetProperty(Actor::Property::COLOR, Color::CYAN); application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - Animation anim = dummyImpl.CreateTransition( transition ); - DALI_TEST_CHECK( ! anim ); + Animation anim = dummyImpl.CreateTransition(transition); + DALI_TEST_CHECK(!anim); - CHECK_MAP_EQUALS( map, transition.GetAnimatorAt(0) ); + CHECK_MAP_EQUALS(map, transition.GetAnimatorAt(0)); END_TEST; } @@ -762,47 +732,44 @@ int UtcDaliTransitionDataMapN4(void) tet_printf("Testing visual doesn't animate with duff bezier data \n"); Property::Map map; - map["target"] = "visual1"; - map["property"] = "mixColor"; + map["target"] = "visual1"; + map["property"] = "mixColor"; map["initialValue"] = Vector3(Color::MAGENTA); - map["targetValue"] = Vector3(Color::RED); - map["animator"] = Property::Map() - .Add("alphaFunction", Vector3(.1f,1.0f,0.5f)) - .Add("timePeriod", Property::Map() - .Add("delay", 0.5f) - .Add("duration", 1.0f)); + map["targetValue"] = Vector3(Color::RED); + map["animator"] = Property::Map() + .Add("alphaFunction", Vector3(.1f, 1.0f, 0.5f)) + .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f)); - Dali::Toolkit::TransitionData transition = TransitionData::New( map ); + Dali::Toolkit::TransitionData transition = TransitionData::New(map); DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); - actor.SetProperty( Actor::Property::COLOR,Color::CYAN); + actor.SetProperty(Dali::Actor::Property::NAME, "Actor1"); + actor.SetProperty(Actor::Property::COLOR, Color::CYAN); application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - Property::Map visualMap; - visualMap[Visual::Property::TYPE] = Visual::COLOR; + Property::Map visualMap; + visualMap[Visual::Property::TYPE] = Visual::COLOR; visualMap[ColorVisual::Property::MIX_COLOR] = Color::MAGENTA; - Visual::Base visual = VisualFactory::Get().CreateVisual( visualMap ); - visual.SetName( "visual1" ); + Visual::Base visual = VisualFactory::Get().CreateVisual(visualMap); + visual.SetName("visual1"); Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1; - dummyImpl.RegisterVisual( visualIndex, visual ); + dummyImpl.RegisterVisual(visualIndex, visual); - Animation anim = dummyImpl.CreateTransition( transition ); - DALI_TEST_CHECK( !anim ); + Animation anim = dummyImpl.CreateTransition(transition); + DALI_TEST_CHECK(!anim); application.SendNotification(); application.Render(0); application.SendNotification(); - Renderer renderer = actor.GetRendererAt(0); - Property::Index mixColorIdx = renderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR ); - - tet_printf( "Test that the property has been set to target value\n"); - DALI_TEST_EQUALS(renderer.GetProperty(mixColorIdx), Vector3(Color::RED), 0.001, TEST_LOCATION); - DALI_TEST_EQUALS(renderer.GetProperty( DevelRenderer::Property::OPACITY ), 1.0f, 0.001, TEST_LOCATION); + Renderer renderer = actor.GetRendererAt(0); + Property::Index mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR; + tet_printf("Test that the property has been set to target value\n"); + DALI_TEST_EQUALS(renderer.GetProperty(mixColorIndex), Vector3(Color::RED), 0.001, TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetProperty(DevelRenderer::Property::OPACITY), 1.0f, 0.001, TEST_LOCATION); END_TEST; } @@ -814,46 +781,43 @@ int UtcDaliTransitionDataMapN5(void) tet_printf("Testing visual doesn't animate with duff bezier data \n"); Property::Map map; - map["target"] = "visual1"; - map["property"] = "mixColor"; + map["target"] = "visual1"; + map["property"] = "mixColor"; map["initialValue"] = Color::MAGENTA; - map["targetValue"] = Color::RED; - map["animator"] = Property::Map() - .Add("alphaFunction", Property::Array().Add(.1f).Add(1.0f).Add(0.5f)) - .Add("timePeriod", Property::Map() - .Add("delay", 0.5f) - .Add("duration", 1.0f)); + map["targetValue"] = Color::RED; + map["animator"] = Property::Map() + .Add("alphaFunction", Property::Array().Add(.1f).Add(1.0f).Add(0.5f)) + .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f)); - Dali::Toolkit::TransitionData transition = TransitionData::New( map ); + Dali::Toolkit::TransitionData transition = TransitionData::New(map); DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); - actor.SetProperty( Actor::Property::COLOR,Color::CYAN); + actor.SetProperty(Dali::Actor::Property::NAME, "Actor1"); + actor.SetProperty(Actor::Property::COLOR, Color::CYAN); application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - Property::Map visualMap; - visualMap[Visual::Property::TYPE] = Visual::COLOR; + Property::Map visualMap; + visualMap[Visual::Property::TYPE] = Visual::COLOR; visualMap[ColorVisual::Property::MIX_COLOR] = Color::MAGENTA; - Visual::Base visual = VisualFactory::Get().CreateVisual( visualMap ); - visual.SetName( "visual1" ); + Visual::Base visual = VisualFactory::Get().CreateVisual(visualMap); + visual.SetName("visual1"); Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1; - dummyImpl.RegisterVisual( visualIndex, visual ); + dummyImpl.RegisterVisual(visualIndex, visual); - Animation anim = dummyImpl.CreateTransition( transition ); - DALI_TEST_CHECK( !anim ); + Animation anim = dummyImpl.CreateTransition(transition); + DALI_TEST_CHECK(!anim); application.SendNotification(); application.Render(0); application.SendNotification(); - Renderer renderer = actor.GetRendererAt(0); - Property::Index mixColorIdx = renderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR ); - - tet_printf( "Test that the property has been set to target value\n"); - DALI_TEST_EQUALS(renderer.GetProperty(mixColorIdx), Vector3(Color::RED), 0.001, TEST_LOCATION); + Renderer renderer = actor.GetRendererAt(0); + Property::Index mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR; + tet_printf("Test that the property has been set to target value\n"); + DALI_TEST_EQUALS(renderer.GetProperty(mixColorIndex), Vector3(Color::RED), 0.001, TEST_LOCATION); END_TEST; } @@ -865,257 +829,227 @@ int UtcDaliTransitionDataMapN6(void) tet_printf("Testing visual doesn't animate with duff bezier data \n"); Property::Map map; - map["target"] = "visual1"; - map["property"] = "mixColor"; + map["target"] = "visual1"; + map["property"] = "mixColor"; map["initialValue"] = Color::MAGENTA; - map["targetValue"] = Color::RED; - map["animator"] = Property::Map() - .Add("alphaFunction", Property::Array().Add("1").Add("Two").Add("3").Add("4")) - .Add("timePeriod", Property::Map() - .Add("delay", 0.5f) - .Add("duration", 1.0f)); + map["targetValue"] = Color::RED; + map["animator"] = Property::Map() + .Add("alphaFunction", Property::Array().Add("1").Add("Two").Add("3").Add("4")) + .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f)); - Dali::Toolkit::TransitionData transition = TransitionData::New( map ); + Dali::Toolkit::TransitionData transition = TransitionData::New(map); DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); - actor.SetProperty( Actor::Property::COLOR,Color::CYAN); + actor.SetProperty(Dali::Actor::Property::NAME, "Actor1"); + actor.SetProperty(Actor::Property::COLOR, Color::CYAN); application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - Property::Map visualMap; - visualMap[Visual::Property::TYPE] = Visual::COLOR; + Property::Map visualMap; + visualMap[Visual::Property::TYPE] = Visual::COLOR; visualMap[ColorVisual::Property::MIX_COLOR] = Color::MAGENTA; - Visual::Base visual = VisualFactory::Get().CreateVisual( visualMap ); - visual.SetName( "visual1" ); + Visual::Base visual = VisualFactory::Get().CreateVisual(visualMap); + visual.SetName("visual1"); Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1; - dummyImpl.RegisterVisual( visualIndex, visual ); + dummyImpl.RegisterVisual(visualIndex, visual); - Animation anim = dummyImpl.CreateTransition( transition ); - DALI_TEST_CHECK( !anim ); + Animation anim = dummyImpl.CreateTransition(transition); + DALI_TEST_CHECK(!anim); application.SendNotification(); application.Render(0); application.SendNotification(); - Renderer renderer = actor.GetRendererAt(0); - Property::Index mixColorIdx = renderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR ); + Renderer renderer = actor.GetRendererAt(0); + Property::Index mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR; - tet_printf( "Test that the property has been set to target value\n"); - DALI_TEST_EQUALS(renderer.GetProperty(mixColorIdx), Vector3(Color::RED), 0.001, TEST_LOCATION); - DALI_TEST_EQUALS(renderer.GetProperty( DevelRenderer::Property::OPACITY ), 1.0f, 0.001, TEST_LOCATION); + tet_printf("Test that the property has been set to target value\n"); + DALI_TEST_EQUALS(renderer.GetProperty(mixColorIndex), Vector3(Color::RED), 0.001, TEST_LOCATION); + DALI_TEST_EQUALS(renderer.GetProperty(DevelRenderer::Property::OPACITY), 1.0f, 0.001, TEST_LOCATION); END_TEST; } - int UtcDaliTransitionDataArrayP(void) { ToolkitTestApplication application; Property::Map map1; - map1["target"] = "Actor1"; - map1["property"] = "color"; + map1["target"] = "Actor1"; + map1["property"] = "color"; map1["initialValue"] = Color::MAGENTA; - map1["targetValue"] = Color::RED; - map1["animator"] = Property::Map() - .Add("alphaFunction", "EASE_IN_OUT") - .Add("timePeriod", Property::Map() - .Add("delay", 0.5f) - .Add("duration", 1.0f)); + map1["targetValue"] = Color::RED; + map1["animator"] = Property::Map() + .Add("alphaFunction", "EASE_IN_OUT") + .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f)); Property::Map map2; - map2["target"] = "Actor1"; - map2["property"] = "position"; - map2["initialValue"] = Vector3(100,0,0); - map2["targetValue"] = Vector3(0,100,0); - map2["animator"] = Property::Map() - .Add("alphaFunction", "EASE_IN_OUT") - .Add("timePeriod", Property::Map() - .Add("delay", 0.0f) - .Add("duration", 1.0f)); + map2["target"] = "Actor1"; + map2["property"] = "position"; + map2["initialValue"] = Vector3(100, 0, 0); + map2["targetValue"] = Vector3(0, 100, 0); + map2["animator"] = Property::Map() + .Add("alphaFunction", "EASE_IN_OUT") + .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 1.0f)); Property::Map map3; - map3["target"] = "Actor1"; - map3["property"] = "orientation"; - map3["targetValue"] = Quaternion( Radian(Math::PI_2), Vector3::ZAXIS ); + map3["target"] = "Actor1"; + map3["property"] = "orientation"; + map3["targetValue"] = Quaternion(Radian(Math::PI_2), Vector3::ZAXIS); Property::Array array; array.PushBack(map1); array.PushBack(map2); array.PushBack(map3); - Dali::Toolkit::TransitionData transition = TransitionData::New( array ); + Dali::Toolkit::TransitionData transition = TransitionData::New(array); DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); - actor.SetProperty( Actor::Property::COLOR,Color::CYAN); + actor.SetProperty(Dali::Actor::Property::NAME, "Actor1"); + actor.SetProperty(Actor::Property::COLOR, Color::CYAN); application.GetScene().Add(actor); - DALI_TEST_EQUALS( actor.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion(Radian(0), Vector3::ZAXIS), TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetCurrentProperty(Actor::Property::ORIENTATION), Quaternion(Radian(0), Vector3::ZAXIS), TEST_LOCATION); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - Animation anim = dummyImpl.CreateTransition( transition ); - DALI_TEST_CHECK( anim ); + Animation anim = dummyImpl.CreateTransition(transition); + DALI_TEST_CHECK(anim); application.SendNotification(); application.Render(0); - DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), Color::MAGENTA, TEST_LOCATION); - DALI_TEST_EQUALS( actor.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion(Radian(Math::PI_2), Vector3::ZAXIS), TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetCurrentProperty(Actor::Property::COLOR), Color::MAGENTA, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetCurrentProperty(Actor::Property::ORIENTATION), Quaternion(Radian(Math::PI_2), Vector3::ZAXIS), TEST_LOCATION); anim.Play(); application.SendNotification(); - application.Render(0); // start map2 anim + application.Render(0); // start map2 anim application.SendNotification(); - DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(100,0,0), TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetCurrentProperty(Actor::Property::POSITION), Vector3(100, 0, 0), TEST_LOCATION); application.Render(500); // Start map1 animation, halfway thru map2 anim application.SendNotification(); - DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(50,50,0), TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetCurrentProperty(Actor::Property::POSITION), Vector3(50, 50, 0), TEST_LOCATION); application.Render(500); // Halfway thru map1 anim, end of map2 anim application.SendNotification(); - DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0,100,0), TEST_LOCATION); - DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), (Color::MAGENTA+Color::RED)*0.5f, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetCurrentProperty(Actor::Property::POSITION), Vector3(0, 100, 0), TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetCurrentProperty(Actor::Property::COLOR), (Color::MAGENTA + Color::RED) * 0.5f, TEST_LOCATION); application.Render(500); // End of map1 anim application.SendNotification(); - DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), Color::RED, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetCurrentProperty(Actor::Property::COLOR), Color::RED, TEST_LOCATION); END_TEST; } - int UtcDaliTransitionDataGetAnimatorP(void) { ToolkitTestApplication application; Property::Map map1; - map1["target"] = "Actor1"; - map1["property"] = "color"; + map1["target"] = "Actor1"; + map1["property"] = "color"; map1["initialValue"] = Color::MAGENTA; - map1["targetValue"] = Color::RED; - map1["animator"] = Property::Map() - .Add("alphaFunction", "EASE_IN_SQUARE") - .Add("timePeriod", Property::Map() - .Add("delay", 0.5f) - .Add("duration", 0.5f)); + map1["targetValue"] = Color::RED; + map1["animator"] = Property::Map() + .Add("alphaFunction", "EASE_IN_SQUARE") + .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 0.5f)); Property::Map map2; - map2["target"] = "Actor1"; - map2["property"] = "position"; - map2["initialValue"] = Vector3(100,0,0); - map2["targetValue"] = Vector3(0,100,0); - map2["animator"] = Property::Map() - .Add("alphaFunction", "EASE_OUT_SQUARE") - .Add("timePeriod", Property::Map() - .Add("delay", 0.2f) - .Add("duration", 2.0f)); + map2["target"] = "Actor1"; + map2["property"] = "position"; + map2["initialValue"] = Vector3(100, 0, 0); + map2["targetValue"] = Vector3(0, 100, 0); + map2["animator"] = Property::Map() + .Add("alphaFunction", "EASE_OUT_SQUARE") + .Add("timePeriod", Property::Map().Add("delay", 0.2f).Add("duration", 2.0f)); Property::Map map3; - map3["target"] = "Actor1"; - map3["property"] = "size"; - map3["initialValue"] = Vector2(10,10); - map3["targetValue"] = Vector2(100,100); - map3["animator"] = Property::Map() - .Add("alphaFunction", "EASE_OUT_SINE") - .Add("timePeriod", Property::Map() - .Add("delay", 0.4f) - .Add("duration", 3.0f)); + map3["target"] = "Actor1"; + map3["property"] = "size"; + map3["initialValue"] = Vector2(10, 10); + map3["targetValue"] = Vector2(100, 100); + map3["animator"] = Property::Map() + .Add("alphaFunction", "EASE_OUT_SINE") + .Add("timePeriod", Property::Map().Add("delay", 0.4f).Add("duration", 3.0f)); Property::Map map4; - map4["target"] = "Actor2"; - map4["property"] = "color"; + map4["target"] = "Actor2"; + map4["property"] = "color"; map4["initialValue"] = Color::BLACK; - map4["targetValue"] = Color::GREEN; - map4["animator"] = Property::Map() - .Add("alphaFunction", "EASE_IN_OUT_SINE") - .Add("timePeriod", Property::Map() - .Add("delay", 0.5f) - .Add("duration", 0.5f)); + map4["targetValue"] = Color::GREEN; + map4["animator"] = Property::Map() + .Add("alphaFunction", "EASE_IN_OUT_SINE") + .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 0.5f)); Property::Map map5; - map5["target"] = "Actor2"; - map5["property"] = "position"; - map5["initialValue"] = Vector3(100,0,0); - map5["targetValue"] = Vector3(0,100,0); - map5["animator"] = Property::Map() - .Add("alphaFunction", "BOUNCE") - .Add("timePeriod", Property::Map() - .Add("delay", 0.2f) - .Add("duration", 2.0f)); + map5["target"] = "Actor2"; + map5["property"] = "position"; + map5["initialValue"] = Vector3(100, 0, 0); + map5["targetValue"] = Vector3(0, 100, 0); + map5["animator"] = Property::Map() + .Add("alphaFunction", "BOUNCE") + .Add("timePeriod", Property::Map().Add("delay", 0.2f).Add("duration", 2.0f)); Property::Map map6; - map6["target"] = "Actor2"; - map6["property"] = "size"; - map6["initialValue"] = Vector2(10,10); - map6["targetValue"] = Vector2(100,100); - map6["animator"] = Property::Map() - .Add("alphaFunction", "SIN") - .Add("timePeriod", Property::Map() - .Add("delay", 0.4f) - .Add("duration", 3.0f)); + map6["target"] = "Actor2"; + map6["property"] = "size"; + map6["initialValue"] = Vector2(10, 10); + map6["targetValue"] = Vector2(100, 100); + map6["animator"] = Property::Map() + .Add("alphaFunction", "SIN") + .Add("timePeriod", Property::Map().Add("delay", 0.4f).Add("duration", 3.0f)); Property::Map map7; - map7["target"] = "Actor4"; - map7["property"] = "sizeModeFactor"; - map7["initialValue"] = Vector3(1,1,1); - map7["targetValue"] = Vector3(2,2,2); - map7["animator"] = Property::Map() - .Add("alphaFunction", "EASE_IN_SINE") - .Add("timePeriod", Property::Map() - .Add("delay", 0.0f) - .Add("duration", 1.0f)); + map7["target"] = "Actor4"; + map7["property"] = "sizeModeFactor"; + map7["initialValue"] = Vector3(1, 1, 1); + map7["targetValue"] = Vector3(2, 2, 2); + map7["animator"] = Property::Map() + .Add("alphaFunction", "EASE_IN_SINE") + .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 1.0f)); Property::Map map8; - map8["target"] = "Visual1"; - map8["property"] = "opacity"; + map8["target"] = "Visual1"; + map8["property"] = "opacity"; map8["initialValue"] = 0.0f; - map8["targetValue"] = 1.0f; - map8["animator"] = Property::Map() - .Add("alphaFunction", "EASE_IN") - .Add("timePeriod", Property::Map() - .Add("delay", 0.3f) - .Add("duration", 9.0f)); + map8["targetValue"] = 1.0f; + map8["animator"] = Property::Map() + .Add("alphaFunction", "EASE_IN") + .Add("timePeriod", Property::Map().Add("delay", 0.3f).Add("duration", 9.0f)); Property::Map map9; - map9["target"] = "Actor2"; - map9["property"] = "scale"; - map9["initialValue"] = Vector3(0,0,0); - map9["targetValue"] = Vector3(1,1,1); - map9["animator"] = Property::Map() - .Add("alphaFunction", "REVERSE") - .Add("timePeriod", Property::Map() - .Add("delay", 0.0f) - .Add("duration", 1.0f)); + map9["target"] = "Actor2"; + map9["property"] = "scale"; + map9["initialValue"] = Vector3(0, 0, 0); + map9["targetValue"] = Vector3(1, 1, 1); + map9["animator"] = Property::Map() + .Add("alphaFunction", "REVERSE") + .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 1.0f)); Property::Map map10; - map10["target"] = "Actor2"; - map10["property"] = "scale"; - map10["initialValue"] = Vector3(0,0,0); - map10["targetValue"] = Vector3(1,1,1); - map10["animator"] = Property::Map() - .Add("alphaFunction", Vector4(.23,.4,.8,1.2)) - .Add("timePeriod", Property::Map() - .Add("delay", 0.0f) - .Add("duration", 1.0f)); + map10["target"] = "Actor2"; + map10["property"] = "scale"; + map10["initialValue"] = Vector3(0, 0, 0); + map10["targetValue"] = Vector3(1, 1, 1); + map10["animator"] = Property::Map() + .Add("alphaFunction", Vector4(.23, .4, .8, 1.2)) + .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 1.0f)); Property::Map map11; - map11["target"] = "Actor2"; - map11["property"] = "scale"; - map11["initialValue"] = Vector3(0,0,0); - map11["targetValue"] = Vector3(1,1,1); - map11["animator"] = Property::Map() - .Add("alphaFunction", Property::Array().Add(.23f).Add(.4f).Add(.8f).Add(.2f)) - .Add("timePeriod", Property::Map() - .Add("delay", 0.0f) - .Add("duration", 1.0f)); + map11["target"] = "Actor2"; + map11["property"] = "scale"; + map11["initialValue"] = Vector3(0, 0, 0); + map11["targetValue"] = Vector3(1, 1, 1); + map11["animator"] = Property::Map() + .Add("alphaFunction", Property::Array().Add(.23f).Add(.4f).Add(.8f).Add(.2f)) + .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 1.0f)); Property::Map map12; - map12["target"] = "Actor1"; - map12["property"] = "orientation"; - map12["targetValue"] = Quaternion( Radian(Math::PI_2), Vector3::ZAXIS ); + map12["target"] = "Actor1"; + map12["property"] = "orientation"; + map12["targetValue"] = Quaternion(Radian(Math::PI_2), Vector3::ZAXIS); Property::Array array; array.PushBack(map1); @@ -1131,17 +1065,17 @@ int UtcDaliTransitionDataGetAnimatorP(void) array.PushBack(map11); array.PushBack(map12); - Dali::Toolkit::TransitionData transition = TransitionData::New( array ); + Dali::Toolkit::TransitionData transition = TransitionData::New(array); - DALI_TEST_EQUALS( transition.Count(), array.Count(), TEST_LOCATION ); + DALI_TEST_EQUALS(transition.Count(), array.Count(), TEST_LOCATION); - for( unsigned int i=0; i < array.Count(); ++i ) + for(unsigned int i = 0; i < array.Count(); ++i) { - Property::Map animatorMap = transition.GetAnimatorAt(i); - Property::Value& value = array.GetElementAt(i); - Property::Map* inputMap = value.GetMap(); - DALI_TEST_CHECK( inputMap ); - CHECK_MAP_EQUALS( *inputMap, animatorMap ); + Property::Map animatorMap = transition.GetAnimatorAt(i); + Property::Value& value = array.GetElementAt(i); + Property::Map* inputMap = value.GetMap(); + DALI_TEST_CHECK(inputMap); + CHECK_MAP_EQUALS(*inputMap, animatorMap); } END_TEST; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp index aaedd55..7d77a1b 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp @@ -14,27 +14,27 @@ * limitations under the License. */ -#include #include #include +#include -#include #include -#include -#include -#include -#include +#include #include +#include #include -#include #include +#include +#include #include -#include -#include #include #include -#include -#include +#include +#include +#include +#include +#include +#include #include "dummy-control.h" @@ -43,96 +43,95 @@ using namespace Dali::Toolkit; namespace { -const char* TEST_GIF_FILE_NAME = TEST_RESOURCE_DIR "/anim.gif"; -const char* TEST_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/gallery-small-1.jpg"; -const char* TEST_NPATCH_FILE_NAME = TEST_RESOURCE_DIR "/button-up.9.png"; -const char* TEST_SVG_FILE_NAME = TEST_RESOURCE_DIR "/svg1.svg"; -const char* TEST_OBJ_FILE_NAME = TEST_RESOURCE_DIR "/Cube.obj"; -const char* TEST_MTL_FILE_NAME = TEST_RESOURCE_DIR "/ToyRobot-Metal.mtl"; -const char* TEST_VECTOR_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/insta_camera.json"; -const char* TEST_RESOURCE_LOCATION = TEST_RESOURCE_DIR "/"; +const char* TEST_GIF_FILE_NAME = TEST_RESOURCE_DIR "/anim.gif"; +const char* TEST_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/gallery-small-1.jpg"; +const char* TEST_NPATCH_FILE_NAME = TEST_RESOURCE_DIR "/button-up.9.png"; +const char* TEST_SVG_FILE_NAME = TEST_RESOURCE_DIR "/svg1.svg"; +const char* TEST_OBJ_FILE_NAME = TEST_RESOURCE_DIR "/Cube.obj"; +const char* TEST_MTL_FILE_NAME = TEST_RESOURCE_DIR "/ToyRobot-Metal.mtl"; +const char* TEST_VECTOR_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/insta_camera.json"; +const char* TEST_RESOURCE_LOCATION = TEST_RESOURCE_DIR "/"; - -const std::string DEFAULT_FONT_DIR( "/resources/fonts" ); +const std::string DEFAULT_FONT_DIR("/resources/fonts"); Property::Map DefaultTransform() { Property::Map transformMap; transformMap - .Add( Toolkit::Visual::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) ) - .Add( Toolkit::Visual::Transform::Property::SIZE, Vector2(1.0f, 1.0f) ) - .Add( Toolkit::Visual::Transform::Property::ORIGIN, Toolkit::Align::TOP_BEGIN ) - .Add( Toolkit::Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::TOP_BEGIN ) - .Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY, Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) ) - .Add( Toolkit::Visual::Transform::Property::SIZE_POLICY, Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) ); + .Add(Toolkit::Visual::Transform::Property::OFFSET, Vector2(0.0f, 0.0f)) + .Add(Toolkit::Visual::Transform::Property::SIZE, Vector2(1.0f, 1.0f)) + .Add(Toolkit::Visual::Transform::Property::ORIGIN, Toolkit::Align::TOP_BEGIN) + .Add(Toolkit::Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::TOP_BEGIN) + .Add(Toolkit::Visual::Transform::Property::OFFSET_POLICY, Vector2(Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE)) + .Add(Toolkit::Visual::Transform::Property::SIZE_POLICY, Vector2(Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE)); return transformMap; } -bool DaliTestCheckMaps( const Property::Map& fontStyleMapGet, const Property::Map& fontStyleMapSet ) +bool DaliTestCheckMaps(const Property::Map& fontStyleMapGet, const Property::Map& fontStyleMapSet) { - if( fontStyleMapGet.Count() == fontStyleMapSet.Count() ) + if(fontStyleMapGet.Count() == fontStyleMapSet.Count()) { - for( unsigned int index = 0u; index < fontStyleMapGet.Count(); ++index ) + for(unsigned int index = 0u; index < fontStyleMapGet.Count(); ++index) { - const KeyValuePair& valueGet = fontStyleMapGet.GetKeyValue( index ); + const KeyValuePair& valueGet = fontStyleMapGet.GetKeyValue(index); Property::Value* valueSet = NULL; - if ( valueGet.first.type == Property::Key::INDEX ) + if(valueGet.first.type == Property::Key::INDEX) { - valueSet = fontStyleMapSet.Find( valueGet.first.indexKey ); + valueSet = fontStyleMapSet.Find(valueGet.first.indexKey); } else { // Get Key is a string so searching Set Map for a string key - valueSet = fontStyleMapSet.Find( valueGet.first.stringKey ); + valueSet = fontStyleMapSet.Find(valueGet.first.stringKey); } - if( NULL != valueSet ) + if(NULL != valueSet) { - if( valueSet->GetType() == Dali::Property::STRING && ( valueGet.second.Get() != valueSet->Get() ) ) + if(valueSet->GetType() == Dali::Property::STRING && (valueGet.second.Get() != valueSet->Get())) { - tet_printf( "Value got : [%s], expected : [%s]", valueGet.second.Get().c_str(), valueSet->Get().c_str() ); + tet_printf("Value got : [%s], expected : [%s]", valueGet.second.Get().c_str(), valueSet->Get().c_str()); return false; } - else if( valueSet->GetType() == Dali::Property::BOOLEAN && ( valueGet.second.Get() != valueSet->Get() ) ) + else if(valueSet->GetType() == Dali::Property::BOOLEAN && (valueGet.second.Get() != valueSet->Get())) { - tet_printf( "Value got : [%d], expected : [%d]", valueGet.second.Get(), valueSet->Get() ); + tet_printf("Value got : [%d], expected : [%d]", valueGet.second.Get(), valueSet->Get()); return false; } - else if( valueSet->GetType() == Dali::Property::INTEGER && ( valueGet.second.Get() != valueSet->Get() ) ) + else if(valueSet->GetType() == Dali::Property::INTEGER && (valueGet.second.Get() != valueSet->Get())) { - tet_printf( "Value got : [%d], expected : [%d]", valueGet.second.Get(), valueSet->Get() ); + tet_printf("Value got : [%d], expected : [%d]", valueGet.second.Get(), valueSet->Get()); return false; } - else if( valueSet->GetType() == Dali::Property::FLOAT && ( valueGet.second.Get() != valueSet->Get() ) ) + else if(valueSet->GetType() == Dali::Property::FLOAT && (valueGet.second.Get() != valueSet->Get())) { - tet_printf( "Value got : [%f], expected : [%f]", valueGet.second.Get(), valueSet->Get() ); + tet_printf("Value got : [%f], expected : [%f]", valueGet.second.Get(), valueSet->Get()); return false; } - else if( valueSet->GetType() == Dali::Property::VECTOR2 && ( valueGet.second.Get() != valueSet->Get() ) ) + else if(valueSet->GetType() == Dali::Property::VECTOR2 && (valueGet.second.Get() != valueSet->Get())) { Vector2 vector2Get = valueGet.second.Get(); Vector2 vector2Set = valueSet->Get(); - tet_printf( "Value got : [%f, %f], expected : [%f, %f]", vector2Get.x, vector2Get.y, vector2Set.x, vector2Set.y ); + tet_printf("Value got : [%f, %f], expected : [%f, %f]", vector2Get.x, vector2Get.y, vector2Set.x, vector2Set.y); return false; } - else if( valueSet->GetType() == Dali::Property::VECTOR4 && ( valueGet.second.Get() != valueSet->Get() ) ) + else if(valueSet->GetType() == Dali::Property::VECTOR4 && (valueGet.second.Get() != valueSet->Get())) { Vector4 vector4Get = valueGet.second.Get(); Vector4 vector4Set = valueSet->Get(); - tet_printf( "Value got : [%f, %f, %f, %f], expected : [%f, %f, %f, %f]", vector4Get.r, vector4Get.g, vector4Get.b, vector4Get.a, vector4Set.r, vector4Set.g, vector4Set.b, vector4Set.a ); + tet_printf("Value got : [%f, %f, %f, %f], expected : [%f, %f, %f, %f]", vector4Get.r, vector4Get.g, vector4Get.b, vector4Get.a, vector4Set.r, vector4Set.g, vector4Set.b, vector4Set.a); return false; } } else { - if ( valueGet.first.type == Property::Key::INDEX ) + if(valueGet.first.type == Property::Key::INDEX) { - tet_printf( " The key %d doesn't exist.", valueGet.first.indexKey ); + tet_printf(" The key %d doesn't exist.", valueGet.first.indexKey); } else { - tet_printf( " The key %s doesn't exist.", valueGet.first.stringKey.c_str() ); + tet_printf(" The key %s doesn't exist.", valueGet.first.stringKey.c_str()); } return false; } @@ -154,47 +153,45 @@ void dali_visual_cleanup(void) test_return_value = TET_PASS; } - -static void TestMixColor( Visual::Base visual, Property::Index mixColorIndex, const Vector4& testColor ) +static void TestMixColor(Visual::Base visual, Property::Index mixColorIndex, const Vector4& testColor) { Property::Map map; visual.CreatePropertyMap(map); - Property::Value* value = map.Find( mixColorIndex ); - DALI_TEST_CHECK( value ); + Property::Value* value = map.Find(mixColorIndex); + DALI_TEST_CHECK(value); Vector3 mixColor1; - DALI_TEST_CHECK( value->Get( mixColor1 ) ); - DALI_TEST_EQUALS( mixColor1, Vector3(testColor), 0.001, TEST_LOCATION ); + DALI_TEST_CHECK(value->Get(mixColor1)); + DALI_TEST_EQUALS(mixColor1, Vector3(testColor), 0.001, TEST_LOCATION); - value = map.Find( Visual::Property::MIX_COLOR ); - DALI_TEST_CHECK( value ); + value = map.Find(Visual::Property::MIX_COLOR); + DALI_TEST_CHECK(value); Vector4 mixColor2; - DALI_TEST_CHECK( value->Get( mixColor2 ) ); - DALI_TEST_EQUALS( mixColor2, testColor, 0.001, TEST_LOCATION ); + DALI_TEST_CHECK(value->Get(mixColor2)); + DALI_TEST_EQUALS(mixColor2, testColor, 0.001, TEST_LOCATION); - value = map.Find( Visual::Property::OPACITY ); - DALI_TEST_CHECK( value ); + value = map.Find(Visual::Property::OPACITY); + DALI_TEST_CHECK(value); float opacity; - DALI_TEST_CHECK( value->Get( opacity ) ); - DALI_TEST_EQUALS( opacity, testColor.a, 0.001, TEST_LOCATION ); + DALI_TEST_CHECK(value->Get(opacity)); + DALI_TEST_EQUALS(opacity, testColor.a, 0.001, TEST_LOCATION); } - int UtcDaliVisualCopyAndAssignment(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualCopyAndAssignment" ); + tet_infoline("UtcDaliVisualCopyAndAssignment"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); - propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); - Visual::Base visual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); + Visual::Base visual = factory.CreateVisual(propertyMap); - Visual::Base visualCopy( visual ); + Visual::Base visualCopy(visual); DALI_TEST_CHECK(visual == visualCopy); Visual::Base emptyVisual; - Visual::Base emptyVisualCopy( emptyVisual ); + Visual::Base emptyVisualCopy(emptyVisual); DALI_TEST_CHECK(emptyVisual == emptyVisualCopy); Visual::Base visualEquals; @@ -203,11 +200,11 @@ int UtcDaliVisualCopyAndAssignment(void) Visual::Base emptyVisualEquals; emptyVisualEquals = emptyVisual; - DALI_TEST_CHECK( emptyVisual == emptyVisualEquals ); + DALI_TEST_CHECK(emptyVisual == emptyVisualEquals); //self assignment visual = visual; - DALI_TEST_CHECK( visual = visualCopy ); + DALI_TEST_CHECK(visual = visualCopy); END_TEST; } @@ -215,18 +212,18 @@ int UtcDaliVisualCopyAndAssignment(void) int UtcDaliVisualSetName01(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualSetName" ); + tet_infoline("UtcDaliVisualSetName"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); - propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); - Visual::Base visual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); + Visual::Base visual = factory.CreateVisual(propertyMap); const char* visualName = "backgroundVisual"; - visual.SetName( visualName ); + visual.SetName(visualName); - DALI_TEST_EQUALS( visual.GetName(), visualName, TEST_LOCATION ); + DALI_TEST_EQUALS(visual.GetName(), visualName, TEST_LOCATION); END_TEST; } @@ -234,32 +231,31 @@ int UtcDaliVisualSetName01(void) int UtcDaliVisualSetGetDepthIndex(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualSetDepthIndex" ); + tet_infoline("UtcDaliVisualSetDepthIndex"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); - propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); - Visual::Base visual = factory.CreateVisual( propertyMap ); - - visual.SetDepthIndex( 1 ); + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); + Visual::Base visual = factory.CreateVisual(propertyMap); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + visual.SetDepthIndex(1); - dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - application.GetScene().Add( dummyControl ); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + application.GetScene().Add(dummyControl); - int depthIndex = dummyControl.GetRendererAt(0u).GetProperty( Renderer::Property::DEPTH_INDEX ); - DALI_TEST_EQUALS( depthIndex, 1, TEST_LOCATION ); - DALI_TEST_EQUALS( visual.GetDepthIndex(), 1, TEST_LOCATION ); + int depthIndex = dummyControl.GetRendererAt(0u).GetProperty(Renderer::Property::DEPTH_INDEX); + DALI_TEST_EQUALS(depthIndex, 1, TEST_LOCATION); + DALI_TEST_EQUALS(visual.GetDepthIndex(), 1, TEST_LOCATION); - visual.SetDepthIndex( -1 ); - depthIndex = dummyControl.GetRendererAt(0u).GetProperty( Renderer::Property::DEPTH_INDEX ); - DALI_TEST_EQUALS( depthIndex, -1, TEST_LOCATION ); - DALI_TEST_EQUALS( visual.GetDepthIndex(), -1, TEST_LOCATION ); + visual.SetDepthIndex(-1); + depthIndex = dummyControl.GetRendererAt(0u).GetProperty(Renderer::Property::DEPTH_INDEX); + DALI_TEST_EQUALS(depthIndex, -1, TEST_LOCATION); + DALI_TEST_EQUALS(visual.GetDepthIndex(), -1, TEST_LOCATION); END_TEST; } @@ -267,133 +263,133 @@ int UtcDaliVisualSetGetDepthIndex(void) int UtcDaliVisualSize(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualSize" ); + tet_infoline("UtcDaliVisualSize"); VisualFactory factory = VisualFactory::Get(); - Vector2 controlSize( 20.f, 30.f ); - Vector2 naturalSize; + Vector2 controlSize(20.f, 30.f); + Vector2 naturalSize; // color colorVisual Dali::Property::Map map; - map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR; - map[ ColorVisual::Property::MIX_COLOR ] = Color::MAGENTA; + map[Toolkit::Visual::Property::TYPE] = Visual::COLOR; + map[ColorVisual::Property::MIX_COLOR] = Color::MAGENTA; - Visual::Base colorVisual = factory.CreateVisual( map ); - colorVisual.SetTransformAndSize(DefaultTransform(), controlSize ); + Visual::Base colorVisual = factory.CreateVisual(map); + colorVisual.SetTransformAndSize(DefaultTransform(), controlSize); colorVisual.GetNaturalSize(naturalSize); - DALI_TEST_EQUALS( naturalSize, Vector2::ZERO, TEST_LOCATION ); + DALI_TEST_EQUALS(naturalSize, Vector2::ZERO, TEST_LOCATION); // image visual map.Clear(); - map[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE; - map[Toolkit::ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; - map[Toolkit::ImageVisual::Property::DESIRED_WIDTH] = 100.0f; + map[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE; + map[Toolkit::ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; + map[Toolkit::ImageVisual::Property::DESIRED_WIDTH] = 100.0f; map[Toolkit::ImageVisual::Property::DESIRED_HEIGHT] = 200.0f; - Visual::Base imageVisual = factory.CreateVisual( map ); - imageVisual.SetTransformAndSize(DefaultTransform(), controlSize ); + Visual::Base imageVisual = factory.CreateVisual(map); + imageVisual.SetTransformAndSize(DefaultTransform(), controlSize); imageVisual.GetNaturalSize(naturalSize); - DALI_TEST_EQUALS( naturalSize, Vector2(100.f, 200.f), TEST_LOCATION ); + DALI_TEST_EQUALS(naturalSize, Vector2(100.f, 200.f), TEST_LOCATION); // n patch visual is tested in the utc-Dali-VisualFactory.cpp // border visual float borderSize = 5.f; map.Clear(); - map[ Toolkit::Visual::Property::TYPE ] = Visual::BORDER; - map[ BorderVisual::Property::COLOR ] = Color::RED; - map[ BorderVisual::Property::SIZE ] = borderSize; - Visual::Base borderVisual = factory.CreateVisual( map ); - borderVisual.SetTransformAndSize(DefaultTransform(), controlSize ); + map[Toolkit::Visual::Property::TYPE] = Visual::BORDER; + map[BorderVisual::Property::COLOR] = Color::RED; + map[BorderVisual::Property::SIZE] = borderSize; + Visual::Base borderVisual = factory.CreateVisual(map); + borderVisual.SetTransformAndSize(DefaultTransform(), controlSize); borderVisual.GetNaturalSize(naturalSize); - DALI_TEST_EQUALS( naturalSize, Vector2::ZERO, TEST_LOCATION ); + DALI_TEST_EQUALS(naturalSize, Vector2::ZERO, TEST_LOCATION); // gradient gradientVisual Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::GRADIENT); + propertyMap.Insert(Visual::Property::TYPE, Visual::GRADIENT); Vector2 start(-1.f, -1.f); Vector2 end(1.f, 1.f); - propertyMap.Insert( "mixColor", Color::MAGENTA ); - propertyMap.Insert( GradientVisual::Property::START_POSITION, start) ; - propertyMap.Insert( GradientVisual::Property::END_POSITION, end ); - propertyMap.Insert( GradientVisual::Property::STOP_OFFSET, Vector2(0.f, 1.f) ); - propertyMap.Insert( GradientVisual::Property::SPREAD_METHOD, GradientVisual::SpreadMethod::REPEAT) ; + propertyMap.Insert("mixColor", Color::MAGENTA); + propertyMap.Insert(GradientVisual::Property::START_POSITION, start); + propertyMap.Insert(GradientVisual::Property::END_POSITION, end); + propertyMap.Insert(GradientVisual::Property::STOP_OFFSET, Vector2(0.f, 1.f)); + propertyMap.Insert(GradientVisual::Property::SPREAD_METHOD, GradientVisual::SpreadMethod::REPEAT); Property::Array stopColors; - stopColors.PushBack( Color::RED ); - stopColors.PushBack( Color::GREEN ); - propertyMap.Insert(GradientVisual::Property::STOP_COLOR, stopColors); + stopColors.PushBack(Color::RED); + stopColors.PushBack(Color::GREEN); + propertyMap.Insert(GradientVisual::Property::STOP_COLOR, stopColors); Visual::Base gradientVisual = factory.CreateVisual(propertyMap); - gradientVisual.SetTransformAndSize(DefaultTransform(), controlSize ); + gradientVisual.SetTransformAndSize(DefaultTransform(), controlSize); gradientVisual.GetNaturalSize(naturalSize); - DALI_TEST_EQUALS( naturalSize, Vector2::ZERO,TEST_LOCATION ); + DALI_TEST_EQUALS(naturalSize, Vector2::ZERO, TEST_LOCATION); // animated gradient visual Vector2 animated_gradient_visual_size(10.f, 10.f); propertyMap.Clear(); - propertyMap.Insert( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT ); - Visual::Base animatedGradientVisual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT); + Visual::Base animatedGradientVisual = factory.CreateVisual(propertyMap); animatedGradientVisual.GetNaturalSize(naturalSize); - animatedGradientVisual.SetTransformAndSize(DefaultTransform(), controlSize ); - DALI_TEST_EQUALS( naturalSize, Vector2::ZERO, TEST_LOCATION ); + animatedGradientVisual.SetTransformAndSize(DefaultTransform(), controlSize); + DALI_TEST_EQUALS(naturalSize, Vector2::ZERO, TEST_LOCATION); // svg visual - Visual::Base svgVisual = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions() ); + Visual::Base svgVisual = factory.CreateVisual(TEST_SVG_FILE_NAME, ImageDimensions()); svgVisual.GetNaturalSize(naturalSize); // TEST_SVG_FILE: // // // - DALI_TEST_EQUALS( naturalSize, Vector2(100.f, 100.f), TEST_LOCATION ); + DALI_TEST_EQUALS(naturalSize, Vector2(100.f, 100.f), TEST_LOCATION); // svg visual with a size - Visual::Base svgVisual2 = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions(200, 200) ); + Visual::Base svgVisual2 = factory.CreateVisual(TEST_SVG_FILE_NAME, ImageDimensions(200, 200)); svgVisual2.GetNaturalSize(naturalSize); - DALI_TEST_EQUALS( naturalSize, Vector2(100.f, 100.f), TEST_LOCATION ); // Natural size should still be 100, 100 + DALI_TEST_EQUALS(naturalSize, Vector2(100.f, 100.f), TEST_LOCATION); // Natural size should still be 100, 100 // Text visual. // Load some fonts to get the same metrics on different platforms. TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get(); - fontClient.SetDpi( 96u, 96u ); + fontClient.SetDpi(96u, 96u); - char* pathNamePtr = get_current_dir_name(); - const std::string pathName( pathNamePtr ); - free( pathNamePtr ); + char* pathNamePtr = get_current_dir_name(); + const std::string pathName(pathNamePtr); + free(pathNamePtr); - fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" ); + fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf"); // Create a TextVisual with a font size of 12 first propertyMap.Clear(); - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::TEXT ); - propertyMap.Insert( TextVisual::Property::ENABLE_MARKUP, true ); - propertyMap.Insert( TextVisual::Property::TEXT, "Hello world" ); - propertyMap.Insert( TextVisual::Property::MULTI_LINE, true ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::TEXT); + propertyMap.Insert(TextVisual::Property::ENABLE_MARKUP, true); + propertyMap.Insert(TextVisual::Property::TEXT, "Hello world"); + propertyMap.Insert(TextVisual::Property::MULTI_LINE, true); - Visual::Base smallTextVisual = factory.CreateVisual( propertyMap ); - Vector2 smallTextVisualNaturalSize; - smallTextVisual.GetNaturalSize( smallTextVisualNaturalSize ); + Visual::Base smallTextVisual = factory.CreateVisual(propertyMap); + Vector2 smallTextVisualNaturalSize; + smallTextVisual.GetNaturalSize(smallTextVisualNaturalSize); // Then create a TextVisual with a font size of 20 - propertyMap[ TextVisual::Property::TEXT ] = "Hello world"; - Visual::Base largeTextVisual = factory.CreateVisual( propertyMap ); - Vector2 largeTextVisualNaturalSize; - largeTextVisual.GetNaturalSize( largeTextVisualNaturalSize ); + propertyMap[TextVisual::Property::TEXT] = "Hello world"; + Visual::Base largeTextVisual = factory.CreateVisual(propertyMap); + Vector2 largeTextVisualNaturalSize; + largeTextVisual.GetNaturalSize(largeTextVisualNaturalSize); // Compare the sizes of the two text visuals, the second one should be bigger as it has a larger point size in the markup. - DALI_TEST_CHECK( smallTextVisualNaturalSize.width < largeTextVisualNaturalSize.width && - smallTextVisualNaturalSize.height < largeTextVisualNaturalSize.height ); + DALI_TEST_CHECK(smallTextVisualNaturalSize.width < largeTextVisualNaturalSize.width && + smallTextVisualNaturalSize.height < largeTextVisualNaturalSize.height); // The height returned for a particular width should also be greater for the large text visual - DALI_TEST_CHECK( smallTextVisual.GetHeightForWidth( 40.f ) < largeTextVisual.GetHeightForWidth( 40.f ) ); + DALI_TEST_CHECK(smallTextVisual.GetHeightForWidth(40.f) < largeTextVisual.GetHeightForWidth(40.f)); //AnimatedImageVisual - Visual::Base animatedImageVisual = factory.CreateVisual( TEST_GIF_FILE_NAME, ImageDimensions() ); - animatedImageVisual.SetTransformAndSize(DefaultTransform(), controlSize ); + Visual::Base animatedImageVisual = factory.CreateVisual(TEST_GIF_FILE_NAME, ImageDimensions()); + animatedImageVisual.SetTransformAndSize(DefaultTransform(), controlSize); animatedImageVisual.GetNaturalSize(naturalSize); // TEST_GIF_FILE: anim.gif // resolution: 50*50, frame count: 4, frame delay: 0.2 second for each frame - DALI_TEST_EQUALS( naturalSize, Vector2(50.f, 50.f), TEST_LOCATION ); + DALI_TEST_EQUALS(naturalSize, Vector2(50.f, 50.f), TEST_LOCATION); END_TEST; } @@ -401,35 +397,35 @@ int UtcDaliVisualSize(void) int UtcDaliVisualSetOnOffScene(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualSetOnOffScene" ); + tet_infoline("UtcDaliVisualSetOnOffScene"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); - propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); - Visual::Base visual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); + Visual::Base visual = factory.CreateVisual(propertyMap); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); application.SendNotification(); application.Render(0); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); - application.GetScene().Add( actor ); + application.GetScene().Add(actor); application.SendNotification(); application.Render(0); - DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 1u); - application.GetScene().Remove( actor ); + application.GetScene().Remove(actor); application.SendNotification(); application.Render(0); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); END_TEST; } @@ -437,57 +433,57 @@ int UtcDaliVisualSetOnOffScene(void) int UtcDaliVisualSetOnOffScene2(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualSetOnOffScene2" ); + tet_infoline("UtcDaliVisualSetOnOffScene2"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::SVG ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_SVG_FILE_NAME ); - Visual::Base visual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::SVG); + propertyMap.Insert(ImageVisual::Property::URL, TEST_SVG_FILE_NAME); + Visual::Base visual = factory.CreateVisual(propertyMap); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); application.SendNotification(); application.Render(0); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); // First on/off - application.GetScene().Add( actor ); + application.GetScene().Add(actor); application.SendNotification(); application.Render(0); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); - DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); - Renderer renderer = actor.GetRendererAt( 0 ); - auto textures = renderer.GetTextures(); - DALI_TEST_CHECK( textures.GetTextureCount() != 0u ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + DALI_TEST_CHECK(actor.GetRendererCount() == 1u); + Renderer renderer = actor.GetRendererAt(0); + auto textures = renderer.GetTextures(); + DALI_TEST_CHECK(textures.GetTextureCount() != 0u); - application.GetScene().Remove( actor ); + application.GetScene().Remove(actor); application.SendNotification(); application.Render(0); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); // Second on/off - application.GetScene().Add( actor ); + application.GetScene().Add(actor); application.SendNotification(); application.Render(0); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); - DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); - renderer = actor.GetRendererAt( 0 ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + DALI_TEST_CHECK(actor.GetRendererCount() == 1u); + renderer = actor.GetRendererAt(0); textures = renderer.GetTextures(); - DALI_TEST_CHECK( textures.GetTextureCount() != 0u ); + DALI_TEST_CHECK(textures.GetTextureCount() != 0u); - application.GetScene().Remove( actor ); + application.GetScene().Remove(actor); application.SendNotification(); application.Render(0); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); END_TEST; } @@ -495,73 +491,73 @@ int UtcDaliVisualSetOnOffScene2(void) int UtcDaliVisualGetPropertyMap1(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetPropertyMap1: ColorVisual (With base MixColor" ); + tet_infoline("UtcDaliVisualGetPropertyMap1: ColorVisual (With base MixColor"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); - propertyMap.Insert(Visual::Property::MIX_COLOR, Color::BLUE); - propertyMap.Insert( DevelVisual::Property::CORNER_RADIUS, 10.0f ); - propertyMap.Insert( DevelVisual::Property::CORNER_RADIUS_POLICY, Toolkit::Visual::Transform::Policy::RELATIVE ); - propertyMap.Insert( DevelVisual::Property::BORDERLINE_WIDTH, 20.0f ); - propertyMap.Insert( DevelVisual::Property::BORDERLINE_COLOR, Color::RED ); - propertyMap.Insert( DevelVisual::Property::BORDERLINE_OFFSET, -1.0f ); - propertyMap.Insert( DevelColorVisual::Property::BLUR_RADIUS, 20.0f ); - Visual::Base colorVisual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(Visual::Property::MIX_COLOR, Color::BLUE); + propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS, 10.0f); + propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS_POLICY, Toolkit::Visual::Transform::Policy::RELATIVE); + propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH, 20.0f); + propertyMap.Insert(DevelVisual::Property::BORDERLINE_COLOR, Color::RED); + propertyMap.Insert(DevelVisual::Property::BORDERLINE_OFFSET, -1.0f); + propertyMap.Insert(DevelColorVisual::Property::BLUR_RADIUS, 20.0f); + Visual::Base colorVisual = factory.CreateVisual(propertyMap); Property::Map resultMap; - colorVisual.CreatePropertyMap( resultMap ); + colorVisual.CreatePropertyMap(resultMap); - Property::Value* typeValue = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_CHECK( typeValue->Get() == Visual::COLOR ); + Property::Value* typeValue = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(typeValue); + DALI_TEST_CHECK(typeValue->Get() == Visual::COLOR); - Property::Value* colorValue = resultMap.Find( ColorVisual::Property::MIX_COLOR, Property::VECTOR4 ); - DALI_TEST_CHECK( colorValue ); - DALI_TEST_CHECK( colorValue->Get() == Color::BLUE ); + Property::Value* colorValue = resultMap.Find(ColorVisual::Property::MIX_COLOR, Property::VECTOR4); + DALI_TEST_CHECK(colorValue); + DALI_TEST_CHECK(colorValue->Get() == Color::BLUE); - Property::Value* cornerRadiusValue = resultMap.Find( DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4 ); - DALI_TEST_CHECK( cornerRadiusValue ); - DALI_TEST_CHECK( cornerRadiusValue->Get< Vector4 >() == Vector4(10.0f, 10.0f, 10.0f, 10.0f) ); + Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4); + DALI_TEST_CHECK(cornerRadiusValue); + DALI_TEST_CHECK(cornerRadiusValue->Get() == Vector4(10.0f, 10.0f, 10.0f, 10.0f)); - Property::Value* cornerRadiusPolicyValue = resultMap.Find( DevelVisual::Property::CORNER_RADIUS_POLICY, Property::INTEGER ); - DALI_TEST_CHECK( cornerRadiusPolicyValue ); - DALI_TEST_CHECK( cornerRadiusPolicyValue->Get< int >() == Toolkit::Visual::Transform::Policy::RELATIVE ); + Property::Value* cornerRadiusPolicyValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS_POLICY, Property::INTEGER); + DALI_TEST_CHECK(cornerRadiusPolicyValue); + DALI_TEST_CHECK(cornerRadiusPolicyValue->Get() == Toolkit::Visual::Transform::Policy::RELATIVE); - Property::Value* borderlineWidthValue = resultMap.Find( DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT ); - DALI_TEST_CHECK( borderlineWidthValue ); - DALI_TEST_CHECK( borderlineWidthValue->Get< float >() == 20.0f ); + Property::Value* borderlineWidthValue = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT); + DALI_TEST_CHECK(borderlineWidthValue); + DALI_TEST_CHECK(borderlineWidthValue->Get() == 20.0f); - Property::Value* borderlineColorValue = resultMap.Find( DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4 ); - DALI_TEST_CHECK( borderlineColorValue ); - DALI_TEST_CHECK( borderlineColorValue->Get< Vector4 >() == Color::RED ); + Property::Value* borderlineColorValue = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4); + DALI_TEST_CHECK(borderlineColorValue); + DALI_TEST_CHECK(borderlineColorValue->Get() == Color::RED); - Property::Value* borderlineOffsetValue = resultMap.Find( DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT ); - DALI_TEST_CHECK( borderlineOffsetValue ); - DALI_TEST_CHECK( borderlineOffsetValue->Get< float >() == -1.0f ); + Property::Value* borderlineOffsetValue = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT); + DALI_TEST_CHECK(borderlineOffsetValue); + DALI_TEST_CHECK(borderlineOffsetValue->Get() == -1.0f); - Property::Value* blurRadiusValue = resultMap.Find( DevelColorVisual::Property::BLUR_RADIUS, Property::FLOAT ); - DALI_TEST_CHECK( blurRadiusValue ); - DALI_TEST_CHECK( blurRadiusValue->Get< float >() == 20.0f ); + Property::Value* blurRadiusValue = resultMap.Find(DevelColorVisual::Property::BLUR_RADIUS, Property::FLOAT); + DALI_TEST_CHECK(blurRadiusValue); + DALI_TEST_CHECK(blurRadiusValue->Get() == 20.0f); // change the blend color propertyMap[ColorVisual::Property::MIX_COLOR] = Color::CYAN; - colorVisual = factory.CreateVisual( propertyMap ); - colorVisual.CreatePropertyMap( resultMap ); + colorVisual = factory.CreateVisual(propertyMap); + colorVisual.CreatePropertyMap(resultMap); - colorValue = resultMap.Find( ColorVisual::Property::MIX_COLOR, Property::VECTOR4 ); - DALI_TEST_CHECK( colorValue ); - DALI_TEST_CHECK( colorValue->Get() == Color::CYAN ); + colorValue = resultMap.Find(ColorVisual::Property::MIX_COLOR, Property::VECTOR4); + DALI_TEST_CHECK(colorValue); + DALI_TEST_CHECK(colorValue->Get() == Color::CYAN); // Test wrong values propertyMap[DevelColorVisual::Property::BLUR_RADIUS] = "3.0f"; - colorVisual = factory.CreateVisual( propertyMap ); - colorVisual.CreatePropertyMap( resultMap ); + colorVisual = factory.CreateVisual(propertyMap); + colorVisual.CreatePropertyMap(resultMap); - blurRadiusValue = resultMap.Find( DevelColorVisual::Property::BLUR_RADIUS, Property::FLOAT ); - DALI_TEST_CHECK( blurRadiusValue ); - DALI_TEST_CHECK( blurRadiusValue->Get< float >() == 0.0f ); + blurRadiusValue = resultMap.Find(DevelColorVisual::Property::BLUR_RADIUS, Property::FLOAT); + DALI_TEST_CHECK(blurRadiusValue); + DALI_TEST_CHECK(blurRadiusValue->Get() == 0.0f); END_TEST; } @@ -569,69 +565,69 @@ int UtcDaliVisualGetPropertyMap1(void) int UtcDaliVisualGetPropertyMap2(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetPropertyMap2: BorderVisual" ); + tet_infoline("UtcDaliVisualGetPropertyMap2: BorderVisual"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::BORDER); - propertyMap.Insert("mixColor", Vector4(1.0f, 0.0f, 1.0f, 0.5f) ); - propertyMap.Insert("borderColor", Color::BLUE); - propertyMap.Insert("borderSize", 5.f); - propertyMap.Insert("antiAliasing", true); - Visual::Base borderVisual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Visual::Property::TYPE, Visual::BORDER); + propertyMap.Insert("mixColor", Vector4(1.0f, 0.0f, 1.0f, 0.5f)); + propertyMap.Insert("borderColor", Color::BLUE); + propertyMap.Insert("borderSize", 5.f); + propertyMap.Insert("antiAliasing", true); + Visual::Base borderVisual = factory.CreateVisual(propertyMap); Property::Map resultMap; - borderVisual.CreatePropertyMap( resultMap ); + borderVisual.CreatePropertyMap(resultMap); // check the property values from the returned map from visual - Property::Value* typeValue = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_CHECK( typeValue->Get() == Visual::BORDER ); + Property::Value* typeValue = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(typeValue); + DALI_TEST_CHECK(typeValue->Get() == Visual::BORDER); - Property::Value* colorValue = resultMap.Find( BorderVisual::Property::COLOR, Property::VECTOR4 ); - DALI_TEST_CHECK( colorValue ); - DALI_TEST_CHECK( colorValue->Get() == Color::BLUE ); + Property::Value* colorValue = resultMap.Find(BorderVisual::Property::COLOR, Property::VECTOR4); + DALI_TEST_CHECK(colorValue); + DALI_TEST_CHECK(colorValue->Get() == Color::BLUE); - Property::Value* sizeValue = resultMap.Find( BorderVisual::Property::SIZE, Property::FLOAT ); - DALI_TEST_CHECK( sizeValue ); - DALI_TEST_CHECK( sizeValue->Get() == 5.f ); + Property::Value* sizeValue = resultMap.Find(BorderVisual::Property::SIZE, Property::FLOAT); + DALI_TEST_CHECK(sizeValue); + DALI_TEST_CHECK(sizeValue->Get() == 5.f); - Property::Value* AAValue = resultMap.Find( BorderVisual::Property::ANTI_ALIASING, Property::BOOLEAN ); - DALI_TEST_CHECK( AAValue ); - DALI_TEST_CHECK( AAValue->Get() == true ); + Property::Value* AAValue = resultMap.Find(BorderVisual::Property::ANTI_ALIASING, Property::BOOLEAN); + DALI_TEST_CHECK(AAValue); + DALI_TEST_CHECK(AAValue->Get() == true); Property::Map propertyMap1; - propertyMap1[ Toolkit::Visual::Property::TYPE ] = Visual::BORDER; - propertyMap1[ BorderVisual::Property::COLOR ] = Color::CYAN; - propertyMap1[ BorderVisual::Property::SIZE ] = 10.0f; - borderVisual = factory.CreateVisual( propertyMap1 ); - borderVisual.CreatePropertyMap( resultMap ); + propertyMap1[Toolkit::Visual::Property::TYPE] = Visual::BORDER; + propertyMap1[BorderVisual::Property::COLOR] = Color::CYAN; + propertyMap1[BorderVisual::Property::SIZE] = 10.0f; + borderVisual = factory.CreateVisual(propertyMap1); + borderVisual.CreatePropertyMap(resultMap); - typeValue = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_CHECK( typeValue->Get() == Visual::BORDER ); + typeValue = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(typeValue); + DALI_TEST_CHECK(typeValue->Get() == Visual::BORDER); - colorValue = resultMap.Find( BorderVisual::Property::COLOR, Property::VECTOR4 ); - DALI_TEST_CHECK( colorValue ); - DALI_TEST_CHECK( colorValue->Get() == Color::CYAN ); + colorValue = resultMap.Find(BorderVisual::Property::COLOR, Property::VECTOR4); + DALI_TEST_CHECK(colorValue); + DALI_TEST_CHECK(colorValue->Get() == Color::CYAN); - sizeValue = resultMap.Find( BorderVisual::Property::SIZE, Property::FLOAT ); - DALI_TEST_CHECK( sizeValue ); - DALI_TEST_CHECK( sizeValue->Get() == 10.f ); + sizeValue = resultMap.Find(BorderVisual::Property::SIZE, Property::FLOAT); + DALI_TEST_CHECK(sizeValue); + DALI_TEST_CHECK(sizeValue->Get() == 10.f); // Get default value of borderline values here - sizeValue = resultMap.Find( DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT ); - DALI_TEST_CHECK( sizeValue ); - DALI_TEST_CHECK( sizeValue->Get() == 0.0f ); + sizeValue = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT); + DALI_TEST_CHECK(sizeValue); + DALI_TEST_CHECK(sizeValue->Get() == 0.0f); - colorValue = resultMap.Find( DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4 ); - DALI_TEST_CHECK( colorValue ); - DALI_TEST_CHECK( colorValue->Get() == Color::BLACK ); + colorValue = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4); + DALI_TEST_CHECK(colorValue); + DALI_TEST_CHECK(colorValue->Get() == Color::BLACK); - sizeValue = resultMap.Find( DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT ); - DALI_TEST_CHECK( sizeValue ); - DALI_TEST_CHECK( sizeValue->Get() == 0.0f ); + sizeValue = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT); + DALI_TEST_CHECK(sizeValue); + DALI_TEST_CHECK(sizeValue->Get() == 0.0f); END_TEST; } @@ -639,103 +635,102 @@ int UtcDaliVisualGetPropertyMap2(void) int UtcDaliVisualGetPropertyMap2N(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetPropertyMap2N: BorderVisual with no setup properties" ); + tet_infoline("UtcDaliVisualGetPropertyMap2N: BorderVisual with no setup properties"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::BORDER); - Visual::Base borderVisual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Visual::Property::TYPE, Visual::BORDER); + Visual::Base borderVisual = factory.CreateVisual(propertyMap); - tet_infoline( "Test that the visual is created, with a default renderer" ); - DALI_TEST_CHECK( borderVisual ); + tet_infoline("Test that the visual is created, with a default renderer"); + DALI_TEST_CHECK(borderVisual); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, borderVisual ); - application.GetScene().Add( dummyControl ); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, borderVisual); + application.GetScene().Add(dummyControl); - DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 1, TEST_LOCATION ); + DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 1, TEST_LOCATION); END_TEST; } - int UtcDaliVisualGetPropertyMap3(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetPropertyMap3: linear GradientVisual" ); + tet_infoline("UtcDaliVisualGetPropertyMap3: linear GradientVisual"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::GRADIENT); + propertyMap.Insert(Visual::Property::TYPE, Visual::GRADIENT); Vector2 start(-1.f, -1.f); Vector2 end(1.f, 1.f); - propertyMap.Insert( "startPosition", start); - propertyMap.Insert( "endPosition", end); - propertyMap.Insert( "spreadMethod", GradientVisual::SpreadMethod::REPEAT); + propertyMap.Insert("startPosition", start); + propertyMap.Insert("endPosition", end); + propertyMap.Insert("spreadMethod", GradientVisual::SpreadMethod::REPEAT); - propertyMap.Insert(GradientVisual::Property::STOP_OFFSET, Vector2(0.2f, 0.8f)); + propertyMap.Insert(GradientVisual::Property::STOP_OFFSET, Vector2(0.2f, 0.8f)); Property::Array stopColors; - stopColors.PushBack( Color::RED ); - stopColors.PushBack( Color::GREEN ); - propertyMap.Insert(GradientVisual::Property::STOP_COLOR, stopColors); + stopColors.PushBack(Color::RED); + stopColors.PushBack(Color::GREEN); + propertyMap.Insert(GradientVisual::Property::STOP_COLOR, stopColors); - float borderlineWidth = 4.0f; + float borderlineWidth = 4.0f; Vector4 cornerRadius(7.0f, 10.0f, 13.0f, 16.0f); - propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH, borderlineWidth); - propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS, cornerRadius); + propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH, borderlineWidth); + propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS, cornerRadius); Visual::Base gradientVisual = factory.CreateVisual(propertyMap); Property::Map resultMap; - gradientVisual.CreatePropertyMap( resultMap ); + gradientVisual.CreatePropertyMap(resultMap); // check the property values from the returned map from visual - Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == Visual::GRADIENT ); + Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == Visual::GRADIENT); - value = resultMap.Find( GradientVisual::Property::UNITS, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == GradientVisual::Units::OBJECT_BOUNDING_BOX ); + value = resultMap.Find(GradientVisual::Property::UNITS, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == GradientVisual::Units::OBJECT_BOUNDING_BOX); - value = resultMap.Find( GradientVisual::Property::SPREAD_METHOD, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == GradientVisual::SpreadMethod::REPEAT ); + value = resultMap.Find(GradientVisual::Property::SPREAD_METHOD, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == GradientVisual::SpreadMethod::REPEAT); - value = resultMap.Find( GradientVisual::Property::START_POSITION, Property::VECTOR2 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), start , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(GradientVisual::Property::START_POSITION, Property::VECTOR2); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), start, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( GradientVisual::Property::END_POSITION, Property::VECTOR2 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), end , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(GradientVisual::Property::END_POSITION, Property::VECTOR2); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), end, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), borderlineWidth , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), borderlineWidth, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), cornerRadius , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), cornerRadius, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( GradientVisual::Property::STOP_OFFSET, Property::ARRAY ); - DALI_TEST_CHECK( value ); + value = resultMap.Find(GradientVisual::Property::STOP_OFFSET, Property::ARRAY); + DALI_TEST_CHECK(value); Property::Array* offsetArray = value->GetArray(); - DALI_TEST_CHECK( offsetArray->Count() == 2 ); - DALI_TEST_EQUALS( offsetArray->GetElementAt(0).Get(), 0.2f , Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( offsetArray->GetElementAt(1).Get(), 0.8f , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_CHECK(offsetArray->Count() == 2); + DALI_TEST_EQUALS(offsetArray->GetElementAt(0).Get(), 0.2f, Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(offsetArray->GetElementAt(1).Get(), 0.8f, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( GradientVisual::Property::STOP_COLOR, Property::ARRAY ); - DALI_TEST_CHECK( value ); + value = resultMap.Find(GradientVisual::Property::STOP_COLOR, Property::ARRAY); + DALI_TEST_CHECK(value); Property::Array* colorArray = value->GetArray(); - DALI_TEST_CHECK( colorArray->Count() == 2 ); - DALI_TEST_EQUALS( colorArray->GetElementAt(0).Get(), Color::RED , Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( colorArray->GetElementAt(1).Get(), Color::GREEN , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_CHECK(colorArray->Count() == 2); + DALI_TEST_EQUALS(colorArray->GetElementAt(0).Get(), Color::RED, Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(colorArray->GetElementAt(1).Get(), Color::GREEN, Math::MACHINE_EPSILON_100, TEST_LOCATION); END_TEST; } @@ -743,83 +738,83 @@ int UtcDaliVisualGetPropertyMap3(void) int UtcDaliVisualGetPropertyMap4(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetPropertyMap4: radial GradientVisual" ); + tet_infoline("UtcDaliVisualGetPropertyMap4: radial GradientVisual"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::GRADIENT); + propertyMap.Insert(Visual::Property::TYPE, Visual::GRADIENT); Vector2 center(100.f, 100.f); - float radius = 100.f; - propertyMap.Insert(GradientVisual::Property::UNITS, GradientVisual::Units::USER_SPACE); - propertyMap.Insert(GradientVisual::Property::CENTER, center); - propertyMap.Insert(GradientVisual::Property::RADIUS, radius); - propertyMap.Insert(GradientVisual::Property::STOP_OFFSET, Vector3(0.1f, 0.3f, 1.1f)); + float radius = 100.f; + propertyMap.Insert(GradientVisual::Property::UNITS, GradientVisual::Units::USER_SPACE); + propertyMap.Insert(GradientVisual::Property::CENTER, center); + propertyMap.Insert(GradientVisual::Property::RADIUS, radius); + propertyMap.Insert(GradientVisual::Property::STOP_OFFSET, Vector3(0.1f, 0.3f, 1.1f)); Property::Array stopColors; - stopColors.PushBack( Color::RED ); - stopColors.PushBack( Color::BLACK ); - stopColors.PushBack( Color::GREEN ); - propertyMap.Insert(GradientVisual::Property::STOP_COLOR, stopColors); + stopColors.PushBack(Color::RED); + stopColors.PushBack(Color::BLACK); + stopColors.PushBack(Color::GREEN); + propertyMap.Insert(GradientVisual::Property::STOP_COLOR, stopColors); - float borderlineWidth = 8.0f; + float borderlineWidth = 8.0f; Vector4 cornerRadius(1.0f, 2.0f, 4.0f, 8.0f); - propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH, borderlineWidth); - propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS, cornerRadius); + propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH, borderlineWidth); + propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS, cornerRadius); Visual::Base gradientVisual = factory.CreateVisual(propertyMap); - DALI_TEST_CHECK( gradientVisual ); + DALI_TEST_CHECK(gradientVisual); Property::Map resultMap; - gradientVisual.CreatePropertyMap( resultMap ); + gradientVisual.CreatePropertyMap(resultMap); // check the property values from the returned map from visual - Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == Visual::GRADIENT ); + Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == Visual::GRADIENT); - value = resultMap.Find( GradientVisual::Property::UNITS, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == GradientVisual::Units::USER_SPACE ); + value = resultMap.Find(GradientVisual::Property::UNITS, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == GradientVisual::Units::USER_SPACE); - value = resultMap.Find( GradientVisual::Property::SPREAD_METHOD, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == GradientVisual::SpreadMethod::PAD ); + value = resultMap.Find(GradientVisual::Property::SPREAD_METHOD, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == GradientVisual::SpreadMethod::PAD); - value = resultMap.Find( GradientVisual::Property::CENTER, Property::VECTOR2 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), center , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(GradientVisual::Property::CENTER, Property::VECTOR2); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), center, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( GradientVisual::Property::RADIUS, Property::FLOAT ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), radius , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(GradientVisual::Property::RADIUS, Property::FLOAT); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), radius, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), borderlineWidth , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), borderlineWidth, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), cornerRadius , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), cornerRadius, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( GradientVisual::Property::STOP_OFFSET, Property::ARRAY ); - DALI_TEST_CHECK( value ); + value = resultMap.Find(GradientVisual::Property::STOP_OFFSET, Property::ARRAY); + DALI_TEST_CHECK(value); Property::Array* offsetArray = value->GetArray(); - DALI_TEST_CHECK( offsetArray->Count() == 3 ); - DALI_TEST_EQUALS( offsetArray->GetElementAt(0).Get(), 0.1f , Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( offsetArray->GetElementAt(1).Get(), 0.3f , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_CHECK(offsetArray->Count() == 3); + DALI_TEST_EQUALS(offsetArray->GetElementAt(0).Get(), 0.1f, Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(offsetArray->GetElementAt(1).Get(), 0.3f, Math::MACHINE_EPSILON_100, TEST_LOCATION); // any stop value will be clamped to [0.0, 1.0]; - DALI_TEST_EQUALS( offsetArray->GetElementAt(2).Get(), 1.0f , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_EQUALS(offsetArray->GetElementAt(2).Get(), 1.0f, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( GradientVisual::Property::STOP_COLOR, Property::ARRAY ); - DALI_TEST_CHECK( value ); + value = resultMap.Find(GradientVisual::Property::STOP_COLOR, Property::ARRAY); + DALI_TEST_CHECK(value); Property::Array* colorArray = value->GetArray(); - DALI_TEST_CHECK( colorArray->Count() == 3 ); - DALI_TEST_EQUALS( colorArray->GetElementAt(0).Get(), Color::RED , Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( colorArray->GetElementAt(1).Get(), Color::BLACK , Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( colorArray->GetElementAt(2).Get(), Color::GREEN , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_CHECK(colorArray->Count() == 3); + DALI_TEST_EQUALS(colorArray->GetElementAt(0).Get(), Color::RED, Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(colorArray->GetElementAt(1).Get(), Color::BLACK, Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(colorArray->GetElementAt(2).Get(), Color::GREEN, Math::MACHINE_EPSILON_100, TEST_LOCATION); END_TEST; } @@ -827,72 +822,72 @@ int UtcDaliVisualGetPropertyMap4(void) int UtcDaliVisualGetPropertyMap5(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetPropertyMap5: ImageVisual" ); + tet_infoline("UtcDaliVisualGetPropertyMap5: ImageVisual"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); - propertyMap.Insert( Visual::Property::MIX_COLOR, Color::MAGENTA ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME ); - propertyMap.Insert( ImageVisual::Property::DESIRED_WIDTH, 20 ); - propertyMap.Insert( ImageVisual::Property::DESIRED_HEIGHT, 30 ); - propertyMap.Insert( "fittingMode", FittingMode::FIT_HEIGHT ); - propertyMap.Insert( "samplingMode", SamplingMode::BOX_THEN_NEAREST ); - propertyMap.Insert( "pixelArea", Vector4( 0.25f, 0.25f, 0.5f, 0.5f ) ); - propertyMap.Insert( "wrapModeU", WrapMode::REPEAT ); - propertyMap.Insert( "wrapModeV", WrapMode::MIRRORED_REPEAT ); - propertyMap.Insert( "synchronousLoading", true ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE); + propertyMap.Insert(Visual::Property::MIX_COLOR, Color::MAGENTA); + propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::DESIRED_WIDTH, 20); + propertyMap.Insert(ImageVisual::Property::DESIRED_HEIGHT, 30); + propertyMap.Insert("fittingMode", FittingMode::FIT_HEIGHT); + propertyMap.Insert("samplingMode", SamplingMode::BOX_THEN_NEAREST); + propertyMap.Insert("pixelArea", Vector4(0.25f, 0.25f, 0.5f, 0.5f)); + propertyMap.Insert("wrapModeU", WrapMode::REPEAT); + propertyMap.Insert("wrapModeV", WrapMode::MIRRORED_REPEAT); + propertyMap.Insert("synchronousLoading", true); Visual::Base imageVisual = factory.CreateVisual(propertyMap); - DALI_TEST_CHECK( imageVisual ); + DALI_TEST_CHECK(imageVisual); Property::Map resultMap; - imageVisual.CreatePropertyMap( resultMap ); + imageVisual.CreatePropertyMap(resultMap); // check the property values from the returned map from visual - Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == Visual::IMAGE ); + Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == Visual::IMAGE); - value = resultMap.Find( ImageVisual::Property::URL, Property::STRING ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == TEST_IMAGE_FILE_NAME ); + value = resultMap.Find(ImageVisual::Property::URL, Property::STRING); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == TEST_IMAGE_FILE_NAME); - value = resultMap.Find( Visual::Property::MIX_COLOR, Property::VECTOR4 ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == Color::MAGENTA ); + value = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == Color::MAGENTA); - value = resultMap.Find( ImageVisual::Property::FITTING_MODE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == FittingMode::FIT_HEIGHT ); + value = resultMap.Find(ImageVisual::Property::FITTING_MODE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == FittingMode::FIT_HEIGHT); - value = resultMap.Find( ImageVisual::Property::SAMPLING_MODE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == SamplingMode::BOX_THEN_NEAREST ); + value = resultMap.Find(ImageVisual::Property::SAMPLING_MODE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == SamplingMode::BOX_THEN_NEAREST); - value = resultMap.Find( ImageVisual::Property::DESIRED_WIDTH, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == 20 ); + value = resultMap.Find(ImageVisual::Property::DESIRED_WIDTH, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == 20); - value = resultMap.Find( ImageVisual::Property::DESIRED_HEIGHT, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == 30 ); + value = resultMap.Find(ImageVisual::Property::DESIRED_HEIGHT, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == 30); - value = resultMap.Find( ImageVisual::Property::PIXEL_AREA, Property::VECTOR4 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), Vector4( 0.25f, 0.25f, 0.5f, 0.5f ), Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(ImageVisual::Property::PIXEL_AREA, Property::VECTOR4); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector4(0.25f, 0.25f, 0.5f, 0.5f), Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( ImageVisual::Property::WRAP_MODE_U, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == WrapMode::REPEAT); + value = resultMap.Find(ImageVisual::Property::WRAP_MODE_U, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == WrapMode::REPEAT); - value = resultMap.Find( ImageVisual::Property::WRAP_MODE_V, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == WrapMode::MIRRORED_REPEAT); + value = resultMap.Find(ImageVisual::Property::WRAP_MODE_V, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == WrapMode::MIRRORED_REPEAT); - value = resultMap.Find( ImageVisual::Property::SYNCHRONOUS_LOADING, Property::BOOLEAN ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == true ); + value = resultMap.Find(ImageVisual::Property::SYNCHRONOUS_LOADING, Property::BOOLEAN); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == true); END_TEST; } @@ -900,85 +895,85 @@ int UtcDaliVisualGetPropertyMap5(void) int UtcDaliVisualGetPropertyMap6(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetPropertyMap6: NPatchVisual" ); + tet_infoline("UtcDaliVisualGetPropertyMap6: NPatchVisual"); - Rect< int > border( 1, 1, 1, 1 ); + Rect border(1, 1, 1, 1); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH ); - propertyMap.Insert( "mixColor", Color::MAGENTA ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_NPATCH_FILE_NAME ); - propertyMap.Insert( ImageVisual::Property::BORDER_ONLY, true ); - propertyMap.Insert( ImageVisual::Property::BORDER, border ); - propertyMap.Insert( DevelImageVisual::Property::AUXILIARY_IMAGE, "application-icon-30.png" ); - propertyMap.Insert( DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA, 0.9f ); - Visual::Base nPatchVisual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert("mixColor", Color::MAGENTA); + propertyMap.Insert(ImageVisual::Property::URL, TEST_NPATCH_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::BORDER_ONLY, true); + propertyMap.Insert(ImageVisual::Property::BORDER, border); + propertyMap.Insert(DevelImageVisual::Property::AUXILIARY_IMAGE, "application-icon-30.png"); + propertyMap.Insert(DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA, 0.9f); + Visual::Base nPatchVisual = factory.CreateVisual(propertyMap); Property::Map resultMap; - nPatchVisual.CreatePropertyMap( resultMap ); + nPatchVisual.CreatePropertyMap(resultMap); // check the property values from the returned map from visual - Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == Visual::N_PATCH ); + Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == Visual::N_PATCH); - value = resultMap.Find( Visual::Property::MIX_COLOR, Property::VECTOR4 ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == Color::MAGENTA ); + value = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == Color::MAGENTA); - value = resultMap.Find( ImageVisual::Property::URL, Property::STRING ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == TEST_NPATCH_FILE_NAME ); + value = resultMap.Find(ImageVisual::Property::URL, Property::STRING); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == TEST_NPATCH_FILE_NAME); - value = resultMap.Find( ImageVisual::Property::BORDER_ONLY, Property::BOOLEAN ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() ); + value = resultMap.Find(ImageVisual::Property::BORDER_ONLY, Property::BOOLEAN); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get()); - value = resultMap.Find( ImageVisual::Property::BORDER, Property::RECTANGLE ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get< Rect< int > >() == border ); + value = resultMap.Find(ImageVisual::Property::BORDER, Property::RECTANGLE); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get >() == border); - value = resultMap.Find( DevelImageVisual::Property::AUXILIARY_IMAGE, Property::STRING ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == "application-icon-30.png" ); + value = resultMap.Find(DevelImageVisual::Property::AUXILIARY_IMAGE, Property::STRING); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == "application-icon-30.png"); - value = resultMap.Find( DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA, Property::FLOAT ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == 0.9f ); + value = resultMap.Find(DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA, Property::FLOAT); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == 0.9f); - Vector4 border1( 1.0f, 1.0f, 1.0f, 1.0f ); + Vector4 border1(1.0f, 1.0f, 1.0f, 1.0f); Property::Map propertyMap1; - propertyMap1.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH ); - propertyMap1.Insert( "mixColor", Color::MAGENTA ); - propertyMap1.Insert( ImageVisual::Property::URL, TEST_NPATCH_FILE_NAME ); - propertyMap1.Insert( ImageVisual::Property::BORDER_ONLY, true ); - propertyMap1.Insert( ImageVisual::Property::BORDER, border1 ); - nPatchVisual = factory.CreateVisual( propertyMap1 ); + propertyMap1.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap1.Insert("mixColor", Color::MAGENTA); + propertyMap1.Insert(ImageVisual::Property::URL, TEST_NPATCH_FILE_NAME); + propertyMap1.Insert(ImageVisual::Property::BORDER_ONLY, true); + propertyMap1.Insert(ImageVisual::Property::BORDER, border1); + nPatchVisual = factory.CreateVisual(propertyMap1); - nPatchVisual.CreatePropertyMap( resultMap ); + nPatchVisual.CreatePropertyMap(resultMap); // check the property values from the returned map from visual - value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == Visual::N_PATCH ); + value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == Visual::N_PATCH); - value = resultMap.Find( Visual::Property::MIX_COLOR, Property::VECTOR4 ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == Color::MAGENTA ); + value = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == Color::MAGENTA); - value = resultMap.Find( ImageVisual::Property::URL, Property::STRING ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == TEST_NPATCH_FILE_NAME ); + value = resultMap.Find(ImageVisual::Property::URL, Property::STRING); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == TEST_NPATCH_FILE_NAME); - value = resultMap.Find( ImageVisual::Property::BORDER_ONLY, Property::BOOLEAN ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() ); + value = resultMap.Find(ImageVisual::Property::BORDER_ONLY, Property::BOOLEAN); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get()); - value = resultMap.Find( ImageVisual::Property::BORDER, Property::RECTANGLE ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get< Rect< int > >() == border ); + value = resultMap.Find(ImageVisual::Property::BORDER, Property::RECTANGLE); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get >() == border); END_TEST; } @@ -986,67 +981,67 @@ int UtcDaliVisualGetPropertyMap6(void) int UtcDaliVisualGetPropertyMap7(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetPropertyMap7: SvgVisual" ); + tet_infoline("UtcDaliVisualGetPropertyMap7: SvgVisual"); // request SvgVisual with a property map VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::SVG ); - propertyMap.Insert( Visual::Property::MIX_COLOR, Color::WHITE ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_SVG_FILE_NAME ); - propertyMap.Insert( ImageVisual::Property::ATLASING, false ); - Visual::Base svgVisual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::SVG); + propertyMap.Insert(Visual::Property::MIX_COLOR, Color::WHITE); + propertyMap.Insert(ImageVisual::Property::URL, TEST_SVG_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::ATLASING, false); + Visual::Base svgVisual = factory.CreateVisual(propertyMap); Property::Map resultMap; - svgVisual.CreatePropertyMap( resultMap ); + svgVisual.CreatePropertyMap(resultMap); // check the property values from the returned map from a visual - Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == Visual::SVG ); + Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == Visual::SVG); - value = resultMap.Find( ImageVisual::Property::URL, Property::STRING ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == TEST_SVG_FILE_NAME ); + value = resultMap.Find(ImageVisual::Property::URL, Property::STRING); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == TEST_SVG_FILE_NAME); - value = resultMap.Find( ImageVisual::Property::ATLASING, Property::BOOLEAN ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == false ); + value = resultMap.Find(ImageVisual::Property::ATLASING, Property::BOOLEAN); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == false); // request SvgVisual with a property map 2 propertyMap.Clear(); - propertyMap[ "visualType" ] = Visual::SVG; - propertyMap[ "mixColor" ] = Color::WHITE; - propertyMap[ "url" ] = TEST_SVG_FILE_NAME; - propertyMap[ "atlasing" ] = true; - Visual::Base svgVisual1 = factory.CreateVisual( propertyMap ); + propertyMap["visualType"] = Visual::SVG; + propertyMap["mixColor"] = Color::WHITE; + propertyMap["url"] = TEST_SVG_FILE_NAME; + propertyMap["atlasing"] = true; + Visual::Base svgVisual1 = factory.CreateVisual(propertyMap); resultMap.Clear(); - svgVisual1.CreatePropertyMap( resultMap ); + svgVisual1.CreatePropertyMap(resultMap); // check the property values from the returned map from a visual - value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == Visual::SVG ); + value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == Visual::SVG); - value = resultMap.Find( ImageVisual::Property::URL, Property::STRING ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == TEST_SVG_FILE_NAME ); + value = resultMap.Find(ImageVisual::Property::URL, Property::STRING); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == TEST_SVG_FILE_NAME); - value = resultMap.Find( ImageVisual::Property::ATLASING, Property::BOOLEAN ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == true ); + value = resultMap.Find(ImageVisual::Property::ATLASING, Property::BOOLEAN); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == true); // request SvgVisual with an URL - Visual::Base svgVisual2 = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions() ); + Visual::Base svgVisual2 = factory.CreateVisual(TEST_SVG_FILE_NAME, ImageDimensions()); resultMap.Clear(); - svgVisual2.CreatePropertyMap( resultMap ); + svgVisual2.CreatePropertyMap(resultMap); // check the property values from the returned map from a visual - value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == Visual::SVG ); + value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == Visual::SVG); - value = resultMap.Find( ImageVisual::Property::URL, Property::STRING ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == TEST_SVG_FILE_NAME ); + value = resultMap.Find(ImageVisual::Property::URL, Property::STRING); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == TEST_SVG_FILE_NAME); END_TEST; } @@ -1055,135 +1050,170 @@ int UtcDaliVisualGetPropertyMap7(void) int UtcDaliVisualGetPropertyMap8(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetPropertyMap8: MeshVisual" ); + tet_infoline("UtcDaliVisualGetPropertyMap8: MeshVisual"); //Request MeshVisual using a property map. VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH ); - propertyMap.Insert( Visual::Property::MIX_COLOR, Color::BLUE ); - propertyMap.Insert( MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME ); - propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME ); - propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_LOCATION ); - propertyMap.Insert( MeshVisual::Property::SHADING_MODE, MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING ); - propertyMap.Insert( MeshVisual::Property::LIGHT_POSITION, Vector3( 5.0f, 10.0f, 15.0f) ); - Visual::Base meshVisual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH); + propertyMap.Insert(Visual::Property::MIX_COLOR, Color::BLUE); + propertyMap.Insert(MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME); + propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME); + propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_LOCATION); + propertyMap.Insert(MeshVisual::Property::SHADING_MODE, MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING); + propertyMap.Insert(MeshVisual::Property::LIGHT_POSITION, Vector3(5.0f, 10.0f, 15.0f)); + Visual::Base meshVisual = factory.CreateVisual(propertyMap); Property::Map resultMap; - meshVisual.CreatePropertyMap( resultMap ); - TestMixColor( meshVisual, Visual::Property::MIX_COLOR, Color::BLUE ); + meshVisual.CreatePropertyMap(resultMap); + TestMixColor(meshVisual, Visual::Property::MIX_COLOR, Color::BLUE); //Check values in the result map are identical to the initial map's values. - Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), (int)Visual::MESH, TEST_LOCATION ); + Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), (int)Visual::MESH, TEST_LOCATION); - value = resultMap.Find( MeshVisual::Property::OBJECT_URL, Property::STRING ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), TEST_OBJ_FILE_NAME, TEST_LOCATION ); + value = resultMap.Find(MeshVisual::Property::OBJECT_URL, Property::STRING); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), TEST_OBJ_FILE_NAME, TEST_LOCATION); - value = resultMap.Find( MeshVisual::Property::MATERIAL_URL, Property::STRING ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), TEST_MTL_FILE_NAME, TEST_LOCATION ); + value = resultMap.Find(MeshVisual::Property::MATERIAL_URL, Property::STRING); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), TEST_MTL_FILE_NAME, TEST_LOCATION); - value = resultMap.Find( MeshVisual::Property::TEXTURES_PATH, Property::STRING ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), TEST_RESOURCE_LOCATION, TEST_LOCATION ); + value = resultMap.Find(MeshVisual::Property::TEXTURES_PATH, Property::STRING); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), TEST_RESOURCE_LOCATION, TEST_LOCATION); - value = resultMap.Find( MeshVisual::Property::SHADING_MODE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), (int)MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING, TEST_LOCATION ); + value = resultMap.Find(MeshVisual::Property::SHADING_MODE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), (int)MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING, TEST_LOCATION); - value = resultMap.Find( MeshVisual::Property::LIGHT_POSITION, Property::VECTOR3 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), Vector3( 5.0f, 10.0f, 15.0f), Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(MeshVisual::Property::LIGHT_POSITION, Property::VECTOR3); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector3(5.0f, 10.0f, 15.0f), Math::MACHINE_EPSILON_100, TEST_LOCATION); - END_TEST; + END_TEST; } //Primitive shape visual int UtcDaliVisualGetPropertyMap9(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetPropertyMap9: PrimitiveVisual" ); + tet_infoline("UtcDaliVisualGetPropertyMap9: PrimitiveVisual"); + + static std::vector customUniforms = + { + UniformData("mixColor", Property::Type::VECTOR3), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); - Vector4 color = Vector4( 1.0, 0.8, 0.6, 1.0); - Vector3 dimensions = Vector3( 1.0, 2.0, 3.0 ); + Vector4 color = Vector4(1.0, 0.8, 0.6, 1.0); + Vector3 dimensions = Vector3(1.0, 2.0, 3.0); //Request PrimitiveVisual using a property map. VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); - propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CUBE ); - propertyMap.Insert( PrimitiveVisual::Property::MIX_COLOR, color ); - propertyMap.Insert( PrimitiveVisual::Property::SLICES, 10 ); - propertyMap.Insert( PrimitiveVisual::Property::STACKS, 20 ); - propertyMap.Insert( PrimitiveVisual::Property::SCALE_TOP_RADIUS, 30.0f ); - propertyMap.Insert( PrimitiveVisual::Property::SCALE_BOTTOM_RADIUS, 40.0f ); - propertyMap.Insert( PrimitiveVisual::Property::SCALE_HEIGHT, 50.0f ); - propertyMap.Insert( PrimitiveVisual::Property::SCALE_RADIUS, 60.0f ); - propertyMap.Insert( PrimitiveVisual::Property::SCALE_DIMENSIONS, dimensions ); - propertyMap.Insert( PrimitiveVisual::Property::BEVEL_PERCENTAGE, 0.3f ); - propertyMap.Insert( PrimitiveVisual::Property::BEVEL_SMOOTHNESS, 0.6f ); - propertyMap.Insert( PrimitiveVisual::Property::LIGHT_POSITION, Vector3( 5.0f, 10.0f, 15.0f) ); - Visual::Base primitiveVisual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CUBE); + propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, color); + propertyMap.Insert(PrimitiveVisual::Property::SLICES, 10); + propertyMap.Insert(PrimitiveVisual::Property::STACKS, 20); + propertyMap.Insert(PrimitiveVisual::Property::SCALE_TOP_RADIUS, 30.0f); + propertyMap.Insert(PrimitiveVisual::Property::SCALE_BOTTOM_RADIUS, 40.0f); + propertyMap.Insert(PrimitiveVisual::Property::SCALE_HEIGHT, 50.0f); + propertyMap.Insert(PrimitiveVisual::Property::SCALE_RADIUS, 60.0f); + propertyMap.Insert(PrimitiveVisual::Property::SCALE_DIMENSIONS, dimensions); + propertyMap.Insert(PrimitiveVisual::Property::BEVEL_PERCENTAGE, 0.3f); + propertyMap.Insert(PrimitiveVisual::Property::BEVEL_SMOOTHNESS, 0.6f); + propertyMap.Insert(PrimitiveVisual::Property::LIGHT_POSITION, Vector3(5.0f, 10.0f, 15.0f)); + Visual::Base primitiveVisual = factory.CreateVisual(propertyMap); Property::Map resultMap; - primitiveVisual.CreatePropertyMap( resultMap ); + primitiveVisual.CreatePropertyMap(resultMap); //Check values in the result map are identical to the initial map's values. - Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), (int)Visual::PRIMITIVE, TEST_LOCATION ); + Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), (int)Visual::PRIMITIVE, TEST_LOCATION); + + value = resultMap.Find(PrimitiveVisual::Property::SHAPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), (int)PrimitiveVisual::Shape::CUBE, TEST_LOCATION); + + value = resultMap.Find(PrimitiveVisual::Property::MIX_COLOR, Property::VECTOR4); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == color); + DALI_TEST_EQUALS(value->Get(), color, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( PrimitiveVisual::Property::SHAPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), (int)PrimitiveVisual::Shape::CUBE, TEST_LOCATION ); + value = resultMap.Find(PrimitiveVisual::Property::SLICES, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), 10, TEST_LOCATION); - value = resultMap.Find( PrimitiveVisual::Property::MIX_COLOR, Property::VECTOR4 ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == color ); - DALI_TEST_EQUALS( value->Get(), color, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(PrimitiveVisual::Property::STACKS, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), 20, TEST_LOCATION); - value = resultMap.Find( PrimitiveVisual::Property::SLICES, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), 10, TEST_LOCATION ); + value = resultMap.Find(PrimitiveVisual::Property::SCALE_TOP_RADIUS, Property::FLOAT); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), 30.0f, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( PrimitiveVisual::Property::STACKS, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), 20, TEST_LOCATION ); + value = resultMap.Find(PrimitiveVisual::Property::SCALE_BOTTOM_RADIUS, Property::FLOAT); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), 40.0f, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( PrimitiveVisual::Property::SCALE_TOP_RADIUS, Property::FLOAT ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), 30.0f, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(PrimitiveVisual::Property::SCALE_HEIGHT, Property::FLOAT); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), 50.0f, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( PrimitiveVisual::Property::SCALE_BOTTOM_RADIUS, Property::FLOAT ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), 40.0f, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(PrimitiveVisual::Property::SCALE_RADIUS, Property::FLOAT); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), 60.0f, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( PrimitiveVisual::Property::SCALE_HEIGHT, Property::FLOAT ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), 50.0f, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(PrimitiveVisual::Property::SCALE_DIMENSIONS, Property::VECTOR3); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), dimensions, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( PrimitiveVisual::Property::SCALE_RADIUS, Property::FLOAT ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), 60.0f, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(PrimitiveVisual::Property::BEVEL_PERCENTAGE, Property::FLOAT); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), 0.3f, Math::MACHINE_EPSILON_100, TEST_LOCATION); + + value = resultMap.Find(PrimitiveVisual::Property::BEVEL_SMOOTHNESS, Property::FLOAT); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), 0.6f, Math::MACHINE_EPSILON_100, TEST_LOCATION); + + value = resultMap.Find(PrimitiveVisual::Property::LIGHT_POSITION, Property::VECTOR3); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector3(5.0f, 10.0f, 15.0f), Math::MACHINE_EPSILON_100, TEST_LOCATION); + + DummyControl actor = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, primitiveVisual); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(actor); - value = resultMap.Find( PrimitiveVisual::Property::SCALE_DIMENSIONS, Property::VECTOR3 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), dimensions, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + Animation animation = Animation::New(1.0f); + animation.AnimateTo(DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, PrimitiveVisual::Property::MIX_COLOR), Vector3(Color::MAGENTA)); + animation.Play(); + application.SendNotification(); + application.Render(0); + application.Render(1000); + application.SendNotification(); - value = resultMap.Find( PrimitiveVisual::Property::BEVEL_PERCENTAGE, Property::FLOAT ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), 0.3f, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + auto& gl = application.GetGlAbstraction(); + DALI_TEST_EQUALS(gl.CheckUniformValue("mixColor", Vector3(Color::MAGENTA)), true, TEST_LOCATION); - value = resultMap.Find( PrimitiveVisual::Property::BEVEL_SMOOTHNESS, Property::FLOAT ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), 0.6f, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + tet_infoline("Check property map after animation"); - value = resultMap.Find( PrimitiveVisual::Property::LIGHT_POSITION, Property::VECTOR3 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), Vector3( 5.0f, 10.0f, 15.0f), Math::MACHINE_EPSILON_100, TEST_LOCATION ); + primitiveVisual.CreatePropertyMap(resultMap); + value = resultMap.Find(PrimitiveVisual::Property::MIX_COLOR, Property::VECTOR4); + DALI_TEST_CHECK(value); + color = value->Get(); + // Ignore alpha part + DALI_TEST_EQUALS(Vector3(color), Vector3(Color::MAGENTA), 0.001f, TEST_LOCATION); END_TEST; } @@ -1192,121 +1222,121 @@ int UtcDaliVisualGetPropertyMap9(void) int UtcDaliVisualGetPropertyMap10(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetPropertyMap10: TextVisual" ); + tet_infoline("UtcDaliVisualGetPropertyMap10: TextVisual"); //Request PrimitiveVisual using a property map. VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::TEXT ); - propertyMap.Insert( Visual::Property::MIX_COLOR, Color::BLACK ); - propertyMap.Insert( "renderingBackend", static_cast( Toolkit::DevelText::DEFAULT_RENDERING_BACKEND ) ); - propertyMap.Insert( "enableMarkup", false ); - propertyMap.Insert( "text", "Hello world" ); - propertyMap.Insert( "fontFamily", "TizenSans" ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::TEXT); + propertyMap.Insert(Visual::Property::MIX_COLOR, Color::BLACK); + propertyMap.Insert("renderingBackend", static_cast(Toolkit::DevelText::DEFAULT_RENDERING_BACKEND)); + propertyMap.Insert("enableMarkup", false); + propertyMap.Insert("text", "Hello world"); + propertyMap.Insert("fontFamily", "TizenSans"); Property::Map fontStyleMapSet; - fontStyleMapSet.Insert( "weight", "bold" ); - propertyMap.Insert( "fontStyle", fontStyleMapSet ); + fontStyleMapSet.Insert("weight", "bold"); + propertyMap.Insert("fontStyle", fontStyleMapSet); - propertyMap.Insert( "pointSize", 12.f ); - propertyMap.Insert( "multiLine", true ); - propertyMap.Insert( "horizontalAlignment", "CENTER" ); - propertyMap.Insert( "verticalAlignment", "CENTER" ); - propertyMap.Insert( "textColor", Color::RED ); + propertyMap.Insert("pointSize", 12.f); + propertyMap.Insert("multiLine", true); + propertyMap.Insert("horizontalAlignment", "CENTER"); + propertyMap.Insert("verticalAlignment", "CENTER"); + propertyMap.Insert("textColor", Color::RED); Property::Map shadowMapSet; - propertyMap.Insert( "shadow", shadowMapSet.Add("color", Color::RED).Add("offset", Vector2(2.0f, 2.0f)).Add("blurRadius", 3.0f) ); + propertyMap.Insert("shadow", shadowMapSet.Add("color", Color::RED).Add("offset", Vector2(2.0f, 2.0f)).Add("blurRadius", 3.0f)); Property::Map underlineMapSet; - propertyMap.Insert( "underline", underlineMapSet.Add("enable", true).Add("color", Color::GREEN).Add("height", 1).Add("type", Text::Underline::Type::SOLID).Add("dashWidth", 2).Add("dashGap", 1) ); + propertyMap.Insert("underline", underlineMapSet.Add("enable", true).Add("color", Color::GREEN).Add("height", 1).Add("type", Text::Underline::Type::SOLID).Add("dashWidth", 2).Add("dashGap", 1)); Property::Map outlineMapSet; - propertyMap.Insert( "outline", outlineMapSet.Add("color", Color::YELLOW).Add("width", 1) ); + propertyMap.Insert("outline", outlineMapSet.Add("color", Color::YELLOW).Add("width", 1)); Property::Map backgroundMapSet; - propertyMap.Insert( "textBackground", backgroundMapSet.Add("enable", true).Add("color", Color::CYAN) ); + propertyMap.Insert("textBackground", backgroundMapSet.Add("enable", true).Add("color", Color::CYAN)); - Visual::Base textVisual = factory.CreateVisual( propertyMap ); + Visual::Base textVisual = factory.CreateVisual(propertyMap); Property::Map resultMap; - textVisual.CreatePropertyMap( resultMap ); + textVisual.CreatePropertyMap(resultMap); //Check values in the result map are identical to the initial map's values. - Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), (int)Visual::TEXT, TEST_LOCATION ); + Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), (int)Visual::TEXT, TEST_LOCATION); - value = resultMap.Find( Visual::Property::MIX_COLOR, Property::VECTOR4 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), Color::BLACK, 0.001f, TEST_LOCATION ); + value = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Color::BLACK, 0.001f, TEST_LOCATION); - value = resultMap.Find( TextVisual::Property::TEXT, Property::STRING ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), "Hello world", TEST_LOCATION ); + value = resultMap.Find(TextVisual::Property::TEXT, Property::STRING); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), "Hello world", TEST_LOCATION); - value = resultMap.Find( TextVisual::Property::FONT_FAMILY, Property::STRING ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), "TizenSans", TEST_LOCATION ); + value = resultMap.Find(TextVisual::Property::FONT_FAMILY, Property::STRING); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), "TizenSans", TEST_LOCATION); - value = resultMap.Find( TextVisual::Property::FONT_STYLE, Property::MAP ); - DALI_TEST_CHECK( value ); + value = resultMap.Find(TextVisual::Property::FONT_STYLE, Property::MAP); + DALI_TEST_CHECK(value); Property::Map fontStyleMapGet = value->Get(); - DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION ); - DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION); + DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION); - value = resultMap.Find( TextVisual::Property::POINT_SIZE, Property::FLOAT ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), 12.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); + value = resultMap.Find(TextVisual::Property::POINT_SIZE, Property::FLOAT); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), 12.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION); - value = resultMap.Find( TextVisual::Property::MULTI_LINE, Property::BOOLEAN ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() ); + value = resultMap.Find(TextVisual::Property::MULTI_LINE, Property::BOOLEAN); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get()); - value = resultMap.Find( TextVisual::Property::HORIZONTAL_ALIGNMENT, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), (int)Text::HorizontalAlignment::CENTER, TEST_LOCATION ); + value = resultMap.Find(TextVisual::Property::HORIZONTAL_ALIGNMENT, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), (int)Text::HorizontalAlignment::CENTER, TEST_LOCATION); - value = resultMap.Find( TextVisual::Property::VERTICAL_ALIGNMENT, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), (int)Text::VerticalAlignment::CENTER, TEST_LOCATION ); + value = resultMap.Find(TextVisual::Property::VERTICAL_ALIGNMENT, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), (int)Text::VerticalAlignment::CENTER, TEST_LOCATION); - value = resultMap.Find( TextVisual::Property::TEXT_COLOR, Property::VECTOR4 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), Color::RED, TEST_LOCATION ); + value = resultMap.Find(TextVisual::Property::TEXT_COLOR, Property::VECTOR4); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Color::RED, TEST_LOCATION); - value = resultMap.Find( TextVisual::Property::ENABLE_MARKUP, Property::BOOLEAN ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( !value->Get() ); + value = resultMap.Find(TextVisual::Property::ENABLE_MARKUP, Property::BOOLEAN); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(!value->Get()); - value = resultMap.Find( TextVisual::Property::SHADOW, Property::MAP ); - DALI_TEST_CHECK( value ); + value = resultMap.Find(TextVisual::Property::SHADOW, Property::MAP); + DALI_TEST_CHECK(value); Property::Map shadowMapGet = value->Get(); - DALI_TEST_EQUALS( shadowMapGet.Count(), shadowMapSet.Count(), TEST_LOCATION ); - DALI_TEST_EQUALS( DaliTestCheckMaps( shadowMapGet, shadowMapSet ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(shadowMapGet.Count(), shadowMapSet.Count(), TEST_LOCATION); + DALI_TEST_EQUALS(DaliTestCheckMaps(shadowMapGet, shadowMapSet), true, TEST_LOCATION); - value = resultMap.Find( TextVisual::Property::UNDERLINE, Property::MAP ); - DALI_TEST_CHECK( value ); + value = resultMap.Find(TextVisual::Property::UNDERLINE, Property::MAP); + DALI_TEST_CHECK(value); Property::Map underlineMapGet = value->Get(); - DALI_TEST_EQUALS( underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION ); - DALI_TEST_EQUALS( DaliTestCheckMaps( underlineMapGet, underlineMapSet ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION); + DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION); - value = resultMap.Find( DevelTextVisual::Property::OUTLINE, Property::MAP ); - DALI_TEST_CHECK( value ); + value = resultMap.Find(DevelTextVisual::Property::OUTLINE, Property::MAP); + DALI_TEST_CHECK(value); Property::Map outlineMapGet = value->Get(); - DALI_TEST_EQUALS( outlineMapGet.Count(), outlineMapSet.Count(), TEST_LOCATION ); - DALI_TEST_EQUALS( DaliTestCheckMaps( outlineMapGet, outlineMapSet ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(outlineMapGet.Count(), outlineMapSet.Count(), TEST_LOCATION); + DALI_TEST_EQUALS(DaliTestCheckMaps(outlineMapGet, outlineMapSet), true, TEST_LOCATION); - value = resultMap.Find( DevelTextVisual::Property::BACKGROUND, Property::MAP ); - DALI_TEST_CHECK( value ); + value = resultMap.Find(DevelTextVisual::Property::BACKGROUND, Property::MAP); + DALI_TEST_CHECK(value); Property::Map backgroundMapGet = value->Get(); - DALI_TEST_EQUALS( backgroundMapGet.Count(), backgroundMapSet.Count(), TEST_LOCATION ); - DALI_TEST_EQUALS( DaliTestCheckMaps( backgroundMapGet, backgroundMapSet ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(backgroundMapGet.Count(), backgroundMapSet.Count(), TEST_LOCATION); + DALI_TEST_EQUALS(DaliTestCheckMaps(backgroundMapGet, backgroundMapSet), true, TEST_LOCATION); END_TEST; } @@ -1314,85 +1344,84 @@ int UtcDaliVisualGetPropertyMap10(void) int UtcDaliVisualGetPropertyMap11(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetPropertyMap11: AnimatedGradientVisual" ); + tet_infoline("UtcDaliVisualGetPropertyMap11: AnimatedGradientVisual"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT); + propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT); Vector2 start(-0.5f, 0.5f); - Vector2 end (0.5f, -0.0f); + Vector2 end(0.5f, -0.0f); Vector4 start_color(1.0f, 0.7f, 0.5f, 1.0f); - Vector4 end_color (0.7f, 0.5f, 1.0f, 1.0f); + Vector4 end_color(0.7f, 0.5f, 1.0f, 1.0f); Vector2 rotate_center(0.0f, 0.4f); - float rotate_amount = 1.57f; - float offset = 100.f; + float rotate_amount = 1.57f; + float offset = 100.f; - propertyMap.Insert(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, DevelAnimatedGradientVisual::GradientType::RADIAL); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE, DevelAnimatedGradientVisual::UnitType::USER_SPACE); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, DevelAnimatedGradientVisual::SpreadType::CLAMP); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, DevelAnimatedGradientVisual::GradientType::RADIAL); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE, DevelAnimatedGradientVisual::UnitType::USER_SPACE); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, DevelAnimatedGradientVisual::SpreadType::CLAMP); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_POSITION, start); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_POSITION, end); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_COLOR, start_color); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_COLOR, end_color); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, rotate_center); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, rotate_amount); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::OFFSET, offset); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_POSITION, start); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_POSITION, end); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_COLOR, start_color); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_COLOR, end_color); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, rotate_center); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, rotate_amount); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::OFFSET, offset); Visual::Base animatedGradientVisual = factory.CreateVisual(propertyMap); - DALI_TEST_CHECK( animatedGradientVisual ); + DALI_TEST_CHECK(animatedGradientVisual); Property::Map resultMap; - animatedGradientVisual.CreatePropertyMap( resultMap ); + animatedGradientVisual.CreatePropertyMap(resultMap); // check the property values from the returned map from visual - Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == DevelVisual::ANIMATED_GRADIENT ); + Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == DevelVisual::ANIMATED_GRADIENT); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == DevelAnimatedGradientVisual::GradientType::RADIAL ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == DevelAnimatedGradientVisual::GradientType::RADIAL); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::UNIT_TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == DevelAnimatedGradientVisual::UnitType::USER_SPACE ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::UNIT_TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == DevelAnimatedGradientVisual::UnitType::USER_SPACE); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::SPREAD_TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == DevelAnimatedGradientVisual::SpreadType::CLAMP ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == DevelAnimatedGradientVisual::SpreadType::CLAMP); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::START_POSITION, Property::VECTOR2); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), start, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::START_POSITION, Property::VECTOR2 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), start , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::END_POSITION, Property::VECTOR2); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), end, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::END_POSITION, Property::VECTOR2 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), end , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::START_COLOR, Property::VECTOR4); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), start_color, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::START_COLOR, Property::VECTOR4 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), start_color , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::END_COLOR, Property::VECTOR4); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), end_color, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::END_COLOR, Property::VECTOR4 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), end_color , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, Property::VECTOR2); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), rotate_center, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::ROTATE_CENTER, Property::VECTOR2 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), rotate_center , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, Property::FLOAT); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), rotate_amount, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, Property::FLOAT ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), rotate_amount , Math::MACHINE_EPSILON_100, TEST_LOCATION ); - - value = resultMap.Find( DevelAnimatedGradientVisual::Property::OFFSET, Property::FLOAT ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), offset , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::OFFSET, Property::FLOAT); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), offset, Math::MACHINE_EPSILON_100, TEST_LOCATION); END_TEST; } @@ -1400,34 +1429,33 @@ int UtcDaliVisualGetPropertyMap11(void) int UtcDaliVisualGetPropertyMap12(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetPropertyMap12: AnimatedGradientVisual with animation param" ); + tet_infoline("UtcDaliVisualGetPropertyMap12: AnimatedGradientVisual with animation param"); // Case 1 : Set values by index { - tet_printf( " - Set Values by Index\n" ); + tet_printf(" - Set Values by Index\n"); // NOTE : PropertyMap doesn't optimized even delay < -loop_count * (duration + repeat_delay) so this animation will not run // _delay = -10.0f is this case. It will progress (10.0f / 1.5f) amount. and 10.0f / 1.5f > 5. for(float _delay = -10.0f; _delay <= 5.0f; _delay += 5.0f) { - tet_printf( "test with delay [%f]\n", _delay ); + tet_printf("test with delay [%f]\n", _delay); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; Property::Map animationMap; - propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT); + propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT); - float duration = 1.1f; - float delay = _delay; + float duration = 1.1f; + float delay = _delay; float repeat_delay = 0.4f; - int direction = DevelAnimatedGradientVisual::AnimationParameter::DirectionType::BACKWARD; + int direction = DevelAnimatedGradientVisual::AnimationParameter::DirectionType::BACKWARD; int loop_count = 5; - int motion = DevelAnimatedGradientVisual::AnimationParameter::MotionType::MIRROR; - int easing = DevelAnimatedGradientVisual::AnimationParameter::EasingType::OUT; + int motion = DevelAnimatedGradientVisual::AnimationParameter::MotionType::MIRROR; + int easing = DevelAnimatedGradientVisual::AnimationParameter::EasingType::OUT; - auto buildAnimatedMap = [&animationMap, &direction, &duration, &delay, &loop_count, &repeat_delay, &motion, &easing](const Property::Value &start, const Property::Value &target)->Property::Map& - { + auto buildAnimatedMap = [&animationMap, &direction, &duration, &delay, &loop_count, &repeat_delay, &motion, &easing](const Property::Value& start, const Property::Value& target) -> Property::Map& { animationMap.Clear(); animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::START, start); animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::TARGET, target); @@ -1443,222 +1471,217 @@ int UtcDaliVisualGetPropertyMap12(void) }; Vector2 start1(-0.5f, 0.5f); - Vector2 end1 (0.5f, -0.5f); + Vector2 end1(0.5f, -0.5f); Vector4 start_color1(1.0f, 0.7f, 0.5f, 1.0f); - Vector4 end_color1 (0.7f, 0.5f, 1.0f, 1.0f); + Vector4 end_color1(0.7f, 0.5f, 1.0f, 1.0f); Vector2 rotate_center1(0.0f, 0.4f); - float rotate_amount1 = 0.0f; - float offset1 = 0.f; + float rotate_amount1 = 0.0f; + float offset1 = 0.f; Vector2 start2(-0.5f, -0.5f); - Vector2 end2 (0.5f, 0.5f); + Vector2 end2(0.5f, 0.5f); Vector4 start_color2(0.0f, 0.1f, 0.8f, 1.0f); - Vector4 end_color2 (0.3f, 1.0f, 0.1f, 0.0f); + Vector4 end_color2(0.3f, 1.0f, 0.1f, 0.0f); Vector2 rotate_center2(0.0f, -0.4f); - float rotate_amount2 = 6.2832f; - float offset2 = 2.f; + float rotate_amount2 = 6.2832f; + float offset2 = 2.f; - propertyMap.Insert(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, DevelAnimatedGradientVisual::GradientType::LINEAR); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE, DevelAnimatedGradientVisual::UnitType::OBJECT_BOUNDING_BOX); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, DevelAnimatedGradientVisual::SpreadType::REPEAT); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, DevelAnimatedGradientVisual::GradientType::LINEAR); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE, DevelAnimatedGradientVisual::UnitType::OBJECT_BOUNDING_BOX); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, DevelAnimatedGradientVisual::SpreadType::REPEAT); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_POSITION, buildAnimatedMap(start1 , start2 )); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_POSITION, buildAnimatedMap(end1 , end2 )); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_COLOR, buildAnimatedMap(start_color1 , start_color2 )); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_COLOR, buildAnimatedMap(end_color1 , end_color2 )); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, buildAnimatedMap(rotate_center1, rotate_center2)); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, buildAnimatedMap(rotate_amount1, rotate_amount2)); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::OFFSET, buildAnimatedMap(offset1 , offset2 )); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_POSITION, buildAnimatedMap(start1, start2)); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_POSITION, buildAnimatedMap(end1, end2)); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_COLOR, buildAnimatedMap(start_color1, start_color2)); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_COLOR, buildAnimatedMap(end_color1, end_color2)); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, buildAnimatedMap(rotate_center1, rotate_center2)); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, buildAnimatedMap(rotate_amount1, rotate_amount2)); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::OFFSET, buildAnimatedMap(offset1, offset2)); Visual::Base animatedGradientVisual = factory.CreateVisual(propertyMap); - DALI_TEST_CHECK( animatedGradientVisual ); + DALI_TEST_CHECK(animatedGradientVisual); Property::Map resultMap; - animatedGradientVisual.CreatePropertyMap( resultMap ); + animatedGradientVisual.CreatePropertyMap(resultMap); // check the property values from the returned map from visual - Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == DevelVisual::ANIMATED_GRADIENT ); + Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == DevelVisual::ANIMATED_GRADIENT); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == DevelAnimatedGradientVisual::GradientType::LINEAR ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == DevelAnimatedGradientVisual::GradientType::LINEAR); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::UNIT_TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == DevelAnimatedGradientVisual::UnitType::OBJECT_BOUNDING_BOX ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::UNIT_TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == DevelAnimatedGradientVisual::UnitType::OBJECT_BOUNDING_BOX); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::SPREAD_TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == DevelAnimatedGradientVisual::SpreadType::REPEAT ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == DevelAnimatedGradientVisual::SpreadType::REPEAT); - auto checkAnimatedMap = [&value, &resultMap, &direction, &duration, &delay, &loop_count, &repeat_delay, &motion, &easing](const Property::Index &index, const Property::Value &start, const Property::Value &target, int line_num)->void - { + auto checkAnimatedMap = [&value, &resultMap, &direction, &duration, &delay, &loop_count, &repeat_delay, &motion, &easing](const Property::Index& index, const Property::Value& start, const Property::Value& target, int line_num) -> void { tet_printf("Check value at %d\n", line_num); - value = resultMap.Find( index, Property::MAP ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->GetType() == Property::MAP ); - Property::Map *temp_map = value->GetMap(); - DALI_TEST_CHECK( temp_map ); - - auto checkMapValue = [&temp_map](const Property::Index index)->Property::Value - { - Property::Value *res = temp_map->Find( index ); - DALI_TEST_CHECK( res ); + value = resultMap.Find(index, Property::MAP); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->GetType() == Property::MAP); + Property::Map* temp_map = value->GetMap(); + DALI_TEST_CHECK(temp_map); + + auto checkMapValue = [&temp_map](const Property::Index index) -> Property::Value { + Property::Value* res = temp_map->Find(index); + DALI_TEST_CHECK(res); return *res; }; - DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::START) , start, Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::TARGET) , target, Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION) , Property::Value( direction ), Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DURATION) , Property::Value( duration ), Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DELAY) , Property::Value( delay ), Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT) , Property::Value( loop_count ), Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT_DELAY), Property::Value( repeat_delay ), Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::MOTION_TYPE) , Property::Value( motion ), Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::EASING_TYPE) , Property::Value( easing ), Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::START), start, Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::TARGET), target, Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION), Property::Value(direction), Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DURATION), Property::Value(duration), Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DELAY), Property::Value(delay), Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT), Property::Value(loop_count), Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT_DELAY), Property::Value(repeat_delay), Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::MOTION_TYPE), Property::Value(motion), Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::EASING_TYPE), Property::Value(easing), Math::MACHINE_EPSILON_100, TEST_LOCATION); }; // check the animation map data is good - checkAnimatedMap(DevelAnimatedGradientVisual::Property::START_POSITION, start1 , start2 , __LINE__); - checkAnimatedMap(DevelAnimatedGradientVisual::Property::END_POSITION , end1 , end2 , __LINE__); - checkAnimatedMap(DevelAnimatedGradientVisual::Property::START_COLOR , start_color1 , start_color2 , __LINE__); - checkAnimatedMap(DevelAnimatedGradientVisual::Property::END_COLOR , end_color1 , end_color2 , __LINE__); - checkAnimatedMap(DevelAnimatedGradientVisual::Property::ROTATE_CENTER , rotate_center1, rotate_center2, __LINE__); - checkAnimatedMap(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT , rotate_amount1, rotate_amount2, __LINE__); - checkAnimatedMap(DevelAnimatedGradientVisual::Property::OFFSET , offset1 , offset2 , __LINE__); + checkAnimatedMap(DevelAnimatedGradientVisual::Property::START_POSITION, start1, start2, __LINE__); + checkAnimatedMap(DevelAnimatedGradientVisual::Property::END_POSITION, end1, end2, __LINE__); + checkAnimatedMap(DevelAnimatedGradientVisual::Property::START_COLOR, start_color1, start_color2, __LINE__); + checkAnimatedMap(DevelAnimatedGradientVisual::Property::END_COLOR, end_color1, end_color2, __LINE__); + checkAnimatedMap(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, rotate_center1, rotate_center2, __LINE__); + checkAnimatedMap(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, rotate_amount1, rotate_amount2, __LINE__); + checkAnimatedMap(DevelAnimatedGradientVisual::Property::OFFSET, offset1, offset2, __LINE__); } } // Case 2 : Set values by string { - tet_printf( " - Set Values by String\n" ); + tet_printf(" - Set Values by String\n"); // NOTE : PropertyMap doesn't optimized even delay < -loop_count * (duration + repeat_delay) so this animation will not run // _delay = -10.0f is this case. It will progress (10.0f / 1.5f) amount. and 10.0f / 1.5f > 5. for(float _delay = -10.0f; _delay <= 5.0f; _delay += 5.0f) { - tet_printf( "test with delay [%f]\n", _delay ); + tet_printf("test with delay [%f]\n", _delay); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; Property::Map animationMap; propertyMap.Insert("visualType", "ANIMATED_GRADIENT"); - float duration = 1.1f; - float delay = _delay; + float duration = 1.1f; + float delay = _delay; float repeat_delay = 0.4f; - int direction = DevelAnimatedGradientVisual::AnimationParameter::DirectionType::BACKWARD; + int direction = DevelAnimatedGradientVisual::AnimationParameter::DirectionType::BACKWARD; int loop_count = 5; - int motion = DevelAnimatedGradientVisual::AnimationParameter::MotionType::MIRROR; - int easing = DevelAnimatedGradientVisual::AnimationParameter::EasingType::IN_OUT; + int motion = DevelAnimatedGradientVisual::AnimationParameter::MotionType::MIRROR; + int easing = DevelAnimatedGradientVisual::AnimationParameter::EasingType::IN_OUT; - auto buildAnimatedMap = [&animationMap, &duration, &delay, &loop_count, &repeat_delay](const Property::Value &start, const Property::Value &target)->Property::Map& - { + auto buildAnimatedMap = [&animationMap, &duration, &delay, &loop_count, &repeat_delay](const Property::Value& start, const Property::Value& target) -> Property::Map& { animationMap.Clear(); - animationMap.Insert("startValue" , start); - animationMap.Insert("targetValue" , target); + animationMap.Insert("startValue", start); + animationMap.Insert("targetValue", target); animationMap.Insert("directionType", "BACKWARD"); - animationMap.Insert("duration" , duration); - animationMap.Insert("delay" , delay); - animationMap.Insert("repeat" , loop_count); - animationMap.Insert("repeatDelay" , repeat_delay); - animationMap.Insert("motionType" , "MIRROR"); - animationMap.Insert("easingType" , "IN_OUT"); + animationMap.Insert("duration", duration); + animationMap.Insert("delay", delay); + animationMap.Insert("repeat", loop_count); + animationMap.Insert("repeatDelay", repeat_delay); + animationMap.Insert("motionType", "MIRROR"); + animationMap.Insert("easingType", "IN_OUT"); return animationMap; }; Vector2 start1(-0.5f, 0.5f); - Vector2 end1 (0.5f, -0.5f); + Vector2 end1(0.5f, -0.5f); Vector4 start_color1(1.0f, 0.7f, 0.5f, 1.0f); - Vector4 end_color1 (0.7f, 0.5f, 1.0f, 1.0f); + Vector4 end_color1(0.7f, 0.5f, 1.0f, 1.0f); Vector2 rotate_center1(0.0f, 0.4f); - float rotate_amount1 = 0.0f; - float offset1 = 0.f; + float rotate_amount1 = 0.0f; + float offset1 = 0.f; Vector2 start2(-0.5f, -0.5f); - Vector2 end2 (0.5f, 0.5f); + Vector2 end2(0.5f, 0.5f); Vector4 start_color2(0.0f, 0.1f, 0.8f, 1.0f); - Vector4 end_color2 (0.3f, 1.0f, 0.1f, 0.0f); + Vector4 end_color2(0.3f, 1.0f, 0.1f, 0.0f); Vector2 rotate_center2(0.0f, -0.4f); - float rotate_amount2 = 6.2832f; - float offset2 = 2.f; + float rotate_amount2 = 6.2832f; + float offset2 = 2.f; // For test mix the type string/index key and string/index value works well. - propertyMap.Insert(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, "RADIAL"); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE, DevelAnimatedGradientVisual::UnitType::USER_SPACE); - propertyMap.Insert("spreadType" , DevelAnimatedGradientVisual::SpreadType::REFLECT); - - propertyMap.Insert("startPosition", buildAnimatedMap(start1 , start2 )); - propertyMap.Insert("endPosition" , buildAnimatedMap(end1 , end2 )); - propertyMap.Insert("startColor" , buildAnimatedMap(start_color1 , start_color2 )); - propertyMap.Insert("endColor" , buildAnimatedMap(end_color1 , end_color2 )); - propertyMap.Insert("rotateCenter" , buildAnimatedMap(rotate_center1, rotate_center2)); - propertyMap.Insert("rotateAmount" , buildAnimatedMap(rotate_amount1, rotate_amount2)); - propertyMap.Insert("offset" , buildAnimatedMap(offset1 , offset2 )); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, "RADIAL"); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE, DevelAnimatedGradientVisual::UnitType::USER_SPACE); + propertyMap.Insert("spreadType", DevelAnimatedGradientVisual::SpreadType::REFLECT); + + propertyMap.Insert("startPosition", buildAnimatedMap(start1, start2)); + propertyMap.Insert("endPosition", buildAnimatedMap(end1, end2)); + propertyMap.Insert("startColor", buildAnimatedMap(start_color1, start_color2)); + propertyMap.Insert("endColor", buildAnimatedMap(end_color1, end_color2)); + propertyMap.Insert("rotateCenter", buildAnimatedMap(rotate_center1, rotate_center2)); + propertyMap.Insert("rotateAmount", buildAnimatedMap(rotate_amount1, rotate_amount2)); + propertyMap.Insert("offset", buildAnimatedMap(offset1, offset2)); Visual::Base animatedGradientVisual = factory.CreateVisual(propertyMap); - DALI_TEST_CHECK( animatedGradientVisual ); + DALI_TEST_CHECK(animatedGradientVisual); Property::Map resultMap; - animatedGradientVisual.CreatePropertyMap( resultMap ); + animatedGradientVisual.CreatePropertyMap(resultMap); // check the property values from the returned map from visual // Note : resultMap from CreatePropertyMap only contain indexKey - Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == DevelVisual::ANIMATED_GRADIENT ); + Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == DevelVisual::ANIMATED_GRADIENT); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == DevelAnimatedGradientVisual::GradientType::RADIAL ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == DevelAnimatedGradientVisual::GradientType::RADIAL); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::UNIT_TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == DevelAnimatedGradientVisual::UnitType::USER_SPACE ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::UNIT_TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == DevelAnimatedGradientVisual::UnitType::USER_SPACE); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::SPREAD_TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == DevelAnimatedGradientVisual::SpreadType::REFLECT ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == DevelAnimatedGradientVisual::SpreadType::REFLECT); - auto checkAnimatedMap = [&value, &resultMap, &direction, &duration, &delay, &loop_count, &repeat_delay, &motion, &easing](const Property::Index &index, const Property::Value &start, const Property::Value &target, int line_num)->void - { + auto checkAnimatedMap = [&value, &resultMap, &direction, &duration, &delay, &loop_count, &repeat_delay, &motion, &easing](const Property::Index& index, const Property::Value& start, const Property::Value& target, int line_num) -> void { tet_printf("Check value at %d\n", line_num); - value = resultMap.Find( index, Property::MAP ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->GetType() == Property::MAP ); - Property::Map *temp_map = value->GetMap(); - DALI_TEST_CHECK( temp_map ); - - auto checkMapValue = [&temp_map](const Property::Index index)->Property::Value - { - Property::Value *res = temp_map->Find( index ); - DALI_TEST_CHECK( res ); + value = resultMap.Find(index, Property::MAP); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->GetType() == Property::MAP); + Property::Map* temp_map = value->GetMap(); + DALI_TEST_CHECK(temp_map); + + auto checkMapValue = [&temp_map](const Property::Index index) -> Property::Value { + Property::Value* res = temp_map->Find(index); + DALI_TEST_CHECK(res); return *res; }; - DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::START) , start, Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::TARGET) , target, Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION) , Property::Value( direction ), Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DURATION) , Property::Value( duration ), Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DELAY) , Property::Value( delay ), Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT) , Property::Value( loop_count ), Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT_DELAY), Property::Value( repeat_delay ), Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::MOTION_TYPE) , Property::Value( motion ), Math::MACHINE_EPSILON_100, TEST_LOCATION ); - DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::EASING_TYPE) , Property::Value( easing ), Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::START), start, Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::TARGET), target, Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION), Property::Value(direction), Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DURATION), Property::Value(duration), Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DELAY), Property::Value(delay), Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT), Property::Value(loop_count), Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT_DELAY), Property::Value(repeat_delay), Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::MOTION_TYPE), Property::Value(motion), Math::MACHINE_EPSILON_100, TEST_LOCATION); + DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::EASING_TYPE), Property::Value(easing), Math::MACHINE_EPSILON_100, TEST_LOCATION); }; // check the animation map data is good - checkAnimatedMap(DevelAnimatedGradientVisual::Property::START_POSITION, start1 , start2 , __LINE__); - checkAnimatedMap(DevelAnimatedGradientVisual::Property::END_POSITION , end1 , end2 , __LINE__); - checkAnimatedMap(DevelAnimatedGradientVisual::Property::START_COLOR , start_color1 , start_color2 , __LINE__); - checkAnimatedMap(DevelAnimatedGradientVisual::Property::END_COLOR , end_color1 , end_color2 , __LINE__); - checkAnimatedMap(DevelAnimatedGradientVisual::Property::ROTATE_CENTER , rotate_center1, rotate_center2, __LINE__); - checkAnimatedMap(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT , rotate_amount1, rotate_amount2, __LINE__); - checkAnimatedMap(DevelAnimatedGradientVisual::Property::OFFSET , offset1 , offset2 , __LINE__); + checkAnimatedMap(DevelAnimatedGradientVisual::Property::START_POSITION, start1, start2, __LINE__); + checkAnimatedMap(DevelAnimatedGradientVisual::Property::END_POSITION, end1, end2, __LINE__); + checkAnimatedMap(DevelAnimatedGradientVisual::Property::START_COLOR, start_color1, start_color2, __LINE__); + checkAnimatedMap(DevelAnimatedGradientVisual::Property::END_COLOR, end_color1, end_color2, __LINE__); + checkAnimatedMap(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, rotate_center1, rotate_center2, __LINE__); + checkAnimatedMap(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, rotate_amount1, rotate_amount2, __LINE__); + checkAnimatedMap(DevelAnimatedGradientVisual::Property::OFFSET, offset1, offset2, __LINE__); } } @@ -1667,36 +1690,37 @@ int UtcDaliVisualGetPropertyMap12(void) int UtcDaliVisualGetPropertyMap13(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetPropertyMap13: AnimatedGradientVisual when repeat = 0" ); + tet_infoline("UtcDaliVisualGetPropertyMap13: AnimatedGradientVisual when repeat = 0"); for(int _direction = 0; _direction <= 1; ++_direction) { for(float _delay = -10.0f; _delay <= 10.0f; _delay += 10.0f) { - tet_printf( ((_direction == 0) ? "Forward test with delay [%f]\n" : "Backward test with delay [%f]\n") , _delay ); + tet_printf(((_direction == 0) ? "Forward test with delay [%f]\n" : "Backward test with delay [%f]\n"), _delay); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; Property::Map animationMap; - propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT); + propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT); - float duration = 1.0f; - float delay = _delay; + float duration = 1.0f; + float delay = _delay; float repeat_delay = 0.5f; - int direction = _direction; + int direction = _direction; int loop_count = 0; // When loop_count is 0, Animation will not be created. - int motion = DevelAnimatedGradientVisual::AnimationParameter::MotionType::LOOP; - int easing = DevelAnimatedGradientVisual::AnimationParameter::EasingType::IN; + int motion = DevelAnimatedGradientVisual::AnimationParameter::MotionType::LOOP; + int easing = DevelAnimatedGradientVisual::AnimationParameter::EasingType::IN; - auto buildAnimatedMap = [&animationMap, &direction, &duration, &delay, &loop_count, &repeat_delay, &motion, &easing](const Property::Value &start, const Property::Value &target)->Property::Map& - { + auto buildAnimatedMap = [&animationMap, &direction, &duration, &delay, &loop_count, &repeat_delay, &motion, &easing](const Property::Value& start, const Property::Value& target) -> Property::Map& { animationMap.Clear(); animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::START, start); animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::TARGET, target); - if(direction == 0)animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION, DevelAnimatedGradientVisual::AnimationParameter::DirectionType::FORWARD); - else animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION, DevelAnimatedGradientVisual::AnimationParameter::DirectionType::BACKWARD); + if(direction == 0) + animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION, DevelAnimatedGradientVisual::AnimationParameter::DirectionType::FORWARD); + else + animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION, DevelAnimatedGradientVisual::AnimationParameter::DirectionType::BACKWARD); animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION, direction); animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::DURATION, duration); animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::DELAY, delay); @@ -1709,86 +1733,86 @@ int UtcDaliVisualGetPropertyMap13(void) }; Vector2 start1(-0.5f, 0.5f); - Vector2 end1 (0.5f, -0.5f); + Vector2 end1(0.5f, -0.5f); Vector4 start_color1(1.0f, 0.7f, 0.5f, 1.0f); - Vector4 end_color1 (0.7f, 0.5f, 1.0f, 1.0f); + Vector4 end_color1(0.7f, 0.5f, 1.0f, 1.0f); Vector2 rotate_center1(1.0f, 0.4f); - float rotate_amount1 = 2.0f; - float offset1 = 1.f; + float rotate_amount1 = 2.0f; + float offset1 = 1.f; Vector2 start2(-0.5f, -0.5f); - Vector2 end2 (0.5f, 0.5f); + Vector2 end2(0.5f, 0.5f); Vector4 start_color2(0.0f, 0.1f, 0.8f, 1.0f); - Vector4 end_color2 (0.3f, 1.0f, 0.1f, 0.0f); + Vector4 end_color2(0.3f, 1.0f, 0.1f, 0.0f); Vector2 rotate_center2(1.0f, -0.4f); - float rotate_amount2 = 1.0f; - float offset2 = 3.f; + float rotate_amount2 = 1.0f; + float offset2 = 3.f; - propertyMap.Insert(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, DevelAnimatedGradientVisual::GradientType::LINEAR); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE, DevelAnimatedGradientVisual::UnitType::OBJECT_BOUNDING_BOX); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, DevelAnimatedGradientVisual::SpreadType::REFLECT); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, DevelAnimatedGradientVisual::GradientType::LINEAR); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE, DevelAnimatedGradientVisual::UnitType::OBJECT_BOUNDING_BOX); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, DevelAnimatedGradientVisual::SpreadType::REFLECT); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_POSITION, buildAnimatedMap(start1 , start2 )); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_POSITION, buildAnimatedMap(end1 , end2 )); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_COLOR, buildAnimatedMap(start_color1 , start_color2 )); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_COLOR, buildAnimatedMap(end_color1 , end_color2 )); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, buildAnimatedMap(rotate_center1, rotate_center2)); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, buildAnimatedMap(rotate_amount1, rotate_amount2)); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::OFFSET, buildAnimatedMap(offset1 , offset2 )); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_POSITION, buildAnimatedMap(start1, start2)); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_POSITION, buildAnimatedMap(end1, end2)); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_COLOR, buildAnimatedMap(start_color1, start_color2)); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_COLOR, buildAnimatedMap(end_color1, end_color2)); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, buildAnimatedMap(rotate_center1, rotate_center2)); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, buildAnimatedMap(rotate_amount1, rotate_amount2)); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::OFFSET, buildAnimatedMap(offset1, offset2)); Visual::Base animatedGradientVisual = factory.CreateVisual(propertyMap); - DALI_TEST_CHECK( animatedGradientVisual ); + DALI_TEST_CHECK(animatedGradientVisual); Property::Map resultMap; - animatedGradientVisual.CreatePropertyMap( resultMap ); + animatedGradientVisual.CreatePropertyMap(resultMap); // check the property values from the returned map from visual - Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == DevelVisual::ANIMATED_GRADIENT ); + Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == DevelVisual::ANIMATED_GRADIENT); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == DevelAnimatedGradientVisual::GradientType::LINEAR ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == DevelAnimatedGradientVisual::GradientType::LINEAR); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::UNIT_TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == DevelAnimatedGradientVisual::UnitType::OBJECT_BOUNDING_BOX ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::UNIT_TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == DevelAnimatedGradientVisual::UnitType::OBJECT_BOUNDING_BOX); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::SPREAD_TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == DevelAnimatedGradientVisual::SpreadType::REFLECT ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == DevelAnimatedGradientVisual::SpreadType::REFLECT); // If loop_count = 0, Animation doesn't created. // Optimized resultMap only have one value, which is target value // Note: target value will be changed by direction option. - value = resultMap.Find( DevelAnimatedGradientVisual::Property::START_POSITION, Property::VECTOR2 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), direction ? start1 : start2 , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::START_POSITION, Property::VECTOR2); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), direction ? start1 : start2, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::END_POSITION, Property::VECTOR2 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), direction ? end1 : end2 , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::END_POSITION, Property::VECTOR2); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), direction ? end1 : end2, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::START_COLOR, Property::VECTOR4 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), direction ? start_color1 : start_color2 , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::START_COLOR, Property::VECTOR4); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), direction ? start_color1 : start_color2, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::END_COLOR, Property::VECTOR4 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), direction ? end_color1 : end_color2 , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::END_COLOR, Property::VECTOR4); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), direction ? end_color1 : end_color2, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::ROTATE_CENTER, Property::VECTOR2 ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), direction ? rotate_center1 : rotate_center2 , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, Property::VECTOR2); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), direction ? rotate_center1 : rotate_center2, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, Property::FLOAT ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), direction ? rotate_amount1 : rotate_amount2 , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, Property::FLOAT); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), direction ? rotate_amount1 : rotate_amount2, Math::MACHINE_EPSILON_100, TEST_LOCATION); - value = resultMap.Find( DevelAnimatedGradientVisual::Property::OFFSET, Property::FLOAT ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), direction ? offset1 : offset2 , Math::MACHINE_EPSILON_100, TEST_LOCATION ); + value = resultMap.Find(DevelAnimatedGradientVisual::Property::OFFSET, Property::FLOAT); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), direction ? offset1 : offset2, Math::MACHINE_EPSILON_100, TEST_LOCATION); } } @@ -1798,142 +1822,139 @@ int UtcDaliVisualGetPropertyMap13(void) int UtcDaliVisualAnimateBorderVisual01(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliAnimateBorderVisual Color" ); + tet_infoline("UtcDaliAnimateBorderVisual Color"); static std::vector customUniforms = - { - UniformData("borderColor", Property::Type::VECTOR4), - UniformData("mixColor", Property::Type::VECTOR3), - }; + { + UniformData("borderColor", Property::Type::VECTOR4), + UniformData("mixColor", Property::Type::VECTOR3), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::BORDER); + propertyMap.Insert(Visual::Property::TYPE, Visual::BORDER); propertyMap.Insert(Visual::Property::MIX_COLOR, Vector4(1, 1, 1, 0.8f)); - propertyMap.Insert(BorderVisual::Property::COLOR, Color::BLUE); - propertyMap.Insert(BorderVisual::Property::SIZE, 5.f); - Visual::Base borderVisual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(BorderVisual::Property::COLOR, Color::BLUE); + propertyMap.Insert(BorderVisual::Property::SIZE, 5.f); + Visual::Base borderVisual = factory.CreateVisual(propertyMap); Property::Map map; - map["target"] = "testVisual"; - map["property"] = "mixColor"; - map["targetValue"] = Vector4(1,1,1,0.1); - map["animator"] = Property::Map() - .Add("alphaFunction", "LINEAR") - .Add("timePeriod", Property::Map() - .Add("delay", 0.0f) - .Add("duration", 4.0f)); - - Dali::Toolkit::TransitionData transition = TransitionData::New( map ); - - DummyControl actor = DummyControl::New(true); + map["target"] = "testVisual"; + map["property"] = "mixColor"; + map["targetValue"] = Vector4(1, 1, 1, 0.1); + map["animator"] = Property::Map() + .Add("alphaFunction", "LINEAR") + .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 4.0f)); + + Dali::Toolkit::TransitionData transition = TransitionData::New(map); + + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, borderVisual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, borderVisual); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); application.GetScene().Add(actor); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); - Renderer renderer = actor.GetRendererAt(0); - Property::Index borderColorIndex = renderer.GetPropertyIndex( BorderVisual::Property::COLOR ); - Property::Index mixColorIndex = renderer.GetPropertyIndex( Visual::Property::MIX_COLOR ); + Renderer renderer = actor.GetRendererAt(0); + Property::Index borderColorIndex = renderer.GetPropertyIndex(BorderVisual::Property::COLOR); + Property::Index mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR; //renderer.GetPropertyIndex( Visual::Property::MIX_COLOR ); - Animation animation = dummyImpl.CreateTransition( transition ); + Animation animation = dummyImpl.CreateTransition(transition); // Animate the mix color through the transition, and the border color through // programmatic method. - animation.AnimateTo( Property(renderer, borderColorIndex), Color::WHITE ); + animation.AnimateTo(Property(renderer, borderColorIndex), Color::WHITE); animation.Play(); application.SendNotification(); application.Render(0); application.Render(2000u); // halfway point between blue and white - Vector4 color = renderer.GetCurrentProperty< Vector4 >( borderColorIndex ); - Vector4 testColor = (Color::BLUE + Color::WHITE)*0.5f; - DALI_TEST_EQUALS( color, testColor, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue("borderColor", testColor ), true, TEST_LOCATION ); + Vector4 color = renderer.GetCurrentProperty(borderColorIndex); + Vector4 testColor = (Color::BLUE + Color::WHITE) * 0.5f; + DALI_TEST_EQUALS(color, testColor, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderColor", testColor), true, TEST_LOCATION); - color = renderer.GetCurrentProperty< Vector3 >( mixColorIndex ); - testColor = Vector4( 1,1,1,0.45f ); - DALI_TEST_EQUALS( Vector3(color), Vector3(testColor), 0.0001f, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue("mixColor", Vector3(testColor) ), true, TEST_LOCATION ); + color = renderer.GetCurrentProperty(mixColorIndex); + testColor = Vector4(1, 1, 1, 0.45f); + DALI_TEST_EQUALS(Vector3(color), Vector3(testColor), 0.0001f, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("mixColor", Vector3(testColor)), true, TEST_LOCATION); Vector4 uColor; - DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue< Vector4 >( "uColor", uColor ) ); - DALI_TEST_EQUALS( uColor.a, testColor.a, TEST_LOCATION ); + DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue("uColor", uColor)); + DALI_TEST_EQUALS(uColor.a, testColor.a, TEST_LOCATION); application.Render(2000u); - color = renderer.GetCurrentProperty< Vector4 >( borderColorIndex ); - DALI_TEST_EQUALS( color, Color::WHITE, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue("borderColor", Color::WHITE ), true, TEST_LOCATION ); + color = renderer.GetCurrentProperty(borderColorIndex); + DALI_TEST_EQUALS(color, Color::WHITE, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderColor", Color::WHITE), true, TEST_LOCATION); - color = renderer.GetCurrentProperty< Vector3 >( mixColorIndex ); - testColor = Vector4(1,1,1,0.1); - DALI_TEST_EQUALS( Vector3(color), Vector3(testColor), TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue("mixColor", Vector3(testColor) ), true, TEST_LOCATION ); + color = renderer.GetCurrentProperty(mixColorIndex); + testColor = Vector4(1, 1, 1, 0.1); + DALI_TEST_EQUALS(Vector3(color), Vector3(testColor), TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("mixColor", Vector3(testColor)), true, TEST_LOCATION); - DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue< Vector4 >( "uColor", uColor ) ); - DALI_TEST_EQUALS( uColor.a, testColor.a, TEST_LOCATION ); + DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue("uColor", uColor)); + DALI_TEST_EQUALS(uColor.a, testColor.a, TEST_LOCATION); END_TEST; } - int UtcDaliVisualAnimateBorderVisual02(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliAnimateBorderVisual Size" ); + tet_infoline("UtcDaliAnimateBorderVisual Size"); static std::vector customUniforms = - { - UniformData("borderSize", Property::Type::FLOAT), - }; + { + UniformData("borderSize", Property::Type::FLOAT), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::BORDER); - propertyMap.Insert(BorderVisual::Property::COLOR, Color::BLUE); - propertyMap.Insert(BorderVisual::Property::SIZE, 5.f); - Visual::Base borderVisual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Visual::Property::TYPE, Visual::BORDER); + propertyMap.Insert(BorderVisual::Property::COLOR, Color::BLUE); + propertyMap.Insert(BorderVisual::Property::SIZE, 5.f); + Visual::Base borderVisual = factory.CreateVisual(propertyMap); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, borderVisual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, borderVisual); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); application.GetScene().Add(actor); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); - Renderer renderer = actor.GetRendererAt(0); - Property::Index index = renderer.GetPropertyIndex( BorderVisual::Property::SIZE ); + Renderer renderer = actor.GetRendererAt(0); + Property::Index index = renderer.GetPropertyIndex(BorderVisual::Property::SIZE); Animation animation = Animation::New(4.0f); - animation.AnimateTo( Property(renderer, index), 9.0f ); + animation.AnimateTo(Property(renderer, index), 9.0f); animation.Play(); application.SendNotification(); application.Render(0); application.Render(2000u); // halfway point - float size = renderer.GetCurrentProperty< float >( index ); - DALI_TEST_EQUALS( size, 7.0f, 0.0001f, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue("borderSize", 7.0f ), true, TEST_LOCATION ); + float size = renderer.GetCurrentProperty(index); + DALI_TEST_EQUALS(size, 7.0f, 0.0001f, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderSize", 7.0f), true, TEST_LOCATION); application.Render(2000u); // halfway point between blue and white - size = renderer.GetCurrentProperty< float >( index ); - DALI_TEST_EQUALS( size, 9.0f, 0.0001f, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue("borderSize", 9.0f ), true, TEST_LOCATION ); + size = renderer.GetCurrentProperty(index); + DALI_TEST_EQUALS(size, 9.0f, 0.0001f, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderSize", 9.0f), true, TEST_LOCATION); END_TEST; } @@ -1941,60 +1962,60 @@ int UtcDaliVisualAnimateBorderVisual02(void) int UtcDaliVisualAnimateColorVisual(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliAnimateColorVisual mixColor" ); + tet_infoline("UtcDaliAnimateColorVisual mixColor"); static std::vector customUniforms = - { - UniformData("mixColor", Property::Type::VECTOR3), - }; + { + UniformData("mixColor", Property::Type::VECTOR3), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); - Visual::Base borderVisual = factory.CreateVisual( propertyMap ); + Visual::Base borderVisual = factory.CreateVisual(propertyMap); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, borderVisual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, borderVisual); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); application.GetScene().Add(actor); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); - Renderer renderer = actor.GetRendererAt(0); - Property::Index mixColorIndex = renderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR ); + Renderer renderer = actor.GetRendererAt(0); + Property::Index mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR; //renderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR ); - Property::Value blendModeValue = renderer.GetProperty( Renderer::Property::BLEND_MODE ); - DALI_TEST_EQUALS( blendModeValue.Get(), (int)BlendMode::AUTO, TEST_LOCATION ); + Property::Value blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE); + DALI_TEST_EQUALS(blendModeValue.Get(), (int)BlendMode::AUTO, TEST_LOCATION); Animation animation = Animation::New(4.0f); - animation.AnimateTo( Property(renderer, mixColorIndex), Vector3(Color::WHITE) ); + animation.AnimateTo(Property(renderer, mixColorIndex), Vector3(Color::WHITE)); animation.Play(); application.SendNotification(); application.Render(0); application.Render(2000u); // halfway point - Vector3 color = renderer.GetCurrentProperty< Vector3 >( mixColorIndex ); - Vector3 testColor = Vector3(Color::BLUE + Color::WHITE)*0.5f; - DALI_TEST_EQUALS( color, testColor, TEST_LOCATION ); + Vector3 color = renderer.GetCurrentProperty(mixColorIndex); + Vector3 testColor = Vector3(Color::BLUE + Color::WHITE) * 0.5f; + DALI_TEST_EQUALS(color, testColor, TEST_LOCATION); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue("mixColor", testColor ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("mixColor", testColor), true, TEST_LOCATION); application.Render(2000u); // halfway point between blue and white - color = renderer.GetCurrentProperty< Vector3 >( mixColorIndex ); - DALI_TEST_EQUALS( color, Vector3(Color::WHITE), TEST_LOCATION ); + color = renderer.GetCurrentProperty(mixColorIndex); + DALI_TEST_EQUALS(color, Vector3(Color::WHITE), TEST_LOCATION); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue("mixColor", Vector3(Color::WHITE) ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("mixColor", Vector3(Color::WHITE)), true, TEST_LOCATION); - blendModeValue = renderer.GetCurrentProperty( Renderer::Property::BLEND_MODE ); - DALI_TEST_EQUALS( blendModeValue.Get(), (int)BlendMode::AUTO, TEST_LOCATION ); + blendModeValue = renderer.GetCurrentProperty(Renderer::Property::BLEND_MODE); + DALI_TEST_EQUALS(blendModeValue.Get(), (int)BlendMode::AUTO, TEST_LOCATION); END_TEST; } @@ -2002,12 +2023,12 @@ int UtcDaliVisualAnimateColorVisual(void) int UtcDaliVisualAnimatePrimitiveVisual(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliAnimatePrimitiveVisual color" ); + tet_infoline("UtcDaliAnimatePrimitiveVisual color"); static std::vector customUniforms = - { - UniformData("mixColor", Property::Type::VECTOR3), - }; + { + UniformData("mixColor", Property::Type::VECTOR3), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); @@ -2015,50 +2036,44 @@ int UtcDaliVisualAnimatePrimitiveVisual(void) { VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(Visual::Property::TYPE, Visual::PRIMITIVE); propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CUBE); propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, Color::BLUE); - Visual::Base visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual(propertyMap); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); - actor.SetProperty( Actor::Property::COLOR,Color::BLACK); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + actor.SetProperty(Actor::Property::COLOR, Color::BLACK); application.GetScene().Add(actor); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); Renderer renderer = actor.GetRendererAt(0); - Property::Index index = renderer.GetPropertyIndex( PrimitiveVisual::Property::MIX_COLOR ); - tet_infoline("Test that the renderer has the Primitive mix color"); - DALI_TEST_CHECK( index != Property::INVALID_INDEX ); - - const Vector4 INITIAL_MIX_COLOR( 1.0f,0.0f,1.0f,0.5f ); // Magenta with half alpha - const Vector4 TARGET_MIX_COLOR( Color::RED ); + const Vector4 INITIAL_MIX_COLOR(1.0f, 0.0f, 1.0f, 0.5f); // Magenta with half alpha + const Vector4 TARGET_MIX_COLOR(Color::RED); Property::Map map; - map["target"] = "testVisual"; - map["property"] = "mixColor"; + map["target"] = "testVisual"; + map["property"] = "mixColor"; map["initialValue"] = INITIAL_MIX_COLOR; - map["targetValue"] = TARGET_MIX_COLOR; - map["animator"] = Property::Map() - .Add("alphaFunction", "LINEAR") - .Add("timePeriod", Property::Map() - .Add("delay", 0.0f) - .Add("duration", 4.0f)); + map["targetValue"] = TARGET_MIX_COLOR; + map["animator"] = Property::Map() + .Add("alphaFunction", "LINEAR") + .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 4.0f)); - Dali::Toolkit::TransitionData transition = TransitionData::New( map ); + Dali::Toolkit::TransitionData transition = TransitionData::New(map); - Animation animation = dummyImpl.CreateTransition( transition ); - animation.AnimateTo( Property(actor, Actor::Property::COLOR), Color::WHITE ); + Animation animation = dummyImpl.CreateTransition(transition); + animation.AnimateTo(Property(actor, Actor::Property::COLOR), Color::WHITE); animation.Play(); TestGlAbstraction& glAbstraction = application.GetGlAbstraction(); - glAbstraction.EnableEnableDisableCallTrace( true ); - TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace(); + glAbstraction.EnableEnableDisableCallTrace(true); + TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace(); std::ostringstream blendStr; blendStr << std::hex << GL_BLEND; @@ -2067,22 +2082,22 @@ int UtcDaliVisualAnimatePrimitiveVisual(void) application.Render(2000u); // halfway point application.SendNotification(); - Vector4 halfwayColor = (INITIAL_MIX_COLOR + TARGET_MIX_COLOR)*0.5; - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue("uColor", Vector4(0.5f, 0.5f, 0.5f, halfwayColor.a )), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue("mixColor", Vector3(halfwayColor) ), true, TEST_LOCATION ); + Vector4 halfwayColor = (INITIAL_MIX_COLOR + TARGET_MIX_COLOR) * 0.5; + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("uColor", Vector4(0.5f, 0.5f, 0.5f, halfwayColor.a)), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("mixColor", Vector3(halfwayColor)), true, TEST_LOCATION); - DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) ); + DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Enable", blendStr.str())); glEnableStack.Reset(); - application.Render(2001u); // go past end + application.Render(2001u); // go past end application.SendNotification(); // Trigger signals - DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), Color::WHITE, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue("uColor", Vector4( 1.0f, 1.0f, 1.0f, TARGET_MIX_COLOR.a ) ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue("mixColor", Vector3(TARGET_MIX_COLOR) ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetCurrentProperty(Actor::Property::COLOR), Color::WHITE, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("uColor", Vector4(1.0f, 1.0f, 1.0f, TARGET_MIX_COLOR.a)), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("mixColor", Vector3(TARGET_MIX_COLOR)), true, TEST_LOCATION); - DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Disable", blendStr.str() ) ); + DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Disable", blendStr.str())); actor.Unparent(); } @@ -2093,18 +2108,18 @@ int UtcDaliVisualAnimatePrimitiveVisual(void) int UtcDaliVisualAnimatedGradientVisual01(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliAnimatedGradientVisual with default" ); + tet_infoline("UtcDaliAnimatedGradientVisual with default"); static std::vector customUniforms = - { - UniformData("start_point", Property::Type::VECTOR2), - UniformData("end_point", Property::Type::VECTOR2), - UniformData("start_color", Property::Type::VECTOR4), - UniformData("end_color", Property::Type::VECTOR4), - UniformData("rotate_center", Property::Type::VECTOR2), - UniformData("rotate_angle", Property::Type::FLOAT), - UniformData("gradient_offset", Property::Type::FLOAT), - }; + { + UniformData("start_point", Property::Type::VECTOR2), + UniformData("end_point", Property::Type::VECTOR2), + UniformData("start_color", Property::Type::VECTOR4), + UniformData("end_color", Property::Type::VECTOR4), + UniformData("rotate_center", Property::Type::VECTOR2), + UniformData("rotate_angle", Property::Type::FLOAT), + UniformData("gradient_offset", Property::Type::FLOAT), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); @@ -2112,22 +2127,22 @@ int UtcDaliVisualAnimatedGradientVisual01(void) { VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT); - Visual::Base visual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT); + Visual::Base visual = factory.CreateVisual(propertyMap); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); - actor.SetProperty( Actor::Property::COLOR,Color::BLACK); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + actor.SetProperty(Actor::Property::COLOR, Color::BLACK); application.GetScene().Add(actor); application.SendNotification(); application.Render(0); application.SendNotification(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); for(int step_iter = 0; step_iter < 3; step_iter++) { @@ -2136,13 +2151,13 @@ int UtcDaliVisualAnimatedGradientVisual01(void) application.Render(750u); // step i/4 application.SendNotification(); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue( "start_point" , Vector2( -0.5f, 0.0f ) ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue( "end_point" , Vector2( 0.5f, 0.0f ) ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue( "start_color" , Vector4( 143.0f, 170.0f, 220.0f, 255.0f ) / 255.0f ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue( "end_color" , Vector4( 255.0f, 163.0f, 163.0f, 255.0f ) / 255.0f ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue( "rotate_center", Vector2( 0.0f, 0.0f ) ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue( "rotate_angle" , 0.0f ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue( "gradient_offset", 0.5f * step_iter + 0.5f ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("start_point", Vector2(-0.5f, 0.0f)), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("end_point", Vector2(0.5f, 0.0f)), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("start_color", Vector4(143.0f, 170.0f, 220.0f, 255.0f) / 255.0f), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("end_color", Vector4(255.0f, 163.0f, 163.0f, 255.0f) / 255.0f), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("rotate_center", Vector2(0.0f, 0.0f)), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("rotate_angle", 0.0f), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("gradient_offset", 0.5f * step_iter + 0.5f), true, TEST_LOCATION); } //Not check here. cause gradient_offset value can be 2.0f or 0.0f @@ -2164,71 +2179,75 @@ int UtcDaliVisualAnimatedGradientVisual01(void) int UtcDaliVisualAnimatedGradientVisual02(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliAnimatedGradientVisual with full-option" ); + tet_infoline("UtcDaliAnimatedGradientVisual with full-option"); static std::vector customUniforms = - { - UniformData("start_point", Property::Type::VECTOR2), - UniformData("end_point", Property::Type::VECTOR2), - UniformData("start_color", Property::Type::VECTOR4), - UniformData("end_color", Property::Type::VECTOR4), - UniformData("rotate_center", Property::Type::VECTOR2), - UniformData("rotate_angle", Property::Type::FLOAT), - UniformData("gradient_offset", Property::Type::FLOAT), - }; + { + UniformData("start_point", Property::Type::VECTOR2), + UniformData("end_point", Property::Type::VECTOR2), + UniformData("start_color", Property::Type::VECTOR4), + UniformData("end_color", Property::Type::VECTOR4), + UniformData("rotate_center", Property::Type::VECTOR2), + UniformData("rotate_angle", Property::Type::FLOAT), + UniformData("gradient_offset", Property::Type::FLOAT), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); { - float _delay[4] = {0.0f, -1.35f, 0.15f, -0.4f}; // fract(_delay) must NOT be 1/4, 2/4, 3/4. cause we don't know progress is 1.0f or 0.0f - int _direction[2] = {0, 1}; - int _loop_count[3] = {-1, 0, 1}; - int _motion[2] = {0, 1}; - int _easing[4] = {0, 1, 2, 3}; + float _delay[4] = {0.0f, -1.35f, 0.15f, -0.4f}; // fract(_delay) must NOT be 1/4, 2/4, 3/4. cause we don't know progress is 1.0f or 0.0f + int _direction[2] = {0, 1}; + int _loop_count[3] = {-1, 0, 1}; + int _motion[2] = {0, 1}; + int _easing[4] = {0, 1, 2, 3}; int test_case_max = 4 * 2 * 3 * 2 * 4; - int test_case = 0; - int test_case_d = 7; // 7 is the number of animated properties. + int test_case = 0; + int test_case_d = 7; // 7 is the number of animated properties. - float _duration = 0.4f; + float _duration = 0.4f; float _repeat_delay = _duration * 0.25f; // < _duration. cause real_duration = _duration - _repeat_delay; - float noise_maker = 0.0f; + float noise_maker = 0.0f; // total testing time = ceil((4*2*3*2*4) / 7) * (_duration(=0.4) * 2 + 0.01) = 22.68 seconds - for( test_case = 0; test_case < test_case_max + test_case_d; test_case += test_case_d ) + for(test_case = 0; test_case < test_case_max + test_case_d; test_case += test_case_d) { - tet_printf( "test [%d ~ %d / %d]\n" , test_case, test_case + test_case_d - 1, test_case_max); + tet_printf("test [%d ~ %d / %d]\n", test_case, test_case + test_case_d - 1, test_case_max); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; Property::Map animationMap; - propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT); + propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT); int gradient_type = DevelAnimatedGradientVisual::GradientType::LINEAR; - int unit_type = DevelAnimatedGradientVisual::UnitType::USER_SPACE; - int spread_type = DevelAnimatedGradientVisual::SpreadType::REPEAT; - - auto buildAnimatedMap = [&animationMap, &_direction, &_duration, &_delay, &_loop_count, &_repeat_delay, &_motion, &_easing, &test_case](const Property::Value &start, const Property::Value &target, int tc_offset)->Property::Map& - { - int tc = (test_case + tc_offset); - int idx_easing = tc % 4; tc /= 4; - int idx_motion = tc % 2; tc /= 2; - int idx_loop_count = tc % 3; tc /= 3; - int idx_direction = tc % 2; tc /= 2; - int idx_delay = tc % 4; tc /= 4; - - float duration = _duration - _repeat_delay; + int unit_type = DevelAnimatedGradientVisual::UnitType::USER_SPACE; + int spread_type = DevelAnimatedGradientVisual::SpreadType::REPEAT; + + auto buildAnimatedMap = [&animationMap, &_direction, &_duration, &_delay, &_loop_count, &_repeat_delay, &_motion, &_easing, &test_case](const Property::Value& start, const Property::Value& target, int tc_offset) -> Property::Map& { + int tc = (test_case + tc_offset); + int idx_easing = tc % 4; + tc /= 4; + int idx_motion = tc % 2; + tc /= 2; + int idx_loop_count = tc % 3; + tc /= 3; + int idx_direction = tc % 2; + tc /= 2; + int idx_delay = tc % 4; + tc /= 4; + + float duration = _duration - _repeat_delay; float repeat_delay = _repeat_delay; - float delay = _delay[idx_delay] * _duration; - int direction = _direction[idx_direction]; - int loop_count = _loop_count[idx_loop_count]; - int motion = _motion[idx_motion]; - int easing = _easing[idx_easing]; + float delay = _delay[idx_delay] * _duration; + int direction = _direction[idx_direction]; + int loop_count = _loop_count[idx_loop_count]; + int motion = _motion[idx_motion]; + int easing = _easing[idx_easing]; animationMap.Clear(); - animationMap.Insert( DevelAnimatedGradientVisual::AnimationParameter::Property::START, start ); - animationMap.Insert( DevelAnimatedGradientVisual::AnimationParameter::Property::TARGET, target ); - if( direction == 0 ) + animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::START, start); + animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::TARGET, target); + if(direction == 0) { animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION, DevelAnimatedGradientVisual::AnimationParameter::DirectionType::FORWARD); } @@ -2240,7 +2259,7 @@ int UtcDaliVisualAnimatedGradientVisual02(void) animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::DELAY, delay); animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT, loop_count); animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT_DELAY, repeat_delay); - if( motion == 0 ) + if(motion == 0) { animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::MOTION_TYPE, DevelAnimatedGradientVisual::AnimationParameter::MotionType::LOOP); } @@ -2248,15 +2267,15 @@ int UtcDaliVisualAnimatedGradientVisual02(void) { animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::MOTION_TYPE, DevelAnimatedGradientVisual::AnimationParameter::MotionType::MIRROR); } - if( easing == 0 ) + if(easing == 0) { animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::EASING_TYPE, DevelAnimatedGradientVisual::AnimationParameter::EasingType::LINEAR); } - else if( easing == 1 ) + else if(easing == 1) { animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::EASING_TYPE, DevelAnimatedGradientVisual::AnimationParameter::EasingType::IN); } - else if( easing == 2 ) + else if(easing == 2) { animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::EASING_TYPE, DevelAnimatedGradientVisual::AnimationParameter::EasingType::OUT); } @@ -2271,173 +2290,177 @@ int UtcDaliVisualAnimatedGradientVisual02(void) // Give different values for debuging noise_maker += 1.0f; Vector2 start1(-0.5f + noise_maker * 0.1f, 0.5f + noise_maker * 0.1f); - Vector2 end1 (0.5f + noise_maker * 0.1f, -0.5f + noise_maker * 0.1f); + Vector2 end1(0.5f + noise_maker * 0.1f, -0.5f + noise_maker * 0.1f); Vector4 start_color1(1.0f, 0.7f, 0.5f, 1.0f); - Vector4 end_color1 (0.7f, 0.5f, 1.0f, 1.0f); + Vector4 end_color1(0.7f, 0.5f, 1.0f, 1.0f); Vector2 rotate_center1(0.0f + noise_maker * 0.1f, 0.4f + noise_maker * 0.1f); - float rotate_amount1 = 0.0f + noise_maker * 0.1f; - float offset1 = 0.f + noise_maker * 0.1f; + float rotate_amount1 = 0.0f + noise_maker * 0.1f; + float offset1 = 0.f + noise_maker * 0.1f; Vector2 start2(0.2f + noise_maker * 0.1f, -0.7f + noise_maker * 0.1f); - Vector2 end2 (0.5f + noise_maker * 0.1f, 0.5f + noise_maker * 0.1f); + Vector2 end2(0.5f + noise_maker * 0.1f, 0.5f + noise_maker * 0.1f); Vector4 start_color2(0.0f, 0.1f, 0.8f, 1.0f); - Vector4 end_color2 (0.3f, 1.0f, 0.1f, 0.0f); + Vector4 end_color2(0.3f, 1.0f, 0.1f, 0.0f); Vector2 rotate_center2(0.0f + noise_maker * 0.1f, -0.4f + noise_maker * 0.1f); - float rotate_amount2 = 7.0f + noise_maker * 0.1f; - float offset2 = 2.f + noise_maker * 0.1f; + float rotate_amount2 = 7.0f + noise_maker * 0.1f; + float offset2 = 2.f + noise_maker * 0.1f; propertyMap.Insert(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, gradient_type); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE, unit_type); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, spread_type); - - propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_POSITION, buildAnimatedMap(start1 , start2 ,0)); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_POSITION, buildAnimatedMap(end1 , end2 ,1)); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_COLOR, buildAnimatedMap(start_color1 , start_color2 ,2)); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_COLOR, buildAnimatedMap(end_color1 , end_color2 ,3)); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, buildAnimatedMap(rotate_center1, rotate_center2,4)); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, buildAnimatedMap(rotate_amount1, rotate_amount2,5)); - propertyMap.Insert(DevelAnimatedGradientVisual::Property::OFFSET, buildAnimatedMap(offset1 , offset2 ,6)); - - Visual::Base visual = factory.CreateVisual( propertyMap ); - - DummyControl actor = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast( actor.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); - actor.SetProperty( Actor::Property::COLOR,Color::BLACK); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE, unit_type); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, spread_type); + + propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_POSITION, buildAnimatedMap(start1, start2, 0)); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_POSITION, buildAnimatedMap(end1, end2, 1)); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_COLOR, buildAnimatedMap(start_color1, start_color2, 2)); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_COLOR, buildAnimatedMap(end_color1, end_color2, 3)); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, buildAnimatedMap(rotate_center1, rotate_center2, 4)); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, buildAnimatedMap(rotate_amount1, rotate_amount2, 5)); + propertyMap.Insert(DevelAnimatedGradientVisual::Property::OFFSET, buildAnimatedMap(offset1, offset2, 6)); + + Visual::Base visual = factory.CreateVisual(propertyMap); + + DummyControl actor = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + actor.SetProperty(Actor::Property::COLOR, Color::BLACK); application.GetScene().Add(actor); application.SendNotification(); - application.Render( 0 ); + application.Render(0); application.SendNotification(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); application.SendNotification(); //Compare between CPU calculated value and Shader Visual calculated value - auto testProperty = [&application, &_direction, &_duration, &_delay, &_loop_count, &_repeat_delay, &_motion, &_easing, &test_case](const char* name, const Property::Value& start, const Property::Value& target, int tc_offset, int value_type, float progress)->void - { - int tc = (test_case + tc_offset); - int idx_easing = tc % 4; tc /= 4; - int idx_motion = tc % 2; tc /= 2; - int idx_loop_count = tc % 3; tc /= 3; - int idx_direction = tc % 2; tc /= 2; - int idx_delay = tc % 4; tc /= 4; - - float duration = _duration - _repeat_delay; + auto testProperty = [&application, &_direction, &_duration, &_delay, &_loop_count, &_repeat_delay, &_motion, &_easing, &test_case](const char* name, const Property::Value& start, const Property::Value& target, int tc_offset, int value_type, float progress) -> void { + int tc = (test_case + tc_offset); + int idx_easing = tc % 4; + tc /= 4; + int idx_motion = tc % 2; + tc /= 2; + int idx_loop_count = tc % 3; + tc /= 3; + int idx_direction = tc % 2; + tc /= 2; + int idx_delay = tc % 4; + tc /= 4; + + float duration = _duration - _repeat_delay; float repeat_delay = _repeat_delay; - float delay = _delay[idx_delay] * _duration; - int direction = _direction[idx_direction]; - int loop_count = _loop_count[idx_loop_count]; - int motion = _motion[idx_motion]; - int easing = _easing[idx_easing]; + float delay = _delay[idx_delay] * _duration; + int direction = _direction[idx_direction]; + int loop_count = _loop_count[idx_loop_count]; + int motion = _motion[idx_motion]; + int easing = _easing[idx_easing]; progress -= delay / _duration; Property::Value s = start; Property::Value t = target; - if( direction == 1 ) + if(direction == 1) { s = target; t = start; } float x; ///< Animator progress value - if( loop_count == 0 ) + if(loop_count == 0) { x = 1.0f; } - else if( loop_count > 0 && progress + 0.01f > loop_count ) + else if(loop_count > 0 && progress + 0.01f > loop_count) { - x = ( motion == 0 ) ? 1.0f : 0.0f; + x = (motion == 0) ? 1.0f : 0.0f; } else { - if( progress < 0.0f ) + if(progress < 0.0f) { progress = 0.0f; } - progress = fmodf( progress, 1.0f ); - progress = Dali::Clamp( (progress * (duration + repeat_delay) - repeat_delay) / duration, 0.0f, 1.0f ); + progress = fmodf(progress, 1.0f); + progress = Dali::Clamp((progress * (duration + repeat_delay) - repeat_delay) / duration, 0.0f, 1.0f); x = progress; - if( motion == 1 ) + if(motion == 1) { x = progress * 2.0f; - if( x > 1.0f ) + if(x > 1.0f) { x = 2.0f - x; } } - if( easing == 1 ) // EASE_IN + if(easing == 1) // EASE_IN { - x = x*x; + x = x * x; } - else if( easing == 2 ) // EASE_OUT + else if(easing == 2) // EASE_OUT { - x = 2.0f*x - x*x; + x = 2.0f * x - x * x; } - else if( easing == 3 ) // EASE_IN_OUT + else if(easing == 3) // EASE_IN_OUT { x = x * x * (3.0f - 2.0f * x); } } - if( value_type == 0 ) // result type is Float + if(value_type == 0) // result type is Float { float res; float cur; res = s.Get() * (1.0f - x) + t.Get() * (x); - DALI_TEST_EQUALS( application.GetGlAbstraction().GetUniformValue(name, cur), true, TEST_LOCATION ); - DALI_TEST_EQUALS( res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().GetUniformValue(name, cur), true, TEST_LOCATION); + DALI_TEST_EQUALS(res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION); } - else if( value_type == 1 ) // result type is Vector2 + else if(value_type == 1) // result type is Vector2 { Vector2 res; Vector2 cur; res = s.Get() * (1.0f - x) + t.Get() * (x); - DALI_TEST_EQUALS( application.GetGlAbstraction().GetUniformValue(name, cur), true, TEST_LOCATION ); - DALI_TEST_EQUALS( res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().GetUniformValue(name, cur), true, TEST_LOCATION); + DALI_TEST_EQUALS(res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION); } - else if( value_type == 2 ) // result type is Vector3 + else if(value_type == 2) // result type is Vector3 { Vector3 res; Vector3 cur; res = s.Get() * (1.0f - x) + t.Get() * (x); - DALI_TEST_EQUALS( application.GetGlAbstraction().GetUniformValue(name, cur), true, TEST_LOCATION ); - DALI_TEST_EQUALS( res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().GetUniformValue(name, cur), true, TEST_LOCATION); + DALI_TEST_EQUALS(res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION); } else // result type is Vector4 { Vector4 res; Vector4 cur; res = s.Get() * (1.0f - x) + t.Get() * (x); - DALI_TEST_EQUALS( application.GetGlAbstraction().GetUniformValue(name, cur), true, TEST_LOCATION ); - DALI_TEST_EQUALS( res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().GetUniformValue(name, cur), true, TEST_LOCATION); + DALI_TEST_EQUALS(res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION); } }; float step = 0.0f; - for( int iter = 0; iter < 2; iter++ ) // test 2*duration seconds + for(int iter = 0; iter < 2; iter++) // test 2*duration seconds { - for( int step_iter = 0; step_iter < 3; step_iter++ ) + for(int step_iter = 0; step_iter < 3; step_iter++) { application.SendNotification(); - application.Render( _duration * 250.f ); // step i/4 + application.Render(_duration * 250.f); // step i/4 application.SendNotification(); step += 0.25f; - testProperty( "start_point" , Property::Value( start1 ) , Property::Value( start2 ) , 0, 1, step ); - testProperty( "end_point" , Property::Value( end1 ) , Property::Value( end2 ) , 1, 1, step ); - testProperty( "start_color" , Property::Value( start_color1 ) , Property::Value( start_color2 ) , 2, 3, step ); - testProperty( "end_color" , Property::Value( end_color1 ) , Property::Value( end_color2 ) , 3, 3, step ); - testProperty( "rotate_center" , Property::Value( rotate_center1 ), Property::Value( rotate_center2 ), 4, 1, step ); - testProperty( "rotate_angle" , Property::Value( rotate_amount1 ), Property::Value( rotate_amount2 ), 5, 0, step ); - testProperty( "gradient_offset", Property::Value( offset1 ) , Property::Value( offset2 ) , 6, 0, step ); + testProperty("start_point", Property::Value(start1), Property::Value(start2), 0, 1, step); + testProperty("end_point", Property::Value(end1), Property::Value(end2), 1, 1, step); + testProperty("start_color", Property::Value(start_color1), Property::Value(start_color2), 2, 3, step); + testProperty("end_color", Property::Value(end_color1), Property::Value(end_color2), 3, 3, step); + testProperty("rotate_center", Property::Value(rotate_center1), Property::Value(rotate_center2), 4, 1, step); + testProperty("rotate_angle", Property::Value(rotate_amount1), Property::Value(rotate_amount2), 5, 0, step); + testProperty("gradient_offset", Property::Value(offset1), Property::Value(offset2), 6, 0, step); } application.SendNotification(); - application.Render(_duration * 250.f); // step 4/4 will not test + application.Render(_duration * 250.f); // step 4/4 will not test application.SendNotification(); step += 0.25f; } @@ -2445,7 +2468,7 @@ int UtcDaliVisualAnimatedGradientVisual02(void) application.SendNotification(); actor.Unparent(); application.SendNotification(); - application.Render(10.f); // tempral time + application.Render(10.f); // tempral time application.SendNotification(); } } @@ -2456,67 +2479,71 @@ int UtcDaliVisualAnimatedGradientVisual02(void) int UtcDaliVisualAnimatedGradientVisual03(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliAnimatedGradientVisual with full-option use string key" ); + tet_infoline("UtcDaliAnimatedGradientVisual with full-option use string key"); static std::vector customUniforms = - { - UniformData("start_point", Property::Type::VECTOR2), - UniformData("end_point", Property::Type::VECTOR2), - UniformData("start_color", Property::Type::VECTOR4), - UniformData("end_color", Property::Type::VECTOR4), - UniformData("rotate_center", Property::Type::VECTOR2), - UniformData("rotate_angle", Property::Type::FLOAT), - UniformData("gradient_offset", Property::Type::FLOAT), - }; + { + UniformData("start_point", Property::Type::VECTOR2), + UniformData("end_point", Property::Type::VECTOR2), + UniformData("start_color", Property::Type::VECTOR4), + UniformData("end_color", Property::Type::VECTOR4), + UniformData("rotate_center", Property::Type::VECTOR2), + UniformData("rotate_angle", Property::Type::FLOAT), + UniformData("gradient_offset", Property::Type::FLOAT), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); { - float _delay[4] = {0.0f, -1.35f, 0.15f, -0.4f}; // fract(_delay) must NOT be 1/4, 2/4, 3/4. cause we don't know progress is 1.0f or 0.0f - int _direction[2] = {0, 1}; - int _loop_count[3] = {-1, 0, 1}; - int _motion[2] = {0, 1}; - int _easing[4] = {0, 1, 2, 3}; + float _delay[4] = {0.0f, -1.35f, 0.15f, -0.4f}; // fract(_delay) must NOT be 1/4, 2/4, 3/4. cause we don't know progress is 1.0f or 0.0f + int _direction[2] = {0, 1}; + int _loop_count[3] = {-1, 0, 1}; + int _motion[2] = {0, 1}; + int _easing[4] = {0, 1, 2, 3}; int test_case_max = 4 * 2 * 3 * 2 * 4; - int test_case = 0; - int test_case_d = 7; // 7 is the number of animated properties. + int test_case = 0; + int test_case_d = 7; // 7 is the number of animated properties. - float _duration = 0.4f; + float _duration = 0.4f; float _repeat_delay = _duration * 0.25f; // < _duration. cause real_duration = _duration - _repeat_delay; - float noise_maker = 0.2f; + float noise_maker = 0.2f; // total testing time = ceil((4*2*3*2*4) / 7) * (_duration(=0.4) * 2 + 0.01) = 22.68 seconds - for( test_case = 0; test_case < test_case_max + test_case_d; test_case += test_case_d ) + for(test_case = 0; test_case < test_case_max + test_case_d; test_case += test_case_d) { - tet_printf( "test [%d ~ %d / %d]\n" , test_case, test_case + test_case_d - 1, test_case_max); + tet_printf("test [%d ~ %d / %d]\n", test_case, test_case + test_case_d - 1, test_case_max); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; Property::Map animationMap; - propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT); - - auto buildAnimatedMap = [&animationMap, &_direction, &_duration, &_delay, &_loop_count, &_repeat_delay, &_motion, &_easing, &test_case](const Property::Value &start, const Property::Value &target, int tc_offset)->Property::Map& - { - int tc = (test_case + tc_offset); - int idx_easing = tc % 4; tc /= 4; - int idx_motion = tc % 2; tc /= 2; - int idx_loop_count = tc % 3; tc /= 3; - int idx_direction = tc % 2; tc /= 2; - int idx_delay = tc % 4; tc /= 4; - - float duration = _duration - _repeat_delay; + propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT); + + auto buildAnimatedMap = [&animationMap, &_direction, &_duration, &_delay, &_loop_count, &_repeat_delay, &_motion, &_easing, &test_case](const Property::Value& start, const Property::Value& target, int tc_offset) -> Property::Map& { + int tc = (test_case + tc_offset); + int idx_easing = tc % 4; + tc /= 4; + int idx_motion = tc % 2; + tc /= 2; + int idx_loop_count = tc % 3; + tc /= 3; + int idx_direction = tc % 2; + tc /= 2; + int idx_delay = tc % 4; + tc /= 4; + + float duration = _duration - _repeat_delay; float repeat_delay = _repeat_delay; - float delay = _delay[idx_delay] * _duration; - int direction = _direction[idx_direction]; - int loop_count = _loop_count[idx_loop_count]; - int motion = _motion[idx_motion]; - int easing = _easing[idx_easing]; + float delay = _delay[idx_delay] * _duration; + int direction = _direction[idx_direction]; + int loop_count = _loop_count[idx_loop_count]; + int motion = _motion[idx_motion]; + int easing = _easing[idx_easing]; animationMap.Clear(); - animationMap.Insert( "startValue", start ); - animationMap.Insert( "targetValue", target ); - if( direction == 0 ) + animationMap.Insert("startValue", start); + animationMap.Insert("targetValue", target); + if(direction == 0) { animationMap.Insert("directionType", "FORWARD"); } @@ -2528,7 +2555,7 @@ int UtcDaliVisualAnimatedGradientVisual03(void) animationMap.Insert("delay", delay); animationMap.Insert("repeat", loop_count); animationMap.Insert("repeatDelay", repeat_delay); - if( motion == 0 ) + if(motion == 0) { animationMap.Insert("motionType", "LOOP"); } @@ -2536,15 +2563,15 @@ int UtcDaliVisualAnimatedGradientVisual03(void) { animationMap.Insert("motionType", "MIRROR"); } - if( easing == 0 ) + if(easing == 0) { animationMap.Insert("easingType", "LINEAR"); } - else if( easing == 1 ) + else if(easing == 1) { animationMap.Insert("easingType", "IN"); } - else if( easing == 2 ) + else if(easing == 2) { animationMap.Insert("easingType", "OUT"); } @@ -2559,173 +2586,177 @@ int UtcDaliVisualAnimatedGradientVisual03(void) // Give different values for debuging noise_maker += 0.8f; Vector2 start1(-0.5f + noise_maker * 0.1f, 0.5f + noise_maker * 0.1f); - Vector2 end1 (0.5f + noise_maker * 0.1f, -0.5f + noise_maker * 0.1f); + Vector2 end1(0.5f + noise_maker * 0.1f, -0.5f + noise_maker * 0.1f); Vector4 start_color1(1.0f, 0.7f, 0.5f, 1.0f); - Vector4 end_color1 (0.7f, 0.5f, 1.0f, 1.0f); + Vector4 end_color1(0.7f, 0.5f, 1.0f, 1.0f); Vector2 rotate_center1(0.0f + noise_maker * 0.1f, 0.4f + noise_maker * 0.1f); - float rotate_amount1 = 0.0f + noise_maker * 0.1f; - float offset1 = 0.f + noise_maker * 0.1f; + float rotate_amount1 = 0.0f + noise_maker * 0.1f; + float offset1 = 0.f + noise_maker * 0.1f; Vector2 start2(0.2f + noise_maker * 0.1f, -0.7f + noise_maker * 0.1f); - Vector2 end2 (0.5f + noise_maker * 0.1f, 0.5f + noise_maker * 0.1f); + Vector2 end2(0.5f + noise_maker * 0.1f, 0.5f + noise_maker * 0.1f); Vector4 start_color2(0.0f, 0.1f, 0.8f, 1.0f); - Vector4 end_color2 (0.3f, 1.0f, 0.1f, 0.0f); + Vector4 end_color2(0.3f, 1.0f, 0.1f, 0.0f); Vector2 rotate_center2(0.0f + noise_maker * 0.1f, -0.4f + noise_maker * 0.1f); - float rotate_amount2 = 7.0f + noise_maker * 0.1f; - float offset2 = 2.f + noise_maker * 0.1f; + float rotate_amount2 = 7.0f + noise_maker * 0.1f; + float offset2 = 2.f + noise_maker * 0.1f; propertyMap.Insert("gradientType", "LINEAR"); - propertyMap.Insert("unitType", "USER_SPACE"); - propertyMap.Insert("spreadType", "CLAMP"); - - propertyMap.Insert("startPosition", buildAnimatedMap(start1 , start2 ,0)); - propertyMap.Insert("endPosition", buildAnimatedMap(end1 , end2 ,1)); - propertyMap.Insert("startColor", buildAnimatedMap(start_color1 , start_color2 ,2)); - propertyMap.Insert("endColor", buildAnimatedMap(end_color1 , end_color2 ,3)); - propertyMap.Insert("rotateCenter", buildAnimatedMap(rotate_center1, rotate_center2,4)); - propertyMap.Insert("rotateAmount", buildAnimatedMap(rotate_amount1, rotate_amount2,5)); - propertyMap.Insert("offset", buildAnimatedMap(offset1 , offset2 ,6)); - - Visual::Base visual = factory.CreateVisual( propertyMap ); - - DummyControl actor = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast( actor.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); - actor.SetProperty( Actor::Property::COLOR,Color::BLACK); + propertyMap.Insert("unitType", "USER_SPACE"); + propertyMap.Insert("spreadType", "CLAMP"); + + propertyMap.Insert("startPosition", buildAnimatedMap(start1, start2, 0)); + propertyMap.Insert("endPosition", buildAnimatedMap(end1, end2, 1)); + propertyMap.Insert("startColor", buildAnimatedMap(start_color1, start_color2, 2)); + propertyMap.Insert("endColor", buildAnimatedMap(end_color1, end_color2, 3)); + propertyMap.Insert("rotateCenter", buildAnimatedMap(rotate_center1, rotate_center2, 4)); + propertyMap.Insert("rotateAmount", buildAnimatedMap(rotate_amount1, rotate_amount2, 5)); + propertyMap.Insert("offset", buildAnimatedMap(offset1, offset2, 6)); + + Visual::Base visual = factory.CreateVisual(propertyMap); + + DummyControl actor = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + actor.SetProperty(Actor::Property::COLOR, Color::BLACK); application.GetScene().Add(actor); application.SendNotification(); - application.Render( 0 ); + application.Render(0); application.SendNotification(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); application.SendNotification(); //Compare between CPU calculated value and Shader Visual calculated value - auto testProperty = [&application, &_direction, &_duration, &_delay, &_loop_count, &_repeat_delay, &_motion, &_easing, &test_case](const char* name, const Property::Value& start, const Property::Value& target, int tc_offset, int value_type, float progress)->void - { - int tc = (test_case + tc_offset); - int idx_easing = tc % 4; tc /= 4; - int idx_motion = tc % 2; tc /= 2; - int idx_loop_count = tc % 3; tc /= 3; - int idx_direction = tc % 2; tc /= 2; - int idx_delay = tc % 4; tc /= 4; - - float duration = _duration - _repeat_delay; + auto testProperty = [&application, &_direction, &_duration, &_delay, &_loop_count, &_repeat_delay, &_motion, &_easing, &test_case](const char* name, const Property::Value& start, const Property::Value& target, int tc_offset, int value_type, float progress) -> void { + int tc = (test_case + tc_offset); + int idx_easing = tc % 4; + tc /= 4; + int idx_motion = tc % 2; + tc /= 2; + int idx_loop_count = tc % 3; + tc /= 3; + int idx_direction = tc % 2; + tc /= 2; + int idx_delay = tc % 4; + tc /= 4; + + float duration = _duration - _repeat_delay; float repeat_delay = _repeat_delay; - float delay = _delay[idx_delay] * _duration; - int direction = _direction[idx_direction]; - int loop_count = _loop_count[idx_loop_count]; - int motion = _motion[idx_motion]; - int easing = _easing[idx_easing]; + float delay = _delay[idx_delay] * _duration; + int direction = _direction[idx_direction]; + int loop_count = _loop_count[idx_loop_count]; + int motion = _motion[idx_motion]; + int easing = _easing[idx_easing]; progress -= delay / _duration; Property::Value s = start; Property::Value t = target; - if( direction == 1 ) + if(direction == 1) { s = target; t = start; } float x; ///< Animator progress value - if( loop_count == 0 ) + if(loop_count == 0) { x = 1.0f; } - else if( loop_count > 0 && progress + 0.01f > loop_count ) + else if(loop_count > 0 && progress + 0.01f > loop_count) { - x = ( motion == 0 ) ? 1.0f : 0.0f; + x = (motion == 0) ? 1.0f : 0.0f; } else { - if( progress < 0.0f ) + if(progress < 0.0f) { progress = 0.0f; } - progress = fmodf( progress, 1.0f ); - progress = Dali::Clamp( (progress * (duration + repeat_delay) - repeat_delay) / duration, 0.0f, 1.0f ); + progress = fmodf(progress, 1.0f); + progress = Dali::Clamp((progress * (duration + repeat_delay) - repeat_delay) / duration, 0.0f, 1.0f); x = progress; - if( motion == 1 ) + if(motion == 1) { x = progress * 2.0f; - if( x > 1.0f ) + if(x > 1.0f) { x = 2.0f - x; } } - if( easing == 1 ) // EASE_IN + if(easing == 1) // EASE_IN { - x = x*x; + x = x * x; } - else if( easing == 2 ) // EASE_OUT + else if(easing == 2) // EASE_OUT { - x = 2.0f*x - x*x; + x = 2.0f * x - x * x; } - else if( easing == 3 ) // EASE_IN_OUT + else if(easing == 3) // EASE_IN_OUT { x = x * x * (3.0f - 2.0f * x); } } - if( value_type == 0 ) // result type is Float + if(value_type == 0) // result type is Float { float res; float cur; res = s.Get() * (1.0f - x) + t.Get() * (x); - DALI_TEST_EQUALS( application.GetGlAbstraction().GetUniformValue(name, cur), true, TEST_LOCATION ); - DALI_TEST_EQUALS( res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().GetUniformValue(name, cur), true, TEST_LOCATION); + DALI_TEST_EQUALS(res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION); } - else if( value_type == 1 ) // result type is Vector2 + else if(value_type == 1) // result type is Vector2 { Vector2 res; Vector2 cur; res = s.Get() * (1.0f - x) + t.Get() * (x); - DALI_TEST_EQUALS( application.GetGlAbstraction().GetUniformValue(name, cur), true, TEST_LOCATION ); - DALI_TEST_EQUALS( res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().GetUniformValue(name, cur), true, TEST_LOCATION); + DALI_TEST_EQUALS(res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION); } - else if( value_type == 2 ) // result type is Vector3 + else if(value_type == 2) // result type is Vector3 { Vector3 res; Vector3 cur; res = s.Get() * (1.0f - x) + t.Get() * (x); - DALI_TEST_EQUALS( application.GetGlAbstraction().GetUniformValue(name, cur), true, TEST_LOCATION ); - DALI_TEST_EQUALS( res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().GetUniformValue(name, cur), true, TEST_LOCATION); + DALI_TEST_EQUALS(res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION); } else // result type is Vector4 { Vector4 res; Vector4 cur; res = s.Get() * (1.0f - x) + t.Get() * (x); - DALI_TEST_EQUALS( application.GetGlAbstraction().GetUniformValue(name, cur), true, TEST_LOCATION ); - DALI_TEST_EQUALS( res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().GetUniformValue(name, cur), true, TEST_LOCATION); + DALI_TEST_EQUALS(res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION); } }; float step = 0.0f; - for( int iter = 0; iter < 2; iter++ ) // test 2*duration seconds + for(int iter = 0; iter < 2; iter++) // test 2*duration seconds { - for( int step_iter = 0; step_iter < 3; step_iter++ ) + for(int step_iter = 0; step_iter < 3; step_iter++) { application.SendNotification(); - application.Render( _duration * 250.f ); // step i/4 + application.Render(_duration * 250.f); // step i/4 application.SendNotification(); step += 0.25f; - testProperty( "start_point" , Property::Value( start1 ) , Property::Value( start2 ) , 0, 1, step ); - testProperty( "end_point" , Property::Value( end1 ) , Property::Value( end2 ) , 1, 1, step ); - testProperty( "start_color" , Property::Value( start_color1 ) , Property::Value( start_color2 ) , 2, 3, step ); - testProperty( "end_color" , Property::Value( end_color1 ) , Property::Value( end_color2 ) , 3, 3, step ); - testProperty( "rotate_center" , Property::Value( rotate_center1 ), Property::Value( rotate_center2 ), 4, 1, step ); - testProperty( "rotate_angle" , Property::Value( rotate_amount1 ), Property::Value( rotate_amount2 ), 5, 0, step ); - testProperty( "gradient_offset", Property::Value( offset1 ) , Property::Value( offset2 ) , 6, 0, step ); + testProperty("start_point", Property::Value(start1), Property::Value(start2), 0, 1, step); + testProperty("end_point", Property::Value(end1), Property::Value(end2), 1, 1, step); + testProperty("start_color", Property::Value(start_color1), Property::Value(start_color2), 2, 3, step); + testProperty("end_color", Property::Value(end_color1), Property::Value(end_color2), 3, 3, step); + testProperty("rotate_center", Property::Value(rotate_center1), Property::Value(rotate_center2), 4, 1, step); + testProperty("rotate_angle", Property::Value(rotate_amount1), Property::Value(rotate_amount2), 5, 0, step); + testProperty("gradient_offset", Property::Value(offset1), Property::Value(offset2), 6, 0, step); } application.SendNotification(); - application.Render(_duration * 250.f); // step 4/4 will not test + application.Render(_duration * 250.f); // step 4/4 will not test application.SendNotification(); step += 0.25f; } @@ -2733,7 +2764,7 @@ int UtcDaliVisualAnimatedGradientVisual03(void) application.SendNotification(); actor.Unparent(); application.SendNotification(); - application.Render(10.f); // tempral time + application.Render(10.f); // tempral time application.SendNotification(); } } @@ -2747,20 +2778,20 @@ int UtcDaliVisualWireframeVisual(void) VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::WIREFRAME ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::WIREFRAME); // Create the visual. - Visual::Base visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual(propertyMap); - DALI_TEST_CHECK( visual ); + DALI_TEST_CHECK(visual); Property::Map resultMap; - visual.CreatePropertyMap( resultMap ); + visual.CreatePropertyMap(resultMap); // Check the property values from the returned map from visual - Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == Visual::WIREFRAME ); + Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == Visual::WIREFRAME); END_TEST; } @@ -2768,204 +2799,191 @@ int UtcDaliVisualWireframeVisual(void) int UtcDaliVisualGetTransform(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetTransform: ColorVisual" ); + tet_infoline("UtcDaliVisualGetTransform: ColorVisual"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); - propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); - Visual::Base colorVisual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); + Visual::Base colorVisual = factory.CreateVisual(propertyMap); Dali::Property::Map visualMap; - colorVisual.CreatePropertyMap( visualMap ); - Property::Value* value = visualMap.Find( Dali::Toolkit::Visual::Property::TRANSFORM ); - Dali::Property::Map* map = value->GetMap(); - DALI_TEST_CHECK( map ); + colorVisual.CreatePropertyMap(visualMap); + Property::Value* value = visualMap.Find(Dali::Toolkit::Visual::Property::TRANSFORM); + Dali::Property::Map* map = value->GetMap(); + DALI_TEST_CHECK(map); //Test default values { - Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_CHECK( typeValue->Get() == Vector2(0.0f,0.0f) ); + Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::OFFSET); + DALI_TEST_CHECK(typeValue); + DALI_TEST_CHECK(typeValue->Get() == Vector2(0.0f, 0.0f)); } { - Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_CHECK( typeValue->Get() == Vector2(1.0f,1.0f) ); + Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(typeValue); + DALI_TEST_CHECK(typeValue->Get() == Vector2(1.0f, 1.0f)); } { - Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::OFFSET_POLICY ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_CHECK( typeValue->Get< Vector2 >() == Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) ); + Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::OFFSET_POLICY); + DALI_TEST_CHECK(typeValue); + DALI_TEST_CHECK(typeValue->Get() == Vector2(Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE)); } { - Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_CHECK( typeValue->Get< Vector2 >() == Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) ); + Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(typeValue); + DALI_TEST_CHECK(typeValue->Get() == Vector2(Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE)); } { - Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::ORIGIN ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_CHECK( (Toolkit::Align::Type)typeValue->Get() == Toolkit::Align::TOP_BEGIN ); + Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::ORIGIN); + DALI_TEST_CHECK(typeValue); + DALI_TEST_CHECK((Toolkit::Align::Type)typeValue->Get() == Toolkit::Align::TOP_BEGIN); } { - Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::ANCHOR_POINT ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_CHECK( (Toolkit::Align::Type)typeValue->Get() == Toolkit::Align::TOP_BEGIN ); + Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::ANCHOR_POINT); + DALI_TEST_CHECK(typeValue); + DALI_TEST_CHECK((Toolkit::Align::Type)typeValue->Get() == Toolkit::Align::TOP_BEGIN); } { - Property::Value* typeValue = map->Find( Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_CHECK( typeValue->Get() == Vector2(0.0f,0.0f) ); + Property::Value* typeValue = map->Find(Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE); + DALI_TEST_CHECK(typeValue); + DALI_TEST_CHECK(typeValue->Get() == Vector2(0.0f, 0.0f)); } END_TEST; } -static void TestTransform( ToolkitTestApplication& application, Visual::Base visual ) +static void TestTransform(ToolkitTestApplication& application, Visual::Base visual) { Property::Map transform; - transform.Insert( Visual::Transform::Property::OFFSET, Vector2(10.0f, 10.0f) ); - transform.Insert( Visual::Transform::Property::SIZE, Vector2(0.2f, 0.2f) ); - transform.Insert( Visual::Transform::Property::OFFSET_POLICY, Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) ); - transform.Insert( Visual::Transform::Property::ORIGIN, "CENTER" ); - transform.Insert( Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::BOTTOM_END ); - transform.Insert( DevelVisual::Transform::Property::EXTRA_SIZE, Vector2(50.0f, 50.0f) ); + transform.Insert(Visual::Transform::Property::OFFSET, Vector2(10.0f, 10.0f)); + transform.Insert(Visual::Transform::Property::SIZE, Vector2(0.2f, 0.2f)); + transform.Insert(Visual::Transform::Property::OFFSET_POLICY, Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE)); + transform.Insert(Visual::Transform::Property::ORIGIN, "CENTER"); + transform.Insert(Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::BOTTOM_END); + transform.Insert(DevelVisual::Transform::Property::EXTRA_SIZE, Vector2(50.0f, 50.0f)); - visual.SetTransformAndSize( transform, Vector2(100, 100) ); + visual.SetTransformAndSize(transform, Vector2(100, 100)); Dali::Property::Map visualMap; - visual.CreatePropertyMap( visualMap ); - Property::Value* value = visualMap.Find( Dali::Toolkit::Visual::Property::TRANSFORM ); - Dali::Property::Map* map = value->GetMap(); - DALI_TEST_CHECK( map ); + visual.CreatePropertyMap(visualMap); + Property::Value* value = visualMap.Find(Dali::Toolkit::Visual::Property::TRANSFORM); + Dali::Property::Map* map = value->GetMap(); + DALI_TEST_CHECK(map); { - Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_EQUALS( typeValue->Get(),Vector2(10.0f,10.0f), TEST_LOCATION ); + Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::OFFSET); + DALI_TEST_CHECK(typeValue); + DALI_TEST_EQUALS(typeValue->Get(), Vector2(10.0f, 10.0f), TEST_LOCATION); } { - Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_EQUALS( typeValue->Get(), Vector2(0.2f,0.2f), TEST_LOCATION ); + Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(typeValue); + DALI_TEST_EQUALS(typeValue->Get(), Vector2(0.2f, 0.2f), TEST_LOCATION); } { - Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::OFFSET_POLICY ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_EQUALS( typeValue->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::OFFSET_POLICY); + DALI_TEST_CHECK(typeValue); + DALI_TEST_EQUALS(typeValue->Get(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION); } { - Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_EQUALS( typeValue->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ), TEST_LOCATION ); + Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(typeValue); + DALI_TEST_EQUALS(typeValue->Get(), Vector2(Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE), TEST_LOCATION); } { - Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::ORIGIN ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_EQUALS( (Toolkit::Align::Type)typeValue->Get(), Toolkit::Align::CENTER, TEST_LOCATION ); + Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::ORIGIN); + DALI_TEST_CHECK(typeValue); + DALI_TEST_EQUALS((Toolkit::Align::Type)typeValue->Get(), Toolkit::Align::CENTER, TEST_LOCATION); } { - Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::ANCHOR_POINT ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_EQUALS( (Toolkit::Align::Type)typeValue->Get(), Toolkit::Align::BOTTOM_END, TEST_LOCATION ); + Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::ANCHOR_POINT); + DALI_TEST_CHECK(typeValue); + DALI_TEST_EQUALS((Toolkit::Align::Type)typeValue->Get(), Toolkit::Align::BOTTOM_END, TEST_LOCATION); } { - Property::Value* typeValue = map->Find( Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_EQUALS( typeValue->Get(),Vector2(50.0f,50.0f), TEST_LOCATION ); + Property::Value* typeValue = map->Find(Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE); + DALI_TEST_CHECK(typeValue); + DALI_TEST_EQUALS(typeValue->Get(), Vector2(50.0f, 50.0f), TEST_LOCATION); } //Put the visual on the stage - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); application.GetScene().Add(actor); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - dummyImpl.SetLayout( DummyControl::Property::TEST_VISUAL, transform ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + dummyImpl.SetLayout(DummyControl::Property::TEST_VISUAL, transform); application.SendNotification(); application.Render(0); - Renderer renderer( actor.GetRendererAt(0) ); - - //Check that the properties have been registered on the Renderer - Property::Index index = renderer.GetPropertyIndex( "offset" ); - DALI_TEST_CHECK( index != Property::INVALID_INDEX ); - Vector2 offset = renderer.GetProperty( index ); - DALI_TEST_EQUALS( offset, Vector2(10.0f,10.0f), TEST_LOCATION ); - - index = renderer.GetPropertyIndex( "size" ); - DALI_TEST_CHECK( index != Property::INVALID_INDEX ); - Vector2 size = renderer.GetProperty( index ); - DALI_TEST_EQUALS( size, Vector2(0.2f,0.2f), TEST_LOCATION ); - - index = renderer.GetPropertyIndex( "offsetSizeMode" ); - DALI_TEST_CHECK( index != Property::INVALID_INDEX ); - Vector4 offsetSizeMode = renderer.GetProperty( index ); - DALI_TEST_EQUALS( offsetSizeMode, Vector4(1.0f,1.0f,0.0f,0.0f), TEST_LOCATION ); - - index = renderer.GetPropertyIndex( "origin" ); - DALI_TEST_CHECK( index != Property::INVALID_INDEX ); - Vector2 parentOrigin = renderer.GetProperty( index ); - DALI_TEST_EQUALS( parentOrigin, Vector2(0.0f,0.0f), TEST_LOCATION ); - - index = renderer.GetPropertyIndex( "anchorPoint" ); - DALI_TEST_CHECK( index != Property::INVALID_INDEX ); - Vector2 anchorPoint = renderer.GetProperty( index ); - DALI_TEST_EQUALS( anchorPoint, Vector2(-0.5f,-0.5f), TEST_LOCATION ); - - index = renderer.GetPropertyIndex( "extraSize" ); - DALI_TEST_CHECK( index != Property::INVALID_INDEX ); - Vector2 extraSize = renderer.GetProperty( index ); - DALI_TEST_EQUALS( extraSize, Vector2(50.0f,50.0f), TEST_LOCATION ); + Renderer renderer(actor.GetRendererAt(0)); + + Vector2 offset = renderer.GetProperty(VisualRenderer::Property::TRANSFORM_OFFSET); + DALI_TEST_EQUALS(offset, Vector2(10.0f, 10.0f), TEST_LOCATION); + + Vector2 size = renderer.GetProperty(VisualRenderer::Property::TRANSFORM_SIZE); + DALI_TEST_EQUALS(size, Vector2(0.2f, 0.2f), TEST_LOCATION); + + Vector4 offsetSizeMode = renderer.GetProperty(VisualRenderer::Property::TRANSFORM_OFFSET_SIZE_MODE); + DALI_TEST_EQUALS(offsetSizeMode, Vector4(1.0f, 1.0f, 0.0f, 0.0f), TEST_LOCATION); + + Vector2 parentOrigin = renderer.GetProperty(VisualRenderer::Property::TRANSFORM_ORIGIN); + DALI_TEST_EQUALS(parentOrigin, Vector2(0.0f, 0.0f), TEST_LOCATION); + + Vector2 anchorPoint = renderer.GetProperty(VisualRenderer::Property::TRANSFORM_ANCHOR_POINT); + DALI_TEST_EQUALS(anchorPoint, Vector2(-0.5f, -0.5f), TEST_LOCATION); + + Vector2 extraSize = renderer.GetProperty(VisualRenderer::Property::EXTRA_SIZE); + DALI_TEST_EQUALS(extraSize, Vector2(50.0f, 50.0f), TEST_LOCATION); //Set a new transform transform.Clear(); transform = DefaultTransform(); - transform.Insert( Visual::Transform::Property::OFFSET, Vector2(20.0f, 20.0f) ); - transform.Insert( Visual::Transform::Property::SIZE, Vector2(100.0f, 100.0f) ); - transform.Insert( Visual::Transform::Property::SIZE_POLICY, Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) ); - transform.Insert( DevelVisual::Transform::Property::EXTRA_SIZE, Vector2(0.5f, 0.5f) ); - visual.SetTransformAndSize( transform, Vector2(100, 100) ); + transform.Insert(Visual::Transform::Property::OFFSET, Vector2(20.0f, 20.0f)); + transform.Insert(Visual::Transform::Property::SIZE, Vector2(100.0f, 100.0f)); + transform.Insert(Visual::Transform::Property::SIZE_POLICY, Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE)); + transform.Insert(DevelVisual::Transform::Property::EXTRA_SIZE, Vector2(0.5f, 0.5f)); + visual.SetTransformAndSize(transform, Vector2(100, 100)); application.SendNotification(); application.Render(0); //Check that the values have changed in the renderer - offset = renderer.GetProperty( renderer.GetPropertyIndex( "offset" ) ); - DALI_TEST_EQUALS( offset, Vector2(20.0f,20.0f), TEST_LOCATION ); + offset = renderer.GetProperty(VisualRenderer::Property::TRANSFORM_OFFSET); + DALI_TEST_EQUALS(offset, Vector2(20.0f, 20.0f), TEST_LOCATION); - size = renderer.GetProperty( renderer.GetPropertyIndex( "size" ) ); - DALI_TEST_EQUALS( size, Vector2(100.0f,100.0f), TEST_LOCATION ); + size = renderer.GetProperty(VisualRenderer::Property::TRANSFORM_SIZE); + DALI_TEST_EQUALS(size, Vector2(100.0f, 100.0f), TEST_LOCATION); - offsetSizeMode = renderer.GetProperty( renderer.GetPropertyIndex( "offsetSizeMode" ) ); - DALI_TEST_EQUALS( offsetSizeMode, Vector4(0.0f,0.0f,1.0f,1.0f), TEST_LOCATION ); + offsetSizeMode = renderer.GetProperty(VisualRenderer::Property::TRANSFORM_OFFSET_SIZE_MODE); + DALI_TEST_EQUALS(offsetSizeMode, Vector4(0.0f, 0.0f, 1.0f, 1.0f), TEST_LOCATION); //Parent origin and anchor point should have the default values - parentOrigin = renderer.GetProperty( renderer.GetPropertyIndex( "origin" ) ); - DALI_TEST_EQUALS( parentOrigin, Vector2(-0.5f,-0.5f), TEST_LOCATION ); + parentOrigin = renderer.GetProperty(VisualRenderer::Property::TRANSFORM_ORIGIN); + DALI_TEST_EQUALS(parentOrigin, Vector2(-0.5f, -0.5f), TEST_LOCATION); - anchorPoint = renderer.GetProperty( renderer.GetPropertyIndex( "anchorPoint" ) ); - DALI_TEST_EQUALS( anchorPoint, Vector2(0.5f,0.5f), TEST_LOCATION ); + anchorPoint = renderer.GetProperty(VisualRenderer::Property::TRANSFORM_ANCHOR_POINT); + DALI_TEST_EQUALS(anchorPoint, Vector2(0.5f, 0.5f), TEST_LOCATION); - extraSize = renderer.GetProperty( renderer.GetPropertyIndex( "extraSize" ) ); - DALI_TEST_EQUALS( extraSize, Vector2(0.5f,0.5f), TEST_LOCATION ); + extraSize = renderer.GetProperty(VisualRenderer::Property::EXTRA_SIZE); + DALI_TEST_EQUALS(extraSize, Vector2(0.5f, 0.5f), TEST_LOCATION); } int UtcDaliVisualSetTransform01(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualSetTransform: ColorVisual" ); + tet_infoline("UtcDaliVisualSetTransform: ColorVisual"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); propertyMap.Insert(Visual::Property::OPACITY, 0.5f); propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); - Visual::Base visual = factory.CreateVisual( propertyMap ); - TestTransform( application, visual ); - TestMixColor( visual, ColorVisual::Property::MIX_COLOR, Color::BLUE ); + Visual::Base visual = factory.CreateVisual(propertyMap); + TestTransform(application, visual); + TestMixColor(visual, ColorVisual::Property::MIX_COLOR, Color::BLUE); END_TEST; } @@ -2973,15 +2991,15 @@ int UtcDaliVisualSetTransform01(void) int UtcDaliVisualSetTransform0(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualSetTransform: ColorVisual" ); + tet_infoline("UtcDaliVisualSetTransform: ColorVisual"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); - propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); - Visual::Base visual = factory.CreateVisual( propertyMap ); - TestTransform( application, visual ); - TestMixColor( visual, ColorVisual::Property::MIX_COLOR, Color::BLUE ); + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); + Visual::Base visual = factory.CreateVisual(propertyMap); + TestTransform(application, visual); + TestMixColor(visual, ColorVisual::Property::MIX_COLOR, Color::BLUE); END_TEST; } @@ -2989,18 +3007,18 @@ int UtcDaliVisualSetTransform0(void) int UtcDaliVisualSetTransform1(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualSetTransform: PrimitiveVisual" ); + tet_infoline("UtcDaliVisualSetTransform: PrimitiveVisual"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap[ Toolkit::Visual::Property::TYPE ] = Visual::PRIMITIVE; - propertyMap[ PrimitiveVisual::Property::MIX_COLOR ] = Color::WHITE; - propertyMap[ PrimitiveVisual::Property::SHAPE ] = PrimitiveVisual::Shape::SPHERE; - propertyMap[ PrimitiveVisual::Property::SLICES ] = 10; - propertyMap[ PrimitiveVisual::Property::STACKS ] = 10; - Visual::Base visual = factory.CreateVisual( propertyMap ); - TestTransform( application, visual ); - TestMixColor( visual, PrimitiveVisual::Property::MIX_COLOR, Color::WHITE ); + propertyMap[Toolkit::Visual::Property::TYPE] = Visual::PRIMITIVE; + propertyMap[PrimitiveVisual::Property::MIX_COLOR] = Color::WHITE; + propertyMap[PrimitiveVisual::Property::SHAPE] = PrimitiveVisual::Shape::SPHERE; + propertyMap[PrimitiveVisual::Property::SLICES] = 10; + propertyMap[PrimitiveVisual::Property::STACKS] = 10; + Visual::Base visual = factory.CreateVisual(propertyMap); + TestTransform(application, visual); + TestMixColor(visual, PrimitiveVisual::Property::MIX_COLOR, Color::WHITE); END_TEST; } @@ -3008,33 +3026,33 @@ int UtcDaliVisualSetTransform1(void) int UtcDaliVisualSetTransform2(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualSetTransform: GradientVisual" ); + tet_infoline("UtcDaliVisualSetTransform: GradientVisual"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::GRADIENT ); - propertyMap.Insert( Visual::Property::MIX_COLOR, Color::GREEN ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::GRADIENT); + propertyMap.Insert(Visual::Property::MIX_COLOR, Color::GREEN); Property::Array stopOffsets; - stopOffsets.PushBack( 0.0f ); - stopOffsets.PushBack( 0.3f ); - stopOffsets.PushBack( 0.6f ); - stopOffsets.PushBack( 0.8f ); - stopOffsets.PushBack( 1.0f ); - propertyMap.Insert( GradientVisual::Property::STOP_OFFSET, stopOffsets ); + stopOffsets.PushBack(0.0f); + stopOffsets.PushBack(0.3f); + stopOffsets.PushBack(0.6f); + stopOffsets.PushBack(0.8f); + stopOffsets.PushBack(1.0f); + propertyMap.Insert(GradientVisual::Property::STOP_OFFSET, stopOffsets); Property::Array stopColors; - stopColors.PushBack( Vector4( 129.f, 198.f, 193.f, 255.f )/255.f ); - stopColors.PushBack( Vector4( 196.f, 198.f, 71.f, 122.f )/255.f ); - stopColors.PushBack( Vector4( 214.f, 37.f, 139.f, 191.f )/255.f ); - stopColors.PushBack( Vector4( 129.f, 198.f, 193.f, 150.f )/255.f ); - stopColors.PushBack( Color::YELLOW ); - propertyMap.Insert( GradientVisual::Property::STOP_COLOR, stopColors ); - propertyMap.Insert( GradientVisual::Property::CENTER, Vector2( 0.5f, 0.5f ) ); - propertyMap.Insert( GradientVisual::Property::RADIUS, 1.414f ); - Visual::Base visual = factory.CreateVisual( propertyMap ); - TestTransform( application, visual ); - TestMixColor( visual, Visual::Property::MIX_COLOR, Color::GREEN ); + stopColors.PushBack(Vector4(129.f, 198.f, 193.f, 255.f) / 255.f); + stopColors.PushBack(Vector4(196.f, 198.f, 71.f, 122.f) / 255.f); + stopColors.PushBack(Vector4(214.f, 37.f, 139.f, 191.f) / 255.f); + stopColors.PushBack(Vector4(129.f, 198.f, 193.f, 150.f) / 255.f); + stopColors.PushBack(Color::YELLOW); + propertyMap.Insert(GradientVisual::Property::STOP_COLOR, stopColors); + propertyMap.Insert(GradientVisual::Property::CENTER, Vector2(0.5f, 0.5f)); + propertyMap.Insert(GradientVisual::Property::RADIUS, 1.414f); + Visual::Base visual = factory.CreateVisual(propertyMap); + TestTransform(application, visual); + TestMixColor(visual, Visual::Property::MIX_COLOR, Color::GREEN); END_TEST; } @@ -3042,17 +3060,17 @@ int UtcDaliVisualSetTransform2(void) int UtcDaliVisualSetTransform3(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualSetTransform: BorderVisual" ); + tet_infoline("UtcDaliVisualSetTransform: BorderVisual"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::BORDER ); - propertyMap.Insert( Visual::Property::MIX_COLOR, Color::MAGENTA ); - propertyMap.Insert( BorderVisual::Property::COLOR, Vector4(0.f, 1.f, 0.f, 0.6f) ); - propertyMap.Insert( BorderVisual::Property::SIZE, 3.0f ); - Visual::Base visual = factory.CreateVisual( propertyMap ); - TestTransform( application, visual ); - TestMixColor( visual, Visual::Property::MIX_COLOR, Color::MAGENTA ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::BORDER); + propertyMap.Insert(Visual::Property::MIX_COLOR, Color::MAGENTA); + propertyMap.Insert(BorderVisual::Property::COLOR, Vector4(0.f, 1.f, 0.f, 0.6f)); + propertyMap.Insert(BorderVisual::Property::SIZE, 3.0f); + Visual::Base visual = factory.CreateVisual(propertyMap); + TestTransform(application, visual); + TestMixColor(visual, Visual::Property::MIX_COLOR, Color::MAGENTA); END_TEST; } @@ -3060,21 +3078,21 @@ int UtcDaliVisualSetTransform3(void) int UtcDaliVisualSetTransform4(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualSetTransform: MeshVisual" ); + tet_infoline("UtcDaliVisualSetTransform: MeshVisual"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH ); - propertyMap.Insert( Visual::Property::MIX_COLOR, Color::CYAN ); - - propertyMap.Insert( "objectUrl", TEST_OBJ_FILE_NAME ); - propertyMap.Insert( "materialUrl", TEST_MTL_FILE_NAME ); - propertyMap.Insert( "texturesPath", TEST_RESOURCE_LOCATION ); - propertyMap.Insert( "shadingMode", MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING ); - propertyMap.Insert( "lightPosition", Vector3( 5.0f, 10.0f, 15.0f) ); - Visual::Base visual = factory.CreateVisual( propertyMap ); - TestTransform( application, visual ); - TestMixColor( visual, Visual::Property::MIX_COLOR, Color::CYAN ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH); + propertyMap.Insert(Visual::Property::MIX_COLOR, Color::CYAN); + + propertyMap.Insert("objectUrl", TEST_OBJ_FILE_NAME); + propertyMap.Insert("materialUrl", TEST_MTL_FILE_NAME); + propertyMap.Insert("texturesPath", TEST_RESOURCE_LOCATION); + propertyMap.Insert("shadingMode", MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING); + propertyMap.Insert("lightPosition", Vector3(5.0f, 10.0f, 15.0f)); + Visual::Base visual = factory.CreateVisual(propertyMap); + TestTransform(application, visual); + TestMixColor(visual, Visual::Property::MIX_COLOR, Color::CYAN); END_TEST; } @@ -3082,21 +3100,21 @@ int UtcDaliVisualSetTransform4(void) int UtcDaliVisualSetTransform5(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualSetTransform: ImageVisual for URL " ); + tet_infoline("UtcDaliVisualSetTransform: ImageVisual for URL "); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE; - propertyMap[Visual::Property::MIX_COLOR] = Color::YELLOW; - propertyMap[Toolkit::ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; - propertyMap[Toolkit::ImageVisual::Property::DESIRED_WIDTH] = 100.0f; - propertyMap[Toolkit::ImageVisual::Property::DESIRED_HEIGHT] = 100.0f; - propertyMap[Toolkit::ImageVisual::Property::FITTING_MODE] = FittingMode::SCALE_TO_FILL; - propertyMap[Toolkit::ImageVisual::Property::SAMPLING_MODE] = SamplingMode::BOX_THEN_LINEAR; + propertyMap[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE; + propertyMap[Visual::Property::MIX_COLOR] = Color::YELLOW; + propertyMap[Toolkit::ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; + propertyMap[Toolkit::ImageVisual::Property::DESIRED_WIDTH] = 100.0f; + propertyMap[Toolkit::ImageVisual::Property::DESIRED_HEIGHT] = 100.0f; + propertyMap[Toolkit::ImageVisual::Property::FITTING_MODE] = FittingMode::SCALE_TO_FILL; + propertyMap[Toolkit::ImageVisual::Property::SAMPLING_MODE] = SamplingMode::BOX_THEN_LINEAR; propertyMap[Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING] = true; - Visual::Base visual = factory.CreateVisual(propertyMap); - TestTransform( application, visual ); - TestMixColor( visual, Visual::Property::MIX_COLOR, Color::YELLOW ); + Visual::Base visual = factory.CreateVisual(propertyMap); + TestTransform(application, visual); + TestMixColor(visual, Visual::Property::MIX_COLOR, Color::YELLOW); END_TEST; } @@ -3104,16 +3122,16 @@ int UtcDaliVisualSetTransform5(void) int UtcDaliVisualSetTransform6(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualSetTransform: NPatch visual" ); + tet_infoline("UtcDaliVisualSetTransform: NPatch visual"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE; - propertyMap[Toolkit::ImageVisual::Property::URL] = TEST_NPATCH_FILE_NAME; + propertyMap[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE; + propertyMap[Toolkit::ImageVisual::Property::URL] = TEST_NPATCH_FILE_NAME; propertyMap[Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING] = true; - Visual::Base visual = factory.CreateVisual(propertyMap); - TestTransform( application, visual ); - TestMixColor( visual, Visual::Property::MIX_COLOR, Color::WHITE ); + Visual::Base visual = factory.CreateVisual(propertyMap); + TestTransform(application, visual); + TestMixColor(visual, Visual::Property::MIX_COLOR, Color::WHITE); END_TEST; } @@ -3121,36 +3139,34 @@ int UtcDaliVisualSetTransform6(void) int UtcDaliVisualTestTransformPoliciesAsStrings(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualTestTransformPoliciesAsStrings: Use a ColorVisual and test the offset and size policies as strings" ); + tet_infoline("UtcDaliVisualTestTransformPoliciesAsStrings: Use a ColorVisual and test the offset and size policies as strings"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); - propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); - Visual::Base visual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); + Visual::Base visual = factory.CreateVisual(propertyMap); Property::Map transform; - transform[ "offsetPolicy" ] = Property::Array().Add( "ABSOLUTE" ) - .Add( "RELATIVE" ); - transform[ "sizePolicy" ] = Property::Array().Add( "RELATIVE" ) - .Add( "ABSOLUTE" ); - visual.SetTransformAndSize( transform, Vector2(100, 100) ); + transform["offsetPolicy"] = Property::Array().Add("ABSOLUTE").Add("RELATIVE"); + transform["sizePolicy"] = Property::Array().Add("RELATIVE").Add("ABSOLUTE"); + visual.SetTransformAndSize(transform, Vector2(100, 100)); Dali::Property::Map visualMap; - visual.CreatePropertyMap( visualMap ); - Property::Value* value = visualMap.Find( Dali::Toolkit::Visual::Property::TRANSFORM ); - Dali::Property::Map* map = value->GetMap(); - DALI_TEST_CHECK( map ); + visual.CreatePropertyMap(visualMap); + Property::Value* value = visualMap.Find(Dali::Toolkit::Visual::Property::TRANSFORM); + Dali::Property::Map* map = value->GetMap(); + DALI_TEST_CHECK(map); { - Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::OFFSET_POLICY ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_EQUALS( typeValue->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::RELATIVE ), TEST_LOCATION ); + Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::OFFSET_POLICY); + DALI_TEST_CHECK(typeValue); + DALI_TEST_EQUALS(typeValue->Get(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::RELATIVE), TEST_LOCATION); } { - Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( typeValue ); - DALI_TEST_EQUALS( typeValue->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(typeValue); + DALI_TEST_EQUALS(typeValue->Get(), Vector2(Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION); } END_TEST; @@ -3159,61 +3175,61 @@ int UtcDaliVisualTestTransformPoliciesAsStrings(void) int UtcDaliNPatchVisualCustomShader(void) { ToolkitTestApplication application; - tet_infoline( "NPatchVisual with custom shader" ); + tet_infoline("NPatchVisual with custom shader"); - VisualFactory factory = VisualFactory::Get(); - Property::Map properties; - Property::Map shader; - const std::string vertexShader = "Foobar"; - const std::string fragmentShader = "Foobar"; + VisualFactory factory = VisualFactory::Get(); + Property::Map properties; + Property::Map shader; + const std::string vertexShader = "Foobar"; + const std::string fragmentShader = "Foobar"; shader[Dali::Toolkit::Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader; - shader[Dali::Toolkit::Visual::Shader::Property::VERTEX_SHADER] = vertexShader; + shader[Dali::Toolkit::Visual::Shader::Property::VERTEX_SHADER] = vertexShader; Property::Map transformMap; - transformMap["size"] = Vector2( 0.5f, 0.5f ) ; - transformMap["offset"] = Vector2( 20.0f, 0.0f ) ; - transformMap["offsetPolicy"] = Vector2( Visual::Transform::Policy::ABSOLUTE, Visual::Transform::Policy::ABSOLUTE ); - transformMap["anchorPoint"] = Align::CENTER; - transformMap["origin"] = Align::CENTER; - transformMap["extraSize"] = Vector2( 0.0f, 50.0f ); + transformMap["size"] = Vector2(0.5f, 0.5f); + transformMap["offset"] = Vector2(20.0f, 0.0f); + transformMap["offsetPolicy"] = Vector2(Visual::Transform::Policy::ABSOLUTE, Visual::Transform::Policy::ABSOLUTE); + transformMap["anchorPoint"] = Align::CENTER; + transformMap["origin"] = Align::CENTER; + transformMap["extraSize"] = Vector2(0.0f, 50.0f); properties[Visual::Property::TRANSFORM] = transformMap; - properties[Visual::Property::TYPE] = Visual::IMAGE; - properties[Visual::Property::MIX_COLOR] = Color::BLUE; - properties[Visual::Property::SHADER]=shader; - properties[ImageVisual::Property::URL] = TEST_NPATCH_FILE_NAME; + properties[Visual::Property::TYPE] = Visual::IMAGE; + properties[Visual::Property::MIX_COLOR] = Color::BLUE; + properties[Visual::Property::SHADER] = shader; + properties[ImageVisual::Property::URL] = TEST_NPATCH_FILE_NAME; properties[ImageVisual::Property::SYNCHRONOUS_LOADING] = true; - Visual::Base visual = factory.CreateVisual( properties ); - TestMixColor( visual, Visual::Property::MIX_COLOR, Color::BLUE ); + Visual::Base visual = factory.CreateVisual(properties); + TestMixColor(visual, Visual::Property::MIX_COLOR, Color::BLUE); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New(true); + DummyControl dummy = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - dummyImpl.SetLayout( DummyControl::Property::TEST_VISUAL, transformMap ); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + dummyImpl.SetLayout(DummyControl::Property::TEST_VISUAL, transformMap); + dummy.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); application.GetScene().Add(dummy); application.SendNotification(); - Renderer renderer = dummy.GetRendererAt( 0 ); - Shader shader2 = renderer.GetShader(); - Property::Value value = shader2.GetProperty( Shader::Property::PROGRAM ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); + Renderer renderer = dummy.GetRendererAt(0); + Shader shader2 = renderer.GetShader(); + Property::Value value = shader2.GetProperty(Shader::Property::PROGRAM); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); - Property::Index index = renderer.GetPropertyIndex("size"); - DALI_TEST_EQUALS( renderer.GetProperty( index ), Property::Value(Vector2(0.5, 0.5)), 0.001, TEST_LOCATION ); + Property::Index index = VisualRenderer::Property::TRANSFORM_SIZE; + DALI_TEST_EQUALS(renderer.GetProperty(index), Property::Value(Vector2(0.5, 0.5)), 0.001, TEST_LOCATION); - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_EQUALS( fragmentShader, fragment->Get(), TEST_LOCATION ); + Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp + DALI_TEST_EQUALS(fragmentShader, fragment->Get(), TEST_LOCATION); - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - DALI_TEST_EQUALS( vertexShader, vertex->Get(), TEST_LOCATION ); + Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp + DALI_TEST_EQUALS(vertexShader, vertex->Get(), TEST_LOCATION); - Vector2 extraSize = renderer.GetProperty( renderer.GetPropertyIndex( "extraSize" ) ); - DALI_TEST_EQUALS( extraSize, Vector2(0.0f, 50.0f), TEST_LOCATION ); + Vector2 extraSize = renderer.GetProperty(VisualRenderer::Property::EXTRA_SIZE); + DALI_TEST_EQUALS(extraSize, Vector2(0.0f, 50.0f), TEST_LOCATION); END_TEST; } @@ -3221,37 +3237,29 @@ int UtcDaliNPatchVisualCustomShader(void) int UtcDaliGradientVisualBlendMode(void) { ToolkitTestApplication application; - VisualFactory factory = VisualFactory::Get(); + VisualFactory factory = VisualFactory::Get(); Visual::Base opaqueGradientVisual = factory.CreateVisual( - Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::GRADIENT ) - .Add( GradientVisual::Property::START_POSITION, Vector2( -0.5f, -0.5f ) ) - .Add( GradientVisual::Property::END_POSITION, Vector2( 0.5f, 0.5f ) ) - .Add( GradientVisual::Property::STOP_COLOR, Property::Array().Add( Color::RED ) - .Add( Color::GREEN ) ) ); + Property::Map().Add(Toolkit::Visual::Property::TYPE, Visual::GRADIENT).Add(GradientVisual::Property::START_POSITION, Vector2(-0.5f, -0.5f)).Add(GradientVisual::Property::END_POSITION, Vector2(0.5f, 0.5f)).Add(GradientVisual::Property::STOP_COLOR, Property::Array().Add(Color::RED).Add(Color::GREEN))); Visual::Base alphaGradientVisual = factory.CreateVisual( - Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::GRADIENT ) - .Add( GradientVisual::Property::START_POSITION, Vector2( -0.5f, -0.5f ) ) - .Add( GradientVisual::Property::END_POSITION, Vector2( 0.5f, 0.5f ) ) - .Add( GradientVisual::Property::STOP_COLOR, Property::Array().Add( Color::RED ) - .Add( Vector4( 1.0f, 1.0f, 1.0f, 0.5f ) ) ) ); + Property::Map().Add(Toolkit::Visual::Property::TYPE, Visual::GRADIENT).Add(GradientVisual::Property::START_POSITION, Vector2(-0.5f, -0.5f)).Add(GradientVisual::Property::END_POSITION, Vector2(0.5f, 0.5f)).Add(GradientVisual::Property::STOP_COLOR, Property::Array().Add(Color::RED).Add(Vector4(1.0f, 1.0f, 1.0f, 0.5f)))); DummyControl control = DummyControl::New(true); control.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - application.GetScene().Add( control ); + application.GetScene().Add(control); - Impl::DummyControl& dummyImpl = static_cast( control.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, opaqueGradientVisual ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL2, alphaGradientVisual ); + Impl::DummyControl& dummyImpl = static_cast(control.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, opaqueGradientVisual); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL2, alphaGradientVisual); application.SendNotification(); application.Render(); // Control should have two renderers, the first one is opaque so our blending mode should be off, the second one has some alpha so should be set to automatic - DALI_TEST_EQUALS( 2u, control.GetRendererCount(), TEST_LOCATION ); - DALI_TEST_EQUALS( control.GetRendererAt( 0 ).GetProperty( Renderer::Property::BLEND_MODE ).Get(), (int)BlendMode::OFF, TEST_LOCATION ); - DALI_TEST_EQUALS( control.GetRendererAt( 1 ).GetProperty( Renderer::Property::BLEND_MODE ).Get(), (int)BlendMode::AUTO, TEST_LOCATION ); + DALI_TEST_EQUALS(2u, control.GetRendererCount(), TEST_LOCATION); + DALI_TEST_EQUALS(control.GetRendererAt(0).GetProperty(Renderer::Property::BLEND_MODE).Get(), (int)BlendMode::OFF, TEST_LOCATION); + DALI_TEST_EQUALS(control.GetRendererAt(1).GetProperty(Renderer::Property::BLEND_MODE).Get(), (int)BlendMode::AUTO, TEST_LOCATION); END_TEST; } @@ -3259,117 +3267,114 @@ int UtcDaliGradientVisualBlendMode(void) int UtcDaliVisualRendererRemovalAndReAddition(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualRendererRemoval" ); + tet_infoline("UtcDaliVisualRendererRemoval"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); - propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); - Visual::Base visual = factory.CreateVisual( propertyMap ); + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); + Visual::Base visual = factory.CreateVisual(propertyMap); - visual.SetDepthIndex( 1 ); + visual.SetDepthIndex(1); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 0, TEST_LOCATION ); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 0, TEST_LOCATION); - dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - tet_infoline( "Add control with visual to stage and check renderer count is 1" ); + dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + tet_infoline("Add control with visual to stage and check renderer count is 1"); - application.GetScene().Add( dummyControl ); + application.GetScene().Add(dummyControl); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 1, TEST_LOCATION ); + DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 1, TEST_LOCATION); - tet_infoline( "Remove control with visual from stage and check renderer count is 0" ); - application.GetScene().Remove( dummyControl ); + tet_infoline("Remove control with visual from stage and check renderer count is 0"); + application.GetScene().Remove(dummyControl); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 0, TEST_LOCATION ); + DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 0, TEST_LOCATION); - tet_infoline( "Re-add control with visual to stage and check renderer count is still 1" ); + tet_infoline("Re-add control with visual to stage and check renderer count is still 1"); - application.GetScene().Add( dummyControl ); + application.GetScene().Add(dummyControl); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 1, TEST_LOCATION ); + DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 1, TEST_LOCATION); END_TEST; } - - int UtcDaliVisualTextVisualRender(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualTextVisualRender" ); + tet_infoline("UtcDaliVisualTextVisualRender"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::TEXT ); - propertyMap.Insert( "mixColor", Color::WHITE ); - propertyMap.Insert( "renderingBackend", static_cast( Toolkit::DevelText::DEFAULT_RENDERING_BACKEND ) ); - propertyMap.Insert( "enableMarkup", false ); - propertyMap.Insert( "text", "Hello world" ); - propertyMap.Insert( "fontFamily", "TizenSans" ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::TEXT); + propertyMap.Insert("mixColor", Color::WHITE); + propertyMap.Insert("renderingBackend", static_cast(Toolkit::DevelText::DEFAULT_RENDERING_BACKEND)); + propertyMap.Insert("enableMarkup", false); + propertyMap.Insert("text", "Hello world"); + propertyMap.Insert("fontFamily", "TizenSans"); Property::Map fontStyleMapSet; - fontStyleMapSet.Insert( "weight", "bold" ); - propertyMap.Insert( "fontStyle", fontStyleMapSet ); + fontStyleMapSet.Insert("weight", "bold"); + propertyMap.Insert("fontStyle", fontStyleMapSet); - propertyMap.Insert( "pointSize", 12.f ); - propertyMap.Insert( "multiLine", true ); - propertyMap.Insert( "horizontalAlignment", "CENTER" ); - propertyMap.Insert( "verticalAlignment", "CENTER" ); - propertyMap.Insert( "textColor", Color::RED ); - Visual::Base textVisual = factory.CreateVisual( propertyMap ); - textVisual.SetDepthIndex( 1 ); + propertyMap.Insert("pointSize", 12.f); + propertyMap.Insert("multiLine", true); + propertyMap.Insert("horizontalAlignment", "CENTER"); + propertyMap.Insert("verticalAlignment", "CENTER"); + propertyMap.Insert("textColor", Color::RED); + Visual::Base textVisual = factory.CreateVisual(propertyMap); + textVisual.SetDepthIndex(1); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, textVisual ); - DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 0, TEST_LOCATION ); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, textVisual); + DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 0, TEST_LOCATION); - dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummyControl.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummyControl.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); - application.GetScene().Add( dummyControl ); + application.GetScene().Add(dummyControl); application.SendNotification(); application.Render(); - // Create a texture bigger than the maximum allowed by the image atlas. Used to increase coverage. propertyMap.Clear(); - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::TEXT ); - propertyMap.Insert( TextVisual::Property::ENABLE_MARKUP, true ); - propertyMap.Insert( TextVisual::Property::TEXT, "Hello world" ); - propertyMap.Insert( TextVisual::Property::MULTI_LINE, true ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::TEXT); + propertyMap.Insert(TextVisual::Property::ENABLE_MARKUP, true); + propertyMap.Insert(TextVisual::Property::TEXT, "Hello world"); + propertyMap.Insert(TextVisual::Property::MULTI_LINE, true); Property::Map transformMap; - transformMap.Insert( "size", Vector2( 0.5f, 0.5f ) ); - propertyMap.Insert( Visual::Property::TRANSFORM, transformMap ); + transformMap.Insert("size", Vector2(0.5f, 0.5f)); + propertyMap.Insert(Visual::Property::TRANSFORM, transformMap); - textVisual = factory.CreateVisual( propertyMap ); - textVisual.SetDepthIndex( 1 ); + textVisual = factory.CreateVisual(propertyMap); + textVisual.SetDepthIndex(1); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, textVisual ); - dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 720.f, 640.f ) ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, textVisual); + dummyControl.SetProperty(Actor::Property::SIZE, Vector2(720.f, 640.f)); application.SendNotification(); // force process events to ensure text visual // adds renderer to the dummy control in OnRelayout application.Render(); - Renderer renderer = dummyControl.GetRendererAt(0u); - Property::Index index = renderer.GetPropertyIndex("size"); + Renderer renderer = dummyControl.GetRendererAt(0u); + Property::Index index = renderer.GetPropertyIndex("transformSize"); - tet_infoline( "Test that the TextVisual has NOT overridden what was set by developer" ); - DALI_TEST_EQUALS( renderer.GetProperty(index), Vector2( 0.5f, 0.5f ), 0.001f, TEST_LOCATION ); + tet_infoline("Test that the TextVisual has NOT overridden what was set by developer"); + DALI_TEST_EQUALS(renderer.GetProperty(index), Vector2(0.5f, 0.5f), 0.001f, TEST_LOCATION); END_TEST; } @@ -3377,50 +3382,50 @@ int UtcDaliVisualTextVisualRender(void) int UtcDaliVisualTextVisualDisableEnable(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualTextVisualDisableEnable Ensure Text visible can be re-enabled" ); + tet_infoline("UtcDaliVisualTextVisualDisableEnable Ensure Text visible can be re-enabled"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::TEXT ); - propertyMap.Insert( "mixColor", Color::WHITE ); - propertyMap.Insert( "renderingBackend", static_cast( Toolkit::DevelText::DEFAULT_RENDERING_BACKEND ) ); - propertyMap.Insert( "enableMarkup", false ); - propertyMap.Insert( "text", "Hello world" ); - propertyMap.Insert( "fontFamily", "TizenSans" ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::TEXT); + propertyMap.Insert("mixColor", Color::WHITE); + propertyMap.Insert("renderingBackend", static_cast(Toolkit::DevelText::DEFAULT_RENDERING_BACKEND)); + propertyMap.Insert("enableMarkup", false); + propertyMap.Insert("text", "Hello world"); + propertyMap.Insert("fontFamily", "TizenSans"); Property::Map fontStyleMapSet; - fontStyleMapSet.Insert( "weight", "bold" ); - propertyMap.Insert( "fontStyle", fontStyleMapSet ); + fontStyleMapSet.Insert("weight", "bold"); + propertyMap.Insert("fontStyle", fontStyleMapSet); - propertyMap.Insert( "pointSize", 12.f ); - propertyMap.Insert( "multiLine", true ); - propertyMap.Insert( "horizontalAlignment", "CENTER" ); - propertyMap.Insert( "verticalAlignment", "CENTER" ); - propertyMap.Insert( "textColor", Color::RED ); - Visual::Base textVisual = factory.CreateVisual( propertyMap ); - textVisual.SetDepthIndex( 1 ); + propertyMap.Insert("pointSize", 12.f); + propertyMap.Insert("multiLine", true); + propertyMap.Insert("horizontalAlignment", "CENTER"); + propertyMap.Insert("verticalAlignment", "CENTER"); + propertyMap.Insert("textColor", Color::RED); + Visual::Base textVisual = factory.CreateVisual(propertyMap); + textVisual.SetDepthIndex(1); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, textVisual ); - DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 0, TEST_LOCATION ); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, textVisual); + DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 0, TEST_LOCATION); - dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummyControl.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummyControl.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); - application.GetScene().Add( dummyControl ); + application.GetScene().Add(dummyControl); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 1, TEST_LOCATION ); + DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 1, TEST_LOCATION); - dummyImpl.EnableVisual( DummyControl::Property::TEST_VISUAL, false ); + dummyImpl.EnableVisual(DummyControl::Property::TEST_VISUAL, false); - DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 0, TEST_LOCATION ); + DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 0, TEST_LOCATION); - dummyImpl.EnableVisual( DummyControl::Property::TEST_VISUAL, true ); + dummyImpl.EnableVisual(DummyControl::Property::TEST_VISUAL, true); - DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 1, TEST_LOCATION ); + DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 1, TEST_LOCATION); END_TEST; } @@ -3428,57 +3433,57 @@ int UtcDaliVisualTextVisualDisableEnable(void) int UtcDaliVisualPremultipliedAlpha(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualPremultipliedAlpha" ); + tet_infoline("UtcDaliVisualPremultipliedAlpha"); VisualFactory factory = VisualFactory::Get(); // image visual, test default value ( true ) { Visual::Base imageVisual = factory.CreateVisual( - Property::Map() - .Add( Toolkit::Visual::Property::TYPE, Visual::IMAGE ) - .Add( ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME ) ); + Property::Map() + .Add(Toolkit::Visual::Property::TYPE, Visual::IMAGE) + .Add(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME)); Dali::Property::Map visualMap; - imageVisual.CreatePropertyMap( visualMap ); - Property::Value* value = visualMap.Find( Visual::Property::PREMULTIPLIED_ALPHA ); + imageVisual.CreatePropertyMap(visualMap); + Property::Value* value = visualMap.Find(Visual::Property::PREMULTIPLIED_ALPHA); // test values - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), true, TEST_LOCATION ); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), true, TEST_LOCATION); } // image visual, override premultiplied { Visual::Base imageVisual = factory.CreateVisual( - Property::Map() - .Add( Toolkit::Visual::Property::TYPE, Visual::IMAGE ) - .Add( ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME ) - .Add( Visual::Property::PREMULTIPLIED_ALPHA, false ) ); + Property::Map() + .Add(Toolkit::Visual::Property::TYPE, Visual::IMAGE) + .Add(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME) + .Add(Visual::Property::PREMULTIPLIED_ALPHA, false)); Dali::Property::Map visualMap; - imageVisual.CreatePropertyMap( visualMap ); - Property::Value* value = visualMap.Find( Visual::Property::PREMULTIPLIED_ALPHA ); + imageVisual.CreatePropertyMap(visualMap); + Property::Value* value = visualMap.Find(Visual::Property::PREMULTIPLIED_ALPHA); // test values - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), false, TEST_LOCATION); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), false, TEST_LOCATION); } // svg visual ( premultiplied alpha by default is true ) { Visual::Base imageVisual = factory.CreateVisual( - Property::Map() - .Add( Toolkit::Visual::Property::TYPE, Visual::IMAGE ) - .Add( ImageVisual::Property::URL, TEST_SVG_FILE_NAME ) ); + Property::Map() + .Add(Toolkit::Visual::Property::TYPE, Visual::IMAGE) + .Add(ImageVisual::Property::URL, TEST_SVG_FILE_NAME)); Dali::Property::Map visualMap; - imageVisual.CreatePropertyMap( visualMap ); - Property::Value* value = visualMap.Find( Visual::Property::PREMULTIPLIED_ALPHA ); + imageVisual.CreatePropertyMap(visualMap); + Property::Value* value = visualMap.Find(Visual::Property::PREMULTIPLIED_ALPHA); // test values - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get(), true, TEST_LOCATION ); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), true, TEST_LOCATION); } END_TEST; @@ -3487,56 +3492,56 @@ int UtcDaliVisualPremultipliedAlpha(void) int UtcDaliRegisterVisualOrder(void) { ToolkitTestApplication application; - tet_infoline( "Register Visual Order" ); + tet_infoline("Register Visual Order"); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); - propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); - - tet_infoline( "Register visual, should have depth index of 0.0f" ); - Visual::Base testVisual = factory.CreateVisual( propertyMap ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, testVisual ); - DALI_TEST_EQUALS( testVisual.GetDepthIndex(), 0, TEST_LOCATION ); - - tet_infoline( "Register more visuals, each added one should have a depth index greater than previous" ); - - Visual::Base testVisual2 = factory.CreateVisual( propertyMap ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL2, testVisual2 ); - DALI_TEST_CHECK( testVisual2.GetDepthIndex() > testVisual.GetDepthIndex() ); - - Visual::Base foregroundVisual = factory.CreateVisual( propertyMap ); - dummyImpl.RegisterVisual( DummyControl::Property::FOREGROUND_VISUAL, foregroundVisual ); - DALI_TEST_CHECK( foregroundVisual.GetDepthIndex() > testVisual2.GetDepthIndex() ); - - Visual::Base focusVisual = factory.CreateVisual( propertyMap ); - dummyImpl.RegisterVisual( DummyControl::Property::FOCUS_VISUAL, focusVisual ); - DALI_TEST_CHECK( focusVisual.GetDepthIndex() > foregroundVisual.GetDepthIndex() ); - - tet_infoline( "Set depth index on a new visual before registering, the depth index should not have been changed" ); - Visual::Base labelVisual = factory.CreateVisual( propertyMap ); - labelVisual.SetDepthIndex( -2000 ); - dummyImpl.RegisterVisual( DummyControl::Property::LABEL_VISUAL, labelVisual ); - DALI_TEST_EQUALS( labelVisual.GetDepthIndex(), -2000, TEST_LOCATION ); - - tet_infoline( "Replace visual, the depth index should be the same as what was previously set" ); - const int testVisual2DepthIndex = testVisual2.GetDepthIndex(); - Visual::Base testVisual2Replacement = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( testVisual2Replacement.GetDepthIndex() != testVisual2DepthIndex ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL2, testVisual2Replacement ); - DALI_TEST_EQUALS( testVisual2Replacement.GetDepthIndex(), testVisual2DepthIndex, TEST_LOCATION ); - - tet_infoline( "Replace visual and set a depth index on the replacement, the depth index of the replacement should be honoured" ); - Visual::Base anotherTestVisual2Replacement = factory.CreateVisual( propertyMap ); - anotherTestVisual2Replacement.SetDepthIndex( 2000 ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL2, anotherTestVisual2Replacement ); - DALI_TEST_EQUALS( anotherTestVisual2Replacement.GetDepthIndex(), 2000, TEST_LOCATION ); - - dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - application.GetScene().Add( dummyControl ); + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); + + tet_infoline("Register visual, should have depth index of 0.0f"); + Visual::Base testVisual = factory.CreateVisual(propertyMap); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, testVisual); + DALI_TEST_EQUALS(testVisual.GetDepthIndex(), 0, TEST_LOCATION); + + tet_infoline("Register more visuals, each added one should have a depth index greater than previous"); + + Visual::Base testVisual2 = factory.CreateVisual(propertyMap); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL2, testVisual2); + DALI_TEST_CHECK(testVisual2.GetDepthIndex() > testVisual.GetDepthIndex()); + + Visual::Base foregroundVisual = factory.CreateVisual(propertyMap); + dummyImpl.RegisterVisual(DummyControl::Property::FOREGROUND_VISUAL, foregroundVisual); + DALI_TEST_CHECK(foregroundVisual.GetDepthIndex() > testVisual2.GetDepthIndex()); + + Visual::Base focusVisual = factory.CreateVisual(propertyMap); + dummyImpl.RegisterVisual(DummyControl::Property::FOCUS_VISUAL, focusVisual); + DALI_TEST_CHECK(focusVisual.GetDepthIndex() > foregroundVisual.GetDepthIndex()); + + tet_infoline("Set depth index on a new visual before registering, the depth index should not have been changed"); + Visual::Base labelVisual = factory.CreateVisual(propertyMap); + labelVisual.SetDepthIndex(-2000); + dummyImpl.RegisterVisual(DummyControl::Property::LABEL_VISUAL, labelVisual); + DALI_TEST_EQUALS(labelVisual.GetDepthIndex(), -2000, TEST_LOCATION); + + tet_infoline("Replace visual, the depth index should be the same as what was previously set"); + const int testVisual2DepthIndex = testVisual2.GetDepthIndex(); + Visual::Base testVisual2Replacement = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(testVisual2Replacement.GetDepthIndex() != testVisual2DepthIndex); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL2, testVisual2Replacement); + DALI_TEST_EQUALS(testVisual2Replacement.GetDepthIndex(), testVisual2DepthIndex, TEST_LOCATION); + + tet_infoline("Replace visual and set a depth index on the replacement, the depth index of the replacement should be honoured"); + Visual::Base anotherTestVisual2Replacement = factory.CreateVisual(propertyMap); + anotherTestVisual2Replacement.SetDepthIndex(2000); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL2, anotherTestVisual2Replacement); + DALI_TEST_EQUALS(anotherTestVisual2Replacement.GetDepthIndex(), 2000, TEST_LOCATION); + + dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + application.GetScene().Add(dummyControl); END_TEST; } @@ -3544,35 +3549,35 @@ int UtcDaliRegisterVisualOrder(void) int UtcDaliRegisterVisualOrder02(void) { ToolkitTestApplication application; - tet_infoline( "Register Visual Order with Background Set" ); + tet_infoline("Register Visual Order with Background Set"); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); const int backgroundDepthIndex = Toolkit::DepthIndex::BACKGROUND; VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); - propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); - tet_printf( "Register a control background visual, should have depth index of %d\n", backgroundDepthIndex ); + tet_printf("Register a control background visual, should have depth index of %d\n", backgroundDepthIndex); - dummyControl.SetProperty( Control::Property::BACKGROUND, propertyMap ); + dummyControl.SetProperty(Control::Property::BACKGROUND, propertyMap); const int TEST_VISUAL_1_DEPTH_INDEX = 0; - tet_printf( "Register visual, should have depth index of %d\n", TEST_VISUAL_1_DEPTH_INDEX ); - Visual::Base testVisual1 = factory.CreateVisual( propertyMap ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, testVisual1 ); - DALI_TEST_EQUALS( testVisual1.GetDepthIndex(), TEST_VISUAL_1_DEPTH_INDEX , TEST_LOCATION ); + tet_printf("Register visual, should have depth index of %d\n", TEST_VISUAL_1_DEPTH_INDEX); + Visual::Base testVisual1 = factory.CreateVisual(propertyMap); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, testVisual1); + DALI_TEST_EQUALS(testVisual1.GetDepthIndex(), TEST_VISUAL_1_DEPTH_INDEX, TEST_LOCATION); - tet_printf( "Register another visual, should have a depth index greater than previous(%d)\n", TEST_VISUAL_1_DEPTH_INDEX ); - Visual::Base testVisual2 = factory.CreateVisual( propertyMap ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL2, testVisual2 ); - DALI_TEST_CHECK( testVisual2.GetDepthIndex() > testVisual1.GetDepthIndex() ); + tet_printf("Register another visual, should have a depth index greater than previous(%d)\n", TEST_VISUAL_1_DEPTH_INDEX); + Visual::Base testVisual2 = factory.CreateVisual(propertyMap); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL2, testVisual2); + DALI_TEST_CHECK(testVisual2.GetDepthIndex() > testVisual1.GetDepthIndex()); - dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - application.GetScene().Add( dummyControl ); + dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + application.GetScene().Add(dummyControl); END_TEST; } @@ -3580,36 +3585,36 @@ int UtcDaliRegisterVisualOrder02(void) int UtcDaliRegisterVisualWithDepthIndex(void) { ToolkitTestApplication application; - tet_infoline( "Register a Visual With Depth Index" ); + tet_infoline("Register a Visual With Depth Index"); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); - propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); - - tet_infoline( "Register a visual with a depth index, it should be enabled by default too" ); - Visual::Base testVisual = factory.CreateVisual( propertyMap ); - DevelControl::RegisterVisual( dummyImpl, DummyControl::Property::TEST_VISUAL, testVisual, 203 ); - DALI_TEST_EQUALS( testVisual.GetDepthIndex(), 203, TEST_LOCATION ); - DALI_TEST_EQUALS( DevelControl::IsVisualEnabled( dummyImpl, DummyControl::Property::TEST_VISUAL ), true, TEST_LOCATION ); - - tet_infoline( "Register another visual with a depth index and it disabled" ); - Visual::Base testVisual2 = factory.CreateVisual( propertyMap ); - DevelControl::RegisterVisual( dummyImpl, DummyControl::Property::TEST_VISUAL2, testVisual2, false, 450 ); - DALI_TEST_EQUALS( testVisual2.GetDepthIndex(), 450, TEST_LOCATION ); - DALI_TEST_EQUALS( DevelControl::IsVisualEnabled( dummyImpl, DummyControl::Property::TEST_VISUAL2 ), false, TEST_LOCATION ); - - tet_infoline( "Register another visual with a depth index and it enabled using the enabled API" ); - Visual::Base testVisual3 = factory.CreateVisual( propertyMap ); - DevelControl::RegisterVisual( dummyImpl, DummyControl::Property::TEST_VISUAL2, testVisual3, true, 300 ); - DALI_TEST_EQUALS( testVisual3.GetDepthIndex(), 300, TEST_LOCATION ); - DALI_TEST_EQUALS( DevelControl::IsVisualEnabled( dummyImpl, DummyControl::Property::TEST_VISUAL2 ), true, TEST_LOCATION ); - - dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - application.GetScene().Add( dummyControl ); + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); + + tet_infoline("Register a visual with a depth index, it should be enabled by default too"); + Visual::Base testVisual = factory.CreateVisual(propertyMap); + DevelControl::RegisterVisual(dummyImpl, DummyControl::Property::TEST_VISUAL, testVisual, 203); + DALI_TEST_EQUALS(testVisual.GetDepthIndex(), 203, TEST_LOCATION); + DALI_TEST_EQUALS(DevelControl::IsVisualEnabled(dummyImpl, DummyControl::Property::TEST_VISUAL), true, TEST_LOCATION); + + tet_infoline("Register another visual with a depth index and it disabled"); + Visual::Base testVisual2 = factory.CreateVisual(propertyMap); + DevelControl::RegisterVisual(dummyImpl, DummyControl::Property::TEST_VISUAL2, testVisual2, false, 450); + DALI_TEST_EQUALS(testVisual2.GetDepthIndex(), 450, TEST_LOCATION); + DALI_TEST_EQUALS(DevelControl::IsVisualEnabled(dummyImpl, DummyControl::Property::TEST_VISUAL2), false, TEST_LOCATION); + + tet_infoline("Register another visual with a depth index and it enabled using the enabled API"); + Visual::Base testVisual3 = factory.CreateVisual(propertyMap); + DevelControl::RegisterVisual(dummyImpl, DummyControl::Property::TEST_VISUAL2, testVisual3, true, 300); + DALI_TEST_EQUALS(testVisual3.GetDepthIndex(), 300, TEST_LOCATION); + DALI_TEST_EQUALS(DevelControl::IsVisualEnabled(dummyImpl, DummyControl::Property::TEST_VISUAL2), true, TEST_LOCATION); + + dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + application.GetScene().Add(dummyControl); END_TEST; } @@ -3617,47 +3622,47 @@ int UtcDaliRegisterVisualWithDepthIndex(void) int UtcDaliSvgVisualCustomShader(void) { ToolkitTestApplication application; - tet_infoline( "SvgVisual with custom shader" ); + tet_infoline("SvgVisual with custom shader"); - VisualFactory factory = VisualFactory::Get(); - Property::Map properties; - Property::Map shader; - const std::string vertexShader = "Foobar"; - const std::string fragmentShader = "Foobar"; + VisualFactory factory = VisualFactory::Get(); + Property::Map properties; + Property::Map shader; + const std::string vertexShader = "Foobar"; + const std::string fragmentShader = "Foobar"; shader[Dali::Toolkit::Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader; - shader[Dali::Toolkit::Visual::Shader::Property::VERTEX_SHADER] = vertexShader; + shader[Dali::Toolkit::Visual::Shader::Property::VERTEX_SHADER] = vertexShader; - properties[Visual::Property::TYPE] = Visual::IMAGE; - properties[Visual::Property::SHADER] = shader; + properties[Visual::Property::TYPE] = Visual::IMAGE; + properties[Visual::Property::SHADER] = shader; properties[ImageVisual::Property::URL] = TEST_SVG_FILE_NAME; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); - Renderer renderer = dummy.GetRendererAt( 0 ); - Shader shader2 = renderer.GetShader(); - Property::Value value = shader2.GetProperty( Shader::Property::PROGRAM ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); + Renderer renderer = dummy.GetRendererAt(0); + Shader shader2 = renderer.GetShader(); + Property::Value value = shader2.GetProperty(Shader::Property::PROGRAM); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), TEST_LOCATION ); + Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp + DALI_TEST_EQUALS(fragmentShader, fragment->Get(), TEST_LOCATION); - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION ); + Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp + DALI_TEST_EQUALS(vertexShader, vertex->Get(), TEST_LOCATION); END_TEST; } @@ -3665,13 +3670,13 @@ int UtcDaliSvgVisualCustomShader(void) int UtcDaliVisualRoundedCorner(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualRoundedCorner" ); + tet_infoline("UtcDaliVisualRoundedCorner"); static std::vector customUniforms = - { - UniformData("cornerRadius", Property::Type::VECTOR4), - UniformData("cornerRadiusPolicy", Property::Type::FLOAT), - }; + { + UniformData("cornerRadius", Property::Type::VECTOR4), + UniformData("cornerRadiusPolicy", Property::Type::FLOAT), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); @@ -3680,57 +3685,57 @@ int UtcDaliVisualRoundedCorner(void) { VisualFactory factory = VisualFactory::Get(); Property::Map properties; - float cornerRadius = 30.0f; + float cornerRadius = 30.0f; - properties[Visual::Property::TYPE] = Visual::IMAGE; - properties[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; + properties[Visual::Property::TYPE] = Visual::IMAGE; + properties[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius) ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius)), true, TEST_LOCATION); // Default corner radius policy is absolute. - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE), true, TEST_LOCATION); } // color visual 1 { VisualFactory factory = VisualFactory::Get(); Property::Map properties; - float cornerRadius = 30.0f; + float cornerRadius = 30.0f; - properties[Visual::Property::TYPE] = Visual::COLOR; + properties[Visual::Property::TYPE] = Visual::COLOR; properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE; - properties["cornerRadius"] = cornerRadius; - properties["cornerRadiusPolicy"] = Toolkit::Visual::Transform::Policy::ABSOLUTE; + properties["cornerRadius"] = cornerRadius; + properties["cornerRadiusPolicy"] = Toolkit::Visual::Transform::Policy::ABSOLUTE; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); @@ -3740,8 +3745,8 @@ int UtcDaliVisualRoundedCorner(void) #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius) ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius)), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE), true, TEST_LOCATION); #endif } @@ -3749,23 +3754,23 @@ int UtcDaliVisualRoundedCorner(void) { VisualFactory factory = VisualFactory::Get(); Property::Map properties; - Vector4 cornerRadius(0.5f, 0.5f, 0.5f, 0.3f); + Vector4 cornerRadius(0.5f, 0.5f, 0.5f, 0.3f); - properties[Visual::Property::TYPE] = Visual::COLOR; - properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE; - properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius; + properties[Visual::Property::TYPE] = Visual::COLOR; + properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE; + properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius; properties[DevelVisual::Property::CORNER_RADIUS_POLICY] = Toolkit::Visual::Transform::Policy::RELATIVE; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); @@ -3775,8 +3780,8 @@ int UtcDaliVisualRoundedCorner(void) #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", cornerRadius ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::RELATIVE ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadius", cornerRadius), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::RELATIVE), true, TEST_LOCATION); #endif } @@ -3784,23 +3789,23 @@ int UtcDaliVisualRoundedCorner(void) { VisualFactory factory = VisualFactory::Get(); Property::Map properties; - Vector4 cornerRadius(30.0f, 30.0f, 30.0f, 20.0f); + Vector4 cornerRadius(30.0f, 30.0f, 30.0f, 20.0f); - properties[Visual::Property::TYPE] = Visual::COLOR; - properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE; - properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius; + properties[Visual::Property::TYPE] = Visual::COLOR; + properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE; + properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius; properties[DevelVisual::Property::CORNER_RADIUS_POLICY] = -1; // Set an invalid value - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); @@ -3810,9 +3815,9 @@ int UtcDaliVisualRoundedCorner(void) #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", cornerRadius ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadius", cornerRadius), true, TEST_LOCATION); // Default corner radius policy is absolute. - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE), true, TEST_LOCATION); #endif } @@ -3820,37 +3825,37 @@ int UtcDaliVisualRoundedCorner(void) { VisualFactory factory = VisualFactory::Get(); Property::Map properties; - float cornerRadius = 30.0f; + float cornerRadius = 30.0f; - properties[Visual::Property::TYPE] = Visual::GRADIENT; - properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE; - properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius; - properties[GradientVisual::Property::START_POSITION] = Vector2( 0.5f, 0.5f ); - properties[GradientVisual::Property::END_POSITION] = Vector2( -0.5f, -0.5f ); - properties[GradientVisual::Property::UNITS] = GradientVisual::Units::USER_SPACE; + properties[Visual::Property::TYPE] = Visual::GRADIENT; + properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE; + properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius; + properties[GradientVisual::Property::START_POSITION] = Vector2(0.5f, 0.5f); + properties[GradientVisual::Property::END_POSITION] = Vector2(-0.5f, -0.5f); + properties[GradientVisual::Property::UNITS] = GradientVisual::Units::USER_SPACE; Property::Array stopOffsets; - stopOffsets.PushBack( 0.0f ); - stopOffsets.PushBack( 0.6f ); - stopOffsets.PushBack( 1.0f ); + stopOffsets.PushBack(0.0f); + stopOffsets.PushBack(0.6f); + stopOffsets.PushBack(1.0f); properties[GradientVisual::Property::STOP_OFFSET] = stopOffsets; Property::Array stopColors; - stopColors.PushBack( Color::RED ); - stopColors.PushBack( Color::YELLOW ); - stopColors.PushBack( Color::GREEN ); + stopColors.PushBack(Color::RED); + stopColors.PushBack(Color::YELLOW); + stopColors.PushBack(Color::GREEN); properties[GradientVisual::Property::STOP_COLOR] = stopColors; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); @@ -3860,9 +3865,9 @@ int UtcDaliVisualRoundedCorner(void) #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius) ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius)), true, TEST_LOCATION); // Default corner radius policy is absolute. - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE), true, TEST_LOCATION); #endif } @@ -3870,37 +3875,37 @@ int UtcDaliVisualRoundedCorner(void) { VisualFactory factory = VisualFactory::Get(); Property::Map properties; - Vector4 cornerRadius(24.0f, 23.0f, 22.0f, 21.0f); + Vector4 cornerRadius(24.0f, 23.0f, 22.0f, 21.0f); - properties[Visual::Property::TYPE] = Visual::ANIMATED_IMAGE; - properties[ImageVisual::Property::URL] = TEST_GIF_FILE_NAME; + properties[Visual::Property::TYPE] = Visual::ANIMATED_IMAGE; + properties[ImageVisual::Property::URL] = TEST_GIF_FILE_NAME; properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius.x + 10.0f; // Dummy Input properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius; - properties["cornerRadiusPolicy"] = Toolkit::Visual::Transform::Policy::ABSOLUTE; + properties["cornerRadiusPolicy"] = Toolkit::Visual::Transform::Policy::ABSOLUTE; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", cornerRadius ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadius", cornerRadius), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE), true, TEST_LOCATION); #endif } @@ -3908,36 +3913,36 @@ int UtcDaliVisualRoundedCorner(void) { VisualFactory factory = VisualFactory::Get(); Property::Map properties; - Vector4 cornerRadius(27.0f, 72.0f, 11.0f, 500.5f); + Vector4 cornerRadius(27.0f, 72.0f, 11.0f, 500.5f); - properties[Visual::Property::TYPE] = Visual::SVG; - properties[ImageVisual::Property::URL] = TEST_SVG_FILE_NAME; + properties[Visual::Property::TYPE] = Visual::SVG; + properties[ImageVisual::Property::URL] = TEST_SVG_FILE_NAME; properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", cornerRadius ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadius", cornerRadius), true, TEST_LOCATION); // Default corner radius policy is absolute. - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE), true, TEST_LOCATION); #endif } @@ -3945,37 +3950,37 @@ int UtcDaliVisualRoundedCorner(void) { VisualFactory factory = VisualFactory::Get(); Property::Map properties; - float cornerRadius = 1.3f; + float cornerRadius = 1.3f; - properties[Visual::Property::TYPE] = DevelVisual::ANIMATED_VECTOR_IMAGE; - properties[ImageVisual::Property::URL] = TEST_VECTOR_IMAGE_FILE_NAME; - properties["cornerRadius"] = Vector4(1.0f, 100.0f, 10.0f, 0.1f); // Dummy Input - properties["cornerRadius"] = cornerRadius; + properties[Visual::Property::TYPE] = DevelVisual::ANIMATED_VECTOR_IMAGE; + properties[ImageVisual::Property::URL] = TEST_VECTOR_IMAGE_FILE_NAME; + properties["cornerRadius"] = Vector4(1.0f, 100.0f, 10.0f, 0.1f); // Dummy Input + properties["cornerRadius"] = cornerRadius; properties[DevelVisual::Property::CORNER_RADIUS_POLICY] = Toolkit::Visual::Transform::Policy::RELATIVE; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius) ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::RELATIVE ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius)), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::RELATIVE), true, TEST_LOCATION); #endif } @@ -3985,16 +3990,16 @@ int UtcDaliVisualRoundedCorner(void) int UtcDaliVisualBorderline(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualBorderline" ); + tet_infoline("UtcDaliVisualBorderline"); static std::vector customUniforms = - { - UniformData("cornerRadius", Property::Type::VECTOR4), - UniformData("cornerRadiusPolicy", Property::Type::FLOAT), - UniformData("borderlineWidth", Property::Type::FLOAT), - UniformData("borderlineColor", Property::Type::VECTOR4), - UniformData("borderlineOffset", Property::Type::FLOAT), - }; + { + UniformData("cornerRadius", Property::Type::VECTOR4), + UniformData("cornerRadiusPolicy", Property::Type::FLOAT), + UniformData("borderlineWidth", Property::Type::FLOAT), + UniformData("borderlineColor", Property::Type::VECTOR4), + UniformData("borderlineOffset", Property::Type::FLOAT), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); @@ -4003,71 +4008,71 @@ int UtcDaliVisualBorderline(void) { VisualFactory factory = VisualFactory::Get(); Property::Map properties; - float cornerRadius = 5.0f; - float borderlineWidth = 30.0f; - Vector4 borderlineColor(1.0f, 0.0f, 0.0f, 1.0f); - float borderlineOffset = 1.0f; - - properties[Visual::Property::TYPE] = Visual::IMAGE; - properties[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; - properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius; - properties[DevelVisual::Property::BORDERLINE_WIDTH] = borderlineWidth; - properties[DevelVisual::Property::BORDERLINE_COLOR] = borderlineColor; + float cornerRadius = 5.0f; + float borderlineWidth = 30.0f; + Vector4 borderlineColor(1.0f, 0.0f, 0.0f, 1.0f); + float borderlineOffset = 1.0f; + + properties[Visual::Property::TYPE] = Visual::IMAGE; + properties[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; + properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius; + properties[DevelVisual::Property::BORDERLINE_WIDTH] = borderlineWidth; + properties[DevelVisual::Property::BORDERLINE_COLOR] = borderlineColor; properties[DevelVisual::Property::BORDERLINE_OFFSET] = borderlineOffset; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius) ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius)), true, TEST_LOCATION); // Default corner radius policy is absolute. - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineWidth", borderlineWidth ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "borderlineColor", borderlineColor ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineOffset", borderlineOffset ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineWidth", borderlineWidth), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineColor", borderlineColor), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineOffset", borderlineOffset), true, TEST_LOCATION); } // color visual 1 { VisualFactory factory = VisualFactory::Get(); Property::Map properties; - Vector4 cornerRadius(23.0f, 2.0f, 3.0f, 2.3f); - float borderlineWidth = 30.0f; - Vector4 borderlineColor(0.5f, 0.4f, 0.3f, 0.2f); - float borderlineOffset = -0.4f; + Vector4 cornerRadius(23.0f, 2.0f, 3.0f, 2.3f); + float borderlineWidth = 30.0f; + Vector4 borderlineColor(0.5f, 0.4f, 0.3f, 0.2f); + float borderlineOffset = -0.4f; - properties[Visual::Property::TYPE] = Visual::COLOR; + properties[Visual::Property::TYPE] = Visual::COLOR; properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE; - properties["cornerRadius"] = cornerRadius; - properties["borderlineWidth"] = borderlineWidth; - properties["borderlineColor"] = borderlineColor; - properties["borderlineOffset"] = borderlineOffset; + properties["cornerRadius"] = cornerRadius; + properties["borderlineWidth"] = borderlineWidth; + properties["borderlineColor"] = borderlineColor; + properties["borderlineOffset"] = borderlineOffset; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); @@ -4077,10 +4082,10 @@ int UtcDaliVisualBorderline(void) #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", cornerRadius ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineWidth", borderlineWidth ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "borderlineColor", borderlineColor ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineOffset", borderlineOffset ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadius", cornerRadius), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineWidth", borderlineWidth), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineColor", borderlineColor), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineOffset", borderlineOffset), true, TEST_LOCATION); #endif } @@ -4088,22 +4093,22 @@ int UtcDaliVisualBorderline(void) { VisualFactory factory = VisualFactory::Get(); Property::Map properties; - float borderlineWidth = 30.0f; + float borderlineWidth = 30.0f; - properties[Visual::Property::TYPE] = Visual::COLOR; - properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE; + properties[Visual::Property::TYPE] = Visual::COLOR; + properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE; properties[DevelVisual::Property::BORDERLINE_WIDTH] = borderlineWidth; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); @@ -4113,11 +4118,11 @@ int UtcDaliVisualBorderline(void) #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineWidth", borderlineWidth ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineWidth", borderlineWidth), true, TEST_LOCATION); // Default borderline color is BLACK. - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "borderlineColor", Color::BLACK ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineColor", Color::BLACK), true, TEST_LOCATION); // Default borderline offset is 0.0f. - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineOffset", 0.0f ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineOffset", 0.0f), true, TEST_LOCATION); #endif } @@ -4125,26 +4130,26 @@ int UtcDaliVisualBorderline(void) { VisualFactory factory = VisualFactory::Get(); Property::Map properties; - float borderlineWidth = 30.0f; - Vector4 borderlineColor(0.5f, 0.4f, 0.3f, 0.2f); - float borderlineOffset = 37.4f; + float borderlineWidth = 30.0f; + Vector4 borderlineColor(0.5f, 0.4f, 0.3f, 0.2f); + float borderlineOffset = 37.4f; - properties[Visual::Property::TYPE] = Visual::COLOR; + properties[Visual::Property::TYPE] = Visual::COLOR; properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE; - properties["borderlineWidth"] = borderlineWidth; - properties["borderlineColor"] = borderlineColor; - properties["borderlineOffset"] = borderlineOffset; + properties["borderlineWidth"] = borderlineWidth; + properties["borderlineColor"] = borderlineColor; + properties["borderlineOffset"] = borderlineOffset; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); @@ -4154,10 +4159,10 @@ int UtcDaliVisualBorderline(void) #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineWidth", borderlineWidth ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "borderlineColor", borderlineColor ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineWidth", borderlineWidth), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineColor", borderlineColor), true, TEST_LOCATION); // NOTE : borderlineOffset will clamp in fragment shader. not visual itself - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineOffset", borderlineOffset ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineOffset", borderlineOffset), true, TEST_LOCATION); #endif } @@ -4165,39 +4170,39 @@ int UtcDaliVisualBorderline(void) { VisualFactory factory = VisualFactory::Get(); Property::Map properties; - float borderlineWidth = 30.0f; - float cornerRadius = 70.0f; + float borderlineWidth = 30.0f; + float cornerRadius = 70.0f; - properties[Visual::Property::TYPE] = Visual::GRADIENT; - properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE; - properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius; - properties[DevelVisual::Property::BORDERLINE_WIDTH] = borderlineWidth; - properties[GradientVisual::Property::START_POSITION] = Vector2( 0.5f, 0.5f ); - properties[GradientVisual::Property::END_POSITION] = Vector2( -0.5f, -0.5f ); - properties[GradientVisual::Property::UNITS] = GradientVisual::Units::USER_SPACE; + properties[Visual::Property::TYPE] = Visual::GRADIENT; + properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE; + properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius; + properties[DevelVisual::Property::BORDERLINE_WIDTH] = borderlineWidth; + properties[GradientVisual::Property::START_POSITION] = Vector2(0.5f, 0.5f); + properties[GradientVisual::Property::END_POSITION] = Vector2(-0.5f, -0.5f); + properties[GradientVisual::Property::UNITS] = GradientVisual::Units::USER_SPACE; Property::Array stopOffsets; - stopOffsets.PushBack( 0.0f ); - stopOffsets.PushBack( 0.6f ); - stopOffsets.PushBack( 1.0f ); + stopOffsets.PushBack(0.0f); + stopOffsets.PushBack(0.6f); + stopOffsets.PushBack(1.0f); properties[GradientVisual::Property::STOP_OFFSET] = stopOffsets; Property::Array stopColors; - stopColors.PushBack( Color::RED ); - stopColors.PushBack( Color::YELLOW ); - stopColors.PushBack( Color::GREEN ); + stopColors.PushBack(Color::RED); + stopColors.PushBack(Color::YELLOW); + stopColors.PushBack(Color::GREEN); properties[GradientVisual::Property::STOP_COLOR] = stopColors; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); @@ -4207,14 +4212,14 @@ int UtcDaliVisualBorderline(void) #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius) ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius)), true, TEST_LOCATION); // Default corner radius policy is absolute. - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineWidth", borderlineWidth ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineWidth", borderlineWidth), true, TEST_LOCATION); // Default borderline color is BLACK. - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "borderlineColor", Color::BLACK ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineColor", Color::BLACK), true, TEST_LOCATION); // Default borderline offset is 0.0f. - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineOffset", 0.0f ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineOffset", 0.0f), true, TEST_LOCATION); #endif } @@ -4222,40 +4227,40 @@ int UtcDaliVisualBorderline(void) { VisualFactory factory = VisualFactory::Get(); Property::Map properties; - float borderlineWidth = 24.0f; - float borderlineOffset = -1.0f; + float borderlineWidth = 24.0f; + float borderlineOffset = -1.0f; - properties[Visual::Property::TYPE] = Visual::ANIMATED_IMAGE; - properties[ImageVisual::Property::URL] = TEST_GIF_FILE_NAME; + properties[Visual::Property::TYPE] = Visual::ANIMATED_IMAGE; + properties[ImageVisual::Property::URL] = TEST_GIF_FILE_NAME; properties[DevelVisual::Property::BORDERLINE_WIDTH] = borderlineWidth + 10.0f; // Dummy Input properties[DevelVisual::Property::BORDERLINE_WIDTH] = borderlineWidth; - properties["borderlineOffset"] = borderlineOffset; + properties["borderlineOffset"] = borderlineOffset; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineWidth", borderlineWidth ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineWidth", borderlineWidth), true, TEST_LOCATION); // Default borderline color is BLACK. - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "borderlineColor", Color::BLACK ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineOffset", borderlineOffset ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineColor", Color::BLACK), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineOffset", borderlineOffset), true, TEST_LOCATION); #endif } @@ -4263,44 +4268,44 @@ int UtcDaliVisualBorderline(void) { VisualFactory factory = VisualFactory::Get(); Property::Map properties; - Vector4 cornerRadius(54.0f, 43.0f, 32.0f, 21.0f); - float borderlineWidth = 27.0f; - Vector4 borderlineColor(0.5f, 0.5f, 0.5f, 0.0f); + Vector4 cornerRadius(54.0f, 43.0f, 32.0f, 21.0f); + float borderlineWidth = 27.0f; + Vector4 borderlineColor(0.5f, 0.5f, 0.5f, 0.0f); - properties[Visual::Property::TYPE] = Visual::SVG; - properties[ImageVisual::Property::URL] = TEST_SVG_FILE_NAME; - properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius; + properties[Visual::Property::TYPE] = Visual::SVG; + properties[ImageVisual::Property::URL] = TEST_SVG_FILE_NAME; + properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius; properties[DevelVisual::Property::BORDERLINE_WIDTH] = borderlineWidth; properties[DevelVisual::Property::BORDERLINE_COLOR] = borderlineColor; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", cornerRadius ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadius", cornerRadius), true, TEST_LOCATION); // Default corner radius policy is absolute. - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineWidth", borderlineWidth ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "borderlineColor", borderlineColor ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineWidth", borderlineWidth), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineColor", borderlineColor), true, TEST_LOCATION); // Default borderline offset is 0.0. - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineOffset", 0.0f ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineOffset", 0.0f), true, TEST_LOCATION); #endif } @@ -4308,45 +4313,45 @@ int UtcDaliVisualBorderline(void) { VisualFactory factory = VisualFactory::Get(); Property::Map properties; - Vector4 cornerRadius(1.3f, 0.0f, 0.4f, 0.2f); - float borderlineWidth = 13.0f; - Vector4 borderlineColor(0.3f, 0.3f, 0.3f, 1.0f); - float borderlineOffset = 13.0f; - - properties[Visual::Property::TYPE] = DevelVisual::ANIMATED_VECTOR_IMAGE; - properties[ImageVisual::Property::URL] = TEST_VECTOR_IMAGE_FILE_NAME; - properties["cornerRadius"] = cornerRadius; + Vector4 cornerRadius(1.3f, 0.0f, 0.4f, 0.2f); + float borderlineWidth = 13.0f; + Vector4 borderlineColor(0.3f, 0.3f, 0.3f, 1.0f); + float borderlineOffset = 13.0f; + + properties[Visual::Property::TYPE] = DevelVisual::ANIMATED_VECTOR_IMAGE; + properties[ImageVisual::Property::URL] = TEST_VECTOR_IMAGE_FILE_NAME; + properties["cornerRadius"] = cornerRadius; properties[DevelVisual::Property::CORNER_RADIUS_POLICY] = Toolkit::Visual::Transform::Policy::RELATIVE; - properties[DevelVisual::Property::BORDERLINE_WIDTH] = borderlineWidth; - properties["borderlineColor"] = borderlineColor; - properties[DevelVisual::Property::BORDERLINE_OFFSET] = borderlineOffset; + properties[DevelVisual::Property::BORDERLINE_WIDTH] = borderlineWidth; + properties["borderlineColor"] = borderlineColor; + properties[DevelVisual::Property::BORDERLINE_OFFSET] = borderlineOffset; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", cornerRadius ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::RELATIVE ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineWidth", borderlineWidth ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "borderlineColor", borderlineColor ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineOffset", borderlineOffset ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadius", cornerRadius), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::RELATIVE), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineWidth", borderlineWidth), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineColor", borderlineColor), true, TEST_LOCATION); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineOffset", borderlineOffset), true, TEST_LOCATION); #endif } @@ -4356,7 +4361,7 @@ int UtcDaliVisualBorderline(void) int UtcDaliVisualBorderlineBlendModeTest(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualBorderlineBlendModeTest" ); + tet_infoline("UtcDaliVisualBorderlineBlendModeTest"); VisualFactory factory = VisualFactory::Get(); // Case 1 : Test which doesn't support borderline feature. @@ -4366,22 +4371,22 @@ int UtcDaliVisualBorderlineBlendModeTest(void) propertyMap.Insert(Visual::Property::TYPE, Visual::BORDER); propertyMap.Insert(BorderVisual::Property::COLOR, Color::BLUE); propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH, 1.0f); - Visual::Base borderVisual = factory.CreateVisual( propertyMap ); + Visual::Base borderVisual = factory.CreateVisual(propertyMap); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, borderVisual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, borderVisual); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); application.GetScene().Add(actor); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); Renderer renderer = actor.GetRendererAt(0); - Property::Value blendModeValue = renderer.GetProperty( Renderer::Property::BLEND_MODE ); + Property::Value blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE); // Visual::BORDER doesn't support BORDERLINE. BlendMode is AUTO. - DALI_TEST_EQUALS( blendModeValue.Get(), (int)BlendMode::AUTO, TEST_LOCATION ); + DALI_TEST_EQUALS(blendModeValue.Get(), (int)BlendMode::AUTO, TEST_LOCATION); application.GetScene().Remove(actor); } @@ -4393,22 +4398,22 @@ int UtcDaliVisualBorderlineBlendModeTest(void) propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH, 1.0f); - Visual::Base colorVisual = factory.CreateVisual( propertyMap ); + Visual::Base colorVisual = factory.CreateVisual(propertyMap); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, colorVisual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, colorVisual); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); application.GetScene().Add(actor); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); Renderer renderer = actor.GetRendererAt(0); - Property::Value blendModeValue = renderer.GetProperty( Renderer::Property::BLEND_MODE ); + Property::Value blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE); // Visual::COLOR support BORDERLINE. BlendMode is ON_WITHOUT_CULL. - DALI_TEST_EQUALS( blendModeValue.Get(), (int)BlendMode::ON_WITHOUT_CULL, TEST_LOCATION ); + DALI_TEST_EQUALS(blendModeValue.Get(), (int)BlendMode::ON_WITHOUT_CULL, TEST_LOCATION); application.GetScene().Remove(actor); } @@ -4419,46 +4424,46 @@ int UtcDaliVisualBorderlineBlendModeTest(void) Property::Map propertyMap; propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); - Visual::Base colorVisual = factory.CreateVisual( propertyMap ); + Visual::Base colorVisual = factory.CreateVisual(propertyMap); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, colorVisual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, colorVisual); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); application.GetScene().Add(actor); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); Renderer renderer = actor.GetRendererAt(0); - Property::Value blendModeValue = renderer.GetProperty( Renderer::Property::BLEND_MODE ); + Property::Value blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE); // BlendMode is AUTO. - DALI_TEST_EQUALS( blendModeValue.Get(), (int)BlendMode::AUTO, TEST_LOCATION ); + DALI_TEST_EQUALS(blendModeValue.Get(), (int)BlendMode::AUTO, TEST_LOCATION); Animation animation = Animation::New(0.1f); - animation.AnimateTo( DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, DevelVisual::Property::BORDERLINE_WIDTH), 1.0f ); + animation.AnimateTo(DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, DevelVisual::Property::BORDERLINE_WIDTH), 1.0f); animation.Play(); application.SendNotification(); application.Render(); application.Render(101u); // End of animation - blendModeValue = renderer.GetProperty( Renderer::Property::BLEND_MODE ); + blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE); // BlendMode is ON_WITHOUT_CULL. - DALI_TEST_EQUALS( blendModeValue.Get(), (int)BlendMode::ON_WITHOUT_CULL, TEST_LOCATION ); + DALI_TEST_EQUALS(blendModeValue.Get(), (int)BlendMode::ON_WITHOUT_CULL, TEST_LOCATION); Animation revanimation = Animation::New(0.1f); - revanimation.AnimateTo( DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, DevelVisual::Property::BORDERLINE_WIDTH), 0.0f ); + revanimation.AnimateTo(DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, DevelVisual::Property::BORDERLINE_WIDTH), 0.0f); revanimation.Play(); application.SendNotification(); application.Render(); application.Render(101u); // End of animation - blendModeValue = renderer.GetProperty( Renderer::Property::BLEND_MODE ); + blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE); // BlendMode is still ON_WITHOUT_CULL. - DALI_TEST_EQUALS( blendModeValue.Get(), (int)BlendMode::ON_WITHOUT_CULL, TEST_LOCATION ); + DALI_TEST_EQUALS(blendModeValue.Get(), (int)BlendMode::ON_WITHOUT_CULL, TEST_LOCATION); application.GetScene().Remove(actor); } @@ -4470,34 +4475,34 @@ int UtcDaliVisualBorderlineBlendModeTest(void) propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH, 1.0f); - Visual::Base colorVisual = factory.CreateVisual( propertyMap ); + Visual::Base colorVisual = factory.CreateVisual(propertyMap); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, colorVisual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, colorVisual); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f)); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); application.GetScene().Add(actor); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); Renderer renderer = actor.GetRendererAt(0); - Property::Value blendModeValue = renderer.GetProperty( Renderer::Property::BLEND_MODE ); + Property::Value blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE); // BlendMode is ON_WITHOUT_CULL. - DALI_TEST_EQUALS( blendModeValue.Get(), (int)BlendMode::ON_WITHOUT_CULL, TEST_LOCATION ); + DALI_TEST_EQUALS(blendModeValue.Get(), (int)BlendMode::ON_WITHOUT_CULL, TEST_LOCATION); Animation animation = Animation::New(0.1f); - animation.AnimateTo( DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, DevelVisual::Property::CORNER_RADIUS), Vector4(1.0f, 1.0f, 1.0f, 1.0f) ); + animation.AnimateTo(DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, DevelVisual::Property::CORNER_RADIUS), Vector4(1.0f, 1.0f, 1.0f, 1.0f)); animation.Play(); application.SendNotification(); application.Render(); application.Render(101u); // End of animation - blendModeValue = renderer.GetProperty( Renderer::Property::BLEND_MODE ); + blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE); // BlendMode is ON_WITHOUT_CULL. - DALI_TEST_EQUALS( blendModeValue.Get(), (int)BlendMode::ON_WITHOUT_CULL, TEST_LOCATION ); + DALI_TEST_EQUALS(blendModeValue.Get(), (int)BlendMode::ON_WITHOUT_CULL, TEST_LOCATION); application.GetScene().Remove(actor); } @@ -4508,54 +4513,54 @@ int UtcDaliVisualBorderlineBlendModeTest(void) int UtcDaliVisualBorderlineColorAnimateTest(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualBorderlineColorAnimateTest color" ); + tet_infoline("UtcDaliVisualBorderlineColorAnimateTest color"); - TestGraphicsController& graphics = application.GetGraphicsController(); + TestGraphicsController& graphics = application.GetGraphicsController(); static std::vector customUniforms = - { - UniformData("mixColor", Property::Type::VECTOR3), - UniformData("cornerRadius", Property::Type::VECTOR4), - UniformData("cornerRadiusPolicy", Property::Type::FLOAT), - UniformData("borderlineWidth", Property::Type::FLOAT), - UniformData("borderlineColor", Property::Type::VECTOR4), - UniformData("borderlineOffset", Property::Type::FLOAT), - }; + { + UniformData("mixColor", Property::Type::VECTOR3), + UniformData("cornerRadius", Property::Type::VECTOR4), + UniformData("cornerRadiusPolicy", Property::Type::FLOAT), + UniformData("borderlineWidth", Property::Type::FLOAT), + UniformData("borderlineColor", Property::Type::VECTOR4), + UniformData("borderlineOffset", Property::Type::FLOAT), + }; graphics.AddCustomUniforms(customUniforms); { - const Vector3 INITIAL_MIX_COLOR( 1.0f,0.0f,1.0f ); - const float INITIAL_MIX_OPACITY( 0.5f ); - const Vector4 INITIAL_BORDERLINE_COLOR( 0.0f,1.0f,0.0f,1.0f ); - const float INITIAL_ACTOR_OPACITY( 1.0f ); - const Vector3 TARGET_MIX_COLOR( 1.0f, 0.0f, 0.0f ); - const float TARGET_MIX_OPACITY( 0.8f ); - const Vector4 TARGET_BORDERLINE_COLOR( 1.0f, 0.0f, 1.0f, 0.2f); - const float TARGET_ACTOR_OPACITY( 0.5f ); + const Vector3 INITIAL_MIX_COLOR(1.0f, 0.0f, 1.0f); + const float INITIAL_MIX_OPACITY(0.5f); + const Vector4 INITIAL_BORDERLINE_COLOR(0.0f, 1.0f, 0.0f, 1.0f); + const float INITIAL_ACTOR_OPACITY(1.0f); + const Vector3 TARGET_MIX_COLOR(1.0f, 0.0f, 0.0f); + const float TARGET_MIX_OPACITY(0.8f); + const Vector4 TARGET_BORDERLINE_COLOR(1.0f, 0.0f, 1.0f, 0.2f); + const float TARGET_ACTOR_OPACITY(0.5f); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); propertyMap.Insert(Visual::Property::MIX_COLOR, INITIAL_MIX_COLOR); propertyMap.Insert(Visual::Property::OPACITY, INITIAL_MIX_OPACITY); propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH, 1.0f); propertyMap.Insert(DevelVisual::Property::BORDERLINE_COLOR, INITIAL_BORDERLINE_COLOR); - Visual::Base visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual(propertyMap); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) ); - actor.SetProperty( Actor::Property::OPACITY, INITIAL_ACTOR_OPACITY ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f)); + actor.SetProperty(Actor::Property::OPACITY, INITIAL_ACTOR_OPACITY); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); application.GetScene().Add(actor); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); Animation animation = Animation::New(4.0f); - animation.AnimateTo( DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, Visual::Property::MIX_COLOR), TARGET_MIX_COLOR ); - animation.AnimateTo( DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, Visual::Property::OPACITY), TARGET_MIX_OPACITY); - animation.AnimateTo( DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, DevelVisual::Property::BORDERLINE_COLOR), TARGET_BORDERLINE_COLOR ); - animation.AnimateTo( Property(actor, Actor::Property::OPACITY), TARGET_ACTOR_OPACITY); + animation.AnimateTo(DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, Visual::Property::MIX_COLOR), TARGET_MIX_COLOR); + animation.AnimateTo(DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, Visual::Property::OPACITY), TARGET_MIX_OPACITY); + animation.AnimateTo(DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, DevelVisual::Property::BORDERLINE_COLOR), TARGET_BORDERLINE_COLOR); + animation.AnimateTo(Property(actor, Actor::Property::OPACITY), TARGET_ACTOR_OPACITY); animation.Play(); TestGlAbstraction& glAbstraction = application.GetGlAbstraction(); @@ -4565,24 +4570,24 @@ int UtcDaliVisualBorderlineColorAnimateTest(void) application.Render(2000u); // halfway point application.SendNotification(); - Vector3 halfwayMixColor = (INITIAL_MIX_COLOR + TARGET_MIX_COLOR ) * 0.5f; - float halfwayMixOpacity = (INITIAL_MIX_OPACITY + TARGET_MIX_OPACITY ) * 0.5f; + Vector3 halfwayMixColor = (INITIAL_MIX_COLOR + TARGET_MIX_COLOR) * 0.5f; + float halfwayMixOpacity = (INITIAL_MIX_OPACITY + TARGET_MIX_OPACITY) * 0.5f; Vector4 halfwayBorderlineColor = (INITIAL_BORDERLINE_COLOR + TARGET_BORDERLINE_COLOR) * 0.5f; - float halfwayActorOpacity = (INITIAL_ACTOR_OPACITY + TARGET_ACTOR_OPACITY ) * 0.5f; + float halfwayActorOpacity = (INITIAL_ACTOR_OPACITY + TARGET_ACTOR_OPACITY) * 0.5f; halfwayMixOpacity *= halfwayActorOpacity; - DALI_TEST_EQUALS( glAbstraction.CheckUniformValue("mixColor", halfwayMixColor), true, TEST_LOCATION ); - DALI_TEST_EQUALS( glAbstraction.CheckUniformValue("uColor", Vector4(1.0f, 1.0f, 1.0f, halfwayMixOpacity)), true, TEST_LOCATION ); - DALI_TEST_EQUALS( glAbstraction.CheckUniformValue("uActorColor", Vector4(1.0f, 1.0f, 1.0f, halfwayActorOpacity)), true, TEST_LOCATION ); - DALI_TEST_EQUALS( glAbstraction.CheckUniformValue("borderlineColor", halfwayBorderlineColor), true, TEST_LOCATION ); + DALI_TEST_EQUALS(glAbstraction.CheckUniformValue("mixColor", halfwayMixColor), true, TEST_LOCATION); + DALI_TEST_EQUALS(glAbstraction.CheckUniformValue("uColor", Vector4(1.0f, 1.0f, 1.0f, halfwayMixOpacity)), true, TEST_LOCATION); + DALI_TEST_EQUALS(glAbstraction.CheckUniformValue("uActorColor", Vector4(1.0f, 1.0f, 1.0f, halfwayActorOpacity)), true, TEST_LOCATION); + DALI_TEST_EQUALS(glAbstraction.CheckUniformValue("borderlineColor", halfwayBorderlineColor), true, TEST_LOCATION); - application.Render(2001u); // go past end + application.Render(2001u); // go past end application.SendNotification(); // Trigger signals - DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), Vector4(1.0f, 1.0f, 1.0f, TARGET_ACTOR_OPACITY), TEST_LOCATION ); - DALI_TEST_EQUALS( glAbstraction.CheckUniformValue("mixColor", TARGET_MIX_COLOR), true, TEST_LOCATION ); - DALI_TEST_EQUALS( glAbstraction.CheckUniformValue("uColor", Vector4(1.0f, 1.0f, 1.0f, TARGET_MIX_OPACITY * TARGET_ACTOR_OPACITY) ), true, TEST_LOCATION ); - DALI_TEST_EQUALS( glAbstraction.CheckUniformValue("uActorColor", Vector4(1.0f, 1.0f, 1.0f, TARGET_ACTOR_OPACITY)), true, TEST_LOCATION ); - DALI_TEST_EQUALS( glAbstraction.CheckUniformValue("borderlineColor", TARGET_BORDERLINE_COLOR ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetCurrentProperty(Actor::Property::COLOR), Vector4(1.0f, 1.0f, 1.0f, TARGET_ACTOR_OPACITY), TEST_LOCATION); + DALI_TEST_EQUALS(glAbstraction.CheckUniformValue("mixColor", TARGET_MIX_COLOR), true, TEST_LOCATION); + DALI_TEST_EQUALS(glAbstraction.CheckUniformValue("uColor", Vector4(1.0f, 1.0f, 1.0f, TARGET_MIX_OPACITY * TARGET_ACTOR_OPACITY)), true, TEST_LOCATION); + DALI_TEST_EQUALS(glAbstraction.CheckUniformValue("uActorColor", Vector4(1.0f, 1.0f, 1.0f, TARGET_ACTOR_OPACITY)), true, TEST_LOCATION); + DALI_TEST_EQUALS(glAbstraction.CheckUniformValue("borderlineColor", TARGET_BORDERLINE_COLOR), true, TEST_LOCATION); actor.Unparent(); } @@ -4593,34 +4598,34 @@ int UtcDaliVisualBorderlineColorAnimateTest(void) int UtcDaliColorVisualBlurRadius(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliColorVisualBlurRadius" ); + tet_infoline("UtcDaliColorVisualBlurRadius"); static std::vector customUniforms = - { - UniformData("blurRadius", Property::Type::FLOAT), - }; + { + UniformData("blurRadius", Property::Type::FLOAT), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); VisualFactory factory = VisualFactory::Get(); Property::Map properties; - float blurRadius = 20.0f; + float blurRadius = 20.0f; - properties[Visual::Property::TYPE] = Visual::COLOR; + properties[Visual::Property::TYPE] = Visual::COLOR; properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE; - properties["blurRadius"] = blurRadius; + properties["blurRadius"] = blurRadius; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // trigger creation through setting on stage - DummyControl dummy = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + DummyControl dummy = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - application.GetScene().Add( dummy ); + dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); @@ -4628,7 +4633,7 @@ int UtcDaliColorVisualBlurRadius(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "blurRadius", blurRadius ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("blurRadius", blurRadius), true, TEST_LOCATION); END_TEST; } @@ -4636,134 +4641,134 @@ int UtcDaliColorVisualBlurRadius(void) int UtcDaliVisualGetType(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetType" ); + tet_infoline("UtcDaliVisualGetType"); VisualFactory factory = VisualFactory::Get(); { Property::Map properties; properties[Visual::Property::TYPE] = Visual::BORDER; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); - DALI_TEST_CHECK( visual.GetType() == Visual::BORDER ); + DALI_TEST_CHECK(visual.GetType() == Visual::BORDER); } { Property::Map properties; properties[Visual::Property::TYPE] = Visual::COLOR; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); - DALI_TEST_CHECK( visual.GetType() == Visual::COLOR ); + DALI_TEST_CHECK(visual.GetType() == Visual::COLOR); } { Property::Map properties; - properties[Visual::Property::TYPE] = Visual::GRADIENT; - properties[GradientVisual::Property::START_POSITION] = Vector2( -1.f, -1.f ); - properties[GradientVisual::Property::END_POSITION] = Vector2( 1.f, 1.f ); - properties[GradientVisual::Property::STOP_OFFSET] = Vector2(0.f, 1.f); + properties[Visual::Property::TYPE] = Visual::GRADIENT; + properties[GradientVisual::Property::START_POSITION] = Vector2(-1.f, -1.f); + properties[GradientVisual::Property::END_POSITION] = Vector2(1.f, 1.f); + properties[GradientVisual::Property::STOP_OFFSET] = Vector2(0.f, 1.f); // propertyMap.Insert( GradientVisual::Property::SPREAD_METHOD, GradientVisual::SpreadMethod::REPEAT) ; Property::Array stopColors; - stopColors.PushBack( Color::RED ); - stopColors.PushBack( Color::GREEN ); + stopColors.PushBack(Color::RED); + stopColors.PushBack(Color::GREEN); properties[GradientVisual::Property::STOP_COLOR] = stopColors; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); - DALI_TEST_CHECK( visual.GetType() == Visual::GRADIENT ); + DALI_TEST_CHECK(visual.GetType() == Visual::GRADIENT); } { Property::Map properties; properties[Visual::Property::TYPE] = Visual::IMAGE; - properties.Insert( ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME ); - Visual::Base visual = factory.CreateVisual( properties ); + properties.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME); + Visual::Base visual = factory.CreateVisual(properties); - DALI_TEST_CHECK( visual.GetType() == Visual::IMAGE ); + DALI_TEST_CHECK(visual.GetType() == Visual::IMAGE); } { Property::Map properties; properties[Visual::Property::TYPE] = Visual::MESH; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); - DALI_TEST_CHECK( visual.GetType() == Visual::MESH ); + DALI_TEST_CHECK(visual.GetType() == Visual::MESH); } { Property::Map properties; - properties[Visual::Property::TYPE] = Visual::PRIMITIVE; + properties[Visual::Property::TYPE] = Visual::PRIMITIVE; properties[PrimitiveVisual::Property::SHAPE] = PrimitiveVisual::Shape::CUBE; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); - DALI_TEST_CHECK( visual.GetType() == Visual::PRIMITIVE ); + DALI_TEST_CHECK(visual.GetType() == Visual::PRIMITIVE); } { Property::Map properties; properties[Visual::Property::TYPE] = Visual::WIREFRAME; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); - DALI_TEST_CHECK( visual.GetType() == Visual::WIREFRAME ); + DALI_TEST_CHECK(visual.GetType() == Visual::WIREFRAME); } { Property::Map properties; properties[Visual::Property::TYPE] = Visual::TEXT; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); - DALI_TEST_CHECK( visual.GetType() == Visual::TEXT ); + DALI_TEST_CHECK(visual.GetType() == Visual::TEXT); } { Property::Map properties; - properties[Visual::Property::TYPE] = Visual::N_PATCH; - properties[ImageVisual::Property::URL] = TEST_NPATCH_FILE_NAME; - Visual::Base visual = factory.CreateVisual( properties ); + properties[Visual::Property::TYPE] = Visual::N_PATCH; + properties[ImageVisual::Property::URL] = TEST_NPATCH_FILE_NAME; + Visual::Base visual = factory.CreateVisual(properties); - DALI_TEST_CHECK( visual.GetType() == Visual::N_PATCH ); + DALI_TEST_CHECK(visual.GetType() == Visual::N_PATCH); } { Property::Map properties; - properties[Visual::Property::TYPE] = Visual::SVG; + properties[Visual::Property::TYPE] = Visual::SVG; properties[ImageVisual::Property::URL] = TEST_SVG_FILE_NAME; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); - DALI_TEST_CHECK( visual.GetType() == Visual::SVG ); + DALI_TEST_CHECK(visual.GetType() == Visual::SVG); } { Property::Map properties; - properties[Visual::Property::TYPE] = Visual::ANIMATED_IMAGE; + properties[Visual::Property::TYPE] = Visual::ANIMATED_IMAGE; properties[ImageVisual::Property::URL] = TEST_GIF_FILE_NAME; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); - DALI_TEST_CHECK( visual.GetType() == Visual::ANIMATED_IMAGE ); + DALI_TEST_CHECK(visual.GetType() == Visual::ANIMATED_IMAGE); } { Property::Map properties; properties[Visual::Property::TYPE] = DevelVisual::ANIMATED_GRADIENT; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); - DALI_TEST_CHECK( visual.GetType() == static_cast( DevelVisual::ANIMATED_GRADIENT ) ); + DALI_TEST_CHECK(visual.GetType() == static_cast(DevelVisual::ANIMATED_GRADIENT)); } { Property::Map properties; - properties[Visual::Property::TYPE] = DevelVisual::ANIMATED_VECTOR_IMAGE; + properties[Visual::Property::TYPE] = DevelVisual::ANIMATED_VECTOR_IMAGE; properties[ImageVisual::Property::URL] = TEST_VECTOR_IMAGE_FILE_NAME; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); - DALI_TEST_CHECK( visual.GetType() == static_cast( DevelVisual::ANIMATED_VECTOR_IMAGE ) ); + DALI_TEST_CHECK(visual.GetType() == static_cast(DevelVisual::ANIMATED_VECTOR_IMAGE)); } { Property::Map properties; properties[Visual::Property::TYPE] = DevelVisual::ARC; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); - DALI_TEST_CHECK( visual.GetType() == static_cast( DevelVisual::ARC ) ); + DALI_TEST_CHECK(visual.GetType() == static_cast(DevelVisual::ARC)); } END_TEST; @@ -4772,19 +4777,19 @@ int UtcDaliVisualGetType(void) int UtcDaliVisualGetVisualProperty01(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetVisualProperty01: Test animatable property, Visual::Base, ColorVisual" ); + tet_infoline("UtcDaliVisualGetVisualProperty01: Test animatable property, Visual::Base, ColorVisual"); static std::vector customUniforms = - { - UniformData("mixColor", Property::Type::VECTOR3), - UniformData("offset", Property::Type::VECTOR2), - UniformData("size", Property::Type::VECTOR2), - UniformData("cornerRadius", Property::Type::VECTOR4), - UniformData("blurRadius", Property::Type::FLOAT), - UniformData("borderlineWidth", Property::Type::FLOAT), - UniformData("borderlineColor", Property::Type::VECTOR4), - UniformData("borderlineOffset", Property::Type::FLOAT), - }; + { + UniformData("mixColor", Property::Type::VECTOR3), + UniformData("offset", Property::Type::VECTOR2), + UniformData("size", Property::Type::VECTOR2), + UniformData("cornerRadius", Property::Type::VECTOR4), + UniformData("blurRadius", Property::Type::FLOAT), + UniformData("borderlineWidth", Property::Type::FLOAT), + UniformData("borderlineColor", Property::Type::VECTOR4), + UniformData("borderlineOffset", Property::Type::FLOAT), + UniformData("preMultipliedAlpha", Property::Type::FLOAT)}; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); @@ -4799,10 +4804,11 @@ int UtcDaliVisualGetVisualProperty01(void) propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH, 20.0f); propertyMap.Insert(DevelVisual::Property::BORDERLINE_COLOR, Color::RED); propertyMap.Insert(DevelVisual::Property::BORDERLINE_OFFSET, 1.0f); + propertyMap.Insert(Visual::Property::PREMULTIPLIED_ALPHA, true); Visual::Base colorVisual = factory.CreateVisual(propertyMap); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, colorVisual); dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f); application.GetScene().Add(dummyControl); @@ -4813,12 +4819,13 @@ int UtcDaliVisualGetVisualProperty01(void) Vector3 targetColor(1.0f, 1.0f, 1.0f); Vector2 targetOffset(0.05f, 0.05f); Vector2 targetSize(1.1f, 1.1f); - float targetOpacity = 0.5f; + float targetOpacity = 0.5f; Vector4 targetCornerRadius(0.0f, 0.0f, 0.0f, 0.0f); - float targetBlurRadius = 10.0f; - float targetBorderlineWidth = 25.0f; + float targetBlurRadius = 10.0f; + float targetBorderlineWidth = 25.0f; Vector4 targetBorderlineColor(1.0f, 1.0f, 1.0f, 1.0f); - float targetBorderlineOffset = -1.0f; + float targetBorderlineOffset = -1.0f; + float targetPreMultipliedAlpha = 1.0f; Animation animation = Animation::New(1.0f); animation.AnimateTo(DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL, Visual::Property::MIX_COLOR), targetColor); @@ -4837,15 +4844,15 @@ int UtcDaliVisualGetVisualProperty01(void) application.Render(1001u); // End of animation Property::Map resultMap; - colorVisual.CreatePropertyMap( resultMap ); + colorVisual.CreatePropertyMap(resultMap); // Test property values: they should be updated Property::Value* colorValue = resultMap.Find(ColorVisual::Property::MIX_COLOR, Property::VECTOR4); DALI_TEST_CHECK(colorValue); DALI_TEST_EQUALS(colorValue->Get(), Vector4(targetColor.r, targetColor.g, targetColor.b, targetOpacity), TEST_LOCATION); - Property::Value* transformValue = resultMap.Find(Dali::Toolkit::Visual::Property::TRANSFORM); - Dali::Property::Map* transformMap = transformValue->GetMap(); + Property::Value* transformValue = resultMap.Find(Dali::Toolkit::Visual::Property::TRANSFORM); + Dali::Property::Map* transformMap = transformValue->GetMap(); DALI_TEST_CHECK(transformMap); Property::Value* offsetValue = transformMap->Find(Toolkit::Visual::Transform::Property::OFFSET); @@ -4858,23 +4865,27 @@ int UtcDaliVisualGetVisualProperty01(void) Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4); DALI_TEST_CHECK(cornerRadiusValue); - DALI_TEST_EQUALS(cornerRadiusValue->Get< Vector4 >(), targetCornerRadius, TEST_LOCATION); + DALI_TEST_EQUALS(cornerRadiusValue->Get(), targetCornerRadius, TEST_LOCATION); Property::Value* blurRadiusValue = resultMap.Find(DevelColorVisual::Property::BLUR_RADIUS, Property::FLOAT); DALI_TEST_CHECK(blurRadiusValue); - DALI_TEST_EQUALS(blurRadiusValue->Get< float >(), targetBlurRadius, TEST_LOCATION); + DALI_TEST_EQUALS(blurRadiusValue->Get(), targetBlurRadius, TEST_LOCATION); Property::Value* borderlineWidthValue = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT); DALI_TEST_CHECK(borderlineWidthValue); - DALI_TEST_EQUALS(borderlineWidthValue->Get< float >(), targetBorderlineWidth, TEST_LOCATION); + DALI_TEST_EQUALS(borderlineWidthValue->Get(), targetBorderlineWidth, TEST_LOCATION); Property::Value* borderlineColorValue = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4); DALI_TEST_CHECK(borderlineColorValue); - DALI_TEST_EQUALS(borderlineColorValue->Get< Vector4 >(), targetBorderlineColor, TEST_LOCATION); + DALI_TEST_EQUALS(borderlineColorValue->Get(), targetBorderlineColor, TEST_LOCATION); Property::Value* borderlineOffsetValue = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT); DALI_TEST_CHECK(borderlineOffsetValue); - DALI_TEST_EQUALS(borderlineOffsetValue->Get< float >(), targetBorderlineOffset, TEST_LOCATION); + DALI_TEST_EQUALS(borderlineOffsetValue->Get(), targetBorderlineOffset, TEST_LOCATION); + + Property::Value* preMultAlphaValue = resultMap.Find(Visual::Property::PREMULTIPLIED_ALPHA, Property::BOOLEAN); + DALI_TEST_CHECK(preMultAlphaValue); + DALI_TEST_EQUALS(preMultAlphaValue->Get(), bool(targetPreMultipliedAlpha), TEST_LOCATION); // Test uniform values DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("mixColor", targetColor), true, TEST_LOCATION); @@ -4885,11 +4896,7 @@ int UtcDaliVisualGetVisualProperty01(void) DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineWidth", targetBorderlineWidth), true, TEST_LOCATION); DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineColor", targetBorderlineColor), true, TEST_LOCATION); DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("borderlineOffset", targetBorderlineOffset), true, TEST_LOCATION); - - // Test not-supported property - Property property1 = DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL, Visual::Property::PREMULTIPLIED_ALPHA); - DALI_TEST_CHECK(!property1.object); - DALI_TEST_CHECK(property1.propertyIndex == Property::INVALID_INDEX); + DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue("preMultipliedAlpha", targetPreMultipliedAlpha), true, TEST_LOCATION); // Test unregistered visual Property property3 = DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL2, Visual::Property::MIX_COLOR); @@ -4902,19 +4909,19 @@ int UtcDaliVisualGetVisualProperty01(void) int UtcDaliVisualGetVisualProperty02(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetVisualProperty02: Test animatable property, ColorVisual" ); + tet_infoline("UtcDaliVisualGetVisualProperty02: Test animatable property, ColorVisual"); static std::vector customUniforms = - { - UniformData("mixColor", Property::Type::VECTOR3), - UniformData("offset", Property::Type::VECTOR2), - UniformData("size", Property::Type::VECTOR2), - UniformData("cornerRadius", Property::Type::VECTOR4), - UniformData("borderlineWidth", Property::Type::FLOAT), - UniformData("borderlineCOlor", Property::Type::VECTOR4), - UniformData("borderlineOffset", Property::Type::FLOAT), - UniformData("blurRadius", Property::Type::FLOAT), - }; + { + UniformData("mixColor", Property::Type::VECTOR3), + UniformData("offset", Property::Type::VECTOR2), + UniformData("size", Property::Type::VECTOR2), + UniformData("cornerRadius", Property::Type::VECTOR4), + UniformData("borderlineWidth", Property::Type::FLOAT), + UniformData("borderlineCOlor", Property::Type::VECTOR4), + UniformData("borderlineOffset", Property::Type::FLOAT), + UniformData("blurRadius", Property::Type::FLOAT), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); @@ -4924,8 +4931,8 @@ int UtcDaliVisualGetVisualProperty02(void) propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); Visual::Base colorVisual = factory.CreateVisual(propertyMap); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, colorVisual); dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f); application.GetScene().Add(dummyControl); @@ -4936,12 +4943,12 @@ int UtcDaliVisualGetVisualProperty02(void) Vector3 targetColor(1.0f, 1.0f, 1.0f); Vector2 targetOffset(0.05f, 0.05f); Vector2 targetSize(1.1f, 1.1f); - float targetOpacity = 0.5f; + float targetOpacity = 0.5f; Vector4 targetCornerRadius(20.0f, 0.0f, 20.0f, 0.0f); - float targetBorderlineWidth = 77.7f; + float targetBorderlineWidth = 77.7f; Vector4 targetBorderlineColor(0.4f, 0.2f, 0.3f, 0.9f); - float targetBorderlineOffset = 1.0f; - float targetBlurRadius = 10.0f; + float targetBorderlineOffset = 1.0f; + float targetBlurRadius = 10.0f; // Should work when the properties are not set before Animation animation = Animation::New(1.0f); @@ -4968,8 +4975,8 @@ int UtcDaliVisualGetVisualProperty02(void) DALI_TEST_CHECK(colorValue); DALI_TEST_EQUALS(colorValue->Get(), Vector4(targetColor.r, targetColor.g, targetColor.b, targetOpacity), TEST_LOCATION); - Property::Value* transformValue = resultMap.Find(Dali::Toolkit::Visual::Property::TRANSFORM); - Dali::Property::Map* transformMap = transformValue->GetMap(); + Property::Value* transformValue = resultMap.Find(Dali::Toolkit::Visual::Property::TRANSFORM); + Dali::Property::Map* transformMap = transformValue->GetMap(); DALI_TEST_CHECK(transformMap); Property::Value* offsetValue = transformMap->Find(Toolkit::Visual::Transform::Property::OFFSET); @@ -4982,23 +4989,23 @@ int UtcDaliVisualGetVisualProperty02(void) Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4); DALI_TEST_CHECK(cornerRadiusValue); - DALI_TEST_EQUALS(cornerRadiusValue->Get< Vector4 >(), targetCornerRadius, TEST_LOCATION); + DALI_TEST_EQUALS(cornerRadiusValue->Get(), targetCornerRadius, TEST_LOCATION); Property::Value* borderlineWidthValue = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT); DALI_TEST_CHECK(borderlineWidthValue); - DALI_TEST_EQUALS(borderlineWidthValue->Get< float >(), targetBorderlineWidth, TEST_LOCATION); + DALI_TEST_EQUALS(borderlineWidthValue->Get(), targetBorderlineWidth, TEST_LOCATION); Property::Value* borderlineColorValue = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4); DALI_TEST_CHECK(borderlineColorValue); - DALI_TEST_EQUALS(borderlineColorValue->Get< Vector4 >(), targetBorderlineColor, TEST_LOCATION); + DALI_TEST_EQUALS(borderlineColorValue->Get(), targetBorderlineColor, TEST_LOCATION); Property::Value* borderlineOffsetValue = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT); DALI_TEST_CHECK(borderlineOffsetValue); - DALI_TEST_EQUALS(borderlineOffsetValue->Get< float >(), targetBorderlineOffset, TEST_LOCATION); + DALI_TEST_EQUALS(borderlineOffsetValue->Get(), targetBorderlineOffset, TEST_LOCATION); Property::Value* blurRadiusValue = resultMap.Find(DevelColorVisual::Property::BLUR_RADIUS, Property::FLOAT); DALI_TEST_CHECK(blurRadiusValue); - DALI_TEST_EQUALS(blurRadiusValue->Get< float >(), targetBlurRadius, TEST_LOCATION); + DALI_TEST_EQUALS(blurRadiusValue->Get(), targetBlurRadius, TEST_LOCATION); #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day @@ -5016,15 +5023,15 @@ int UtcDaliVisualGetVisualProperty02(void) int UtcDaliVisualGetVisualProperty03(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetVisualProperty03: Test animatable property, ImageVisual" ); + tet_infoline("UtcDaliVisualGetVisualProperty03: Test animatable property, ImageVisual"); static std::vector customUniforms = - { - UniformData("cornerRadius", Property::Type::VECTOR4), - UniformData("borderlineWidth", Property::Type::FLOAT), - UniformData("borderlineColor", Property::Type::VECTOR4), - UniformData("borderlineOffset", Property::Type::FLOAT), - }; + { + UniformData("cornerRadius", Property::Type::VECTOR4), + UniformData("borderlineWidth", Property::Type::FLOAT), + UniformData("borderlineColor", Property::Type::VECTOR4), + UniformData("borderlineOffset", Property::Type::FLOAT), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); @@ -5036,8 +5043,8 @@ int UtcDaliVisualGetVisualProperty03(void) Visual::Base imageVisual = factory.CreateVisual(propertyMap); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual); dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f); application.GetScene().Add(dummyControl); @@ -5048,11 +5055,11 @@ int UtcDaliVisualGetVisualProperty03(void) application.SendNotification(); application.Render(); - float targetOpacity = 0.5f; + float targetOpacity = 0.5f; Vector4 targetCornerRadius(20.0f, 20.0f, 0.0f, 0.0f); - float targetBorderlineWidth = 10.0f; + float targetBorderlineWidth = 10.0f; Vector4 targetBorderlineColor(1.0f, 0.0f, 1.0f, 0.5f); - float targetBorderlineOffset = -1.5f; + float targetBorderlineOffset = -1.5f; Animation animation = Animation::New(1.0f); animation.AnimateTo(DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL, Visual::Property::OPACITY), targetOpacity); @@ -5067,7 +5074,7 @@ int UtcDaliVisualGetVisualProperty03(void) application.Render(1001u); // End of animation Property::Map resultMap; - imageVisual.CreatePropertyMap( resultMap ); + imageVisual.CreatePropertyMap(resultMap); // Test property values: they should be updated Property::Value* colorValue = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4); @@ -5076,19 +5083,19 @@ int UtcDaliVisualGetVisualProperty03(void) Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4); DALI_TEST_CHECK(cornerRadiusValue); - DALI_TEST_EQUALS(cornerRadiusValue->Get< Vector4 >(), targetCornerRadius, TEST_LOCATION); + DALI_TEST_EQUALS(cornerRadiusValue->Get(), targetCornerRadius, TEST_LOCATION); Property::Value* borderlineWidthValue = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT); DALI_TEST_CHECK(borderlineWidthValue); - DALI_TEST_EQUALS(borderlineWidthValue->Get< float >(), targetBorderlineWidth, TEST_LOCATION); + DALI_TEST_EQUALS(borderlineWidthValue->Get(), targetBorderlineWidth, TEST_LOCATION); Property::Value* borderlineColorValue = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4); DALI_TEST_CHECK(borderlineColorValue); - DALI_TEST_EQUALS(borderlineColorValue->Get< Vector4 >(), targetBorderlineColor, TEST_LOCATION); + DALI_TEST_EQUALS(borderlineColorValue->Get(), targetBorderlineColor, TEST_LOCATION); Property::Value* borderlineOffsetValue = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT); DALI_TEST_CHECK(borderlineOffsetValue); - DALI_TEST_EQUALS(borderlineOffsetValue->Get< float >(), targetBorderlineOffset, TEST_LOCATION); + DALI_TEST_EQUALS(borderlineOffsetValue->Get(), targetBorderlineOffset, TEST_LOCATION); #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day @@ -5105,25 +5112,25 @@ int UtcDaliVisualGetVisualProperty03(void) int UtcDaliVisualGetVisualProperty04(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetVisualProperty04: Test animatable property, GradientVisual" ); + tet_infoline("UtcDaliVisualGetVisualProperty04: Test animatable property, GradientVisual"); static std::vector customUniforms = - { - UniformData("cornerRadius", Property::Type::VECTOR4), - }; + { + UniformData("cornerRadius", Property::Type::VECTOR4), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); - Vector2 start(-1.f, -1.f); - Vector2 end(1.f, 1.f); + Vector2 start(-1.f, -1.f); + Vector2 end(1.f, 1.f); Property::Array stopColors; - stopColors.PushBack( Color::RED ); - stopColors.PushBack( Color::GREEN ); + stopColors.PushBack(Color::RED); + stopColors.PushBack(Color::GREEN); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::GRADIENT); + propertyMap.Insert(Visual::Property::TYPE, Visual::GRADIENT); propertyMap.Insert(GradientVisual::Property::START_POSITION, start); propertyMap.Insert(GradientVisual::Property::END_POSITION, end); propertyMap.Insert(GradientVisual::Property::STOP_OFFSET, Vector2(0.f, 1.f)); @@ -5131,8 +5138,8 @@ int UtcDaliVisualGetVisualProperty04(void) propertyMap.Insert(GradientVisual::Property::STOP_COLOR, stopColors); Visual::Base gradientVisual = factory.CreateVisual(propertyMap); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, gradientVisual); dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f); application.GetScene().Add(dummyControl); @@ -5140,7 +5147,7 @@ int UtcDaliVisualGetVisualProperty04(void) application.SendNotification(); application.Render(); - float targetOpacity = 0.5f; + float targetOpacity = 0.5f; Vector4 targetCornerRadius(20.0f, 30.0f, 10.0f, 20.0f); Animation animation = Animation::New(1.0f); @@ -5153,7 +5160,7 @@ int UtcDaliVisualGetVisualProperty04(void) application.Render(1001u); // End of animation Property::Map resultMap; - gradientVisual.CreatePropertyMap( resultMap ); + gradientVisual.CreatePropertyMap(resultMap); // Test property values: they should be updated Property::Value* colorValue = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4); @@ -5162,7 +5169,7 @@ int UtcDaliVisualGetVisualProperty04(void) Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4); DALI_TEST_CHECK(cornerRadiusValue); - DALI_TEST_EQUALS(cornerRadiusValue->Get< Vector4 >(), targetCornerRadius, TEST_LOCATION); + DALI_TEST_EQUALS(cornerRadiusValue->Get(), targetCornerRadius, TEST_LOCATION); #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day @@ -5176,15 +5183,15 @@ int UtcDaliVisualGetVisualProperty04(void) int UtcDaliVisualGetVisualProperty05(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetVisualProperty05: Test animatable property, SvgVisual" ); + tet_infoline("UtcDaliVisualGetVisualProperty05: Test animatable property, SvgVisual"); static std::vector customUniforms = - { - UniformData("cornerRadius", Property::Type::VECTOR4), - UniformData("borderlineWidth", Property::Type::FLOAT), - UniformData("borderlineColor", Property::Type::VECTOR4), - UniformData("borderlineOffset", Property::Type::FLOAT), - }; + { + UniformData("cornerRadius", Property::Type::VECTOR4), + UniformData("borderlineWidth", Property::Type::FLOAT), + UniformData("borderlineColor", Property::Type::VECTOR4), + UniformData("borderlineOffset", Property::Type::FLOAT), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); @@ -5196,8 +5203,8 @@ int UtcDaliVisualGetVisualProperty05(void) Visual::Base svgVisual = factory.CreateVisual(propertyMap); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, svgVisual); dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f); application.GetScene().Add(dummyControl); @@ -5211,11 +5218,11 @@ int UtcDaliVisualGetVisualProperty05(void) application.SendNotification(); application.Render(); - float targetOpacity = 0.5f; + float targetOpacity = 0.5f; Vector4 targetCornerRadius(20.0f, 20.0f, 0.0f, 0.0f); - float targetBorderlineWidth = 10.0f; + float targetBorderlineWidth = 10.0f; Vector4 targetBorderlineColor(1.0f, 0.0f, 1.0f, 0.5f); - float targetBorderlineOffset = -1.5f; + float targetBorderlineOffset = -1.5f; Animation animation = Animation::New(1.0f); animation.AnimateTo(DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL, Visual::Property::OPACITY), targetOpacity); @@ -5230,7 +5237,7 @@ int UtcDaliVisualGetVisualProperty05(void) application.Render(1001u); // End of animation Property::Map resultMap; - svgVisual.CreatePropertyMap( resultMap ); + svgVisual.CreatePropertyMap(resultMap); // Test property values: they should be updated Property::Value* colorValue = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4); @@ -5239,19 +5246,19 @@ int UtcDaliVisualGetVisualProperty05(void) Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4); DALI_TEST_CHECK(cornerRadiusValue); - DALI_TEST_EQUALS(cornerRadiusValue->Get< Vector4 >(), targetCornerRadius, TEST_LOCATION); + DALI_TEST_EQUALS(cornerRadiusValue->Get(), targetCornerRadius, TEST_LOCATION); Property::Value* borderlineWidthValue = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT); DALI_TEST_CHECK(borderlineWidthValue); - DALI_TEST_EQUALS(borderlineWidthValue->Get< float >(), targetBorderlineWidth, TEST_LOCATION); + DALI_TEST_EQUALS(borderlineWidthValue->Get(), targetBorderlineWidth, TEST_LOCATION); Property::Value* borderlineColorValue = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4); DALI_TEST_CHECK(borderlineColorValue); - DALI_TEST_EQUALS(borderlineColorValue->Get< Vector4 >(), targetBorderlineColor, TEST_LOCATION); + DALI_TEST_EQUALS(borderlineColorValue->Get(), targetBorderlineColor, TEST_LOCATION); Property::Value* borderlineOffsetValue = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT); DALI_TEST_CHECK(borderlineOffsetValue); - DALI_TEST_EQUALS(borderlineOffsetValue->Get< float >(), targetBorderlineOffset, TEST_LOCATION); + DALI_TEST_EQUALS(borderlineOffsetValue->Get(), targetBorderlineOffset, TEST_LOCATION); #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day @@ -5268,15 +5275,15 @@ int UtcDaliVisualGetVisualProperty05(void) int UtcDaliVisualGetVisualProperty06(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetVisualProperty06: Test animatable property, AnimatedImageVisual" ); + tet_infoline("UtcDaliVisualGetVisualProperty06: Test animatable property, AnimatedImageVisual"); static std::vector customUniforms = - { - UniformData("cornerRadius", Property::Type::VECTOR4), - UniformData("borderlineWidth", Property::Type::FLOAT), - UniformData("borderlineColor", Property::Type::VECTOR4), - UniformData("borderlineOffset", Property::Type::FLOAT), - }; + { + UniformData("cornerRadius", Property::Type::VECTOR4), + UniformData("borderlineWidth", Property::Type::FLOAT), + UniformData("borderlineColor", Property::Type::VECTOR4), + UniformData("borderlineOffset", Property::Type::FLOAT), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); @@ -5288,8 +5295,8 @@ int UtcDaliVisualGetVisualProperty06(void) Visual::Base animatedImageVisual = factory.CreateVisual(propertyMap); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, animatedImageVisual); dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f); application.GetScene().Add(dummyControl); @@ -5303,11 +5310,11 @@ int UtcDaliVisualGetVisualProperty06(void) application.SendNotification(); application.Render(); - float targetOpacity = 0.5f; + float targetOpacity = 0.5f; Vector4 targetCornerRadius(20.0f, 20.0f, 0.0f, 0.0f); - float targetBorderlineWidth = 10.0f; + float targetBorderlineWidth = 10.0f; Vector4 targetBorderlineColor(1.0f, 0.0f, 1.0f, 0.5f); - float targetBorderlineOffset = -1.5f; + float targetBorderlineOffset = -1.5f; Animation animation = Animation::New(1.0f); animation.AnimateTo(DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL, Visual::Property::OPACITY), targetOpacity); @@ -5322,7 +5329,7 @@ int UtcDaliVisualGetVisualProperty06(void) application.Render(1001u); // End of animation Property::Map resultMap; - animatedImageVisual.CreatePropertyMap( resultMap ); + animatedImageVisual.CreatePropertyMap(resultMap); // Test property values: they should be updated Property::Value* colorValue = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4); @@ -5331,19 +5338,19 @@ int UtcDaliVisualGetVisualProperty06(void) Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4); DALI_TEST_CHECK(cornerRadiusValue); - DALI_TEST_EQUALS(cornerRadiusValue->Get< Vector4 >(), targetCornerRadius, TEST_LOCATION); + DALI_TEST_EQUALS(cornerRadiusValue->Get(), targetCornerRadius, TEST_LOCATION); Property::Value* borderlineWidthValue = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT); DALI_TEST_CHECK(borderlineWidthValue); - DALI_TEST_EQUALS(borderlineWidthValue->Get< float >(), targetBorderlineWidth, TEST_LOCATION); + DALI_TEST_EQUALS(borderlineWidthValue->Get(), targetBorderlineWidth, TEST_LOCATION); Property::Value* borderlineColorValue = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4); DALI_TEST_CHECK(borderlineColorValue); - DALI_TEST_EQUALS(borderlineColorValue->Get< Vector4 >(), targetBorderlineColor, TEST_LOCATION); + DALI_TEST_EQUALS(borderlineColorValue->Get(), targetBorderlineColor, TEST_LOCATION); Property::Value* borderlineOffsetValue = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT); DALI_TEST_CHECK(borderlineOffsetValue); - DALI_TEST_EQUALS(borderlineOffsetValue->Get< float >(), targetBorderlineOffset, TEST_LOCATION); + DALI_TEST_EQUALS(borderlineOffsetValue->Get(), targetBorderlineOffset, TEST_LOCATION); #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day @@ -5360,15 +5367,15 @@ int UtcDaliVisualGetVisualProperty06(void) int UtcDaliVisualGetVisualProperty07(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetVisualProperty07: Test animatable property, AnimatedVectorVisual" ); + tet_infoline("UtcDaliVisualGetVisualProperty07: Test animatable property, AnimatedVectorVisual"); static std::vector customUniforms = - { - UniformData("cornerRadius", Property::Type::VECTOR4), - UniformData("borderlineWidth", Property::Type::FLOAT), - UniformData("borderlineColor", Property::Type::VECTOR4), - UniformData("borderlineOffset", Property::Type::FLOAT), - }; + { + UniformData("cornerRadius", Property::Type::VECTOR4), + UniformData("borderlineWidth", Property::Type::FLOAT), + UniformData("borderlineColor", Property::Type::VECTOR4), + UniformData("borderlineOffset", Property::Type::FLOAT), + }; TestGraphicsController& graphics = application.GetGraphicsController(); graphics.AddCustomUniforms(customUniforms); @@ -5380,8 +5387,8 @@ int UtcDaliVisualGetVisualProperty07(void) Visual::Base animatedVectorVisual = factory.CreateVisual(propertyMap); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, animatedVectorVisual); dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f); application.GetScene().Add(dummyControl); @@ -5395,11 +5402,11 @@ int UtcDaliVisualGetVisualProperty07(void) application.SendNotification(); application.Render(); - float targetOpacity = 0.5f; + float targetOpacity = 0.5f; Vector4 targetCornerRadius(20.0f, 20.0f, 0.0f, 0.0f); - float targetBorderlineWidth = 10.0f; + float targetBorderlineWidth = 10.0f; Vector4 targetBorderlineColor(1.0f, 0.0f, 1.0f, 0.5f); - float targetBorderlineOffset = -1.5f; + float targetBorderlineOffset = -1.5f; Animation animation = Animation::New(1.0f); animation.AnimateTo(DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL, Visual::Property::OPACITY), targetOpacity); @@ -5414,7 +5421,7 @@ int UtcDaliVisualGetVisualProperty07(void) application.Render(1001u); // End of animation Property::Map resultMap; - animatedVectorVisual.CreatePropertyMap( resultMap ); + animatedVectorVisual.CreatePropertyMap(resultMap); // Test property values: they should be updated Property::Value* colorValue = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4); @@ -5423,19 +5430,19 @@ int UtcDaliVisualGetVisualProperty07(void) Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4); DALI_TEST_CHECK(cornerRadiusValue); - DALI_TEST_EQUALS(cornerRadiusValue->Get< Vector4 >(), targetCornerRadius, TEST_LOCATION); + DALI_TEST_EQUALS(cornerRadiusValue->Get(), targetCornerRadius, TEST_LOCATION); Property::Value* borderlineWidthValue = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT); DALI_TEST_CHECK(borderlineWidthValue); - DALI_TEST_EQUALS(borderlineWidthValue->Get< float >(), targetBorderlineWidth, TEST_LOCATION); + DALI_TEST_EQUALS(borderlineWidthValue->Get(), targetBorderlineWidth, TEST_LOCATION); Property::Value* borderlineColorValue = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4); DALI_TEST_CHECK(borderlineColorValue); - DALI_TEST_EQUALS(borderlineColorValue->Get< Vector4 >(), targetBorderlineColor, TEST_LOCATION); + DALI_TEST_EQUALS(borderlineColorValue->Get(), targetBorderlineColor, TEST_LOCATION); Property::Value* borderlineOffsetValue = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT); DALI_TEST_CHECK(borderlineOffsetValue); - DALI_TEST_EQUALS(borderlineOffsetValue->Get< float >(), targetBorderlineOffset, TEST_LOCATION); + DALI_TEST_EQUALS(borderlineOffsetValue->Get(), targetBorderlineOffset, TEST_LOCATION); #ifdef OLD_GRAPHICS_TEST // Currently test with multiple program doesn't work well. will fix another day @@ -5452,19 +5459,19 @@ int UtcDaliVisualGetVisualProperty07(void) int UtcDaliVisualUpdateProperty(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualUpdateProperty: Test update property by DoAction. Standard case" ); + tet_infoline("UtcDaliVisualUpdateProperty: Test update property by DoAction. Standard case"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap[Visual::Property::TYPE] = Visual::Type::IMAGE; - propertyMap[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; - propertyMap[Visual::Property::MIX_COLOR] = Color::BLUE; + propertyMap[Visual::Property::TYPE] = Visual::Type::IMAGE; + propertyMap[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; + propertyMap[Visual::Property::MIX_COLOR] = Color::BLUE; propertyMap[DevelVisual::Property::VISUAL_FITTING_MODE] = DevelVisual::FIT_WIDTH; Visual::Base imageVisual = factory.CreateVisual(propertyMap); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual); dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f); application.GetScene().Add(dummyControl); @@ -5479,7 +5486,7 @@ int UtcDaliVisualUpdateProperty(void) application.Render(); Property::Map originalMap; - imageVisual.CreatePropertyMap( originalMap ); + imageVisual.CreatePropertyMap(originalMap); float targetOpacity = 0.5f; Vector3 targetMixColor = Vector3(1.0f, 0.4f, 0.2f); @@ -5497,7 +5504,7 @@ int UtcDaliVisualUpdateProperty(void) DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap); Property::Map resultMap; - imageVisual.CreatePropertyMap( resultMap ); + imageVisual.CreatePropertyMap(resultMap); // Test property values: they should be updated Property::Value* colorValue = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4); @@ -5507,15 +5514,15 @@ int UtcDaliVisualUpdateProperty(void) Property::Value* urlValue = resultMap.Find(ImageVisual::Property::URL, Property::STRING); DALI_TEST_CHECK(urlValue); // NOTE : ImageVisual URL must NOT changed. - DALI_TEST_EQUALS(urlValue->Get< std::string >(), TEST_IMAGE_FILE_NAME, TEST_LOCATION); + DALI_TEST_EQUALS(urlValue->Get(), TEST_IMAGE_FILE_NAME, TEST_LOCATION); Property::Value* preMultipliedValue = resultMap.Find(Visual::Property::PREMULTIPLIED_ALPHA, Property::BOOLEAN); DALI_TEST_CHECK(preMultipliedValue); - DALI_TEST_EQUALS(preMultipliedValue->Get< bool >(), targetPreMultipliedAlpha, TEST_LOCATION); + DALI_TEST_EQUALS(preMultipliedValue->Get(), targetPreMultipliedAlpha, TEST_LOCATION); Property::Value* visualFittingModeValue = resultMap.Find(DevelVisual::Property::VISUAL_FITTING_MODE, Property::STRING); DALI_TEST_CHECK(visualFittingModeValue); - DALI_TEST_EQUALS(visualFittingModeValue->Get< std::string >(), "CENTER", TEST_LOCATION); + DALI_TEST_EQUALS(visualFittingModeValue->Get(), "CENTER", TEST_LOCATION); END_TEST; } @@ -5523,20 +5530,20 @@ int UtcDaliVisualUpdateProperty(void) int UtcDaliVisualUpdatePropertyChangeShader01(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualUpdatePropertyChangeShader01: Test update property by DoAction. Change the shader case" ); + tet_infoline("UtcDaliVisualUpdatePropertyChangeShader01: Test update property by DoAction. Change the shader case"); TraceCallStack& callStack = application.GetGraphicsController().mCallStack; VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; // Case ImageVisual - propertyMap[Visual::Property::TYPE] = Visual::Type::IMAGE; + propertyMap[Visual::Property::TYPE] = Visual::Type::IMAGE; propertyMap[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; Visual::Base imageVisual = factory.CreateVisual(propertyMap); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual); dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f); application.GetScene().Add(dummyControl); @@ -5552,24 +5559,24 @@ int UtcDaliVisualUpdatePropertyChangeShader01(void) // Get shader { - Renderer renderer = dummyControl.GetRendererAt( 0 ); - Shader shader = renderer.GetShader(); - Property::Value value = shader.GetProperty( Shader::Property::PROGRAM ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); - - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_CHECK( fragment ); + Renderer renderer = dummyControl.GetRendererAt(0); + Shader shader = renderer.GetShader(); + Property::Value value = shader.GetProperty(Shader::Property::PROGRAM); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); + + Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp + DALI_TEST_CHECK(fragment); std::string fragmentShader; - DALI_TEST_CHECK( fragment->Get(fragmentShader) ); - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos ); - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos ); - - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - std::string vertexShader; - DALI_TEST_CHECK( vertex->Get(vertexShader) ); - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos ); - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos ); + DALI_TEST_CHECK(fragment->Get(fragmentShader)); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos); + + Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp + std::string vertexShader; + DALI_TEST_CHECK(vertex->Get(vertexShader)); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos); } callStack.Reset(); callStack.Enable(true); @@ -5577,14 +5584,14 @@ int UtcDaliVisualUpdatePropertyChangeShader01(void) Vector4 targetCornerRadius = Vector4(1.0f, 12.0f, 2.0f, 21.0f); Property::Map targetPropertyMap; - targetPropertyMap[DevelVisual::Property::CORNER_RADIUS] = targetCornerRadius; + targetPropertyMap[DevelVisual::Property::CORNER_RADIUS] = targetCornerRadius; targetPropertyMap[DevelVisual::Property::CORNER_RADIUS_POLICY] = Toolkit::Visual::Transform::Policy::RELATIVE; // Update Properties with CornerRadius DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap); Property::Map resultMap; - imageVisual.CreatePropertyMap( resultMap ); + imageVisual.CreatePropertyMap(resultMap); // Test property values: they should be updated Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4); @@ -5597,24 +5604,24 @@ int UtcDaliVisualUpdatePropertyChangeShader01(void) // Get shader { - Renderer renderer = dummyControl.GetRendererAt( 0 ); - Shader shader = renderer.GetShader(); - Property::Value value = shader.GetProperty( Shader::Property::PROGRAM ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); - - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_CHECK( fragment ); + Renderer renderer = dummyControl.GetRendererAt(0); + Shader shader = renderer.GetShader(); + Property::Value value = shader.GetProperty(Shader::Property::PROGRAM); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); + + Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp + DALI_TEST_CHECK(fragment); std::string fragmentShader; - DALI_TEST_CHECK( fragment->Get(fragmentShader) ); - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos ); - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos ); - - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - std::string vertexShader; - DALI_TEST_CHECK( vertex->Get(vertexShader) ); - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos ); - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos ); + DALI_TEST_CHECK(fragment->Get(fragmentShader)); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos); + + Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp + std::string vertexShader; + DALI_TEST_CHECK(vertex->Get(vertexShader)); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos); } // Send shader compile signal @@ -5623,7 +5630,7 @@ int UtcDaliVisualUpdatePropertyChangeShader01(void) callStack.Enable(false); // Shader changed - DALI_TEST_CHECK( callStack.FindMethod("CreateShader") ); + DALI_TEST_CHECK(callStack.FindMethod("CreateShader")); callStack.Reset(); callStack.Enable(true); @@ -5642,7 +5649,7 @@ int UtcDaliVisualUpdatePropertyChangeShader01(void) DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap2); Property::Map resultMap2; - imageVisual.CreatePropertyMap( resultMap2 ); + imageVisual.CreatePropertyMap(resultMap2); // Test property values: they should be updated cornerRadiusValue = resultMap2.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4); @@ -5667,26 +5674,26 @@ int UtcDaliVisualUpdatePropertyChangeShader01(void) // Get shader { - Renderer renderer = dummyControl.GetRendererAt( 0 ); - Shader shader = renderer.GetShader(); - Property::Value value = shader.GetProperty( Shader::Property::PROGRAM ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); - - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_CHECK( fragment ); + Renderer renderer = dummyControl.GetRendererAt(0); + Shader shader = renderer.GetShader(); + Property::Value value = shader.GetProperty(Shader::Property::PROGRAM); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); + + Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp + DALI_TEST_CHECK(fragment); std::string fragmentShader; - DALI_TEST_CHECK( fragment->Get(fragmentShader) ); - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") != std::string::npos ); + DALI_TEST_CHECK(fragment->Get(fragmentShader)); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") != std::string::npos); // Note : mAlwaysUsingCornerRadius is true. - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos ); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos); - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - std::string vertexShader; - DALI_TEST_CHECK( vertex->Get(vertexShader) ); - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") != std::string::npos ); + Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp + std::string vertexShader; + DALI_TEST_CHECK(vertex->Get(vertexShader)); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") != std::string::npos); // Note : mAlwaysUsingCornerRadius is true. - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos ); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos); } // Send shader compile signal @@ -5695,7 +5702,7 @@ int UtcDaliVisualUpdatePropertyChangeShader01(void) callStack.Enable(false); // Shader changed - DALI_TEST_CHECK( callStack.FindMethod("CreateShader") ); + DALI_TEST_CHECK(callStack.FindMethod("CreateShader")); callStack.Reset(); callStack.Enable(true); @@ -5710,7 +5717,7 @@ int UtcDaliVisualUpdatePropertyChangeShader01(void) DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap3); Property::Map resultMap3; - imageVisual.CreatePropertyMap( resultMap3 ); + imageVisual.CreatePropertyMap(resultMap3); // Test property values: they should be updated cornerRadiusValue = resultMap3.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4); @@ -5735,26 +5742,26 @@ int UtcDaliVisualUpdatePropertyChangeShader01(void) // Get shader { - Renderer renderer = dummyControl.GetRendererAt( 0 ); - Shader shader = renderer.GetShader(); - Property::Value value = shader.GetProperty( Shader::Property::PROGRAM ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); - - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_CHECK( fragment ); + Renderer renderer = dummyControl.GetRendererAt(0); + Shader shader = renderer.GetShader(); + Property::Value value = shader.GetProperty(Shader::Property::PROGRAM); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); + + Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp + DALI_TEST_CHECK(fragment); std::string fragmentShader; - DALI_TEST_CHECK( fragment->Get(fragmentShader) ); + DALI_TEST_CHECK(fragment->Get(fragmentShader)); // Note : mAlwaysUsingBorderline and mAlwaysUsingCornerRadius is true. - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") != std::string::npos ); - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos ); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") != std::string::npos); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos); - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - std::string vertexShader; - DALI_TEST_CHECK( vertex->Get(vertexShader) ); + Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp + std::string vertexShader; + DALI_TEST_CHECK(vertex->Get(vertexShader)); // Note : mAlwaysUsingBorderline and mAlwaysUsingCornerRadius is true. - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") != std::string::npos ); - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos ); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") != std::string::npos); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos); } // Send shader compile signal @@ -5763,7 +5770,7 @@ int UtcDaliVisualUpdatePropertyChangeShader01(void) callStack.Enable(false); // Shader not changed - DALI_TEST_CHECK( !callStack.FindMethod("CreateShader") ); + DALI_TEST_CHECK(!callStack.FindMethod("CreateShader")); END_TEST; } @@ -5771,20 +5778,20 @@ int UtcDaliVisualUpdatePropertyChangeShader01(void) int UtcDaliVisualUpdatePropertyChangeShader02(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualUpdatePropertyChangeShader02: Test update property by DoAction. Fake update" ); + tet_infoline("UtcDaliVisualUpdatePropertyChangeShader02: Test update property by DoAction. Fake update"); TraceCallStack& callStack = application.GetGraphicsController().mCallStack; VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; // Case ImageVisual - propertyMap[Visual::Property::TYPE] = Visual::Type::IMAGE; + propertyMap[Visual::Property::TYPE] = Visual::Type::IMAGE; propertyMap[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; Visual::Base imageVisual = factory.CreateVisual(propertyMap); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual); dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f); application.GetScene().Add(dummyControl); @@ -5800,24 +5807,24 @@ int UtcDaliVisualUpdatePropertyChangeShader02(void) // Get shader { - Renderer renderer = dummyControl.GetRendererAt( 0 ); - Shader shader = renderer.GetShader(); - Property::Value value = shader.GetProperty( Shader::Property::PROGRAM ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); - - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_CHECK( fragment ); + Renderer renderer = dummyControl.GetRendererAt(0); + Shader shader = renderer.GetShader(); + Property::Value value = shader.GetProperty(Shader::Property::PROGRAM); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); + + Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp + DALI_TEST_CHECK(fragment); std::string fragmentShader; - DALI_TEST_CHECK( fragment->Get(fragmentShader) ); - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos ); - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos ); - - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - std::string vertexShader; - DALI_TEST_CHECK( vertex->Get(vertexShader) ); - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos ); - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos ); + DALI_TEST_CHECK(fragment->Get(fragmentShader)); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos); + + Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp + std::string vertexShader; + DALI_TEST_CHECK(vertex->Get(vertexShader)); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos); } Vector4 targetCornerRadius = Vector4(0.0f, 0.0f, 0.0f, 0.0f); @@ -5832,7 +5839,7 @@ int UtcDaliVisualUpdatePropertyChangeShader02(void) DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap); Property::Map resultMap; - imageVisual.CreatePropertyMap( resultMap ); + imageVisual.CreatePropertyMap(resultMap); // Test property values: they should be updated Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4); @@ -5841,26 +5848,26 @@ int UtcDaliVisualUpdatePropertyChangeShader02(void) // Get shader { - Renderer renderer = dummyControl.GetRendererAt( 0 ); - Shader shader = renderer.GetShader(); - Property::Value value = shader.GetProperty( Shader::Property::PROGRAM ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); - - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_CHECK( fragment ); + Renderer renderer = dummyControl.GetRendererAt(0); + Shader shader = renderer.GetShader(); + Property::Value value = shader.GetProperty(Shader::Property::PROGRAM); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); + + Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp + DALI_TEST_CHECK(fragment); std::string fragmentShader; - DALI_TEST_CHECK( fragment->Get(fragmentShader) ); - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos ); + DALI_TEST_CHECK(fragment->Get(fragmentShader)); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos); // Note : corner radius is zero. so we don't change shader! - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos ); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos); - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - std::string vertexShader; - DALI_TEST_CHECK( vertex->Get(vertexShader) ); - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos ); + Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp + std::string vertexShader; + DALI_TEST_CHECK(vertex->Get(vertexShader)); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos); // Note : corner radius is zero. so we don't change shader! - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos ); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos); } // Send shader compile signal @@ -5870,12 +5877,12 @@ int UtcDaliVisualUpdatePropertyChangeShader02(void) callStack.Enable(false); // Shader doesn't changed - DALI_TEST_CHECK( !(callStack.FindMethod("CreateShader")) ); + DALI_TEST_CHECK(!(callStack.FindMethod("CreateShader"))); callStack.Reset(); callStack.Enable(true); - float targetBorderlineWidth = 0.0f; - Vector4 targetBorderlineColor = Vector4(1.0f, 1.0f, 0.0f, 0.0f); + float targetBorderlineWidth = 0.0f; + Vector4 targetBorderlineColor = Vector4(1.0f, 1.0f, 0.0f, 0.0f); float targetBorderlineOffset = -1.0f; Property::Map targetPropertyMap2; @@ -5887,7 +5894,7 @@ int UtcDaliVisualUpdatePropertyChangeShader02(void) DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap2); Property::Map resultMap2; - imageVisual.CreatePropertyMap( resultMap2 ); + imageVisual.CreatePropertyMap(resultMap2); // Test property values: they should be updated Property::Value* borderlineWidthValue = resultMap2.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT); @@ -5904,26 +5911,26 @@ int UtcDaliVisualUpdatePropertyChangeShader02(void) // Get shader { - Renderer renderer = dummyControl.GetRendererAt( 0 ); - Shader shader = renderer.GetShader(); - Property::Value value = shader.GetProperty( Shader::Property::PROGRAM ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); - - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_CHECK( fragment ); + Renderer renderer = dummyControl.GetRendererAt(0); + Shader shader = renderer.GetShader(); + Property::Value value = shader.GetProperty(Shader::Property::PROGRAM); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); + + Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp + DALI_TEST_CHECK(fragment); std::string fragmentShader; - DALI_TEST_CHECK( fragment->Get(fragmentShader) ); + DALI_TEST_CHECK(fragment->Get(fragmentShader)); // Note : borderline width is zero. so we don't change shader! - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos ); - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos ); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos); - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - std::string vertexShader; - DALI_TEST_CHECK( vertex->Get(vertexShader) ); + Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp + std::string vertexShader; + DALI_TEST_CHECK(vertex->Get(vertexShader)); // Note : borderline width is zero. so we don't change shader! - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos ); - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos ); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos); } // Send shader compile signal @@ -5933,7 +5940,7 @@ int UtcDaliVisualUpdatePropertyChangeShader02(void) callStack.Enable(false); // Shader doesn't changed - DALI_TEST_CHECK( !(callStack.FindMethod("CreateShader")) ); + DALI_TEST_CHECK(!(callStack.FindMethod("CreateShader"))); END_TEST; } @@ -5941,20 +5948,20 @@ int UtcDaliVisualUpdatePropertyChangeShader02(void) int UtcDaliVisualUpdatePropertyChangeShader03(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualUpdatePropertyChangeShader03: Test update property by DoAction. Blur Radius" ); + tet_infoline("UtcDaliVisualUpdatePropertyChangeShader03: Test update property by DoAction. Blur Radius"); TraceCallStack& callStack = application.GetGraphicsController().mCallStack; VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; // Case ImageVisual - propertyMap[Visual::Property::TYPE] = Visual::Type::COLOR; + propertyMap[Visual::Property::TYPE] = Visual::Type::COLOR; propertyMap[ColorVisual::Property::MIX_COLOR] = Color::BLUE; Visual::Base imageVisual = factory.CreateVisual(propertyMap); - DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual); dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f); application.GetScene().Add(dummyControl); @@ -5967,26 +5974,26 @@ int UtcDaliVisualUpdatePropertyChangeShader03(void) // Get shader { - Renderer renderer = dummyControl.GetRendererAt( 0 ); - Shader shader = renderer.GetShader(); - Property::Value value = shader.GetProperty( Shader::Property::PROGRAM ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); - - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_CHECK( fragment ); + Renderer renderer = dummyControl.GetRendererAt(0); + Shader shader = renderer.GetShader(); + Property::Value value = shader.GetProperty(Shader::Property::PROGRAM); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); + + Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp + DALI_TEST_CHECK(fragment); std::string fragmentShader; - DALI_TEST_CHECK( fragment->Get(fragmentShader) ); - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_BLUR 1") == std::string::npos ); - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos ); - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos ); - - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - std::string vertexShader; - DALI_TEST_CHECK( vertex->Get(vertexShader) ); - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_BLUR 1") == std::string::npos ); - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos ); - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos ); + DALI_TEST_CHECK(fragment->Get(fragmentShader)); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_BLUR 1") == std::string::npos); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos); + + Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp + std::string vertexShader; + DALI_TEST_CHECK(vertex->Get(vertexShader)); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_BLUR 1") == std::string::npos); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") == std::string::npos); } float targetBlurRadius = 15.0f; @@ -6004,7 +6011,7 @@ int UtcDaliVisualUpdatePropertyChangeShader03(void) DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap); Property::Map resultMap; - imageVisual.CreatePropertyMap( resultMap ); + imageVisual.CreatePropertyMap(resultMap); // Test property values: they should be updated Property::Value* blurRadiusValue = resultMap.Find(DevelColorVisual::Property::BLUR_RADIUS, Property::FLOAT); @@ -6017,28 +6024,28 @@ int UtcDaliVisualUpdatePropertyChangeShader03(void) // Get shader { - Renderer renderer = dummyControl.GetRendererAt( 0 ); - Shader shader = renderer.GetShader(); - Property::Value value = shader.GetProperty( Shader::Property::PROGRAM ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); - - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_CHECK( fragment ); + Renderer renderer = dummyControl.GetRendererAt(0); + Shader shader = renderer.GetShader(); + Property::Value value = shader.GetProperty(Shader::Property::PROGRAM); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); + + Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp + DALI_TEST_CHECK(fragment); std::string fragmentShader; - DALI_TEST_CHECK( fragment->Get(fragmentShader) ); - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_BLUR 1") != std::string::npos ); + DALI_TEST_CHECK(fragment->Get(fragmentShader)); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_BLUR 1") != std::string::npos); // Note : We ignore borderline when blur radius occured - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos ); - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos ); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos); - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - std::string vertexShader; - DALI_TEST_CHECK( vertex->Get(vertexShader) ); - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_BLUR 1") != std::string::npos ); + Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp + std::string vertexShader; + DALI_TEST_CHECK(vertex->Get(vertexShader)); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_BLUR 1") != std::string::npos); // Note : We ignore borderline when blur radius occured - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos ); - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos ); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos); } // Send shader compile signal @@ -6048,7 +6055,7 @@ int UtcDaliVisualUpdatePropertyChangeShader03(void) callStack.Enable(false); // Shader changed - DALI_TEST_CHECK( (callStack.FindMethod("CreateShader")) ); + DALI_TEST_CHECK((callStack.FindMethod("CreateShader"))); callStack.Reset(); callStack.Enable(true); @@ -6061,7 +6068,7 @@ int UtcDaliVisualUpdatePropertyChangeShader03(void) DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap2); Property::Map resultMap2; - imageVisual.CreatePropertyMap( resultMap2 ); + imageVisual.CreatePropertyMap(resultMap2); // Test property values: they should be updated blurRadiusValue = resultMap2.Find(DevelColorVisual::Property::BLUR_RADIUS, Property::FLOAT); @@ -6074,30 +6081,30 @@ int UtcDaliVisualUpdatePropertyChangeShader03(void) // Get shader { - Renderer renderer = dummyControl.GetRendererAt( 0 ); - Shader shader = renderer.GetShader(); - Property::Value value = shader.GetProperty( Shader::Property::PROGRAM ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); - - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_CHECK( fragment ); + Renderer renderer = dummyControl.GetRendererAt(0); + Shader shader = renderer.GetShader(); + Property::Value value = shader.GetProperty(Shader::Property::PROGRAM); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); + + Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp + DALI_TEST_CHECK(fragment); std::string fragmentShader; - DALI_TEST_CHECK( fragment->Get(fragmentShader) ); + DALI_TEST_CHECK(fragment->Get(fragmentShader)); // Note : mAlwaysUsingBlurRadius and mAlwaysUsingCornerRadius is true. - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_BLUR 1") != std::string::npos ); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_BLUR 1") != std::string::npos); // Note : We ignore borderline when blur radius occured - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos ); - DALI_TEST_CHECK( fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos ); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos); + DALI_TEST_CHECK(fragmentShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos); - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - std::string vertexShader; - DALI_TEST_CHECK( vertex->Get(vertexShader) ); + Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp + std::string vertexShader; + DALI_TEST_CHECK(vertex->Get(vertexShader)); // Note : mAlwaysUsingBlurRadius and mAlwaysUsingCornerRadius is true. - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_BLUR 1") != std::string::npos ); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_BLUR 1") != std::string::npos); // Note : We ignore borderline when blur radius occured - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos ); - DALI_TEST_CHECK( vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos ); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_BORDERLINE 1") == std::string::npos); + DALI_TEST_CHECK(vertexShader.find("#define IS_REQUIRED_ROUNDED_CORNER 1") != std::string::npos); } // Send shader compile signal @@ -6107,7 +6114,7 @@ int UtcDaliVisualUpdatePropertyChangeShader03(void) callStack.Enable(false); // Shader not changed - DALI_TEST_CHECK( !(callStack.FindMethod("CreateShader")) ); + DALI_TEST_CHECK(!(callStack.FindMethod("CreateShader"))); END_TEST; } diff --git a/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.cpp b/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.cpp index 30d8616..d85d6ed 100644 --- a/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.cpp +++ b/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.cpp @@ -463,7 +463,7 @@ void AnimatedGradientVisual::OnSetTransform() { if(mImpl->mRenderer) { - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } } @@ -664,7 +664,7 @@ void AnimatedGradientVisual::OnInitialize() mFactoryCache.SaveShader(shaderType, shader); } - mImpl->mRenderer = Renderer::New(geometry, shader); + mImpl->mRenderer = VisualRenderer::New(geometry, shader); mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); mImpl->mRenderer.RegisterUniqueProperty(UNIFORM_START_POINT_NAME, GetStartValue(mValueMap, Toolkit::DevelAnimatedGradientVisual::Property::START_POSITION, START_POSITION_NAME)); @@ -676,7 +676,7 @@ void AnimatedGradientVisual::OnInitialize() mImpl->mRenderer.RegisterUniqueProperty(UNIFORM_OFFSET_NAME, GetStartValue(mValueMap, Toolkit::DevelAnimatedGradientVisual::Property::OFFSET, OFFSET_NAME)); //Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } } //namespace Internal diff --git a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp index 92948e4..b8eb497 100644 --- a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp +++ b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp @@ -46,7 +46,7 @@ namespace Internal { namespace { -const int CUSTOM_PROPERTY_COUNT(8); // 5 transform properties + ltr, wrap, pixel area, +const int CUSTOM_PROPERTY_COUNT(3); // ltr, wrap, pixel area, // stop behavior DALI_ENUM_TO_STRING_TABLE_BEGIN(STOP_BEHAVIOR) @@ -533,7 +533,7 @@ void AnimatedImageVisual::OnSetTransform() { if(mImpl->mRenderer) { - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } } @@ -553,11 +553,11 @@ void AnimatedImageVisual::OnInitialize() Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY); - mImpl->mRenderer = Renderer::New(geometry, shader); + mImpl->mRenderer = VisualRenderer::New(geometry, shader); mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); // Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); if(!defaultWrapMode) // custom wrap mode { diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp index 623a88e..440dbd4 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp +++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp @@ -290,14 +290,14 @@ void AnimatedVectorImageVisual::OnInitialize(void) Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY); - mImpl->mRenderer = Renderer::New(geometry, shader); + mImpl->mRenderer = VisualRenderer::New(geometry, shader); mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); TextureSet textureSet = TextureSet::New(); mImpl->mRenderer.SetTextures(textureSet); // Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } void AnimatedVectorImageVisual::DoSetOnScene(Actor& actor) diff --git a/dali-toolkit/internal/visuals/arc/arc-visual.cpp b/dali-toolkit/internal/visuals/arc/arc-visual.cpp index bf07a40..bbaabe9 100644 --- a/dali-toolkit/internal/visuals/arc/arc-visual.cpp +++ b/dali-toolkit/internal/visuals/arc/arc-visual.cpp @@ -37,7 +37,7 @@ namespace Internal { namespace { -const int CUSTOM_PROPERTY_COUNT(9); // 5 transform properties + thickness,start,sweep,radius +const int CUSTOM_PROPERTY_COUNT(4); // thickness,start,sweep,radius // cap DALI_ENUM_TO_STRING_TABLE_BEGIN(CAP) @@ -213,7 +213,7 @@ void ArcVisual::OnInitialize() } } - mImpl->mRenderer = Renderer::New(geometry, shader); + mImpl->mRenderer = VisualRenderer::New(geometry, shader); mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); mThicknessIndex = mImpl->mRenderer.RegisterUniqueProperty(DevelArcVisual::Property::THICKNESS, THICKNESS_NAME, mThickness); @@ -225,7 +225,7 @@ void ArcVisual::OnInitialize() mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON); // Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } } // namespace Internal diff --git a/dali-toolkit/internal/visuals/border/border-visual.cpp b/dali-toolkit/internal/visuals/border/border-visual.cpp index b60cc27..b715cca 100644 --- a/dali-toolkit/internal/visuals/border/border-visual.cpp +++ b/dali-toolkit/internal/visuals/border/border-visual.cpp @@ -39,7 +39,7 @@ namespace Internal { namespace { -const int CUSTOM_PROPERTY_COUNT(7); // 5 transform properties + color,size +const int CUSTOM_PROPERTY_COUNT(2); // color,size const char* const POSITION_ATTRIBUTE_NAME("aPosition"); const char* const DRIFT_ATTRIBUTE_NAME("aDrift"); @@ -166,7 +166,7 @@ void BorderVisual::OnSetTransform() { if(mImpl->mRenderer) { - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } } @@ -180,11 +180,11 @@ void BorderVisual::OnInitialize() } Shader shader = GetBorderShader(); - mImpl->mRenderer = Renderer::New(geometry, shader); + mImpl->mRenderer = VisualRenderer::New(geometry, shader); mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); //Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } Shader BorderVisual::GetBorderShader() diff --git a/dali-toolkit/internal/visuals/color/color-visual.cpp b/dali-toolkit/internal/visuals/color/color-visual.cpp index 21a1a70..60899bd 100644 --- a/dali-toolkit/internal/visuals/color/color-visual.cpp +++ b/dali-toolkit/internal/visuals/color/color-visual.cpp @@ -41,7 +41,7 @@ namespace Internal { namespace { -const int CUSTOM_PROPERTY_COUNT(12); // 5 transform properties + Blur Radius + Mix Color + border/corner +const int CUSTOM_PROPERTY_COUNT(6); // Blur Radius + border/corner VisualFactoryCache::ShaderType SHADER_TYPE_TABLE[6] = { @@ -180,7 +180,7 @@ void ColorVisual::OnSetTransform() { if(mImpl->mRenderer) { - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } } @@ -199,13 +199,10 @@ void ColorVisual::OnInitialize() Shader shader = GenerateShader(); - mImpl->mRenderer = Renderer::New(geometry, shader); + mImpl->mRenderer = VisualRenderer::New(geometry, shader); mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); - // ColorVisual has it's own index key for mix color - use this instead - // of using the new base index to avoid changing existing applications - // String keys will get to this property. - mImpl->mMixColorIndex = mImpl->mRenderer.RegisterProperty(Toolkit::ColorVisual::Property::MIX_COLOR, MIX_COLOR, Vector3(mImpl->mMixColor)); + mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_MIX_COLOR, Vector3(mImpl->mMixColor)); if(!EqualsZero(mBlurRadius)) { @@ -214,7 +211,7 @@ void ColorVisual::OnInitialize() } // Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } Shader ColorVisual::GenerateShader() const diff --git a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp index f3028c4..648ffcc 100644 --- a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp +++ b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp @@ -46,7 +46,7 @@ namespace Internal { namespace { -const int CUSTOM_PROPERTY_COUNT(11); // 5 transform properties + alignment + corner/border +const int CUSTOM_PROPERTY_COUNT(6); // alignment + corner/border DALI_ENUM_TO_STRING_TABLE_BEGIN(UNITS) DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::GradientVisual::Units, OBJECT_BOUNDING_BOX) @@ -169,7 +169,7 @@ void GradientVisual::OnSetTransform() { if(mImpl->mRenderer) { - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } } @@ -252,7 +252,7 @@ void GradientVisual::OnInitialize() sampler.SetWrapMode(wrap, wrap); textureSet.SetSampler(0u, sampler); - mImpl->mRenderer = Renderer::New(geometry, shader); + mImpl->mRenderer = VisualRenderer::New(geometry, shader); mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); mImpl->mRenderer.SetTextures(textureSet); @@ -265,7 +265,7 @@ void GradientVisual::OnInitialize() mImpl->mRenderer.RegisterUniqueProperty(UNIFORM_ALIGNMENT_MATRIX_NAME, mGradientTransform); //Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } bool GradientVisual::NewGradient(Type gradientType, const Property::Map& propertyMap) diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp index 263974f..7b20e1f 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/image-visual.cpp @@ -51,7 +51,7 @@ namespace Internal { namespace { -const int CUSTOM_PROPERTY_COUNT(14); // 5 transform properties + wrap, pixel area, atlas, pixalign, + border/corner +const int CUSTOM_PROPERTY_COUNT(9); // wrap, pixel area, atlas, pixalign, + border/corner // fitting modes DALI_ENUM_TO_STRING_TABLE_BEGIN(FITTING_MODE) @@ -567,11 +567,11 @@ void ImageVisual::OnInitialize() Shader shader = GenerateShader(); // Create the renderer - mImpl->mRenderer = Renderer::New(geometry, shader); + mImpl->mRenderer = VisualRenderer::New(geometry, shader); mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); //Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); EnablePreMultipliedAlpha(IsPreMultipliedAlphaEnabled()); } @@ -817,7 +817,7 @@ void ImageVisual::OnSetTransform() { if(mImpl->mRenderer) { - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } } diff --git a/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp index 640bff5..f49138e 100644 --- a/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp +++ b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp @@ -237,7 +237,7 @@ void MeshVisual::OnSetTransform() { if(mImpl->mRenderer) { - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } } @@ -302,21 +302,20 @@ void MeshVisual::OnInitialize() return; } - mImpl->mRenderer = Renderer::New(mGeometry, mShader); - mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); + mImpl->mRenderer = VisualRenderer::New(mGeometry, mShader); mImpl->mRenderer.SetTextures(mTextureSet); mImpl->mRenderer.SetProperty(Renderer::Property::DEPTH_WRITE_MODE, DepthWriteMode::ON); mImpl->mRenderer.SetProperty(Renderer::Property::DEPTH_TEST_MODE, DepthTestMode::ON); //Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } void MeshVisual::SupplyEmptyGeometry() { mGeometry = Geometry::New(); mShader = Shader::New(SHADER_MESH_VISUAL_SIMPLE_SHADER_VERT, SHADER_MESH_VISUAL_SIMPLE_SHADER_FRAG); - mImpl->mRenderer = Renderer::New(mGeometry, mShader); + mImpl->mRenderer = VisualRenderer::New(mGeometry, mShader); DALI_LOG_ERROR("Initialisation error in mesh visual.\n"); } diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp index bca8d03..71d8cba 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp @@ -46,7 +46,7 @@ namespace Internal { namespace { -const int CUSTOM_PROPERTY_COUNT(10); // 5 transform properties + fixed(3),stretch,aux +const int CUSTOM_PROPERTY_COUNT(5); // fixed(3),stretch,aux } /////////////////NPatchVisual//////////////// @@ -236,7 +236,7 @@ void NPatchVisual::OnSetTransform() { if(mImpl->mRenderer) { - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } } @@ -300,11 +300,11 @@ void NPatchVisual::OnInitialize() mFactoryCache, ImageVisualShaderFeature::FeatureBuilder()); - mImpl->mRenderer = Renderer::New(geometry, shader); + mImpl->mRenderer = VisualRenderer::New(geometry, shader); mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); //Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } Geometry NPatchVisual::CreateGeometry() @@ -493,7 +493,7 @@ void NPatchVisual::ApplyTextureAndUniforms() mImpl->mRenderer.SetTextures(textureSet); // Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } Geometry NPatchVisual::GetNinePatchGeometry(VisualFactoryCache::GeometryType subType) diff --git a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp index e2a4106..788efb7 100644 --- a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp +++ b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp @@ -39,8 +39,6 @@ namespace Internal { namespace { -const int CUSTOM_PROPERTY_COUNT(6); // 5 transform properties+mix - // shapes DALI_ENUM_TO_STRING_TABLE_BEGIN(SHAPE_TYPE) DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::PrimitiveVisual::Shape, SPHERE) @@ -365,7 +363,7 @@ void PrimitiveVisual::OnSetTransform() { if(mImpl->mRenderer) { - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } } @@ -381,14 +379,10 @@ void PrimitiveVisual::OnInitialize() CreateShader(); } - mImpl->mRenderer = Renderer::New(mGeometry, mShader); - mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); + mImpl->mRenderer = VisualRenderer::New(mGeometry, mShader); mImpl->mRenderer.SetProperty(Renderer::Property::FACE_CULLING_MODE, FaceCullingMode::BACK); - - // Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); - - mImpl->mMixColorIndex = mImpl->mRenderer.RegisterProperty(Toolkit::PrimitiveVisual::Property::MIX_COLOR, MIX_COLOR, Vector3(mImpl->mMixColor)); + mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_MIX_COLOR, Vector3(mImpl->mMixColor)); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } void PrimitiveVisual::UpdateShaderUniforms() diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.cpp b/dali-toolkit/internal/visuals/svg/svg-visual.cpp index 234e703..599d3de 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.cpp +++ b/dali-toolkit/internal/visuals/svg/svg-visual.cpp @@ -39,7 +39,7 @@ namespace Internal { namespace { -const int CUSTOM_PROPERTY_COUNT(11); // 5 transform properties + atlas + corner/border +const int CUSTOM_PROPERTY_COUNT(6); // atlas + corner/border // property name const Dali::Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); @@ -88,7 +88,7 @@ void SvgVisual::OnInitialize() { Shader shader = GenerateShader(); Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY); - mImpl->mRenderer = Renderer::New(geometry, shader); + mImpl->mRenderer = VisualRenderer::New(geometry, shader); mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); } @@ -151,7 +151,7 @@ void SvgVisual::DoSetOnScene(Actor& actor) mImpl->mRenderer.SetTextures(textureSet); // Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); // Defer the rasterisation task until we get given a size (by Size Negotiation algorithm) @@ -355,7 +355,7 @@ void SvgVisual::OnSetTransform() if(mImpl->mRenderer) { - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } } diff --git a/dali-toolkit/internal/visuals/text/text-visual.cpp b/dali-toolkit/internal/visuals/text/text-visual.cpp index 5b12a34..a7d6ae7 100644 --- a/dali-toolkit/internal/visuals/text/text-visual.cpp +++ b/dali-toolkit/internal/visuals/text/text-visual.cpp @@ -49,7 +49,7 @@ namespace Internal { namespace { -const int CUSTOM_PROPERTY_COUNT(10); // 5 transform properties + anim,premul,size,offset,multicol +const int CUSTOM_PROPERTY_COUNT(5); // anim,premul,size,offset,multicol const Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); @@ -258,7 +258,7 @@ void TextVisual::OnInitialize() Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY); Shader shader = GetTextShader(mFactoryCache, TextType::SINGLE_COLOR_TEXT, TextType::NO_EMOJI, TextType::NO_STYLES); - mImpl->mRenderer = Renderer::New(geometry, shader); + mImpl->mRenderer = VisualRenderer::New(geometry, shader); mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); } @@ -323,6 +323,7 @@ void TextVisual::DoSetOnScene(Actor& actor) // Make zero if the alpha value of text color is zero to skip rendering text if(!mOpacityConstraint) { + // VisualRenderer::Property::OPACITY uses same animatable property internally. mOpacityConstraint = Constraint::New(mImpl->mRenderer, Dali::DevelRenderer::Property::OPACITY, OpacityConstraint); mOpacityConstraint.AddSource(Source(actor, mAnimatableTextColorPropertyIndex)); } @@ -596,7 +597,7 @@ PixelData TextVisual::ConvertToPixelData(unsigned char* buffer, int width, int h return pixelData; } -void TextVisual::CreateTextureSet(TilingInfo& info, Renderer& renderer, Sampler& sampler, bool hasMultipleTextColors, bool containsColorGlyph, bool styleEnabled, bool isOverlayStyle) +void TextVisual::CreateTextureSet(TilingInfo& info, VisualRenderer& renderer, Sampler& sampler, bool hasMultipleTextColors, bool containsColorGlyph, bool styleEnabled, bool isOverlayStyle) { TextureSet textureSet = TextureSet::New(); unsigned int textureSetIndex = 0u; @@ -633,17 +634,17 @@ void TextVisual::CreateTextureSet(TilingInfo& info, Renderer& renderer, Sampler& renderer.SetTextures(textureSet); //Register transform properties - mImpl->mTransform.RegisterUniforms(renderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(renderer, Direction::LEFT_TO_RIGHT); // Enable the pre-multiplied alpha to improve the text quality renderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, true); renderer.RegisterProperty(PREMULTIPLIED_ALPHA, 1.0f); // Set size and offset for the tiling. - renderer.RegisterProperty(SIZE, Vector2(info.width, info.height)); - renderer.RegisterProperty(OFFSET, Vector2(info.offSet.x, info.offSet.y)); - renderer.RegisterProperty("uHasMultipleTextColors", static_cast(hasMultipleTextColors)); + renderer.SetProperty(VisualRenderer::Property::TRANSFORM_SIZE, Vector2(info.width, info.height)); + renderer.SetProperty(VisualRenderer::Property::TRANSFORM_OFFSET, Vector2(info.offSet.x, info.offSet.y)); renderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON); + renderer.RegisterProperty("uHasMultipleTextColors", static_cast(hasMultipleTextColors)); mRendererList.push_back(renderer); } @@ -663,7 +664,7 @@ void TextVisual::AddRenderer(Actor& actor, const Vector2& size, bool hasMultiple mImpl->mRenderer.SetTextures(textureSet); //Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); mImpl->mRenderer.RegisterProperty("uHasMultipleTextColors", static_cast(hasMultipleTextColors)); mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON); @@ -731,7 +732,7 @@ void TextVisual::AddRenderer(Actor& actor, const Vector2& size, bool hasMultiple // Create a renderer by cutting maxTextureSize. while(verifiedHeight > 0) { - Renderer tilingRenderer = Renderer::New(geometry, shader); + VisualRenderer tilingRenderer = VisualRenderer::New(geometry, shader); tilingRenderer.SetProperty(Dali::Renderer::Property::DEPTH_INDEX, Toolkit::DepthIndex::CONTENT); // New offset position of buffer for tiling. info.offsetPosition += offsetPosition; diff --git a/dali-toolkit/internal/visuals/text/text-visual.h b/dali-toolkit/internal/visuals/text/text-visual.h index 76f4bf9..8474441 100644 --- a/dali-toolkit/internal/visuals/text/text-visual.h +++ b/dali-toolkit/internal/visuals/text/text-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_TEXT_VISUAL_H /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -271,7 +272,7 @@ private: * @param[in] styleEnabled Whether the text contains any styles (e.g. shadow, underline, etc.). * @param[in] isOverlayStyle Whether the style needs to overlay on the text (e.g. strikethrough, underline, etc.). */ - void CreateTextureSet(TilingInfo& info, Renderer& renderer, Sampler& sampler, bool hasMultipleTextColors, bool containsColorGlyph, bool styleEnabled, bool isOverlayStyle); + void CreateTextureSet(TilingInfo& info, VisualRenderer& renderer, Sampler& sampler, bool hasMultipleTextColors, bool containsColorGlyph, bool styleEnabled, bool isOverlayStyle); /** * Create renderer of the text for rendering. @@ -350,4 +351,4 @@ private: } // namespace Dali -#endif /* DALI_TOOLKIT_INTERNAL_TEXT_VISUAL_H */ \ No newline at end of file +#endif /* DALI_TOOLKIT_INTERNAL_TEXT_VISUAL_H */ diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp index 654bb89..2616b2a 100644 --- a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp @@ -73,6 +73,7 @@ Dali::Vector2 PointToVector2(Toolkit::Align::Type point, Toolkit::Direction::Typ 0.0f,1.0f, 0.5f,1.0f, 1.0f,1.0f}; + // clang-format on Vector2 result(&pointToVector2[point * 2]); @@ -125,7 +126,6 @@ Internal::Visual::Base::Impl::Impl(FittingMode fittingMode, Toolkit::Visual::Typ mCornerRadius(Vector4::ZERO), mCornerRadiusPolicy(1.0f), mDepthIndex(0.0f), - mMixColorIndex(Property::INVALID_INDEX), mBorderlineWidthIndex(Property::INVALID_INDEX), mBorderlineColorIndex(Property::INVALID_INDEX), mBorderlineOffsetIndex(Property::INVALID_INDEX), @@ -252,9 +252,7 @@ Internal::Visual::Base::Impl::Transform::Transform() mExtraSize(0.0f, 0.0f), mOffsetSizeMode(0.0f, 0.0f, 0.0f, 0.0f), mOrigin(Toolkit::Align::TOP_BEGIN), - mAnchorPoint(Toolkit::Align::TOP_BEGIN), - mOffsetIndex(Property::INVALID_INDEX), - mSizeIndex(Property::INVALID_INDEX) + mAnchorPoint(Toolkit::Align::TOP_BEGIN) { } @@ -276,76 +274,29 @@ void Internal::Visual::Base::Impl::Transform::UpdatePropertyMap(const Property:: for(Property::Map::SizeType i(0); i < map.Count(); ++i) { KeyValuePair keyValue = map.GetKeyValue(i); - if(keyValue.first.type == Property::Key::INDEX) - { - switch(keyValue.first.indexKey) - { - case Toolkit::Visual::Transform::Property::OFFSET: - { - keyValue.second.Get(mOffset); - break; - } - case Toolkit::Visual::Transform::Property::SIZE: - { - keyValue.second.Get(mSize); - break; - } - case Toolkit::Visual::Transform::Property::ORIGIN: - { - Scripting::GetEnumerationProperty(keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, mOrigin); - break; - } - case Toolkit::Visual::Transform::Property::ANCHOR_POINT: - { - Scripting::GetEnumerationProperty(keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, mAnchorPoint); - break; - } - case Toolkit::Visual::Transform::Property::OFFSET_POLICY: - { - Vector2 policy; - if(GetPolicyFromValue(keyValue.second, policy)) - { - mOffsetSizeMode.x = policy.x; - mOffsetSizeMode.y = policy.y; - } - break; - } - case Toolkit::Visual::Transform::Property::SIZE_POLICY: - { - Vector2 policy; - if(GetPolicyFromValue(keyValue.second, policy)) - { - mOffsetSizeMode.z = policy.x; - mOffsetSizeMode.w = policy.y; - } - break; - } - case Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE: - { - keyValue.second.Get(mExtraSize); - break; - } - } - } - else // Key type is STRING + switch(Visual::Base::GetIntKey(keyValue.first)) { - if(keyValue.first == "offset") + case Toolkit::Visual::Transform::Property::OFFSET: { keyValue.second.Get(mOffset); + break; } - else if(keyValue.first == "size") + case Toolkit::Visual::Transform::Property::SIZE: { keyValue.second.Get(mSize); + break; } - else if(keyValue.first == "origin") + case Toolkit::Visual::Transform::Property::ORIGIN: { Scripting::GetEnumerationProperty(keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, mOrigin); + break; } - else if(keyValue.first == "anchorPoint") + case Toolkit::Visual::Transform::Property::ANCHOR_POINT: { Scripting::GetEnumerationProperty(keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, mAnchorPoint); + break; } - else if(keyValue.first == "offsetPolicy") + case Toolkit::Visual::Transform::Property::OFFSET_POLICY: { Vector2 policy; if(GetPolicyFromValue(keyValue.second, policy)) @@ -353,8 +304,9 @@ void Internal::Visual::Base::Impl::Transform::UpdatePropertyMap(const Property:: mOffsetSizeMode.x = policy.x; mOffsetSizeMode.y = policy.y; } + break; } - else if(keyValue.first == "sizePolicy") + case Toolkit::Visual::Transform::Property::SIZE_POLICY: { Vector2 policy; if(GetPolicyFromValue(keyValue.second, policy)) @@ -362,10 +314,12 @@ void Internal::Visual::Base::Impl::Transform::UpdatePropertyMap(const Property:: mOffsetSizeMode.z = policy.x; mOffsetSizeMode.w = policy.y; } + break; } - else if(keyValue.first == "extraSize") + case Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE: { keyValue.second.Get(mExtraSize); + break; } } } @@ -374,7 +328,8 @@ void Internal::Visual::Base::Impl::Transform::UpdatePropertyMap(const Property:: void Internal::Visual::Base::Impl::Transform::GetPropertyMap(Property::Map& map) const { map.Clear(); - map.Add(Toolkit::Visual::Transform::Property::OFFSET, mOffset) + map + .Add(Toolkit::Visual::Transform::Property::OFFSET, mOffset) .Add(Toolkit::Visual::Transform::Property::SIZE, mSize) .Add(Toolkit::Visual::Transform::Property::ORIGIN, mOrigin) .Add(Toolkit::Visual::Transform::Property::ANCHOR_POINT, mAnchorPoint) @@ -383,34 +338,16 @@ void Internal::Visual::Base::Impl::Transform::GetPropertyMap(Property::Map& map) .Add(Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE, mExtraSize); } -void Internal::Visual::Base::Impl::Transform::RegisterUniforms(Dali::Renderer renderer, Toolkit::Direction::Type direction) -{ - // have to test if one of these properties has already been registered on the renderer; as some visuals use more than one renderer, so can't use stored property index. - // - if(Property::INVALID_INDEX == renderer.GetPropertyIndex(SIZE)) - { - mSizeIndex = renderer.RegisterUniqueProperty(SIZE, mSize); - mOffsetIndex = renderer.RegisterUniqueProperty(OFFSET, direction == Toolkit::Direction::LEFT_TO_RIGHT ? mOffset : mOffset * Vector2(-1.0f, 1.0f)); - renderer.RegisterUniqueProperty(OFFSET_SIZE_MODE, mOffsetSizeMode); - renderer.RegisterUniqueProperty(ORIGIN, PointToVector2(mOrigin, direction) - Vector2(0.5, 0.5)); - renderer.RegisterUniqueProperty(ANCHOR_POINT, Vector2(0.5, 0.5) - PointToVector2(mAnchorPoint, direction)); - renderer.RegisterUniqueProperty(EXTRA_SIZE, mExtraSize); - } - else - { - SetUniforms(renderer, direction); - } -} - -void Internal::Visual::Base::Impl::Transform::SetUniforms(Dali::Renderer renderer, Toolkit::Direction::Type direction) +void Internal::Visual::Base::Impl::Transform::SetUniforms(Dali::VisualRenderer renderer, Toolkit::Direction::Type direction) { - renderer.SetProperty(mSizeIndex, mSize); - renderer.SetProperty(mOffsetIndex, direction == Toolkit::Direction::LEFT_TO_RIGHT ? mOffset : mOffset * Vector2(-1.0f, 1.0f)); - - renderer.SetProperty(renderer.GetPropertyIndex(OFFSET_SIZE_MODE), mOffsetSizeMode); - renderer.SetProperty(renderer.GetPropertyIndex(ORIGIN), PointToVector2(mOrigin, direction) - Vector2(0.5, 0.5)); - renderer.SetProperty(renderer.GetPropertyIndex(ANCHOR_POINT), Vector2(0.5, 0.5) - PointToVector2(mAnchorPoint, direction)); - renderer.SetProperty(renderer.GetPropertyIndex(EXTRA_SIZE), mExtraSize); + renderer.SetProperty(VisualRenderer::Property::TRANSFORM_SIZE, mSize); + renderer.SetProperty(VisualRenderer::Property::TRANSFORM_OFFSET, + direction == Toolkit::Direction::LEFT_TO_RIGHT ? mOffset : mOffset * Vector2(-1.0f, 1.0f)); + renderer.SetProperty(VisualRenderer::Property::TRANSFORM_OFFSET_SIZE_MODE, mOffsetSizeMode); + renderer.SetProperty(VisualRenderer::Property::TRANSFORM_ORIGIN, PointToVector2(mOrigin, direction) - Vector2(0.5, 0.5)); + renderer.SetProperty(VisualRenderer::Property::TRANSFORM_ANCHOR_POINT, + Vector2(0.5, 0.5) - PointToVector2(mAnchorPoint, direction)); + renderer.SetProperty(VisualRenderer::Property::EXTRA_SIZE, mExtraSize); } Vector2 Internal::Visual::Base::Impl::Transform::GetVisualSize(const Vector2& controlSize) diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.h b/dali-toolkit/internal/visuals/visual-base-data-impl.h index 3c8f072..f462be2 100644 --- a/dali-toolkit/internal/visuals/visual-base-data-impl.h +++ b/dali-toolkit/internal/visuals/visual-base-data-impl.h @@ -20,7 +20,7 @@ // EXTERNAL INCLUDES #include -#include +#include // INTERNAL INCLUDES #include @@ -96,14 +96,9 @@ struct Base::Impl void UpdatePropertyMap(const Property::Map& map); /** - * Register the uniform properties onto the renderer - */ - void RegisterUniforms(Renderer renderer, Toolkit::Direction::Type direction); - - /** * Set the uniform properties onto the renderer */ - void SetUniforms(Renderer renderer, Toolkit::Direction::Type direction); + void SetUniforms(VisualRenderer renderer, Toolkit::Direction::Type direction); /** * Convert the control size and the transform attributes into the actual @@ -117,11 +112,9 @@ struct Base::Impl Vector4 mOffsetSizeMode; Toolkit::Align::Type mOrigin; Toolkit::Align::Type mAnchorPoint; - Property::Index mOffsetIndex{Property::INVALID_INDEX}; - Property::Index mSizeIndex{Property::INVALID_INDEX}; }; - Renderer mRenderer; + VisualRenderer mRenderer; CustomShader* mCustomShader; EventObserver* mEventObserver; ///< Allows controls to observe when the visual has events to notify std::string mName; @@ -134,7 +127,6 @@ struct Base::Impl Vector4 mCornerRadius; float mCornerRadiusPolicy; int mDepthIndex; - Property::Index mMixColorIndex; Property::Index mBorderlineWidthIndex; Property::Index mBorderlineColorIndex; Property::Index mBorderlineOffsetIndex; diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp index 81126c3..8601cb3 100644 --- a/dali-toolkit/internal/visuals/visual-base-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp @@ -23,6 +23,7 @@ #include #include #include +#include //INTERNAL HEARDER #include @@ -40,7 +41,9 @@ namespace Debug::Filter* gVisualBaseLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_VISUAL_BASE"); #endif -const char* const PRE_MULTIPLIED_ALPHA_PROPERTY("preMultipliedAlpha"); +// visual string constants contains OFFSET_SIZE_MODE instead +const char* const OFFSET_POLICY("offsetPolicy"); +const char* const SIZE_POLICY("sizePolicy"); } // namespace @@ -563,16 +566,12 @@ void Visual::Base::CreatePropertyMap(Property::Map& map) const if(mImpl->mRenderer) { // Update values from Renderer - mImpl->mMixColor = mImpl->mRenderer.GetProperty(mImpl->mMixColorIndex); + mImpl->mMixColor = mImpl->mRenderer.GetProperty(VisualRenderer::Property::VISUAL_MIX_COLOR); mImpl->mMixColor.a = mImpl->mRenderer.GetProperty(DevelRenderer::Property::OPACITY); - if(mImpl->mTransform.mOffsetIndex != Property::INVALID_INDEX) - { - mImpl->mTransform.mOffset = mImpl->mRenderer.GetProperty(mImpl->mTransform.mOffsetIndex); - } - if(mImpl->mTransform.mSizeIndex != Property::INVALID_INDEX) - { - mImpl->mTransform.mSize = mImpl->mRenderer.GetProperty(mImpl->mTransform.mSizeIndex); - } + + mImpl->mTransform.mOffset = mImpl->mRenderer.GetProperty(VisualRenderer::Property::TRANSFORM_OFFSET); + mImpl->mTransform.mSize = mImpl->mRenderer.GetProperty(VisualRenderer::Property::TRANSFORM_SIZE); + if(mImpl->mCornerRadiusIndex != Property::INVALID_INDEX) { mImpl->mCornerRadius = mImpl->mRenderer.GetProperty(mImpl->mCornerRadiusIndex); @@ -606,7 +605,7 @@ void Visual::Base::CreatePropertyMap(Property::Map& map) const map.Insert(Toolkit::Visual::Property::PREMULTIPLIED_ALPHA, premultipliedAlpha); // Note, Color and Primitive will also insert their own mix color into the map - // which is ok, because they have a different key value range. + // which is ok, because they have a different key value range, but uses same cached value anyway. map.Insert(Toolkit::Visual::Property::MIX_COLOR, mImpl->mMixColor); // vec4 map.Insert(Toolkit::Visual::Property::OPACITY, mImpl->mMixColor.a); @@ -646,7 +645,7 @@ void Visual::Base::EnablePreMultipliedAlpha(bool preMultiplied) if(mImpl->mRenderer) { mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, preMultiplied); - mImpl->mRenderer.RegisterProperty(PRE_MULTIPLIED_ALPHA_PROPERTY, static_cast(preMultiplied)); + mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_PRE_MULTIPLIED_ALPHA, preMultiplied); } } @@ -702,24 +701,19 @@ void Visual::Base::OnDoAction(const Property::Index actionId, const Property::Va void Visual::Base::RegisterMixColor() { - // Only register if not already registered. - // (Color and Primitive visuals will register their own and save to this index) - if(mImpl->mMixColorIndex == Property::INVALID_INDEX) + if(mImpl->mRenderer) { - mImpl->mMixColorIndex = mImpl->mRenderer.RegisterUniqueProperty( - Toolkit::Visual::Property::MIX_COLOR, - MIX_COLOR, - Vector3(mImpl->mMixColor)); - } - - mImpl->mRenderer.SetProperty(DevelRenderer::Property::OPACITY, mImpl->mMixColor.a); + // All visual renderers now use same mix color / opacity properties. + mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_MIX_COLOR, Vector3(mImpl->mMixColor)); + mImpl->mRenderer.SetProperty(DevelRenderer::Property::OPACITY, mImpl->mMixColor.a); - float preMultipliedAlpha = 0.0f; - if(IsPreMultipliedAlphaEnabled()) - { - preMultipliedAlpha = 1.0f; + float preMultipliedAlpha = 0.0f; + if(IsPreMultipliedAlphaEnabled()) + { + preMultipliedAlpha = 1.0f; + } + mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_PRE_MULTIPLIED_ALPHA, preMultipliedAlpha); } - mImpl->mRenderer.RegisterProperty(PRE_MULTIPLIED_ALPHA_PROPERTY, preMultipliedAlpha); } void Visual::Base::SetMixColor(const Vector4& color) @@ -728,7 +722,7 @@ void Visual::Base::SetMixColor(const Vector4& color) if(mImpl->mRenderer) { - mImpl->mRenderer.SetProperty(mImpl->mMixColorIndex, Vector3(color)); + mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_MIX_COLOR, Vector3(color)); mImpl->mRenderer.SetProperty(DevelRenderer::Property::OPACITY, color.a); } } @@ -741,7 +735,7 @@ void Visual::Base::SetMixColor(const Vector3& color) if(mImpl->mRenderer) { - mImpl->mRenderer.SetProperty(mImpl->mMixColorIndex, color); + mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_MIX_COLOR, color); } } @@ -804,8 +798,123 @@ Renderer Visual::Base::GetRenderer() return mImpl->mRenderer; } +Property::Index Visual::Base::GetIntKey(Property::Key key) +{ + if(key.type == Property::Key::INDEX) + { + return key.indexKey; + } + + if(key.stringKey == ANCHOR_POINT) + { + return Toolkit::Visual::Transform::Property::ANCHOR_POINT; + } + else if(key.stringKey == EXTRA_SIZE) + { + return Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE; + } + else if(key.stringKey == MIX_COLOR) + { + return Toolkit::Visual::Property::MIX_COLOR; + } + else if(key.stringKey == OPACITY) + { + return Toolkit::Visual::Property::OPACITY; + } + else if(key.stringKey == OFFSET) + { + return Toolkit::Visual::Transform::Property::OFFSET; + } + else if(key.stringKey == OFFSET_POLICY) + { + return Toolkit::Visual::Transform::Property::OFFSET_POLICY; + } + else if(key.stringKey == ORIGIN) + { + return Toolkit::Visual::Transform::Property::ORIGIN; + } + else if(key.stringKey == PREMULTIPLIED_ALPHA) + { + return Toolkit::Visual::Property::PREMULTIPLIED_ALPHA; + } + else if(key.stringKey == CUSTOM_SHADER) + { + return Toolkit::Visual::Property::SHADER; + } + else if(key.stringKey == SIZE) + { + return Toolkit::Visual::Transform::Property::SIZE; + } + else if(key.stringKey == SIZE_POLICY) + { + return Toolkit::Visual::Transform::Property::SIZE_POLICY; + } + else if(key.stringKey == TRANSFORM) + { + return Toolkit::Visual::Property::TRANSFORM; + } + else if(key.stringKey == VISUAL_FITTING_MODE) + { + return Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE; + } + else if(key.stringKey == CORNER_RADIUS) + { + return Toolkit::DevelVisual::Property::CORNER_RADIUS; + } + else if(key.stringKey == CORNER_RADIUS_POLICY) + { + return Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY; + } + else if(key.stringKey == BORDERLINE_WIDTH) + { + return Toolkit::DevelVisual::Property::BORDERLINE_WIDTH; + } + else if(key.stringKey == BORDERLINE_COLOR) + { + return Toolkit::DevelVisual::Property::BORDERLINE_COLOR; + } + else if(key.stringKey == BORDERLINE_OFFSET) + { + return Toolkit::DevelVisual::Property::BORDERLINE_OFFSET; + } + + return Property::INVALID_INDEX; +} + Property::Index Visual::Base::GetPropertyIndex(Property::Key key) { + switch(GetIntKey(key)) + { + case Dali::Toolkit::Visual::Transform::Property::OFFSET: + { + return VisualRenderer::Property::TRANSFORM_OFFSET; + } + case Dali::Toolkit::Visual::Transform::Property::SIZE: + { + return VisualRenderer::Property::TRANSFORM_SIZE; + } + case Dali::Toolkit::Visual::Transform::Property::ORIGIN: + { + return VisualRenderer::Property::TRANSFORM_ORIGIN; + } + case Dali::Toolkit::Visual::Transform::Property::ANCHOR_POINT: + { + return VisualRenderer::Property::TRANSFORM_ANCHOR_POINT; + } + case Dali::Toolkit::Visual::Property::MIX_COLOR: + { + return VisualRenderer::Property::VISUAL_MIX_COLOR; + } + case Dali::Toolkit::Visual::Property::OPACITY: + { + return DevelRenderer::Property::OPACITY; + } + case Dali::Toolkit::Visual::Property::PREMULTIPLIED_ALPHA: + { + return VisualRenderer::Property::VISUAL_PRE_MULTIPLIED_ALPHA; + } + } + Property::Index index = mImpl->mRenderer.GetPropertyIndex(key); if(index == Property::INVALID_INDEX) @@ -924,7 +1033,9 @@ void Visual::Base::AnimateRendererProperty( Dali::Animation& transition, Internal::TransitionData::Animator& animator) { + // Get actual renderer index (will convert transform keys into visualproperty indices) Property::Index index = GetPropertyIndex(animator.propertyKey); + if(index != Property::INVALID_INDEX) { if(animator.targetValue.GetType() != Property::NONE) @@ -943,7 +1054,6 @@ void Visual::Base::AnimateRendererProperty( mImpl->mTransform.UpdatePropertyMap(map); } - SetupTransition(transition, animator, index, animator.initialValue, animator.targetValue); } } @@ -952,50 +1062,47 @@ void Visual::Base::AnimateMixColorProperty( Dali::Animation& transition, Internal::TransitionData::Animator& animator) { - Property::Index index = mImpl->mMixColorIndex; - bool animateOpacity = false; + bool animateOpacity = false; Property::Value initialOpacity; Property::Value targetOpacity; Property::Value initialMixColor; Property::Value targetMixColor; - if(index != Property::INVALID_INDEX) + Vector4 initialColor; + if(animator.initialValue.Get(initialColor)) { - Vector4 initialColor; - if(animator.initialValue.Get(initialColor)) + if(animator.initialValue.GetType() == Property::VECTOR4) { - if(animator.initialValue.GetType() == Property::VECTOR4) - { - // if there is an initial color specifying alpha, test it - initialOpacity = initialColor.a; - } - initialMixColor = Vector3(initialColor); + // if there is an initial color specifying alpha, test it + initialOpacity = initialColor.a; } + initialMixColor = Vector3(initialColor); + } - // Set target value into data store - if(animator.targetValue.GetType() != Property::NONE) + // Set target value into data store + if(animator.targetValue.GetType() != Property::NONE) + { + Vector4 mixColor; + animator.targetValue.Get(mixColor); + if(animator.targetValue.GetType() == Property::VECTOR4) { - Vector4 mixColor; - animator.targetValue.Get(mixColor); - if(animator.targetValue.GetType() == Property::VECTOR4) - { - mImpl->mMixColor.a = mixColor.a; - targetOpacity = mixColor.a; - animateOpacity = true; - } - - mImpl->mMixColor.r = mixColor.r; - mImpl->mMixColor.g = mixColor.g; - mImpl->mMixColor.b = mixColor.b; - targetMixColor = Vector3(mixColor); + mImpl->mMixColor.a = mixColor.a; + targetOpacity = mixColor.a; + animateOpacity = true; } - SetupTransition(transition, animator, index, initialMixColor, targetMixColor); - if(animateOpacity) - { - SetupTransition(transition, animator, DevelRenderer::Property::OPACITY, initialOpacity, targetOpacity); - } + mImpl->mMixColor.r = mixColor.r; + mImpl->mMixColor.g = mixColor.g; + mImpl->mMixColor.b = mixColor.b; + targetMixColor = Vector3(mixColor); + } + + SetupTransition(transition, animator, VisualRenderer::Property::VISUAL_MIX_COLOR, initialMixColor, targetMixColor); + + if(animateOpacity) + { + SetupTransition(transition, animator, DevelRenderer::Property::OPACITY, initialOpacity, targetOpacity); } } @@ -1007,43 +1114,33 @@ Dali::Property Visual::Base::GetPropertyObject(Dali::Property::Key key) return Dali::Property(handle, Property::INVALID_INDEX); } - // Mix color or opacity cases - if(key.type == Property::Key::INDEX) + // Default animatable properties from VisualRenderer + switch(GetIntKey(key)) { - if(key.indexKey == Toolkit::Visual::Property::MIX_COLOR || (mImpl->mType == Toolkit::Visual::COLOR && key.indexKey == ColorVisual::Property::MIX_COLOR) || (mImpl->mType == Toolkit::Visual::PRIMITIVE && key.indexKey == PrimitiveVisual::Property::MIX_COLOR)) + case Toolkit::Visual::Property::MIX_COLOR: { - return Dali::Property(mImpl->mRenderer, mImpl->mMixColorIndex); + return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::VISUAL_MIX_COLOR); } - else if(key.indexKey == Toolkit::Visual::Property::OPACITY) + case Toolkit::Visual::Property::OPACITY: { return Dali::Property(mImpl->mRenderer, DevelRenderer::Property::OPACITY); } - else if(key.indexKey == Toolkit::Visual::Transform::Property::OFFSET) + case Toolkit::Visual::Transform::Property::OFFSET: { - return Dali::Property(mImpl->mRenderer, OFFSET); + return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::TRANSFORM_OFFSET); } - else if(key.indexKey == Toolkit::Visual::Transform::Property::SIZE) + case Toolkit::Visual::Transform::Property::SIZE: { - return Dali::Property(mImpl->mRenderer, SIZE); + return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::TRANSFORM_SIZE); } - } - else - { - if(key.stringKey == MIX_COLOR) - { - return Dali::Property(mImpl->mRenderer, mImpl->mMixColorIndex); - } - else if(key.stringKey == OPACITY) - { - return Dali::Property(mImpl->mRenderer, DevelRenderer::Property::OPACITY); - } - else if(key.stringKey == OFFSET) - { - return Dali::Property(mImpl->mRenderer, OFFSET); - } - else if(key.stringKey == SIZE) + default: { - return Dali::Property(mImpl->mRenderer, SIZE); + if(key.type == Property::Key::INDEX && + ((mImpl->mType == Toolkit::Visual::COLOR && key.indexKey == ColorVisual::Property::MIX_COLOR) || + (mImpl->mType == Toolkit::Visual::PRIMITIVE && key.indexKey == PrimitiveVisual::Property::MIX_COLOR))) + { + return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::VISUAL_MIX_COLOR); + } } } diff --git a/dali-toolkit/internal/visuals/visual-base-impl.h b/dali-toolkit/internal/visuals/visual-base-impl.h index b7b72e1..0f57210 100644 --- a/dali-toolkit/internal/visuals/visual-base-impl.h +++ b/dali-toolkit/internal/visuals/visual-base-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_VISUAL_H /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -186,6 +186,13 @@ public: Renderer GetRenderer(); /** + * Convert all string keys to int keys + * @param[in] key The key to convert + * @return the index key supplied or matching, or INVALID_INDEX if no match + */ + static Property::Index GetIntKey(Property::Key key); + + /** * Sets the mix color ( including opacity ) of the visual. * @param[in] mixColor The new mix color */ diff --git a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp index 9494d9f..0998590 100644 --- a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp +++ b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp @@ -34,7 +34,6 @@ namespace Internal { namespace { -const int CUSTOM_PROPERTY_COUNT(5); const char* const POSITION_ATTRIBUTE_NAME("aPosition"); const char* const INDEX_NAME("indices"); } // namespace @@ -156,11 +155,10 @@ void WireframeVisual::OnInitialize() } //Create the renderer - mImpl->mRenderer = Renderer::New(geometry, shader); - mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); + mImpl->mRenderer = VisualRenderer::New(geometry, shader); //Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } Geometry WireframeVisual::CreateQuadWireframeGeometry() @@ -200,7 +198,7 @@ void WireframeVisual::OnSetTransform() if(mImpl->mRenderer) { //Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } }