#include <stdlib.h>
#include <dali-toolkit-test-suite-utils.h>
#include <dali/devel-api/rendering/renderer.h>
-#include <dali/devel-api/rendering/material.h>
+#include <dali/devel-api/rendering/texture-set.h>
#include <dali/devel-api/rendering/shader.h>
#include <dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.h>
RendererFactory factory = RendererFactory::Get();
Property::Map propertyMap;
propertyMap.Insert("rendererType", "color");
- propertyMap.Insert("blendColor", Color::BLUE);
+ propertyMap.Insert("mixColor", Color::BLUE);
ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
ControlRenderer controlRendererCopy( controlRenderer );
RendererFactory factory = RendererFactory::Get();
Property::Map propertyMap;
propertyMap.Insert("rendererType", "color");
- propertyMap.Insert("blendColor", Color::BLUE);
+ propertyMap.Insert("mixColor", Color::BLUE);
ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
controlRenderer.SetDepthIndex( 1.f );
RendererFactory factory = RendererFactory::Get();
Property::Map propertyMap;
propertyMap.Insert("rendererType", "color");
- propertyMap.Insert("blendColor", Color::BLUE);
+ propertyMap.Insert("mixColor", Color::BLUE);
ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
Actor actor = Actor::New();
RendererFactory factory = RendererFactory::Get();
Property::Map propertyMap;
propertyMap.Insert("rendererType", "color");
- propertyMap.Insert("blendColor", Color::BLUE);
+ propertyMap.Insert("mixColor", Color::BLUE);
ControlRenderer colorRenderer = factory.GetControlRenderer( propertyMap );
Property::Map resultMap;
DALI_TEST_CHECK( typeValue );
DALI_TEST_CHECK( typeValue->Get<std::string>() == "color" );
- Property::Value* colorValue = resultMap.Find( "blendColor", Property::VECTOR4 );
+ Property::Value* colorValue = resultMap.Find( "mixColor", Property::VECTOR4 );
DALI_TEST_CHECK( colorValue );
DALI_TEST_CHECK( colorValue->Get<Vector4>() == Color::BLUE );
factory.ResetRenderer( colorRenderer, actor, Color::CYAN );
colorRenderer.CreatePropertyMap( resultMap );
- colorValue = resultMap.Find( "blendColor", Property::VECTOR4 );
+ colorValue = resultMap.Find( "mixColor", Property::VECTOR4 );
DALI_TEST_CHECK( colorValue );
DALI_TEST_CHECK( colorValue->Get<Vector4>() == Color::CYAN );
DALI_TEST_CHECK( typeValue );
DALI_TEST_CHECK( typeValue->Get<std::string>() == "border" );
- colorValue = resultMap.Find( "borderColor", Property::VECTOR4 );
+ colorValue = resultMap.Find( "borderColor", Property::VECTOR4 );
DALI_TEST_CHECK( colorValue );
DALI_TEST_CHECK( colorValue->Get<Vector4>() == Color::CYAN );
RendererFactory factory = RendererFactory::Get();
Property::Map propertyMap;
propertyMap.Insert( "rendererType", "image" );
- propertyMap.Insert( "imageUrl", TEST_IMAGE_FILE_NAME );
- propertyMap.Insert( "imageDesiredWidth", 20 );
- propertyMap.Insert( "imageDesiredHeight", 30 );
- propertyMap.Insert( "imageFittingMode", "fitHeight" );
- propertyMap.Insert( "imageSamplingMode", "boxThenNearest" );
+ propertyMap.Insert( "url", TEST_IMAGE_FILE_NAME );
+ propertyMap.Insert( "desiredWidth", 20 );
+ propertyMap.Insert( "desiredHeight", 30 );
+ propertyMap.Insert( "fittingMode", "FIT_HEIGHT" );
+ propertyMap.Insert( "samplingMode", "BOX_THEN_NEAREST" );
ControlRenderer imageRenderer = factory.GetControlRenderer(propertyMap);
DALI_TEST_CHECK( imageRenderer );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<std::string>() == "image" );
- value = resultMap.Find( "imageUrl", Property::STRING );
+ value = resultMap.Find( "url", Property::STRING );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<std::string>() == TEST_IMAGE_FILE_NAME );
- value = resultMap.Find( "imageFittingMode", Property::STRING );
+ value = resultMap.Find( "fittingMode", Property::STRING );
DALI_TEST_CHECK( value );
- DALI_TEST_CHECK( value->Get<std::string>() == "fitHeight" );
+ DALI_TEST_CHECK( value->Get<std::string>() == "FIT_HEIGHT" );
- value = resultMap.Find( "imageSamplingMode", Property::STRING );
+ value = resultMap.Find( "samplingMode", Property::STRING );
DALI_TEST_CHECK( value );
- DALI_TEST_CHECK( value->Get<std::string>() == "boxThenNearest" );
+ DALI_TEST_CHECK( value->Get<std::string>() == "BOX_THEN_NEAREST" );
- value = resultMap.Find( "imageDesiredWidth", Property::INTEGER );
+ value = resultMap.Find( "desiredWidth", Property::INTEGER );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<int>() == 20 );
- value = resultMap.Find( "imageDesiredHeight", Property::INTEGER );
+ value = resultMap.Find( "desiredHeight", Property::INTEGER );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<int>() == 30 );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<std::string>() == "image" );
- value = resultMap.Find( "imageUrl", Property::STRING );
+ value = resultMap.Find( "url", Property::STRING );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<std::string>() == TEST_IMAGE_FILE_NAME );
- value = resultMap.Find( "imageFittingMode", Property::STRING );
+ value = resultMap.Find( "fittingMode", Property::STRING );
DALI_TEST_CHECK( value );
- DALI_TEST_CHECK( value->Get<std::string>() == "shrinkToFit" );
+ DALI_TEST_CHECK( value->Get<std::string>() == "SHRINK_TO_FIT" );
- value = resultMap.Find( "imageSamplingMode", Property::STRING );
+ value = resultMap.Find( "samplingMode", Property::STRING );
DALI_TEST_CHECK( value );
- DALI_TEST_CHECK( value->Get<std::string>() == "box" );
+ DALI_TEST_CHECK( value->Get<std::string>() == "BOX" );
- value = resultMap.Find( "imageDesiredWidth", Property::INTEGER );
+ value = resultMap.Find( "desiredWidth", Property::INTEGER );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<int>() == 100 );
- value = resultMap.Find( "imageDesiredHeight", Property::INTEGER );
+ value = resultMap.Find( "desiredHeight", Property::INTEGER );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<int>() == 200 );
RendererFactory factory = RendererFactory::Get();
Property::Map propertyMap;
- propertyMap.Insert( "rendererType", "nPatch" );
- propertyMap.Insert( "imageUrl", TEST_NPATCH_FILE_NAME );
+ propertyMap.Insert( "rendererType", "image" );
+ propertyMap.Insert( "url", TEST_NPATCH_FILE_NAME );
propertyMap.Insert( "borderOnly", true );
ControlRenderer nPatchRenderer = factory.GetControlRenderer( propertyMap );
// check the property values from the returned map from control renderer
Property::Value* value = resultMap.Find( "rendererType", Property::STRING );
DALI_TEST_CHECK( value );
- DALI_TEST_CHECK( value->Get<std::string>() == "nPatch" );
+ DALI_TEST_CHECK( value->Get<std::string>() == "image" );
- value = resultMap.Find( "imageUrl", Property::STRING );
+ value = resultMap.Find( "url", Property::STRING );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<std::string>() == TEST_NPATCH_FILE_NAME );
// request SvgRenderer with a property map
RendererFactory factory = RendererFactory::Get();
Property::Map propertyMap;
- propertyMap.Insert( "rendererType", "svg" );
- propertyMap.Insert( "imageUrl", TEST_SVG_FILE_NAME );
+ propertyMap.Insert( "rendererType", "image" );
+ propertyMap.Insert( "url", TEST_SVG_FILE_NAME );
ControlRenderer svgRenderer = factory.GetControlRenderer( propertyMap );
Property::Map resultMap;
// check the property values from the returned map from control renderer
Property::Value* value = resultMap.Find( "rendererType", Property::STRING );
DALI_TEST_CHECK( value );
- DALI_TEST_CHECK( value->Get<std::string>() == "svg" );
+ DALI_TEST_CHECK( value->Get<std::string>() == "image" );
- value = resultMap.Find( "imageUrl", Property::STRING );
+ value = resultMap.Find( "url", Property::STRING );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<std::string>() == TEST_SVG_FILE_NAME );
// check the property values from the returned map from control renderer
value = resultMap.Find( "rendererType", Property::STRING );
DALI_TEST_CHECK( value );
- DALI_TEST_CHECK( value->Get<std::string>() == "svg" );
+ DALI_TEST_CHECK( value->Get<std::string>() == "image" );
- value = resultMap.Find( "imageUrl", Property::STRING );
+ value = resultMap.Find( "url", Property::STRING );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<std::string>() == TEST_SVG_FILE_NAME );