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=ab67b9d4aef0493d113833fe9627330267ceaa56;hp=38883a3aaeefd5dcb15534816bc2ad75aa429299;hb=34acf01671928c22fe260fe8aa365ec2d0e05525;hpb=c13965db82ba91ac307c063c931c6a3cd8bc739e diff --git a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp index 38883a3..ab67b9d 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) 2021 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. @@ -76,7 +76,7 @@ void TestVisualRender( ToolkitTestApplication& application, actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); - Stage::GetCurrent().Add( actor ); + application.GetScene().Add( actor ); application.SendNotification(); application.Render(); @@ -97,7 +97,7 @@ void TestVisualAsynchronousRender( ToolkitTestApplication& application, actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); - Stage::GetCurrent().Add( actor ); + application.GetScene().Add( actor ); application.SendNotification(); application.Render(); @@ -181,6 +181,14 @@ int UtcDaliVisualFactoryGetColorVisual1(void) ToolkitTestApplication application; 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 ); @@ -211,6 +219,14 @@ int UtcDaliVisualFactoryGetColorVisual2(void) ToolkitTestApplication application; 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 ); @@ -232,7 +248,7 @@ int UtcDaliVisualFactoryGetColorVisual2(void) DALI_TEST_EQUALS( actualValue, Vector3(testColor), TEST_LOCATION ); DALI_TEST_EQUALS( actualColor.a, testColor.a, TEST_LOCATION ); - Stage::GetCurrent().Remove(actor); + application.GetScene().Remove(actor); DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); END_TEST; @@ -243,6 +259,15 @@ int UtcDaliVisualFactoryGetBorderVisual1(void) ToolkitTestApplication application; 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 ); @@ -260,7 +285,7 @@ int UtcDaliVisualFactoryGetBorderVisual1(void) DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - Stage::GetCurrent().Add( actor ); + application.GetScene().Add( actor ); visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f)); DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); @@ -291,6 +316,15 @@ int UtcDaliVisualFactoryGetBorderVisual2(void) ToolkitTestApplication application; 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 ); @@ -308,7 +342,7 @@ int UtcDaliVisualFactoryGetBorderVisual2(void) DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - Stage::GetCurrent().Add( actor ); + application.GetScene().Add( actor ); visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f)); DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); @@ -340,7 +374,7 @@ int UtcDaliVisualFactoryGetBorderVisual2(void) visual = factory.CreateVisual( map ); dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); - Stage::GetCurrent().Add( actor ); + application.GetScene().Add( actor ); blendMode = actor.GetRendererAt(0u).GetProperty( Renderer::Property::BLEND_MODE ); DALI_TEST_EQUALS( static_cast(blendMode), BlendMode::ON, TEST_LOCATION ); @@ -353,6 +387,14 @@ 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 ); @@ -390,6 +432,14 @@ 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 ); @@ -459,7 +509,7 @@ int UtcDaliVisualFactoryDefaultOffsetsGradientVisual(void) DummyControl actor = DummyControl::New(true); TestVisualRender( application, actor, visual ); - Stage::GetCurrent().Remove( actor ); + application.GetScene().Remove( actor ); DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); END_TEST; @@ -771,9 +821,6 @@ int UtcDaliVisualFactoryGetNPatchVisual3(void) DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); - Stage::GetCurrent().Remove( actor ); - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); - Vector2 naturalSize( 0.0f, 0.0f ); visual.GetNaturalSize( naturalSize ); DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION ); @@ -797,7 +844,7 @@ int UtcDaliVisualFactoryGetNPatchVisual3(void) visual.GetNaturalSize( naturalSize ); DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION ); - Stage::GetCurrent().Remove( actor ); + application.GetScene().Remove( actor ); DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); } @@ -897,7 +944,7 @@ int UtcDaliVisualFactoryGetNPatchVisual6(void) visual.GetNaturalSize( naturalSize ); DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION ); - Stage::GetCurrent().Remove( actor ); + application.GetScene().Remove( actor ); DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); } @@ -925,7 +972,7 @@ int UtcDaliVisualFactoryGetNPatchVisual6(void) visual.GetNaturalSize( naturalSize ); DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION ); - Stage::GetCurrent().Remove( actor ); + application.GetScene().Remove( actor ); DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); } @@ -967,7 +1014,7 @@ int UtcDaliVisualFactoryGetNPatchVisual7(void) actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); - Stage::GetCurrent().Add( actor ); + application.GetScene().Add( actor ); actor.Unparent(); application.SendNotification(); @@ -984,7 +1031,80 @@ int UtcDaliVisualFactoryGetNPatchVisual7(void) END_TEST; } -int UtcDaliNPatchVisualAuxiliaryImage(void) +int UtcDaliVisualFactoryGetNPatchVisual8(void) +{ + ToolkitTestApplication application; + 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 UtcDaliNPatchVisualAuxiliaryImage01(void) { ToolkitTestApplication application; tet_infoline( "NPatchVisual with aux image" ); @@ -1017,7 +1137,7 @@ int UtcDaliNPatchVisualAuxiliaryImage(void) dummyImpl.SetLayout( DummyControl::Property::TEST_VISUAL, transformMap ); dummy.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); dummy.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); - Stage::GetCurrent().Add(dummy); + application.GetScene().Add(dummy); application.SendNotification(); application.Render(); @@ -1030,6 +1150,39 @@ int UtcDaliNPatchVisualAuxiliaryImage(void) 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( 3 ), 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; } @@ -1052,10 +1205,13 @@ int UtcDaliVisualFactoryGetNPatchVisualN1(void) 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; } @@ -1128,15 +1284,12 @@ int UtcDaliVisualFactoryGetSvgVisual(void) DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - Stage::GetCurrent().Add( actor ); + 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 ); // renderer is added to actor @@ -1168,14 +1321,11 @@ int UtcDaliVisualFactoryGetSvgVisualLarge(void) 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 ); - Stage::GetCurrent().Add( actor ); + 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 ); // renderer is added to actor @@ -1213,15 +1363,13 @@ int UtcDaliVisualFactoryGetSvgVisualAtlas(void) DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - Stage::GetCurrent().Add( actor ); + 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 ); // renderer is added to actor @@ -1252,7 +1400,7 @@ void MeshVisualLoadsCorrectlyTest( Property::Map& propertyMap, ToolkitTestApplic DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - Stage::GetCurrent().Add( actor ); + application.GetScene().Add( actor ); visual.SetTransformAndSize(DefaultTransform(), Vector2( 200.f, 200.f ) ); //Ensure set on stage. @@ -1295,7 +1443,7 @@ void MeshVisualDoesNotLoadCorrectlyTest( Property::Map& propertyMap, ToolkitTest DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - Stage::GetCurrent().Add( actor ); + application.GetScene().Add( actor ); visual.SetTransformAndSize(DefaultTransform(), Vector2( 200.f, 200.f ) ); //Ensure set on stage. @@ -1326,6 +1474,13 @@ int UtcDaliVisualFactoryGetMeshVisual1(void) 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; @@ -1347,6 +1502,14 @@ int UtcDaliVisualFactoryGetMeshVisual2(void) 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 ); @@ -1368,6 +1531,14 @@ int UtcDaliVisualFactoryGetMeshVisual3b(void) 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 ); @@ -1392,6 +1563,14 @@ int UtcDaliVisualFactoryGetMeshVisual3(void) 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 ); @@ -1416,6 +1595,13 @@ int UtcDaliVisualFactoryGetMeshVisual4(void) 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; @@ -1438,6 +1624,14 @@ int UtcDaliVisualFactoryGetMeshVisual5(void) 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 ); @@ -1464,6 +1658,14 @@ int UtcDaliVisualFactoryGetMeshVisual6(void) 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 ); @@ -1483,9 +1685,16 @@ 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), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); + //Set up visual properties. Property::Map propertyMap; propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH ); @@ -1509,6 +1718,14 @@ int UtcDaliVisualFactoryGetMeshVisual8(void) 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 ); @@ -1602,7 +1819,7 @@ void TestPrimitiveVisualWithProperties( Property::Map& propertyMap, ToolkitTestA dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - Stage::GetCurrent().Add( actor ); + application.GetScene().Add( actor ); visual.SetTransformAndSize(DefaultTransform(), Vector2( 200.f, 200.f ) ); //Ensure set on stage. @@ -1633,6 +1850,14 @@ int UtcDaliVisualFactoryGetPrimitiveVisual1(void) 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 ); @@ -1652,6 +1877,14 @@ int UtcDaliVisualFactoryGetPrimitiveVisual2(void) 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 ); @@ -1681,6 +1914,14 @@ int UtcDaliVisualFactoryGetPrimitiveVisual3(void) 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 ); @@ -1703,10 +1944,18 @@ int UtcDaliVisualFactoryGetPrimitiveVisual4(void) 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_FRUSTRUM ); + 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 ); @@ -1727,6 +1976,14 @@ int UtcDaliVisualFactoryGetPrimitiveVisual5(void) 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 ); @@ -1748,6 +2005,14 @@ int UtcDaliVisualFactoryGetPrimitiveVisual6(void) 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 ); @@ -1768,6 +2033,14 @@ int UtcDaliVisualFactoryGetPrimitiveVisual7(void) 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 ); @@ -1791,6 +2064,14 @@ int UtcDaliVisualFactoryGetPrimitiveVisual8(void) 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 ); @@ -1812,6 +2093,14 @@ int UtcDaliVisualFactoryGetPrimitiveVisual9(void) 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 ); @@ -1832,6 +2121,14 @@ int UtcDaliVisualFactoryGetPrimitiveVisual10(void) 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 ); @@ -1852,6 +2149,14 @@ int UtcDaliVisualFactoryGetPrimitiveVisual11(void) 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 ); @@ -1872,6 +2177,14 @@ int UtcDaliVisualFactoryGetPrimitiveVisual12(void) 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 ); @@ -1892,6 +2205,14 @@ int UtcDaliVisualFactoryGetPrimitiveVisual13(void) 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 ); @@ -1912,6 +2233,14 @@ int UtcDaliVisualFactoryGetPrimitiveVisual14(void) 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 ); @@ -1932,6 +2261,14 @@ int UtcDaliVisualFactoryGetPrimitiveVisual15(void) 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 ); @@ -1952,6 +2289,14 @@ int UtcDaliVisualFactoryGetPrimitiveVisual16(void) 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 ); @@ -1972,6 +2317,14 @@ int UtcDaliVisualFactoryGetPrimitiveVisual17(void) 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 ); @@ -1992,6 +2345,14 @@ int UtcDaliVisualFactoryGetPrimitiveVisual18(void) 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 ); @@ -2016,6 +2377,14 @@ int UtcDaliVisualFactoryGetPrimitiveVisualN1(void) 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 ); @@ -2043,7 +2412,7 @@ int UtcDaliVisualFactoryGetAnimatedImageVisual1(void) DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - Stage::GetCurrent().Add( actor ); + application.GetScene().Add( actor ); application.SendNotification(); application.Render(); @@ -2098,7 +2467,7 @@ int UtcDaliVisualFactoryGetAnimatedImageVisual1(void) DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); textureTrace.Reset(); - // Test SetOffStage(). + // Test SetOffScene(). actor.Unparent(); DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); @@ -2110,6 +2479,15 @@ int UtcDaliVisualFactoryGetAnimatedImageVisual2(void) ToolkitTestApplication application; 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 ) @@ -2131,7 +2509,7 @@ int UtcDaliVisualFactoryGetAnimatedImageVisual2(void) 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 ) ); - Stage::GetCurrent().Add( actor ); + application.GetScene().Add( actor ); application.SendNotification(); application.Render();