#include <dali/public-api/rendering/renderer.h>
#include <dali/public-api/rendering/texture-set.h>
#include <dali/public-api/rendering/shader.h>
-#include <dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.h>
+#include <dali-toolkit/devel-api/controls/visual-factory/visual-factory.h>
using namespace Dali;
using namespace Dali::Toolkit;
const char* TEST_RESOURCE_LOCATION = TEST_RESOURCE_DIR "/";
}
-void dali_control_renderer_startup(void)
+void dali_visual_startup(void)
{
test_return_value = TET_UNDEF;
}
-void dali_control_renderer_cleanup(void)
+void dali_visual_cleanup(void)
{
test_return_value = TET_PASS;
}
-int UtcDaliControlRendererCopyAndAssignment(void)
+int UtcDaliVisualCopyAndAssignment(void)
{
ToolkitTestApplication application;
- tet_infoline( "UtcDaliControlRendererCopyAndAssignment" );
+ tet_infoline( "UtcDaliVisualCopyAndAssignment" );
- RendererFactory factory = RendererFactory::Get();
+ VisualFactory factory = VisualFactory::Get();
Property::Map propertyMap;
propertyMap.Insert("rendererType", "COLOR");
propertyMap.Insert("mixColor", Color::BLUE);
- ControlRenderer controlRenderer = factory.CreateControlRenderer( propertyMap );
+ Visual visual = factory.CreateVisual( propertyMap );
- ControlRenderer controlRendererCopy( controlRenderer );
- DALI_TEST_CHECK(controlRenderer == controlRendererCopy);
+ Visual visualCopy( visual );
+ DALI_TEST_CHECK(visual == visualCopy);
- ControlRenderer emptyControlRenderer;
- ControlRenderer emptyControlRendererCopy( emptyControlRenderer );
- DALI_TEST_CHECK(emptyControlRenderer == emptyControlRendererCopy);
+ Visual emptyVisual;
+ Visual emptyVisualCopy( emptyVisual );
+ DALI_TEST_CHECK(emptyVisual == emptyVisualCopy);
- ControlRenderer controlRendererEquals;
- controlRendererEquals = controlRenderer;
- DALI_TEST_CHECK(controlRenderer == controlRendererEquals);
+ Visual visualEquals;
+ visualEquals = visual;
+ DALI_TEST_CHECK(visual == visualEquals);
- ControlRenderer emptyControlRendererEquals;
- emptyControlRendererEquals = emptyControlRenderer;
- DALI_TEST_CHECK( emptyControlRenderer == emptyControlRendererEquals );
+ Visual emptyVisualEquals;
+ emptyVisualEquals = emptyVisual;
+ DALI_TEST_CHECK( emptyVisual == emptyVisualEquals );
//self assignment
- controlRenderer = controlRenderer;
- DALI_TEST_CHECK( controlRenderer = controlRendererCopy );
+ visual = visual;
+ DALI_TEST_CHECK( visual = visualCopy );
END_TEST;
}
-int UtcDaliControlRendererSetGetDepthIndex(void)
+int UtcDaliVisualSetGetDepthIndex(void)
{
ToolkitTestApplication application;
- tet_infoline( "UtcDaliControlRendererSetDepthIndex" );
+ tet_infoline( "UtcDaliVisualSetDepthIndex" );
- RendererFactory factory = RendererFactory::Get();
+ VisualFactory factory = VisualFactory::Get();
Property::Map propertyMap;
propertyMap.Insert("rendererType", "COLOR");
propertyMap.Insert("mixColor", Color::BLUE);
- ControlRenderer controlRenderer = factory.CreateControlRenderer( propertyMap );
+ Visual visual = factory.CreateVisual( propertyMap );
- controlRenderer.SetDepthIndex( 1.f );
+ visual.SetDepthIndex( 1.f );
Actor actor = Actor::New();
actor.SetSize(200.f, 200.f);
Stage::GetCurrent().Add( actor );
- controlRenderer.SetOnStage( actor );
+ visual.SetOnStage( actor );
int depthIndex = actor.GetRendererAt(0u).GetProperty<int>( Renderer::Property::DEPTH_INDEX );
DALI_TEST_EQUALS( depthIndex, 1, TEST_LOCATION );
- DALI_TEST_EQUALS( controlRenderer.GetDepthIndex(), 1.f, TEST_LOCATION );
+ DALI_TEST_EQUALS( visual.GetDepthIndex(), 1.f, TEST_LOCATION );
- controlRenderer.SetDepthIndex( -1.f );
+ visual.SetDepthIndex( -1.f );
depthIndex = actor.GetRendererAt(0u).GetProperty<int>( Renderer::Property::DEPTH_INDEX );
DALI_TEST_EQUALS( depthIndex, -1, TEST_LOCATION );
- DALI_TEST_EQUALS( controlRenderer.GetDepthIndex(), -1.f, TEST_LOCATION );
+ DALI_TEST_EQUALS( visual.GetDepthIndex(), -1.f, TEST_LOCATION );
END_TEST;
}
-int UtcDaliControlRendererSize(void)
+int UtcDaliVisualSize(void)
{
ToolkitTestApplication application;
- tet_infoline( "UtcDaliControlRendererGetNaturalSize" );
+ tet_infoline( "UtcDaliVisualGetNaturalSize" );
- RendererFactory factory = RendererFactory::Get();
- Vector2 rendererSize( 20.f, 30.f );
+ VisualFactory factory = VisualFactory::Get();
+ Vector2 visualSize( 20.f, 30.f );
Vector2 naturalSize;
- // color renderer
+ // color colorVisual
Dali::Property::Map map;
map[ "rendererType" ] = "COLOR";
map[ "mixColor" ] = Color::MAGENTA;
- ControlRenderer colorRenderer = factory.CreateControlRenderer( map );
- colorRenderer.SetSize( rendererSize );
- DALI_TEST_EQUALS( colorRenderer.GetSize(), rendererSize, TEST_LOCATION );
- colorRenderer.GetNaturalSize(naturalSize);
+ Visual colorVisual = factory.CreateVisual( map );
+ colorVisual.SetSize( visualSize );
+ DALI_TEST_EQUALS( colorVisual.GetSize(), visualSize, TEST_LOCATION );
+ colorVisual.GetNaturalSize(naturalSize);
DALI_TEST_EQUALS( naturalSize, Vector2::ZERO, TEST_LOCATION );
- // image renderer
+ // image visual
Image image = ResourceImage::New(TEST_IMAGE_FILE_NAME, ImageDimensions(100, 200));
- ControlRenderer imageRenderer = factory.CreateControlRenderer( image );
- imageRenderer.SetSize( rendererSize );
- DALI_TEST_EQUALS( imageRenderer.GetSize(), rendererSize, TEST_LOCATION );
- imageRenderer.GetNaturalSize(naturalSize);
+ Visual imageVisual = factory.CreateVisual( image );
+ imageVisual.SetSize( visualSize );
+ DALI_TEST_EQUALS( imageVisual.GetSize(), visualSize, TEST_LOCATION );
+ imageVisual.GetNaturalSize(naturalSize);
DALI_TEST_EQUALS( naturalSize, Vector2(100.f, 200.f), TEST_LOCATION );
- // n patch renderer
+ // n patch visual
TestPlatformAbstraction& platform = application.GetPlatform();
Vector2 testSize(80.f, 160.f);
platform.SetClosestImageSize(testSize);
image = ResourceImage::New(TEST_NPATCH_FILE_NAME);
- ControlRenderer nPatchRenderer = factory.CreateControlRenderer( image );
- nPatchRenderer.SetSize( rendererSize );
- DALI_TEST_EQUALS( nPatchRenderer.GetSize(), rendererSize, TEST_LOCATION );
- nPatchRenderer.GetNaturalSize(naturalSize);
+ Visual nPatchVisual = factory.CreateVisual( image );
+ nPatchVisual.SetSize( visualSize );
+ DALI_TEST_EQUALS( nPatchVisual.GetSize(), visualSize, TEST_LOCATION );
+ nPatchVisual.GetNaturalSize(naturalSize);
DALI_TEST_EQUALS( naturalSize, testSize, TEST_LOCATION );
- // border renderer
+ // border visual
float borderSize = 5.f;
map.Clear();
map[ "rendererType" ] = "BORDER";
map[ "borderColor" ] = Color::RED;
map[ "borderSize" ] = borderSize;
- ControlRenderer borderRenderer = factory.CreateControlRenderer( map );
- borderRenderer.SetSize( rendererSize );
- DALI_TEST_EQUALS( borderRenderer.GetSize(), rendererSize, TEST_LOCATION );
- borderRenderer.GetNaturalSize(naturalSize);
+ Visual borderVisual = factory.CreateVisual( map );
+ borderVisual.SetSize( visualSize );
+ DALI_TEST_EQUALS( borderVisual.GetSize(), visualSize, TEST_LOCATION );
+ borderVisual.GetNaturalSize(naturalSize);
DALI_TEST_EQUALS( naturalSize, Vector2::ZERO, TEST_LOCATION );
- // gradient renderer
+ // gradient gradientVisual
Property::Map propertyMap;
propertyMap.Insert("rendererType", "GRADIENT");
Vector2 start(-1.f, -1.f);
stopColors.PushBack( Color::RED );
stopColors.PushBack( Color::GREEN );
propertyMap.Insert("stopColor", stopColors);
- ControlRenderer gradientRenderer = factory.CreateControlRenderer(propertyMap);
- gradientRenderer.SetSize( rendererSize );
- DALI_TEST_EQUALS( gradientRenderer.GetSize(), rendererSize, TEST_LOCATION );
- gradientRenderer.GetNaturalSize(naturalSize);
+ Visual gradientVisual = factory.CreateVisual(propertyMap);
+ gradientVisual.SetSize( visualSize );
+ DALI_TEST_EQUALS( gradientVisual.GetSize(), visualSize, TEST_LOCATION );
+ gradientVisual.GetNaturalSize(naturalSize);
DALI_TEST_EQUALS( naturalSize, Vector2::ZERO,TEST_LOCATION );
- //svg renderer
- ControlRenderer svgRenderer = factory.CreateControlRenderer( TEST_SVG_FILE_NAME, ImageDimensions() );
- svgRenderer.SetSize( rendererSize );
- DALI_TEST_EQUALS( svgRenderer.GetSize(), rendererSize, TEST_LOCATION );
- svgRenderer.GetNaturalSize(naturalSize);
+ //svg visual
+ Visual svgVisual = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions() );
+ svgVisual.SetSize( visualSize );
+ DALI_TEST_EQUALS( svgVisual.GetSize(), visualSize, TEST_LOCATION );
+ svgVisual.GetNaturalSize(naturalSize);
// TEST_SVG_FILE:
// <svg width="100" height="100">
// <circle cx="50" cy="50" r="40" stroke="green" stroke-width="4" fill="yellow" />
END_TEST;
}
-int UtcDaliControlRendererSetOnOffStage(void)
+int UtcDaliVisualSetOnOffStage(void)
{
ToolkitTestApplication application;
- tet_infoline( "UtcDaliControlRendererSetDepthIndex" );
+ tet_infoline( "UtcDaliVisualSetDepthIndex" );
- RendererFactory factory = RendererFactory::Get();
+ VisualFactory factory = VisualFactory::Get();
Property::Map propertyMap;
propertyMap.Insert("rendererType", "COLOR");
propertyMap.Insert("mixColor", Color::BLUE);
- ControlRenderer controlRenderer = factory.CreateControlRenderer( propertyMap );
+ Visual visual = factory.CreateVisual( propertyMap );
Actor actor = Actor::New();
actor.SetSize(200.f, 200.f);
application.Render(0);
DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
- controlRenderer.SetOnStage( actor );
+ visual.SetOnStage( actor );
application.SendNotification();
application.Render(0);
DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
- controlRenderer.SetOffStage( actor );
+ visual.SetOffStage( actor );
application.SendNotification();
application.Render(0);
DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
END_TEST;
}
-int UtcDaliControlRendererRemoveAndReset(void)
+int UtcDaliVisualRemoveAndReset(void)
{
ToolkitTestApplication application;
- tet_infoline( "intUtcDaliControlRendererRemoveAndReset" );
+ tet_infoline( "intUtcDaliVisualRemoveAndReset" );
- RendererFactory factory = RendererFactory::Get();
+ VisualFactory factory = VisualFactory::Get();
Actor actor = Actor::New();
actor.SetSize(200.f, 200.f);
Stage::GetCurrent().Add( actor );
- ControlRenderer imageRenderer;
+ Visual imageVisual;
// test calling RemoveAndReset with an empty handle
try
{
- imageRenderer.RemoveAndReset( actor );
+ imageVisual.RemoveAndReset( actor );
tet_result(TET_PASS);
}
catch (DaliException& exception)
}
Image image = ResourceImage::New(TEST_IMAGE_FILE_NAME, ImageDimensions(100, 200));
- imageRenderer = factory.CreateControlRenderer(image);
- DALI_TEST_CHECK( imageRenderer );
+ imageVisual = factory.CreateVisual(image);
+ DALI_TEST_CHECK( imageVisual );
- imageRenderer.SetOnStage( actor );
+ imageVisual.SetOnStage( actor );
application.SendNotification();
application.Render(0);
DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
- imageRenderer.RemoveAndReset( actor );
+ imageVisual.RemoveAndReset( actor );
application.SendNotification();
application.Render(0);
- DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); // renderer is removed from actor
- DALI_TEST_CHECK( !imageRenderer ); // control renderer is reset
+ DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); // visual is removed from actor
+ DALI_TEST_CHECK( !imageVisual ); // visual is reset
END_TEST;
}
-int UtcDaliControlRendererGetPropertyMap1(void)
+int UtcDaliVisualGetPropertyMap1(void)
{
ToolkitTestApplication application;
- tet_infoline( "UtcDaliControlRendererGetPropertyMap1: ColorRenderer" );
+ tet_infoline( "UtcDaliVisualGetPropertyMap1: ColorVisual" );
- RendererFactory factory = RendererFactory::Get();
+ VisualFactory factory = VisualFactory::Get();
Property::Map propertyMap;
propertyMap.Insert("rendererType", "COLOR");
propertyMap.Insert("mixColor", Color::BLUE);
- ControlRenderer colorRenderer = factory.CreateControlRenderer( propertyMap );
+ Visual colorVisual = factory.CreateVisual( propertyMap );
Property::Map resultMap;
- colorRenderer.CreatePropertyMap( resultMap );
+ colorVisual.CreatePropertyMap( resultMap );
Property::Value* typeValue = resultMap.Find( "rendererType", Property::STRING );
DALI_TEST_CHECK( typeValue );
// change the blend color
Actor actor;
- colorRenderer.RemoveAndReset( actor );
+ colorVisual.RemoveAndReset( actor );
propertyMap["mixColor"] = Color::CYAN;
- colorRenderer = factory.CreateControlRenderer( propertyMap );
- colorRenderer.CreatePropertyMap( resultMap );
+ colorVisual = factory.CreateVisual( propertyMap );
+ colorVisual.CreatePropertyMap( resultMap );
colorValue = resultMap.Find( "mixColor", Property::VECTOR4 );
DALI_TEST_CHECK( colorValue );
END_TEST;
}
-int UtcDaliControlRendererGetPropertyMap2(void)
+int UtcDaliVisualGetPropertyMap2(void)
{
ToolkitTestApplication application;
- tet_infoline( "UtcDaliControlRendererGetPropertyMap2: BorderRenderer" );
+ tet_infoline( "UtcDaliVisualGetPropertyMap2: BorderVisual" );
- RendererFactory factory = RendererFactory::Get();
+ VisualFactory factory = VisualFactory::Get();
Property::Map propertyMap;
propertyMap.Insert("rendererType", "BORDER");
propertyMap.Insert("borderColor", Color::BLUE);
propertyMap.Insert("borderSize", 5.f);
- ControlRenderer borderRenderer = factory.CreateControlRenderer( propertyMap );
+ Visual borderVisual = factory.CreateVisual( propertyMap );
Property::Map resultMap;
- borderRenderer.CreatePropertyMap( resultMap );
+ borderVisual.CreatePropertyMap( resultMap );
- // check the property values from the returned map from control renderer
+ // check the property values from the returned map from visual
Property::Value* typeValue = resultMap.Find( "rendererType", Property::STRING );
DALI_TEST_CHECK( typeValue );
DALI_TEST_CHECK( typeValue->Get<std::string>() == "BORDER" );
propertyMap1[ "rendererType" ] = "BORDER";
propertyMap1[ "borderColor" ] = Color::CYAN;
propertyMap1[ "borderSize" ] = 10.0f;
- borderRenderer = factory.CreateControlRenderer( propertyMap1 );
- borderRenderer.CreatePropertyMap( resultMap );
+ borderVisual = factory.CreateVisual( propertyMap1 );
+ borderVisual.CreatePropertyMap( resultMap );
typeValue = resultMap.Find( "rendererType", Property::STRING );
DALI_TEST_CHECK( typeValue );
END_TEST;
}
-int UtcDaliControlRendererGetPropertyMap3(void)
+int UtcDaliVisualGetPropertyMap3(void)
{
ToolkitTestApplication application;
- tet_infoline( "UtcDaliControlRendererGetPropertyMap3: linear GradientRenderer" );
+ tet_infoline( "UtcDaliVisualGetPropertyMap3: linear GradientVisual" );
- RendererFactory factory = RendererFactory::Get();
+ VisualFactory factory = VisualFactory::Get();
DALI_TEST_CHECK( factory );
Property::Map propertyMap;
stopColors.PushBack( Color::GREEN );
propertyMap.Insert("stopColor", stopColors);
- ControlRenderer gradientRenderer = factory.CreateControlRenderer(propertyMap);
+ Visual gradientVisual = factory.CreateVisual(propertyMap);
Property::Map resultMap;
- gradientRenderer.CreatePropertyMap( resultMap );
+ gradientVisual.CreatePropertyMap( resultMap );
- // check the property values from the returned map from control renderer
+ // check the property values from the returned map from visual
Property::Value* value = resultMap.Find( "rendererType", Property::STRING );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<std::string>() == "GRADIENT" );
END_TEST;
}
-int UtcDaliControlRendererGetPropertyMap4(void)
+int UtcDaliVisualGetPropertyMap4(void)
{
ToolkitTestApplication application;
- tet_infoline( "UtcDaliControlRendererGetPropertyMap4: radial GradientRenderer" );
+ tet_infoline( "UtcDaliVisualGetPropertyMap4: radial GradientVisual" );
- RendererFactory factory = RendererFactory::Get();
+ VisualFactory factory = VisualFactory::Get();
DALI_TEST_CHECK( factory );
Property::Map propertyMap;
stopColors.PushBack( Color::GREEN );
propertyMap.Insert("stopColor", stopColors);
- ControlRenderer gradientRenderer = factory.CreateControlRenderer(propertyMap);
- DALI_TEST_CHECK( gradientRenderer );
+ Visual gradientVisual = factory.CreateVisual(propertyMap);
+ DALI_TEST_CHECK( gradientVisual );
Property::Map resultMap;
- gradientRenderer.CreatePropertyMap( resultMap );
+ gradientVisual.CreatePropertyMap( resultMap );
- // check the property values from the returned map from control renderer
+ // check the property values from the returned map from visual
Property::Value* value = resultMap.Find( "rendererType", Property::STRING );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<std::string>() == "GRADIENT" );
END_TEST;
}
-int UtcDaliControlRendererGetPropertyMap5(void)
+int UtcDaliVisualGetPropertyMap5(void)
{
ToolkitTestApplication application;
- tet_infoline( "UtcDaliControlRendererGetPropertyMap5: ImageRenderer" );
+ tet_infoline( "UtcDaliVisualGetPropertyMap5: ImageVisual" );
- RendererFactory factory = RendererFactory::Get();
+ VisualFactory factory = VisualFactory::Get();
Property::Map propertyMap;
propertyMap.Insert( "rendererType", "IMAGE" );
propertyMap.Insert( "url", TEST_IMAGE_FILE_NAME );
propertyMap.Insert( "samplingMode", "BOX_THEN_NEAREST" );
propertyMap.Insert( "synchronousLoading", true );
- ControlRenderer imageRenderer = factory.CreateControlRenderer(propertyMap);
- DALI_TEST_CHECK( imageRenderer );
+ Visual imageVisual = factory.CreateVisual(propertyMap);
+ DALI_TEST_CHECK( imageVisual );
Property::Map resultMap;
- imageRenderer.CreatePropertyMap( resultMap );
+ imageVisual.CreatePropertyMap( resultMap );
- // check the property values from the returned map from control renderer
+ // check the property values from the returned map from visual
Property::Value* value = resultMap.Find( "rendererType", Property::STRING );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<std::string>() == "IMAGE" );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<bool>() == true );
- // Get an image renderer with an image handle, and test the default property values
+ // Get an image visual with an image handle, and test the default property values
Image image = ResourceImage::New(TEST_IMAGE_FILE_NAME, ImageDimensions(100, 200));
- imageRenderer = factory.CreateControlRenderer(image);
- imageRenderer.CreatePropertyMap( resultMap );
+ imageVisual = factory.CreateVisual(image);
+ imageVisual.CreatePropertyMap( resultMap );
value = resultMap.Find( "rendererType", Property::STRING );
DALI_TEST_CHECK( value );
END_TEST;
}
-int UtcDaliControlRendererGetPropertyMap6(void)
+int UtcDaliVisualGetPropertyMap6(void)
{
ToolkitTestApplication application;
- tet_infoline( "UtcDaliControlRendererGetPropertyMap6: NPatchRenderer" );
+ tet_infoline( "UtcDaliVisualGetPropertyMap6: NPatchVisual" );
- RendererFactory factory = RendererFactory::Get();
+ VisualFactory factory = VisualFactory::Get();
Property::Map propertyMap;
propertyMap.Insert( "rendererType", "IMAGE" );
propertyMap.Insert( "url", TEST_NPATCH_FILE_NAME );
propertyMap.Insert( "borderOnly", true );
- ControlRenderer nPatchRenderer = factory.CreateControlRenderer( propertyMap );
+ Visual nPatchVisual = factory.CreateVisual( propertyMap );
Property::Map resultMap;
- nPatchRenderer.CreatePropertyMap( resultMap );
+ nPatchVisual.CreatePropertyMap( resultMap );
- // check the property values from the returned map from control renderer
+ // check the property values from the returned map from visual
Property::Value* value = resultMap.Find( "rendererType", Property::STRING );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<std::string>() == "IMAGE" );
END_TEST;
}
-int UtcDaliControlRendererGetPropertyMap7(void)
+int UtcDaliVisualGetPropertyMap7(void)
{
ToolkitTestApplication application;
- tet_infoline( "UtcDaliControlRendererGetPropertyMap7: SvgRenderer" );
+ tet_infoline( "UtcDaliVisualGetPropertyMap7: SvgVisual" );
- // request SvgRenderer with a property map
- RendererFactory factory = RendererFactory::Get();
+ // request SvgVisual with a property map
+ VisualFactory factory = VisualFactory::Get();
Property::Map propertyMap;
propertyMap.Insert( "rendererType", "IMAGE" );
propertyMap.Insert( "url", TEST_SVG_FILE_NAME );
- ControlRenderer svgRenderer = factory.CreateControlRenderer( propertyMap );
+ Visual svgVisual = factory.CreateVisual( propertyMap );
Property::Map resultMap;
- svgRenderer.CreatePropertyMap( resultMap );
- // check the property values from the returned map from control renderer
+ svgVisual.CreatePropertyMap( resultMap );
+ // check the property values from the returned map from a visual
Property::Value* value = resultMap.Find( "rendererType", Property::STRING );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<std::string>() == "IMAGE" );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<std::string>() == TEST_SVG_FILE_NAME );
- // request SvgRenderer with an URL
- ControlRenderer svgRenderer2 = factory.CreateControlRenderer( TEST_SVG_FILE_NAME, ImageDimensions() );
+ // request SvgVisual with an URL
+ Visual svgVisual2 = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions() );
resultMap.Clear();
- svgRenderer2.CreatePropertyMap( resultMap );
- // check the property values from the returned map from control renderer
+ svgVisual2.CreatePropertyMap( resultMap );
+ // check the property values from the returned map from a visual
value = resultMap.Find( "rendererType", Property::STRING );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<std::string>() == "IMAGE" );
END_TEST;
}
-//Mesh renderer
-int UtcDaliControlRendererGetPropertyMap8(void)
+//Mesh visual
+int UtcDaliVisualGetPropertyMap8(void)
{
ToolkitTestApplication application;
- tet_infoline( "UtcDaliControlRendererGetPropertyMap8: MeshRenderer" );
+ tet_infoline( "UtcDaliVisualGetPropertyMap8: MeshVisual" );
- //Request MeshRenderer using a property map.
- RendererFactory factory = RendererFactory::Get();
+ //Request MeshVisual using a property map.
+ VisualFactory factory = VisualFactory::Get();
Property::Map propertyMap;
propertyMap.Insert( "rendererType", "MESH" );
propertyMap.Insert( "objectUrl", TEST_OBJ_FILE_NAME );
propertyMap.Insert( "texturesPath", TEST_RESOURCE_LOCATION );
propertyMap.Insert( "shaderType", "TEXTURELESS" );
propertyMap.Insert( "lightPosition", Vector3( 5.0f, 10.0f, 15.0f) );
- ControlRenderer meshRenderer = factory.CreateControlRenderer( propertyMap );
+ Visual meshVisual = factory.CreateVisual( propertyMap );
Property::Map resultMap;
- meshRenderer.CreatePropertyMap( resultMap );
+ meshVisual.CreatePropertyMap( resultMap );
//Check values in the result map are identical to the initial map's values.
Property::Value* value = resultMap.Find( "rendererType", Property::STRING );
END_TEST;
}
-//Primitive shape renderer
-int UtcDaliControlRendererGetPropertyMap9(void)
+//Primitive shape visual
+int UtcDaliVisualGetPropertyMap9(void)
{
ToolkitTestApplication application;
- tet_infoline( "UtcDaliControlRendererGetPropertyMap9: PrimitiveRenderer" );
+ tet_infoline( "UtcDaliVisualGetPropertyMap9: PrimitiveVisual" );
Vector4 color = Vector4( 1.0, 0.8, 0.6, 1.0);
Vector3 dimensions = Vector3( 1.0, 2.0, 3.0 );
- //Request PrimitiveRenderer using a property map.
- RendererFactory factory = RendererFactory::Get();
+ //Request PrimitiveVisual using a property map.
+ VisualFactory factory = VisualFactory::Get();
Property::Map propertyMap;
propertyMap.Insert( "rendererType", "PRIMITIVE" );
propertyMap.Insert( "shape", "CUBE" );
propertyMap.Insert( "bevelPercentage", 0.3f );
propertyMap.Insert( "bevelSmoothness", 0.6f );
propertyMap.Insert( "lightPosition", Vector3( 5.0f, 10.0f, 15.0f) );
- ControlRenderer primitiveRenderer = factory.CreateControlRenderer( propertyMap );
+ Visual primitiveVisual = factory.CreateVisual( propertyMap );
Property::Map resultMap;
- primitiveRenderer.CreatePropertyMap( resultMap );
+ primitiveVisual.CreatePropertyMap( resultMap );
//Check values in the result map are identical to the initial map's values.
Property::Value* value = resultMap.Find( "rendererType", Property::STRING );