X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-VisualFactory.cpp;h=929825ce572e62e5a40b8299079247ea84dd8509;hp=2818d8717de089a83c1ca6ade08bb82b23035fa3;hb=HEAD;hpb=6d4347e7eff8ab62127a60984af2f1cdf156716c diff --git a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp index 2818d87..726a7b8 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 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,22 @@ * limitations under the License. */ -#include #include -#include -#include +#include + #include +#include +#include "dummy-control.h" + +#include #include +#include #include #include #include #include -#include -#include "dummy-control.h" - #include +#include using namespace Dali; using namespace Dali::Toolkit; @@ -36,15 +38,15 @@ namespace { typedef Toolkit::NPatchUtility::StretchRanges StretchRanges; -const char* TEST_9_PATCH_FILE_NAME = TEST_RESOURCE_DIR "/demo-tile-texture-focused.9.png"; -const char* TEST_NPATCH_FILE_NAME = TEST_RESOURCE_DIR "/heartsframe.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_9_PATCH_FILE_NAME = TEST_RESOURCE_DIR "/demo-tile-texture-focused.9.png"; +const char* TEST_NPATCH_FILE_NAME = TEST_RESOURCE_DIR "/heartsframe.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_SIMPLE_OBJ_FILE_NAME = TEST_RESOURCE_DIR "/Cube-Points-Only.obj"; const char* TEST_SIMPLE_MTL_FILE_NAME = TEST_RESOURCE_DIR "/ToyRobot-Metal-Simple.mtl"; -const char* TEST_AUX_IMAGE = TEST_RESOURCE_DIR "/folder_appicon_empty_bg.png"; -const char* TEST_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/gallery-small-1.jpg"; +const char* TEST_AUX_IMAGE = TEST_RESOURCE_DIR "/folder_appicon_empty_bg.png"; +const char* TEST_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/gallery-small-1.jpg"; // resolution: 50*50, frame count: 4, frame delay: 0.2 second for each frame const char* TEST_GIF_FILE_NAME = TEST_RESOURCE_DIR "/anim.gif"; @@ -52,31 +54,30 @@ const char* TEST_GIF_FILE_NAME = TEST_RESOURCE_DIR "/anim.gif"; // resolution: 34*34, pixel format: RGBA8888 static const char* gImage_34_RGBA = TEST_RESOURCE_DIR "/icon-edit.png"; - 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::CENTER ) - .Add( Toolkit::Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER ) - .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::CENTER) + .Add(Toolkit::Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER) + .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; } -void TestVisualRender( ToolkitTestApplication& application, - DummyControl& actor, - Visual::Base& visual ) +void TestVisualRender(ToolkitTestApplication& application, + DummyControl& actor, + Visual::Base& visual) { 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(); @@ -84,34 +85,40 @@ void TestVisualRender( ToolkitTestApplication& application, application.Render(); application.SendNotification(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); } -void TestVisualAsynchronousRender( ToolkitTestApplication& application, - DummyControl& actor, - Visual::Base& visual ) +void TestVisualAsynchronousRender(ToolkitTestApplication& application, + DummyControl& actor, + Visual::Base& visual) { 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 ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); } -} // namespace +int gResourceReadySignalCounter; +void OnResourceReadySignal(Control control) +{ + gResourceReadySignalCounter++; +} + +} // namespace void dali_visual_factory_startup(void) { @@ -126,21 +133,21 @@ void dali_visual_factory_cleanup(void) int UtcDaliVisualFactoryGet(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactory" ); + tet_infoline("UtcDaliVisualFactory"); //Register type TypeInfo type; - type = TypeRegistry::Get().GetTypeInfo( "VisualFactory" ); - DALI_TEST_CHECK( type ); + type = TypeRegistry::Get().GetTypeInfo("VisualFactory"); + DALI_TEST_CHECK(type); BaseHandle handle = type.CreateInstance(); - DALI_TEST_CHECK( handle ); + DALI_TEST_CHECK(handle); VisualFactory factory; factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); VisualFactory newFactory = VisualFactory::Get(); - DALI_TEST_CHECK( newFactory ); + DALI_TEST_CHECK(newFactory); // Check that visual factory is a singleton DALI_TEST_CHECK(factory == newFactory); @@ -151,14 +158,14 @@ int UtcDaliVisualFactoryGet(void) int UtcDaliVisualFactoryCopyAndAssignment(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryCopyAndAssignment" ); + tet_infoline("UtcDaliVisualFactoryCopyAndAssignment"); VisualFactory factory = VisualFactory::Get(); - VisualFactory factoryCopy( factory ); + VisualFactory factoryCopy(factory); DALI_TEST_CHECK(factory == factoryCopy); VisualFactory emptyFactory; - VisualFactory emptyFactoryCopy( emptyFactory ); + VisualFactory emptyFactoryCopy(emptyFactory); DALI_TEST_CHECK(emptyFactory == emptyFactoryCopy); VisualFactory factoryEquals; @@ -167,11 +174,11 @@ int UtcDaliVisualFactoryCopyAndAssignment(void) VisualFactory emptyFactoryEquals; emptyFactoryEquals = emptyFactory; - DALI_TEST_CHECK( emptyFactory == emptyFactoryEquals ); + DALI_TEST_CHECK(emptyFactory == emptyFactoryEquals); //self assignment factory = factory; - DALI_TEST_CHECK( factory = factoryCopy ); + DALI_TEST_CHECK(factory = factoryCopy); END_TEST; } @@ -179,29 +186,37 @@ int UtcDaliVisualFactoryCopyAndAssignment(void) int UtcDaliVisualFactoryGetColorVisual1(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetColorVisual1: Request color visual with a Property::Map" ); + tet_infoline("UtcDaliVisualFactoryGetColorVisual1: Request color visual with a Property::Map"); + + static std::vector customUniforms = + { + UniformData("mixColor", Property::Type::VECTOR3), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - Vector4 testColor( 1.f, 0.5f, 0.3f, 0.2f ); - propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); - propertyMap.Insert(ColorVisual::Property::MIX_COLOR, testColor); + Vector4 testColor(1.f, 0.5f, 0.3f, 0.2f); + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(ColorVisual::Property::MIX_COLOR, testColor); Visual::Base visual = factory.CreateVisual(propertyMap); - DALI_TEST_CHECK( visual ); + DALI_TEST_CHECK(visual); DummyControl actor = DummyControl::New(true); - TestVisualRender( application, actor, visual ); + TestVisualRender(application, actor, visual); - Vector3 actualValue(Vector4::ZERO); - Vector4 actualColor(Vector4::ZERO); + Vector3 actualValue(Vector4::ZERO); + Vector4 actualColor(Vector4::ZERO); TestGlAbstraction& gl = application.GetGlAbstraction(); - DALI_TEST_CHECK( gl.GetUniformValue( "mixColor", actualValue ) ); - DALI_TEST_CHECK( gl.GetUniformValue( "uColor", actualColor ) ); - DALI_TEST_EQUALS( actualValue, Vector3(testColor), TEST_LOCATION ); - DALI_TEST_EQUALS( actualColor.a, testColor.a, TEST_LOCATION ); + DALI_TEST_CHECK(gl.GetUniformValue("mixColor", actualValue)); + DALI_TEST_CHECK(gl.GetUniformValue("uColor", actualColor)); + DALI_TEST_EQUALS(actualValue, Vector3(testColor), TEST_LOCATION); + DALI_TEST_EQUALS(actualColor.a, testColor.a, TEST_LOCATION); END_TEST; } @@ -209,31 +224,39 @@ int UtcDaliVisualFactoryGetColorVisual1(void) int UtcDaliVisualFactoryGetColorVisual2(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetColorVisual2: Request color visual with a Vector4" ); + tet_infoline("UtcDaliVisualFactoryGetColorVisual2: Request color visual with a Vector4"); + + static std::vector customUniforms = + { + UniformData("mixColor", Property::Type::VECTOR3), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); - Vector4 testColor( 1.f, 0.5f, 0.3f, 0.2f ); + Vector4 testColor(1.f, 0.5f, 0.3f, 0.2f); Dali::Property::Map map; - map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR; - map[ ColorVisual::Property::MIX_COLOR ] = testColor; - Visual::Base visual = factory.CreateVisual( map ); - DALI_TEST_CHECK( visual ); + map[Toolkit::Visual::Property::TYPE] = Visual::COLOR; + map[ColorVisual::Property::MIX_COLOR] = testColor; + Visual::Base visual = factory.CreateVisual(map); + DALI_TEST_CHECK(visual); DummyControl actor = DummyControl::New(true); - TestVisualRender( application, actor, visual ); + TestVisualRender(application, actor, visual); - Vector3 actualValue; - Vector4 actualColor; + Vector3 actualValue; + Vector4 actualColor; TestGlAbstraction& gl = application.GetGlAbstraction(); - DALI_TEST_CHECK( gl.GetUniformValue( "mixColor", actualValue ) ); - DALI_TEST_CHECK( gl.GetUniformValue( "uColor", actualColor ) ); - DALI_TEST_EQUALS( actualValue, Vector3(testColor), TEST_LOCATION ); - DALI_TEST_EQUALS( actualColor.a, testColor.a, TEST_LOCATION ); + DALI_TEST_CHECK(gl.GetUniformValue("mixColor", actualValue)); + DALI_TEST_CHECK(gl.GetUniformValue("uColor", actualColor)); + DALI_TEST_EQUALS(actualValue, Vector3(testColor), TEST_LOCATION); + DALI_TEST_EQUALS(actualColor.a, testColor.a, TEST_LOCATION); application.GetScene().Remove(actor); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); END_TEST; } @@ -241,31 +264,40 @@ int UtcDaliVisualFactoryGetColorVisual2(void) int UtcDaliVisualFactoryGetBorderVisual1(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetBorderVisual1: Request border visual with a Property::Map" ); + tet_infoline("UtcDaliVisualFactoryGetBorderVisual1: Request border visual with a Property::Map"); + + static std::vector customUniforms = + { + UniformData("borderColor", Property::Type::VECTOR4), + UniformData("borderSize", Property::Type::FLOAT), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - Vector4 testColor( 1.f, 0.5f, 0.3f, 0.2f ); - float testSize = 5.f; - propertyMap.Insert(Visual::Property::TYPE, Visual::BORDER); - propertyMap.Insert(BorderVisual::Property::COLOR, testColor); - propertyMap.Insert(BorderVisual::Property::SIZE, testSize); + Vector4 testColor(1.f, 0.5f, 0.3f, 0.2f); + float testSize = 5.f; + propertyMap.Insert(Visual::Property::TYPE, Visual::BORDER); + propertyMap.Insert(BorderVisual::Property::COLOR, testColor); + propertyMap.Insert(BorderVisual::Property::SIZE, testSize); Visual::Base visual = factory.CreateVisual(propertyMap); - DALI_TEST_CHECK( visual ); + DALI_TEST_CHECK(visual); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - application.GetScene().Add( actor ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + application.GetScene().Add(actor); visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f)); - DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); - int blendMode = actor.GetRendererAt(0u).GetProperty( Renderer::Property::BLEND_MODE ); - DALI_TEST_EQUALS( static_cast(blendMode), BlendMode::ON, TEST_LOCATION ); + DALI_TEST_CHECK(actor.GetRendererCount() == 1u); + int blendMode = actor.GetRendererAt(0u).GetProperty(Renderer::Property::BLEND_MODE); + DALI_TEST_EQUALS(static_cast(blendMode), BlendMode::ON, TEST_LOCATION); TestGlAbstraction& gl = application.GetGlAbstraction(); @@ -273,15 +305,15 @@ int UtcDaliVisualFactoryGetBorderVisual1(void) application.Render(0); Vector4 actualColor(Vector4::ZERO); - DALI_TEST_CHECK( gl.GetUniformValue( "borderColor", actualColor ) ); - DALI_TEST_EQUALS( actualColor, testColor, TEST_LOCATION ); + DALI_TEST_CHECK(gl.GetUniformValue("borderColor", actualColor)); + DALI_TEST_EQUALS(actualColor, testColor, TEST_LOCATION); float actualSize = 0.f; - DALI_TEST_CHECK( gl.GetUniformValue( "borderSize", actualSize ) ); - DALI_TEST_EQUALS( actualSize, testSize, TEST_LOCATION ); + DALI_TEST_CHECK(gl.GetUniformValue("borderSize", actualSize)); + DALI_TEST_EQUALS(actualSize, testSize, TEST_LOCATION); actor.Unparent(); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); END_TEST; } @@ -289,61 +321,70 @@ int UtcDaliVisualFactoryGetBorderVisual1(void) int UtcDaliVisualFactoryGetBorderVisual2(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetBorderVisual2: Request border visual with a borderSize and a borderColor" ); + tet_infoline("UtcDaliVisualFactoryGetBorderVisual2: Request border visual with a borderSize and a borderColor"); + + static std::vector customUniforms = + { + UniformData("borderColor", Property::Type::VECTOR4), + UniformData("borderSize", Property::Type::FLOAT), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); - Vector4 testColor( 1.f, 0.5f, 0.3f, 1.f ); - float testSize = 5.f; + Vector4 testColor(1.f, 0.5f, 0.3f, 1.f); + float testSize = 5.f; Dali::Property::Map propertyMap; - propertyMap[ Toolkit::Visual::Property::TYPE ] = Visual::BORDER; - propertyMap[ BorderVisual::Property::COLOR ] = testColor; - propertyMap[ BorderVisual::Property::SIZE ] = testSize; - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + propertyMap[Toolkit::Visual::Property::TYPE] = Visual::BORDER; + propertyMap[BorderVisual::Property::COLOR] = testColor; + propertyMap[BorderVisual::Property::SIZE] = testSize; + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - application.GetScene().Add( actor ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + application.GetScene().Add(actor); visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f)); - DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 1u); TestGlAbstraction& gl = application.GetGlAbstraction(); application.SendNotification(); application.Render(0); - int blendMode = actor.GetRendererAt(0u).GetProperty( Renderer::Property::BLEND_MODE ); - DALI_TEST_EQUALS( static_cast(blendMode), BlendMode::AUTO, TEST_LOCATION ); + int blendMode = actor.GetRendererAt(0u).GetProperty(Renderer::Property::BLEND_MODE); + DALI_TEST_EQUALS(static_cast(blendMode), BlendMode::AUTO, TEST_LOCATION); Vector4 actualColor(Vector4::ZERO); - DALI_TEST_CHECK( gl.GetUniformValue( "borderColor", actualColor ) ); - DALI_TEST_EQUALS( actualColor, testColor, TEST_LOCATION ); + DALI_TEST_CHECK(gl.GetUniformValue("borderColor", actualColor)); + DALI_TEST_EQUALS(actualColor, testColor, TEST_LOCATION); float actualSize = 0.f; - DALI_TEST_CHECK( gl.GetUniformValue( "borderSize", actualSize ) ); - DALI_TEST_EQUALS( actualSize, testSize, TEST_LOCATION ); + DALI_TEST_CHECK(gl.GetUniformValue("borderSize", actualSize)); + DALI_TEST_EQUALS(actualSize, testSize, TEST_LOCATION); actor.Unparent(); // enable the anti-aliasing Dali::Property::Map map; - map[ Toolkit::Visual::Property::TYPE ] = Visual::BORDER; - map[ BorderVisual::Property::COLOR ] = testColor; - map[ BorderVisual::Property::SIZE ] = testSize; - map[ BorderVisual::Property::ANTI_ALIASING ] = true; - visual = factory.CreateVisual( map ); + map[Toolkit::Visual::Property::TYPE] = Visual::BORDER; + map[BorderVisual::Property::COLOR] = testColor; + map[BorderVisual::Property::SIZE] = testSize; + map[BorderVisual::Property::ANTI_ALIASING] = true; + visual = factory.CreateVisual(map); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); - application.GetScene().Add( actor ); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); + application.GetScene().Add(actor); - blendMode = actor.GetRendererAt(0u).GetProperty( Renderer::Property::BLEND_MODE ); - DALI_TEST_EQUALS( static_cast(blendMode), BlendMode::ON, TEST_LOCATION ); + blendMode = actor.GetRendererAt(0u).GetProperty(Renderer::Property::BLEND_MODE); + DALI_TEST_EQUALS(static_cast(blendMode), BlendMode::ON, TEST_LOCATION); END_TEST; } @@ -353,11 +394,19 @@ int UtcDaliVisualFactoryGetLinearGradientVisual(void) ToolkitTestApplication application; tet_infoline("UtcDaliVisualFactoryGetRadialGradientVisual"); + static std::vector customUniforms = + { + UniformData("uAlignmentMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); + 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); @@ -366,21 +415,21 @@ int UtcDaliVisualFactoryGetLinearGradientVisual(void) propertyMap.Insert(GradientVisual::Property::SPREAD_METHOD, GradientVisual::SpreadMethod::REPEAT); Property::Array stopOffsets; - stopOffsets.PushBack( 0.2f ); - stopOffsets.PushBack( 0.8f ); + stopOffsets.PushBack(0.2f); + stopOffsets.PushBack(0.8f); propertyMap.Insert(GradientVisual::Property::STOP_OFFSET, stopOffsets); Property::Array stopColors; - stopColors.PushBack( Color::RED ); - stopColors.PushBack( Color::GREEN ); + stopColors.PushBack(Color::RED); + stopColors.PushBack(Color::GREEN); propertyMap.Insert(GradientVisual::Property::STOP_COLOR, stopColors); Visual::Base visual = factory.CreateVisual(propertyMap); - DALI_TEST_CHECK( visual ); + DALI_TEST_CHECK(visual); // A lookup texture is generated and pass to shader as sampler DummyControl actor = DummyControl::New(true); - TestVisualRender( application, actor, visual ); + TestVisualRender(application, actor, visual); END_TEST; } @@ -390,42 +439,50 @@ int UtcDaliVisualFactoryGetRadialGradientVisual(void) ToolkitTestApplication application; tet_infoline("UtcDaliVisualFactoryGetRadialGradientVisual"); + static std::vector customUniforms = + { + UniformData("uAlignmentMatrix", Property::Type::MATRIX3), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); + 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); + 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); Property::Array stopOffsets; - stopOffsets.PushBack( 0.0f ); - stopOffsets.PushBack( 1.f ); - propertyMap.Insert(GradientVisual::Property::STOP_OFFSET, stopOffsets); + stopOffsets.PushBack(0.0f); + stopOffsets.PushBack(1.f); + propertyMap.Insert(GradientVisual::Property::STOP_OFFSET, stopOffsets); 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 visual = factory.CreateVisual(propertyMap); - DALI_TEST_CHECK( visual ); + DALI_TEST_CHECK(visual); // A lookup texture is generated and pass to shader as sampler DummyControl actor = DummyControl::New(true); - TestVisualRender( application, actor, visual ); + TestVisualRender(application, actor, visual); - Matrix3 alignMatrix( radius, 0.f, 0.f, 0.f, radius, 0.f, center.x, center.y, 1.f ); + Matrix3 alignMatrix(radius, 0.f, 0.f, 0.f, radius, 0.f, center.x, center.y, 1.f); alignMatrix.Invert(); - Matrix3 actualValue( Matrix3::IDENTITY ); + Matrix3 actualValue(Matrix3::IDENTITY); TestGlAbstraction& gl = application.GetGlAbstraction(); - DALI_TEST_CHECK( gl.GetUniformValue( "uAlignmentMatrix", actualValue ) ); - DALI_TEST_EQUALS( actualValue, alignMatrix, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_CHECK(gl.GetUniformValue("uAlignmentMatrix", actualValue)); + DALI_TEST_EQUALS(actualValue, alignMatrix, Math::MACHINE_EPSILON_100, TEST_LOCATION); END_TEST; } @@ -436,10 +493,10 @@ int UtcDaliVisualFactoryDefaultOffsetsGradientVisual(void) tet_infoline("UtcDaliVisualFactoryGetRadialGradientVisual"); 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); @@ -448,19 +505,19 @@ int UtcDaliVisualFactoryDefaultOffsetsGradientVisual(void) 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); propertyMap.Insert(GradientVisual::Property::STOP_COLOR, stopColors); Visual::Base visual = factory.CreateVisual(propertyMap); - DALI_TEST_CHECK( visual ); + DALI_TEST_CHECK(visual); // A lookup texture is generated and pass to shader as sampler DummyControl actor = DummyControl::New(true); - TestVisualRender( application, actor, visual ); + TestVisualRender(application, actor, visual); - application.GetScene().Remove( actor ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + application.GetScene().Remove(actor); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); END_TEST; } @@ -468,55 +525,55 @@ int UtcDaliVisualFactoryDefaultOffsetsGradientVisual(void) int UtcDaliVisualFactoryGetNPatchVisualSynchronousLoad1(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetNPatchVisualSynchronousLoad1: Request 9-patch visual with a Property::Map" ); + tet_infoline("UtcDaliVisualFactoryGetNPatchVisualSynchronousLoad1: Request 9-patch visual with a Property::Map"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); // Get actual size of test image - ImageDimensions imageSize = Dali::GetClosestImageSize( TEST_9_PATCH_FILE_NAME ); + ImageDimensions imageSize = Dali::GetClosestImageSize(TEST_9_PATCH_FILE_NAME); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_9_PATCH_FILE_NAME ); - propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, TEST_9_PATCH_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true); { - tet_infoline( "whole grid" ); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + tet_infoline("whole grid"); + 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(true); - TestVisualRender( application, actor, visual ); + TestVisualRender(application, actor, visual); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - Vector2 naturalSize( 0.0f, 0.0f ); - visual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION ); + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION); } - propertyMap.Insert( ImageVisual::Property::BORDER_ONLY, true ); + propertyMap.Insert(ImageVisual::Property::BORDER_ONLY, true); { - tet_infoline( "border only" ); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + tet_infoline("border only"); + 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(true); - TestVisualRender( application, actor, visual ); + TestVisualRender(application, actor, visual); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - Vector2 naturalSize( 0.0f, 0.0f ); - visual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION ); + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION); } END_TEST; @@ -525,80 +582,80 @@ int UtcDaliVisualFactoryGetNPatchVisualSynchronousLoad1(void) int UtcDaliVisualFactoryGetNPatchVisualSynchronousLoad2(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetNPatchVisualSynchronousLoad2: Request 9-patch visual with a Property::Map including border" ); + tet_infoline("UtcDaliVisualFactoryGetNPatchVisualSynchronousLoad2: Request 9-patch visual with a Property::Map including border"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); // Get actual size of test image - ImageDimensions imageSize = Dali::GetClosestImageSize( gImage_34_RGBA ); + ImageDimensions imageSize = Dali::GetClosestImageSize(gImage_34_RGBA); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH ); - propertyMap.Insert( ImageVisual::Property::URL, gImage_34_RGBA ); - propertyMap.Insert( ImageVisual::Property::BORDER, Rect< int >( 2, 2, 2, 2 ) ); - propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA); + propertyMap.Insert(ImageVisual::Property::BORDER, Rect(2, 2, 2, 2)); + propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true); { - tet_infoline( "whole grid" ); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + tet_infoline("whole grid"); + 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(true); - TestVisualRender( application, actor, visual ); + TestVisualRender(application, actor, visual); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - Vector2 naturalSize( 0.0f, 0.0f ); - visual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth(), imageSize.GetHeight() ), TEST_LOCATION ); + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION); } - propertyMap.Insert( ImageVisual::Property::BORDER_ONLY, true ); + propertyMap.Insert(ImageVisual::Property::BORDER_ONLY, true); { - tet_infoline( "border only" ); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + tet_infoline("border only"); + 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(true); - TestVisualRender( application, actor, visual ); + TestVisualRender(application, actor, visual); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - Vector2 naturalSize( 0.0f, 0.0f ); - visual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth(), imageSize.GetHeight() ), TEST_LOCATION ); + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION); } propertyMap.Clear(); - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH ); - propertyMap.Insert( ImageVisual::Property::URL, gImage_34_RGBA ); - propertyMap.Insert( ImageVisual::Property::BORDER, Rect< int >( 1, 1, 1, 1 ) ); - propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA); + propertyMap.Insert(ImageVisual::Property::BORDER, Rect(1, 1, 1, 1)); + propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true); { - tet_infoline( "whole grid" ); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + tet_infoline("whole grid"); + 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(true); - TestVisualRender( application, actor, visual ); + TestVisualRender(application, actor, visual); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - Vector2 naturalSize( 0.0f, 0.0f ); - visual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth(), imageSize.GetHeight() ), TEST_LOCATION ); + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION); } END_TEST; @@ -607,58 +664,58 @@ int UtcDaliVisualFactoryGetNPatchVisualSynchronousLoad2(void) int UtcDaliVisualFactoryGetNPatchVisual1(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetNPatchVisual1: Request 9-patch visual with a Property::Map" ); + tet_infoline("UtcDaliVisualFactoryGetNPatchVisual1: Request 9-patch visual with a Property::Map"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); // Get actual size of test image - ImageDimensions imageSize = Dali::GetClosestImageSize( TEST_9_PATCH_FILE_NAME ); + ImageDimensions imageSize = Dali::GetClosestImageSize(TEST_9_PATCH_FILE_NAME); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_9_PATCH_FILE_NAME ); - propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, false ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, TEST_9_PATCH_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, false); { - tet_infoline( "whole grid" ); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + tet_infoline("whole grid"); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); - Vector2 naturalSize( 0.0f, 0.0f ); - visual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth(), imageSize.GetHeight() ), TEST_LOCATION ); + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION); - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); DummyControl actor = DummyControl::New(true); - TestVisualAsynchronousRender( application, actor, visual ); + TestVisualAsynchronousRender(application, actor, visual); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - visual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION ); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION); } - propertyMap.Insert( ImageVisual::Property::BORDER_ONLY, true ); + propertyMap.Insert(ImageVisual::Property::BORDER_ONLY, true); { - tet_infoline( "border only" ); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + tet_infoline("border only"); + 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(true); - TestVisualRender( application, actor, visual ); + TestVisualRender(application, actor, visual); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - Vector2 naturalSize( 0.0f, 0.0f ); - visual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION ); + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION); } END_TEST; @@ -667,78 +724,149 @@ int UtcDaliVisualFactoryGetNPatchVisual1(void) int UtcDaliVisualFactoryGetNPatchVisual2(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetNPatchVisual2: Request 9-patch visual with a Property::Map including border" ); + tet_infoline("UtcDaliVisualFactoryGetNPatchVisual2: Request 9-patch visual with a Property::Map including border"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); // Get actual size of test image - ImageDimensions imageSize = Dali::GetClosestImageSize( gImage_34_RGBA ); + ImageDimensions imageSize = Dali::GetClosestImageSize(gImage_34_RGBA); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH ); - propertyMap.Insert( ImageVisual::Property::URL, gImage_34_RGBA ); - propertyMap.Insert( ImageVisual::Property::BORDER, Rect< int >( 2, 2, 2, 2 ) ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA); + propertyMap.Insert(ImageVisual::Property::BORDER, Rect(2, 2, 2, 2)); + { + tet_infoline("whole grid (2,2,2,2) async"); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + DummyControl actor = DummyControl::New(true); + TestVisualAsynchronousRender(application, actor, visual); + + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION); + } + + propertyMap.Insert(ImageVisual::Property::BORDER_ONLY, true); + { + tet_infoline("border only"); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + DummyControl actor = DummyControl::New(true); + TestVisualRender(application, actor, visual); + + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION); + } + + propertyMap.Clear(); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA); + propertyMap.Insert(ImageVisual::Property::BORDER, Rect(2, 2, 2, 2)); + propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true); + { + tet_infoline("whole grid (2,2,2,2) sync"); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + DummyControl actor = DummyControl::New(true); + TestVisualRender(application, actor, visual); + + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION); + } + + propertyMap.Clear(); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA); + propertyMap.Insert(ImageVisual::Property::BORDER, Rect(1, 1, 1, 1)); + propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true); { - tet_infoline( "whole grid" ); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + tet_infoline("whole grid (1,1,1,1) sync : for testing same image, different border"); + 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(true); - TestVisualAsynchronousRender( application, actor, visual ); + TestVisualRender(application, actor, visual); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - Vector2 naturalSize( 0.0f, 0.0f ); - visual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth(), imageSize.GetHeight() ), TEST_LOCATION ); + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION); } - propertyMap.Insert( ImageVisual::Property::BORDER_ONLY, true ); + propertyMap.Clear(); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA); + propertyMap.Insert(ImageVisual::Property::BORDER, Rect(1, 1, 1, 1)); { - tet_infoline( "border only" ); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + tet_infoline("whole grid (1,1,1,1) async"); + 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(true); - TestVisualRender( application, actor, visual ); + TestVisualRender(application, actor, visual); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - Vector2 naturalSize( 0.0f, 0.0f ); - visual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth(), imageSize.GetHeight() ), TEST_LOCATION ); + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION); } propertyMap.Clear(); - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH ); - propertyMap.Insert( ImageVisual::Property::URL, gImage_34_RGBA ); - propertyMap.Insert( ImageVisual::Property::BORDER, Rect< int >( 1, 1, 1, 1 ) ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA); + propertyMap.Insert(ImageVisual::Property::BORDER, Rect(3, 3, 3, 3)); { - tet_infoline( "whole grid" ); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + tet_infoline("whole grid (3,3,3,3) async"); + 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(true); - TestVisualRender( application, actor, visual ); + TestVisualRender(application, actor, visual); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - Vector2 naturalSize( 0.0f, 0.0f ); - visual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth(), imageSize.GetHeight() ), TEST_LOCATION ); + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION); } END_TEST; @@ -747,58 +875,55 @@ int UtcDaliVisualFactoryGetNPatchVisual2(void) int UtcDaliVisualFactoryGetNPatchVisual3(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetNPatchVisual3: Request n-patch visual with a Property::Map" ); + tet_infoline("UtcDaliVisualFactoryGetNPatchVisual3: Request n-patch visual with a Property::Map"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); // Get actual size of test image - ImageDimensions imageSize = Dali::GetClosestImageSize( TEST_NPATCH_FILE_NAME ); + ImageDimensions imageSize = Dali::GetClosestImageSize(TEST_NPATCH_FILE_NAME); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_NPATCH_FILE_NAME ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, TEST_NPATCH_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(true); - TestVisualAsynchronousRender( application, actor, visual ); - - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + TestVisualAsynchronousRender(application, actor, visual); - application.GetScene().Remove( actor ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - Vector2 naturalSize( 0.0f, 0.0f ); - visual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION ); + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION); } - propertyMap.Insert( ImageVisual::Property::BORDER_ONLY, true ); + propertyMap.Insert(ImageVisual::Property::BORDER_ONLY, true); { - tet_infoline( "border only" ); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + tet_infoline("border only"); + 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(true); - TestVisualRender( application, actor, visual ); + TestVisualRender(application, actor, visual); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - Vector2 naturalSize( 0.0f, 0.0f ); - visual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION ); + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION); - application.GetScene().Remove( actor ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + application.GetScene().Remove(actor); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); } END_TEST; @@ -807,28 +932,28 @@ int UtcDaliVisualFactoryGetNPatchVisual3(void) int UtcDaliVisualFactoryGetNPatchVisual4(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetNPatchVisual4: Request 9-patch visual with an image url" ); + tet_infoline("UtcDaliVisualFactoryGetNPatchVisual4: Request 9-patch visual with an image url"); // Get actual size of test image - ImageDimensions imageSize = Dali::GetClosestImageSize( TEST_9_PATCH_FILE_NAME ); + ImageDimensions imageSize = Dali::GetClosestImageSize(TEST_9_PATCH_FILE_NAME); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); - Visual::Base visual = factory.CreateVisual( TEST_9_PATCH_FILE_NAME, ImageDimensions() ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(TEST_9_PATCH_FILE_NAME, ImageDimensions()); + 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(true); - TestVisualAsynchronousRender( application, actor, visual ); + TestVisualAsynchronousRender(application, actor, visual); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - Vector2 naturalSize( 0.0f, 0.0f ); - visual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION ); + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION); textureTrace.Reset(); @@ -838,29 +963,29 @@ int UtcDaliVisualFactoryGetNPatchVisual4(void) int UtcDaliVisualFactoryGetNPatchVisual5(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetNPatchVisual5: Request n-patch visual with an image url" ); + tet_infoline("UtcDaliVisualFactoryGetNPatchVisual5: Request n-patch visual with an image url"); // Get actual size of test image - ImageDimensions imageSize = Dali::GetClosestImageSize( TEST_NPATCH_FILE_NAME ); + ImageDimensions imageSize = Dali::GetClosestImageSize(TEST_NPATCH_FILE_NAME); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); - Visual::Base visual = factory.CreateVisual( TEST_NPATCH_FILE_NAME, ImageDimensions() ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(TEST_NPATCH_FILE_NAME, ImageDimensions()); + 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(true); - TestVisualAsynchronousRender( application, actor, visual ); + TestVisualAsynchronousRender(application, actor, visual); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - Vector2 naturalSize( 0.0f, 0.0f ); - visual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION ); + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION); END_TEST; } @@ -868,65 +993,65 @@ int UtcDaliVisualFactoryGetNPatchVisual5(void) int UtcDaliVisualFactoryGetNPatchVisual6(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetNPatchVisual6: Request n-patch visual with a general image" ); + tet_infoline("UtcDaliVisualFactoryGetNPatchVisual6: Request n-patch visual with a general image"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); { // Get actual size of test image - ImageDimensions imageSize = Dali::GetClosestImageSize( gImage_34_RGBA ); + ImageDimensions imageSize = Dali::GetClosestImageSize(gImage_34_RGBA); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH ); - propertyMap.Insert( ImageVisual::Property::URL, gImage_34_RGBA ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA); - 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(true); - TestVisualAsynchronousRender( application, actor, visual ); + TestVisualAsynchronousRender(application, actor, visual); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - Vector2 naturalSize( 0.0f, 0.0f ); - visual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION ); + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION); - application.GetScene().Remove( actor ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + application.GetScene().Remove(actor); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); } { // Get actual size of test image - ImageDimensions imageSize = Dali::GetClosestImageSize( TEST_IMAGE_FILE_NAME ); + ImageDimensions imageSize = Dali::GetClosestImageSize(TEST_IMAGE_FILE_NAME); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + 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(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); DummyControl actor = DummyControl::New(true); - TestVisualAsynchronousRender( application, actor, visual ); + TestVisualAsynchronousRender(application, actor, visual); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); - Vector2 naturalSize( 0.0f, 0.0f ); - visual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION ); + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION); - application.GetScene().Remove( actor ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + application.GetScene().Remove(actor); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); } END_TEST; @@ -935,127 +1060,393 @@ int UtcDaliVisualFactoryGetNPatchVisual6(void) int UtcDaliVisualFactoryGetNPatchVisual7(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetNPatchVisual7: Add 9-patch visual on stage and instantly remove it." ); + tet_infoline("UtcDaliVisualFactoryGetNPatchVisual7: Add 9-patch visual on stage and instantly remove it."); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); // Get actual size of test image - ImageDimensions imageSize = Dali::GetClosestImageSize( TEST_9_PATCH_FILE_NAME ); + ImageDimensions imageSize = Dali::GetClosestImageSize(TEST_9_PATCH_FILE_NAME); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_9_PATCH_FILE_NAME ); - propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, false ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, TEST_9_PATCH_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, false); { - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); - Vector2 naturalSize( 0.0f, 0.0f ); - visual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth(), imageSize.GetHeight() ), TEST_LOCATION ); + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION); - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); DummyControl actor = DummyControl::New(true); 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); actor.Unparent(); 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(), 0u, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); } END_TEST; } -int UtcDaliNPatchVisualAuxiliaryImage(void) +int UtcDaliVisualFactoryGetNPatchVisual8(void) { ToolkitTestApplication application; - tet_infoline( "NPatchVisual with aux image" ); + tet_infoline("UtcDaliVisualFactoryGetNPatchVisual8: Add 9-patch visual on stage, instantly remove it and add new 9-patch visual with same propertyMap"); + + VisualFactory factory = VisualFactory::Get(); + DALI_TEST_CHECK(factory); + + // Get actual size of test image + ImageDimensions imageSize = Dali::GetClosestImageSize(TEST_9_PATCH_FILE_NAME); + + Property::Map propertyMap; + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, TEST_9_PATCH_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, false); + { + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); + + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION); + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + DummyControl actor = DummyControl::New(true); + + DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); + 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); + + application.GetScene().Add(actor); + actor.Unparent(); + + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(); + + visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); + + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION); + + actor = DummyControl::New(true); + + DummyControlImpl& dummyImpl2 = static_cast(actor.GetImplementation()); + dummyImpl2.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); + + application.GetScene().Add(actor); + + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(); + + Renderer renderer = actor.GetRendererAt(0); + auto textures = renderer.GetTextures(); + + DALI_TEST_EQUALS(textures.GetTextureCount(), 1, TEST_LOCATION); + } + + END_TEST; +} + +int UtcDaliVisualFactoryGetNPatchVisual9(void) +{ + ToolkitTestApplication application; + tet_infoline("UtcDaliVisualFactoryGetNPatchVisual9: Request n-patch visual sync during another n-patch visual load image asynchronously"); + + VisualFactory factory = VisualFactory::Get(); + DALI_TEST_CHECK(factory); + + Property::Map propertyMap; + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, TEST_NPATCH_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, false); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + DummyControl actor = DummyControl::New(true); + + DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); + 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); + + application.GetScene().Add(actor); + + propertyMap.Clear(); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, TEST_NPATCH_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true); + Visual::Base visual2 = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual2); + + DummyControl actor2 = DummyControl::New(true); + + DummyControlImpl& dummyImpl2 = static_cast(actor2.GetImplementation()); + dummyImpl2.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual2); + + actor2.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + DALI_TEST_EQUALS(actor2.GetRendererCount(), 0u, TEST_LOCATION); + + application.GetScene().Add(actor2); + application.Render(); + + // Async loading is not finished yet. + { + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); + } + // Sync loading is finished. + { + Renderer renderer = actor2.GetRendererAt(0); + auto textures = renderer.GetTextures(); + + DALI_TEST_EQUALS(textures.GetTextureCount(), 1, TEST_LOCATION); + } + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(); + // Async loading is finished. + { + Renderer renderer = actor.GetRendererAt(0); + auto textures = renderer.GetTextures(); + + DALI_TEST_EQUALS(textures.GetTextureCount(), 1, TEST_LOCATION); + } + + END_TEST; +} + +int UtcDaliVisualFactoryGetNPatchVisual10(void) +{ + ToolkitTestApplication application; + tet_infoline("UtcDaliVisualFactoryGetNPatchVisual10: Request same 9-patch visual with a different border"); + + VisualFactory factory = VisualFactory::Get(); + DALI_TEST_CHECK(factory); + + // Get actual size of test image + ImageDimensions imageSize = Dali::GetClosestImageSize(gImage_34_RGBA); + + Property::Map propertyMap; + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA); + propertyMap.Insert(ImageVisual::Property::BORDER, Rect(2, 2, 2, 2)); + { + tet_infoline("whole grid (2,2,2,2) async"); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + DummyControl actor = DummyControl::New(true); + TestVisualAsynchronousRender(application, actor, visual); + + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + + Vector2 naturalSize(0.0f, 0.0f); + visual.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION); + } + + propertyMap.Clear(); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA); + propertyMap.Insert(ImageVisual::Property::BORDER, Rect(1, 1, 1, 1)); + { + tet_infoline("whole grid (1,1,1,1) async. Check whether we use cached texture"); + // We don't use dummyControl here + + const int expectResourceReadySignalCounter = 10; + gResourceReadySignalCounter = 0; + + for(int i = 0; i < expectResourceReadySignalCounter; i++) + { + ImageView imageView = ImageView::New(); + imageView[Toolkit::ImageView::Property::IMAGE] = propertyMap; + imageView.ResourceReadySignal().Connect(&OnResourceReadySignal); + application.GetScene().Add(imageView); + } + + // Dont wait for loading. All border use cached texture. + + DALI_TEST_EQUALS(gResourceReadySignalCounter, expectResourceReadySignalCounter, TEST_LOCATION); + } + + propertyMap.Clear(); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA); + propertyMap.Insert(ImageVisual::Property::BORDER, Rect(1, 2, 1, 2)); + { + tet_infoline("whole grid (1,2,1,2) async. Check whether we use cached texture"); + // We don't use dummyControl here + + const int expectResourceReadySignalCounter = 10; + gResourceReadySignalCounter = 0; + + for(int i = 0; i < expectResourceReadySignalCounter; i++) + { + ImageView imageView = ImageView::New(); + imageView[Toolkit::ImageView::Property::IMAGE] = propertyMap; + imageView.ResourceReadySignal().Connect(&OnResourceReadySignal); + application.GetScene().Add(imageView); + } + + // Dont wait for loading. All border use cached texture. + + DALI_TEST_EQUALS(gResourceReadySignalCounter, expectResourceReadySignalCounter, TEST_LOCATION); + } + + END_TEST; +} + +int UtcDaliNPatchVisualAuxiliaryImage01(void) +{ + ToolkitTestApplication application; + tet_infoline("NPatchVisual with aux image"); VisualFactory factory = VisualFactory::Get(); Property::Map properties; Property::Map shader; 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["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; 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_9_PATCH_FILE_NAME; - properties[DevelImageVisual::Property::AUXILIARY_IMAGE] = TEST_AUX_IMAGE; + properties[Visual::Property::TYPE] = Visual::IMAGE; + properties[Visual::Property::MIX_COLOR] = Color::BLUE; + properties[Visual::Property::SHADER] = shader; + properties[ImageVisual::Property::URL] = TEST_9_PATCH_FILE_NAME; + properties[DevelImageVisual::Property::AUXILIARY_IMAGE] = TEST_AUX_IMAGE; properties[DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA] = 0.9f; - Visual::Base visual = factory.CreateVisual( properties ); + Visual::Base visual = factory.CreateVisual(properties); // 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.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); - dummy.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + dummyImpl.SetLayout(DummyControl::Property::TEST_VISUAL, transformMap); + dummy.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS); + dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); application.GetScene().Add(dummy); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); application.SendNotification(); application.Render(); - Renderer renderer = dummy.GetRendererAt( 0 ); - auto textures = renderer.GetTextures(); - DALI_TEST_EQUALS( textures.GetTextureCount(), 2, TEST_LOCATION ); + Renderer renderer = dummy.GetRendererAt(0); + auto textures = renderer.GetTextures(); + DALI_TEST_EQUALS(textures.GetTextureCount(), 2, TEST_LOCATION); + UnparentAndReset(dummy); END_TEST; } +int UtcDaliNPatchVisualAuxiliaryImage02(void) +{ + ToolkitTestApplication application; + tet_infoline("Multiple NPatchVisual with aux image coincidentally"); + + const Property::Value NPATCH_TEST{ + {ImageVisual::Property::URL, TEST_9_PATCH_FILE_NAME}, + {DevelImageVisual::Property::AUXILIARY_IMAGE, TEST_AUX_IMAGE}}; + + ImageView imageView1 = ImageView::New(); + imageView1[ImageView::Property::IMAGE] = NPATCH_TEST; + application.GetScene().Add(imageView1); + + ImageView imageView2 = ImageView::New(); + imageView2[ImageView::Property::IMAGE] = NPATCH_TEST; + application.GetScene().Add(imageView2); + + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(); + + Renderer renderer1 = imageView1.GetRendererAt(0); + auto textureSet1 = renderer1.GetTextures(); + + Renderer renderer2 = imageView2.GetRendererAt(0); + auto textureSet2 = renderer2.GetTextures(); + DALI_TEST_EQUALS(textureSet1 != textureSet2, true, TEST_LOCATION); + + END_TEST; +} int UtcDaliVisualFactoryGetNPatchVisualN1(void) { //This should still load but display an error image ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetNPatchVisualN: Request n-patch visual with an invalid image url" ); + tet_infoline("UtcDaliVisualFactoryGetNPatchVisualN: Request n-patch visual with an invalid image url"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); - Visual::Base visual = factory.CreateVisual( "ERROR.9.jpg", ImageDimensions() ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual("ERROR.9.jpg", ImageDimensions()); + 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(true); - TestVisualAsynchronousRender( application, actor, visual ); + { + DummyControl actor = DummyControl::New(true); + TestVisualAsynchronousRender(application, actor, visual); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + UnparentAndReset(actor); + } END_TEST; } @@ -1065,28 +1456,28 @@ int UtcDaliVisualFactoryGetNPatchVisualN2(void) //This should still load but display an error image ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetNPatchVisualN: Request n-patch visual with an invalid URL" ); + tet_infoline("UtcDaliVisualFactoryGetNPatchVisualN: Request n-patch visual with an invalid URL"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH ); - propertyMap.Insert( ImageVisual::Property::URL, "ERROR.9.jpg" ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH); + propertyMap.Insert(ImageVisual::Property::URL, "ERROR.9.jpg"); - 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); TraceCallStack& drawTrace = gl.GetDrawTrace(); drawTrace.Enable(true); DummyControl actor = DummyControl::New(true); - TestVisualAsynchronousRender( application, actor, visual ); + TestVisualAsynchronousRender(application, actor, visual); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); END_TEST; } @@ -1096,17 +1487,17 @@ int UtcDaliVisualFactoryGetNPatchVisualN3(void) // Passing in an invalid visual type so we should not get a visual ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetNPatchVisualN: Request n-patch visual with an invalid visual type" ); + tet_infoline("UtcDaliVisualFactoryGetNPatchVisualN: Request n-patch visual with an invalid visual type"); VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, 111 ); - propertyMap.Insert( ImageVisual::Property::URL, "ERROR.9.jpg" ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, 111); + propertyMap.Insert(ImageVisual::Property::URL, "ERROR.9.jpg"); - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( !visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(!visual); END_TEST; } @@ -1114,39 +1505,38 @@ int UtcDaliVisualFactoryGetNPatchVisualN3(void) int UtcDaliVisualFactoryGetSvgVisual(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetSvgVisual: Request svg visual with a svg url" ); + tet_infoline("UtcDaliVisualFactoryGetSvgVisual: Request svg visual with a svg url"); VisualFactory factory = VisualFactory::Get(); - Visual::Base visual = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions() ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(TEST_SVG_FILE_NAME, ImageDimensions()); + 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(true); + DummyControl actor = DummyControl::New(true); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - application.GetScene().Add( actor ); - visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f) ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + application.GetScene().Add(actor); + visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f)); + // Either application.SendNotification() or the trigger can now complete the task. application.SendNotification(); application.Render(); - // renderer is not added to actor until the rasterization is completed. - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); - - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + // Wait for loading & rasterization + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); // renderer is added to actor - DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 1u); // waiting for the resource uploading application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); END_TEST; } @@ -1154,38 +1544,37 @@ int UtcDaliVisualFactoryGetSvgVisual(void) int UtcDaliVisualFactoryGetSvgVisualLarge(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetSvgVisual: Request svg visual with a svg url" ); + tet_infoline("UtcDaliVisualFactoryGetSvgVisual: Request svg visual with a svg url"); VisualFactory factory = VisualFactory::Get(); - Visual::Base visual = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions( 2000, 2000 ) ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(TEST_SVG_FILE_NAME, ImageDimensions(2000, 2000)); + 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(true); + DummyControl actor = DummyControl::New(true); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - actor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); // Only rasterizes when it knows control size. - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - application.GetScene().Add( actor ); + actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); // Only rasterizes when it knows control size. + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + application.GetScene().Add(actor); + // Either application.SendNotification() or the trigger can now complete the task. application.SendNotification(); application.Render(); - // renderer is not added to actor until the rasterization is completed. - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); - - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + // Wait for loading & rasterization + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); // renderer is added to actor - DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 1u); // waiting for the resource uploading application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); END_TEST; } @@ -1193,129 +1582,129 @@ int UtcDaliVisualFactoryGetSvgVisualLarge(void) int UtcDaliVisualFactoryGetSvgVisualAtlas(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetSvgVisual: Request svg visual with enabled atlas" ); + tet_infoline("UtcDaliVisualFactoryGetSvgVisual: Request svg visual with enabled atlas"); VisualFactory factory = VisualFactory::Get(); Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::SVG ); - propertyMap.Insert( ImageVisual::Property::URL, TEST_SVG_FILE_NAME ); - propertyMap.Insert( ImageVisual::Property::ATLASING, true ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::SVG); + propertyMap.Insert(ImageVisual::Property::URL, TEST_SVG_FILE_NAME); + propertyMap.Insert(ImageVisual::Property::ATLASING, 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(true); + DummyControl actor = DummyControl::New(true); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - application.GetScene().Add( actor ); - visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f) ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + application.GetScene().Add(actor); + visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f)); + // Either application.SendNotification() or the trigger can now complete the task. + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); application.SendNotification(); application.Render(); - // renderer is not added to actor until the rasterization is completed. - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); - - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + // Wait for loading & rasterization + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); // renderer is added to actor - DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 1u); // waiting for the resource uploading application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); END_TEST; } //Creates a mesh visual from the given propertyMap and tries to load it on stage in the given application. //This is expected to succeed, which will then pass the test. -void MeshVisualLoadsCorrectlyTest( Property::Map& propertyMap, ToolkitTestApplication& application ) +void MeshVisualLoadsCorrectlyTest(Property::Map& propertyMap, ToolkitTestApplication& application) { VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); //Create a mesh visual. - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); //Create an actor on stage to house the visual. - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - application.GetScene().Add( actor ); - visual.SetTransformAndSize(DefaultTransform(), Vector2( 200.f, 200.f ) ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + application.GetScene().Add(actor); + visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f)); //Ensure set on stage. - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); //Attempt to render to queue resource load requests. application.SendNotification(); - application.Render( 0 ); + application.Render(0); //Render again to upload the now-loaded textures. application.SendNotification(); - application.Render( 0 ); + application.Render(0); Matrix testScaleMatrix; - testScaleMatrix.SetIdentityAndScale( Vector3( 1.0, -1.0, 1.0 ) ); + testScaleMatrix.SetIdentityAndScale(Vector3(1.0, -1.0, 1.0)); Matrix actualScaleMatrix; //Test to see if the object has been successfully loaded. - DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue( "uObjectMatrix", actualScaleMatrix ) ); - DALI_TEST_EQUALS( actualScaleMatrix, testScaleMatrix, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue("uObjectMatrix", actualScaleMatrix)); + DALI_TEST_EQUALS(actualScaleMatrix, testScaleMatrix, Math::MACHINE_EPSILON_100, TEST_LOCATION); //Finish by setting off stage, and ensuring this was successful. actor.Unparent(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); } //Creates a mesh visual from the given propertyMap and tries to load it on stage in the given application. //This is expected to fail, which will then pass the test. -void MeshVisualDoesNotLoadCorrectlyTest( Property::Map& propertyMap, ToolkitTestApplication& application ) +void MeshVisualDoesNotLoadCorrectlyTest(Property::Map& propertyMap, ToolkitTestApplication& application) { VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); //Create a mesh visual. - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); //Create an actor on stage to house the visual. - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - application.GetScene().Add( actor ); - visual.SetTransformAndSize(DefaultTransform(), Vector2( 200.f, 200.f ) ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + application.GetScene().Add(actor); + visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f)); //Ensure set on stage. - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); //Attempt to render to queue resource load requests. application.SendNotification(); - application.Render( 0 ); + application.Render(0); //Render again to upload the now-loaded textures. application.SendNotification(); - application.Render( 0 ); + application.Render(0); //Test to see if the object has not been loaded, as expected. Matrix scaleMatrix; - DALI_TEST_CHECK( !application.GetGlAbstraction().GetUniformValue( "uObjectMatrix", scaleMatrix ) ); + DALI_TEST_CHECK(!application.GetGlAbstraction().GetUniformValue("uObjectMatrix", scaleMatrix)); //Finish by setting off stage, and ensuring this was successful. actor.Unparent(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); } //Test if mesh loads correctly when supplied with only the bare minimum requirements, an object file. @@ -1324,38 +1713,52 @@ int UtcDaliVisualFactoryGetMeshVisual1(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetMeshVisual1: Request mesh visual with a valid object file only" ); + tet_infoline("UtcDaliVisualFactoryGetMeshVisual1: Request mesh visual with a valid object file only"); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH ); - propertyMap.Insert( MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH); + propertyMap.Insert(MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME); //Test to see if mesh loads correctly. - MeshVisualLoadsCorrectlyTest( propertyMap, application ); + MeshVisualLoadsCorrectlyTest(propertyMap, application); END_TEST; } - //Test if mesh loads correctly when supplied with an object file as well as a blank material file and images directory. int UtcDaliVisualFactoryGetMeshVisual2(void) { //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetMeshVisual2: Request mesh visual with blank material file and images directory" ); + tet_infoline("UtcDaliVisualFactoryGetMeshVisual2: Request mesh visual with blank material file and images directory"); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH ); - propertyMap.Insert( MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME ); - propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, "" ); - propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, "" ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH); + propertyMap.Insert(MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME); + propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, ""); + propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, ""); //Test to see if mesh loads correctly. - MeshVisualLoadsCorrectlyTest( propertyMap, application ); + MeshVisualLoadsCorrectlyTest(propertyMap, application); END_TEST; } @@ -1366,20 +1769,28 @@ int UtcDaliVisualFactoryGetMeshVisual3b(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetMeshVisual3: Request mesh visual with all parameters correct" ); + tet_infoline("UtcDaliVisualFactoryGetMeshVisual3: Request mesh visual with all parameters correct"); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH ); - propertyMap.Insert( MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME ); - propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME ); - propertyMap.Insert( MeshVisual::Property::USE_MIPMAPPING, Color::GREEN ); // Test that wrong property types don't prevent the object load - propertyMap.Insert( MeshVisual::Property::USE_SOFT_NORMALS, 1.0f ); - propertyMap.Insert( MeshVisual::Property::LIGHT_POSITION, 1.0f ); - propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/" ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH); + propertyMap.Insert(MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME); + propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME); + propertyMap.Insert(MeshVisual::Property::USE_MIPMAPPING, Color::GREEN); // Test that wrong property types don't prevent the object load + propertyMap.Insert(MeshVisual::Property::USE_SOFT_NORMALS, 1.0f); + propertyMap.Insert(MeshVisual::Property::LIGHT_POSITION, 1.0f); + propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/"); //Test to see if mesh loads correctly. - MeshVisualLoadsCorrectlyTest( propertyMap, application ); + MeshVisualLoadsCorrectlyTest(propertyMap, application); END_TEST; } @@ -1390,20 +1801,28 @@ int UtcDaliVisualFactoryGetMeshVisual3(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetMeshVisual3: Request mesh visual with all parameters correct" ); + tet_infoline("UtcDaliVisualFactoryGetMeshVisual3: Request mesh visual with all parameters correct"); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH ); - propertyMap.Insert( MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME ); - propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME ); - propertyMap.Insert( MeshVisual::Property::USE_MIPMAPPING, false ); - propertyMap.Insert( MeshVisual::Property::USE_SOFT_NORMALS, false ); - propertyMap.Insert( MeshVisual::Property::LIGHT_POSITION, Vector3::XAXIS ); - propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/" ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH); + propertyMap.Insert(MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME); + propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME); + propertyMap.Insert(MeshVisual::Property::USE_MIPMAPPING, false); + propertyMap.Insert(MeshVisual::Property::USE_SOFT_NORMALS, false); + propertyMap.Insert(MeshVisual::Property::LIGHT_POSITION, Vector3::XAXIS); + propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/"); //Test to see if mesh loads correctly. - MeshVisualLoadsCorrectlyTest( propertyMap, application ); + MeshVisualLoadsCorrectlyTest(propertyMap, application); END_TEST; } @@ -1414,18 +1833,25 @@ int UtcDaliVisualFactoryGetMeshVisual4(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetMeshVisual4: Request mesh visual with diffuse texture but not normal or gloss." ); + tet_infoline("UtcDaliVisualFactoryGetMeshVisual4: Request mesh visual with diffuse texture but not normal or gloss."); + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH ); - propertyMap.Insert( MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME ); - propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, TEST_SIMPLE_MTL_FILE_NAME ); - propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/" ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH); + propertyMap.Insert(MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME); + propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, TEST_SIMPLE_MTL_FILE_NAME); + propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/"); //Test to see if mesh loads correctly. - MeshVisualLoadsCorrectlyTest( propertyMap, application ); + MeshVisualLoadsCorrectlyTest(propertyMap, application); END_TEST; } @@ -1436,22 +1862,29 @@ int UtcDaliVisualFactoryGetMeshVisual5(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetMeshVisual5: Request mesh visual and make it only use diffuse textures." ); + tet_infoline("UtcDaliVisualFactoryGetMeshVisual5: Request mesh visual and make it only use diffuse textures."); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH ); - propertyMap.Insert( "objectUrl", TEST_OBJ_FILE_NAME ); - propertyMap.Insert( "materialUrl", TEST_MTL_FILE_NAME ); - propertyMap.Insert( "texturesPath", TEST_RESOURCE_DIR "/" ); - propertyMap.Insert( "useMipmapping", false ); - propertyMap.Insert( "useSoftNormals", false ); - propertyMap.Insert( "lightPosition", Vector3::ZAXIS ); - propertyMap.Insert( "shadingMode", MeshVisual::ShadingMode::TEXTURED_WITH_SPECULAR_LIGHTING ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH); + propertyMap.Insert("objectUrl", TEST_OBJ_FILE_NAME); + propertyMap.Insert("materialUrl", TEST_MTL_FILE_NAME); + propertyMap.Insert("texturesPath", TEST_RESOURCE_DIR "/"); + propertyMap.Insert("useMipmapping", false); + propertyMap.Insert("useSoftNormals", false); + propertyMap.Insert("lightPosition", Vector3::ZAXIS); + propertyMap.Insert("shadingMode", MeshVisual::ShadingMode::TEXTURED_WITH_SPECULAR_LIGHTING); //Test to see if mesh loads correctly. - MeshVisualLoadsCorrectlyTest( propertyMap, application ); - + MeshVisualLoadsCorrectlyTest(propertyMap, application); END_TEST; } @@ -1462,18 +1895,26 @@ int UtcDaliVisualFactoryGetMeshVisual6(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetMeshVisual6: Request mesh visual and make it not use any textures." ); + tet_infoline("UtcDaliVisualFactoryGetMeshVisual6: Request mesh visual and make it not use any textures."); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH ); - 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_DIR "/" ); - propertyMap.Insert( MeshVisual::Property::SHADING_MODE, MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH); + 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_DIR "/"); + propertyMap.Insert(MeshVisual::Property::SHADING_MODE, MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING); //Test to see if mesh loads correctly. - MeshVisualLoadsCorrectlyTest( propertyMap, application ); + MeshVisualLoadsCorrectlyTest(propertyMap, application); END_TEST; } @@ -1483,19 +1924,26 @@ int UtcDaliVisualFactoryGetMeshVisual7(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; + tet_infoline("UtcDaliVisualFactoryGetMeshVisual7: Request mesh visual with custom light position."); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; - tet_infoline( "UtcDaliVisualFactoryGetMeshVisual7: Request mesh visual with custom light position." ); + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH ); - 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_DIR "/" ); - propertyMap.Insert( MeshVisual::Property::LIGHT_POSITION, Vector3( 0.0, 1.0, 2.0 ) ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH); + 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_DIR "/"); + propertyMap.Insert(MeshVisual::Property::LIGHT_POSITION, Vector3(0.0, 1.0, 2.0)); //Test to see if mesh loads correctly. - MeshVisualLoadsCorrectlyTest( propertyMap, application ); + MeshVisualLoadsCorrectlyTest(propertyMap, application); END_TEST; } @@ -1507,17 +1955,25 @@ int UtcDaliVisualFactoryGetMeshVisual8(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetMeshVisual5: Request mesh visual with normal-less object file." ); + tet_infoline("UtcDaliVisualFactoryGetMeshVisual5: Request mesh visual with normal-less object file."); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH ); - propertyMap.Insert( MeshVisual::Property::OBJECT_URL, TEST_SIMPLE_OBJ_FILE_NAME ); - propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME ); - propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/" ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH); + propertyMap.Insert(MeshVisual::Property::OBJECT_URL, TEST_SIMPLE_OBJ_FILE_NAME); + propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME); + propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/"); //Test to see if mesh loads correctly. - MeshVisualLoadsCorrectlyTest( propertyMap, application ); + MeshVisualLoadsCorrectlyTest(propertyMap, application); END_TEST; } @@ -1528,17 +1984,16 @@ int UtcDaliVisualFactoryGetMeshVisualN1(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetMeshVisualN1: Request mesh visual without object file" ); + tet_infoline("UtcDaliVisualFactoryGetMeshVisualN1: Request mesh visual without object file"); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH ); - propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME ); - propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/" ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH); + propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME); + propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/"); //Test to see if mesh doesn't load with these properties, as expected. - MeshVisualDoesNotLoadCorrectlyTest( propertyMap, application ); - + MeshVisualDoesNotLoadCorrectlyTest(propertyMap, application); END_TEST; } @@ -1549,18 +2004,17 @@ int UtcDaliVisualFactoryGetMeshVisualN2(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetMeshVisualN2: Request mesh visual with invalid material and images urls" ); + tet_infoline("UtcDaliVisualFactoryGetMeshVisualN2: Request mesh visual with invalid material and images urls"); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH ); - propertyMap.Insert( MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME ); - propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, "invalid" ); - propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, "also invalid" ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH); + propertyMap.Insert(MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME); + propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, "invalid"); + propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, "also invalid"); //Test to see if mesh doesn't load with these properties, as expected. - MeshVisualDoesNotLoadCorrectlyTest( propertyMap, application ); - + MeshVisualDoesNotLoadCorrectlyTest(propertyMap, application); END_TEST; } @@ -1570,59 +2024,58 @@ int UtcDaliVisualFactoryGetMeshVisualN3(void) { //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetMeshVisualN3: Request mesh visual with invalid object url" ); - + tet_infoline("UtcDaliVisualFactoryGetMeshVisualN3: Request mesh visual with invalid object url"); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH ); - propertyMap.Insert( MeshVisual::Property::OBJECT_URL, "invalid" ); - propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME ); - propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/" ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH); + propertyMap.Insert(MeshVisual::Property::OBJECT_URL, "invalid"); + propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME); + propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/"); //Test to see if mesh doesn't load with these properties, as expected. - MeshVisualDoesNotLoadCorrectlyTest( propertyMap, application ); + MeshVisualDoesNotLoadCorrectlyTest(propertyMap, application); END_TEST; } //Creates a primitive visual with the given property map and tests to see if it correctly loads in the given application. -void TestPrimitiveVisualWithProperties( Property::Map& propertyMap, ToolkitTestApplication& application ) +void TestPrimitiveVisualWithProperties(Property::Map& propertyMap, ToolkitTestApplication& application) { VisualFactory factory = VisualFactory::Get(); - DALI_TEST_CHECK( factory ); + DALI_TEST_CHECK(factory); //Create a primitive visual. - Visual::Base visual = factory.CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(propertyMap); + DALI_TEST_CHECK(visual); //Create an actor on stage to house the visual. - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); 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 ) ); - application.GetScene().Add( actor ); - visual.SetTransformAndSize(DefaultTransform(), Vector2( 200.f, 200.f ) ); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + application.GetScene().Add(actor); + visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f)); //Ensure set on stage. - DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION); //Tell test application to load the visual. application.SendNotification(); application.Render(0); Matrix testScaleMatrix; - testScaleMatrix.SetIdentityAndScale( Vector3( 1.0, -1.0, 1.0 ) ); + testScaleMatrix.SetIdentityAndScale(Vector3(1.0, -1.0, 1.0)); Matrix actualScaleMatrix; //Test to see if the object has been successfully loaded. - DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue( "uObjectMatrix", actualScaleMatrix ) ); - DALI_TEST_EQUALS( actualScaleMatrix, testScaleMatrix, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue("uObjectMatrix", actualScaleMatrix)); + DALI_TEST_EQUALS(actualScaleMatrix, testScaleMatrix, Math::MACHINE_EPSILON_100, TEST_LOCATION); //Finish by setting off stage, and ensuring this was successful. actor.Unparent(); - DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); + DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION); } //Test if primitive shape loads correctly when supplied with only the bare minimum requirements, the shape to use. @@ -1631,15 +2084,23 @@ int UtcDaliVisualFactoryGetPrimitiveVisual1(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual1: Request primitive visual with a shape only" ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual1: Request primitive visual with a shape only"); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); - propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CUBE ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CUBE); //Test to see if shape loads correctly. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -1650,25 +2111,33 @@ int UtcDaliVisualFactoryGetPrimitiveVisual2(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual2: Request primitive visual with everything" ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual2: Request primitive visual with everything"); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. 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, Vector4( 0.5, 0.5, 0.5, 1.0 ) ); - 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::BEVEL_PERCENTAGE, 0.7f ); - propertyMap.Insert( PrimitiveVisual::Property::BEVEL_SMOOTHNESS, 0.8f ); - propertyMap.Insert( MeshVisual::Property::LIGHT_POSITION, Vector3( 0.9, 1.0, 1.1 ) ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CUBE); + propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, Vector4(0.5, 0.5, 0.5, 1.0)); + 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::BEVEL_PERCENTAGE, 0.7f); + propertyMap.Insert(PrimitiveVisual::Property::BEVEL_SMOOTHNESS, 0.8f); + propertyMap.Insert(MeshVisual::Property::LIGHT_POSITION, Vector3(0.9, 1.0, 1.1)); //Test to see if shape loads correctly. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -1679,18 +2148,26 @@ int UtcDaliVisualFactoryGetPrimitiveVisual3(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual3: Request primitive visual to display a sphere" ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual3: Request primitive visual to display a sphere"); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); - propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE ); - propertyMap.Insert( PrimitiveVisual::Property::MIX_COLOR, Vector4( 0.5, 0.5, 0.5, 1.0 ) ); - propertyMap.Insert( PrimitiveVisual::Property::SLICES, 10 ); - propertyMap.Insert( PrimitiveVisual::Property::STACKS, 20 ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE); + propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, Vector4(0.5, 0.5, 0.5, 1.0)); + propertyMap.Insert(PrimitiveVisual::Property::SLICES, 10); + propertyMap.Insert(PrimitiveVisual::Property::STACKS, 20); //Test to see if shape loads correctly. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -1701,20 +2178,28 @@ int UtcDaliVisualFactoryGetPrimitiveVisual4(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual4: Request primitive visual to display a conic section" ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual4: Request primitive visual to display a conic section"); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); - propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CONICAL_FRUSTUM ); - propertyMap.Insert( PrimitiveVisual::Property::MIX_COLOR, Vector4( 0.5, 0.5, 0.5, 1.0 ) ); - propertyMap.Insert( PrimitiveVisual::Property::SLICES, 10 ); - 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(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CONICAL_FRUSTUM); + propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, Vector4(0.5, 0.5, 0.5, 1.0)); + propertyMap.Insert(PrimitiveVisual::Property::SLICES, 10); + 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); //Test to see if shape loads correctly. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -1725,17 +2210,25 @@ int UtcDaliVisualFactoryGetPrimitiveVisual5(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual5: Request primitive visual to display a bevelled cube" ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual5: Request primitive visual to display a bevelled cube"); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); - propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::BEVELLED_CUBE ); - propertyMap.Insert( PrimitiveVisual::Property::MIX_COLOR, Vector4( 0.5, 0.5, 0.5, 1.0 ) ); - propertyMap.Insert( PrimitiveVisual::Property::BEVEL_PERCENTAGE, 0.7f ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::BEVELLED_CUBE); + propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, Vector4(0.5, 0.5, 0.5, 1.0)); + propertyMap.Insert(PrimitiveVisual::Property::BEVEL_PERCENTAGE, 0.7f); //Test to see if shape loads correctly. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -1746,16 +2239,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual6(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual6: Request primitive visual to display an octahedron" ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual6: Request primitive visual to display an octahedron"); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); - propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::OCTAHEDRON ); - propertyMap.Insert( PrimitiveVisual::Property::MIX_COLOR, Vector4( 0.5, 0.5, 0.5, 1.0 ) ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::OCTAHEDRON); + propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, Vector4(0.5, 0.5, 0.5, 1.0)); //Test to see if shape loads correctly. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -1766,19 +2267,27 @@ int UtcDaliVisualFactoryGetPrimitiveVisual7(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual7: Request primitive visual to display a cone" ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual7: Request primitive visual to display a cone"); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); - propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CONE ); - propertyMap.Insert( PrimitiveVisual::Property::MIX_COLOR, Vector4( 0.5, 0.5, 0.5, 1.0 ) ); - propertyMap.Insert( PrimitiveVisual::Property::SLICES, 10 ); - propertyMap.Insert( PrimitiveVisual::Property::SCALE_TOP_RADIUS, 30.0f ); - propertyMap.Insert( PrimitiveVisual::Property::SCALE_HEIGHT, 50.0f ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CONE); + propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, Vector4(0.5, 0.5, 0.5, 1.0)); + propertyMap.Insert(PrimitiveVisual::Property::SLICES, 10); + propertyMap.Insert(PrimitiveVisual::Property::SCALE_TOP_RADIUS, 30.0f); + propertyMap.Insert(PrimitiveVisual::Property::SCALE_HEIGHT, 50.0f); //Test to see if shape loads correctly. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -1789,17 +2298,25 @@ int UtcDaliVisualFactoryGetPrimitiveVisual8(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual8: Request primitive visual with set light position" ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual8: Request primitive visual with set light position"); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); - propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE ); - propertyMap.Insert( PrimitiveVisual::Property::MIX_COLOR, Vector4( 0.5, 0.5, 0.5, 1.0 ) ); - propertyMap.Insert( MeshVisual::Property::LIGHT_POSITION, Vector3( 0.0, 1.0, 2.0 ) ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE); + propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, Vector4(0.5, 0.5, 0.5, 1.0)); + propertyMap.Insert(MeshVisual::Property::LIGHT_POSITION, Vector3(0.0, 1.0, 2.0)); //Test to see if shape loads correctly. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -1810,16 +2327,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual9(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual9: Request primitive visual with above-cap slices." ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual9: Request primitive visual with above-cap slices."); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); - propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE ); - propertyMap.Insert( PrimitiveVisual::Property::SLICES, Property::Value( 1000000 ) ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE); + propertyMap.Insert(PrimitiveVisual::Property::SLICES, Property::Value(1000000)); //Test to see if shape loads correctly. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -1830,16 +2355,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual10(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual10: Request primitive visual with too few slices." ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual10: Request primitive visual with too few slices."); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); - propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE ); - propertyMap.Insert( PrimitiveVisual::Property::SLICES, Property::Value( 2 ) ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE); + propertyMap.Insert(PrimitiveVisual::Property::SLICES, Property::Value(2)); //Test to see if shape loads correctly. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -1850,16 +2383,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual11(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual11: Request primitive visual with too many stacks." ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual11: Request primitive visual with too many stacks."); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); - propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE ); - propertyMap.Insert( PrimitiveVisual::Property::STACKS, Property::Value( 1000000 ) ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE); + propertyMap.Insert(PrimitiveVisual::Property::STACKS, Property::Value(1000000)); //Test to see if shape loads correctly. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -1870,16 +2411,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual12(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual12: Request primitive visual with too few stacks." ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual12: Request primitive visual with too few stacks."); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); - propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE ); - propertyMap.Insert( PrimitiveVisual::Property::STACKS, Property::Value( 1 ) ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE); + propertyMap.Insert(PrimitiveVisual::Property::STACKS, Property::Value(1)); //Test to see if shape loads correctly. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -1890,16 +2439,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual13(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual13: Request primitive visual with invalid scale dimensions." ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual13: Request primitive visual with invalid scale dimensions."); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); - propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE ); - propertyMap.Insert( PrimitiveVisual::Property::SCALE_DIMENSIONS, Vector3::ZERO ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE); + propertyMap.Insert(PrimitiveVisual::Property::SCALE_DIMENSIONS, Vector3::ZERO); //Test to see if shape loads correctly. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -1910,16 +2467,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual14(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual14: Request primitive visual with too low a bevel percentage." ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual14: Request primitive visual with too low a bevel percentage."); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); - propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE ); - propertyMap.Insert( PrimitiveVisual::Property::BEVEL_PERCENTAGE, Property::Value( -1.0f ) ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE); + propertyMap.Insert(PrimitiveVisual::Property::BEVEL_PERCENTAGE, Property::Value(-1.0f)); //Test to see if shape loads correctly. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -1930,16 +2495,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual15(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual15: Request primitive visual with too high a bevel percentage." ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual15: Request primitive visual with too high a bevel percentage."); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); - propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE ); - propertyMap.Insert( PrimitiveVisual::Property::BEVEL_PERCENTAGE, Property::Value( 2.0f ) ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE); + propertyMap.Insert(PrimitiveVisual::Property::BEVEL_PERCENTAGE, Property::Value(2.0f)); //Test to see if shape loads correctly. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -1950,16 +2523,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual16(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual16: Request primitive visual with too low a bevel smoothness." ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual16: Request primitive visual with too low a bevel smoothness."); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); - propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE ); - propertyMap.Insert( PrimitiveVisual::Property::BEVEL_SMOOTHNESS, Property::Value( -1.0f ) ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE); + propertyMap.Insert(PrimitiveVisual::Property::BEVEL_SMOOTHNESS, Property::Value(-1.0f)); //Test to see if shape loads correctly. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -1970,16 +2551,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual17(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual17: Request primitive visual with too high a bevel smoothness." ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual17: Request primitive visual with too high a bevel smoothness."); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); - propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE ); - propertyMap.Insert( PrimitiveVisual::Property::BEVEL_SMOOTHNESS, Property::Value( 2.0f ) ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE); + propertyMap.Insert(PrimitiveVisual::Property::BEVEL_SMOOTHNESS, Property::Value(2.0f)); //Test to see if shape loads correctly. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -1990,20 +2579,28 @@ int UtcDaliVisualFactoryGetPrimitiveVisual18(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual18: Request primitive visual to display a conic section" ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual18: Request primitive visual to display a conic section"); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); - propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CONICAL_FRUSTUM ); - propertyMap.Insert( PrimitiveVisual::Property::MIX_COLOR, Vector4( 0.5, 0.5, 0.5, 1.0 ) ); - propertyMap.Insert( PrimitiveVisual::Property::SLICES, 10 ); - 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(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); + propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CONICAL_FRUSTUM); + propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, Vector4(0.5, 0.5, 0.5, 1.0)); + propertyMap.Insert(PrimitiveVisual::Property::SLICES, 10); + 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); //Test to see if shape loads correctly. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -2014,14 +2611,22 @@ int UtcDaliVisualFactoryGetPrimitiveVisualN1(void) //Set up test application first, so everything else can be handled. ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisualN1: Request primitive visual without shape" ); + tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisualN1: Request primitive visual without shape"); + + static std::vector customUniforms = + { + UniformData("uObjectMatrix", Property::Type::MATRIX), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); //Set up visual properties, without supplying shape. Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE ); + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE); //Test to see if shape loads regardless of missing input. - TestPrimitiveVisualWithProperties( propertyMap, application ); + TestPrimitiveVisualWithProperties(propertyMap, application); END_TEST; } @@ -2029,49 +2634,49 @@ int UtcDaliVisualFactoryGetPrimitiveVisualN1(void) int UtcDaliVisualFactoryGetAnimatedImageVisual1(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetAnimatedImageVisual1: Request animated image visual with a gif url" ); + tet_infoline("UtcDaliVisualFactoryGetAnimatedImageVisual1: Request animated image visual with a gif url"); - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); VisualFactory factory = VisualFactory::Get(); - Visual::Base visual = factory.CreateVisual( TEST_GIF_FILE_NAME, ImageDimensions() ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = factory.CreateVisual(TEST_GIF_FILE_NAME, ImageDimensions()); + DALI_TEST_CHECK(visual); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - application.GetScene().Add( actor ); + dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + application.GetScene().Add(actor); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); application.SendNotification(); application.Render(); // renderer is added to actor - DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); - Renderer renderer = actor.GetRendererAt( 0u ); - DALI_TEST_CHECK( renderer ); + DALI_TEST_CHECK(actor.GetRendererCount() == 1u); + Renderer renderer = actor.GetRendererAt(0u); + DALI_TEST_CHECK(renderer); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); textureTrace.Reset(); // Force the timer used by the animatedImageVisual to tick, - Dali::Timer timer = Timer::New( 0 ); + Dali::Timer timer = Timer::New(0); timer.MockEmitSignal(); 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( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); textureTrace.Reset(); // Force the timer used by the animatedImageVisual to tick, @@ -2079,11 +2684,11 @@ int UtcDaliVisualFactoryGetAnimatedImageVisual1(void) 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( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); textureTrace.Reset(); // Force the timer used by the animatedImageVisual to tick, @@ -2091,16 +2696,16 @@ int UtcDaliVisualFactoryGetAnimatedImageVisual1(void) 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( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); textureTrace.Reset(); - // Test SetOffStage(). + // Test SetOffScene(). actor.Unparent(); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + DALI_TEST_CHECK(actor.GetRendererCount() == 0u); END_TEST; } @@ -2108,70 +2713,117 @@ int UtcDaliVisualFactoryGetAnimatedImageVisual1(void) int UtcDaliVisualFactoryGetAnimatedImageVisual2(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualFactoryGetAnimatedImageVisual2: Request animated image visual with a Property::Map, test custom wrap mode and pixel area" ); + tet_infoline("UtcDaliVisualFactoryGetAnimatedImageVisual2: Request animated image visual with a Property::Map, test custom wrap mode and pixel area"); + + static std::vector customUniforms = + { + UniformData("pixelArea", Property::Type::VECTOR4), + UniformData("wrapMode", Property::Type::VECTOR2), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); const Vector4 pixelArea(-0.5f, -0.5f, 2.f, 2.f); Property::Map propertyMap; - propertyMap.Add( Toolkit::Visual::Property::TYPE, Visual::IMAGE ) - .Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME ) - .Add( ImageVisual::Property::PIXEL_AREA, pixelArea ) - .Add( ImageVisual::Property::WRAP_MODE_U, WrapMode::MIRRORED_REPEAT ) - .Add( ImageVisual::Property::WRAP_MODE_V, WrapMode::REPEAT ); + propertyMap.Add(Toolkit::Visual::Property::TYPE, Visual::IMAGE) + .Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME) + .Add(ImageVisual::Property::PIXEL_AREA, pixelArea) + .Add(ImageVisual::Property::WRAP_MODE_U, WrapMode::MIRRORED_REPEAT) + .Add(ImageVisual::Property::WRAP_MODE_V, WrapMode::REPEAT); - Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap ); - DALI_TEST_CHECK( visual ); + Visual::Base visual = VisualFactory::Get().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); TraceCallStack& texParameterTrace = gl.GetTexParameterTrace(); - texParameterTrace.Enable( true ); + texParameterTrace.Enable(true); - DummyControl actor = DummyControl::New(true); + DummyControl actor = DummyControl::New(true); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); - actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - application.GetScene().Add( actor ); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + application.GetScene().Add(actor); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); 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); // For animated image visual, the wrapping is handled manually in shader, so the following gl function should not be called std::stringstream out; out << 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 << 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; +} + + +int UtcDaliVisualFactoryGetPreCompiler(void) +{ + ToolkitTestApplication application; + tet_infoline("UtcDaliVisualFactoryGetAnimatedImageVisual2: Request animated image visual with a Property::Map, test custom wrap mode and pixel area"); + + + std::vector precompiledShaderList; + DALI_TEST_CHECK(precompiledShaderList.size() == 0u); // before Get Shader + ShaderPreCompiler::Get().GetPreCompileShaderList(precompiledShaderList); + DALI_TEST_CHECK(precompiledShaderList.size() == 0u); // after Get Shader + + VisualFactory factory = VisualFactory::Get(); + DALI_TEST_CHECK(factory); + + factory.UsePreCompiledShader(); + + ShaderPreCompiler::Get().GetPreCompileShaderList(precompiledShaderList); + DALI_TEST_CHECK(precompiledShaderList.size() != 0u); // after Get Shader + + Property::Map propertyMap; + 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); + + DummyControl actor = DummyControl::New(true); + DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); + dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual); + actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + application.GetScene().Add(actor); + + application.SendNotification(); + application.Render(); END_TEST; }