From 99e2ea03e6d6059f5803d700932df1ff1c848cd3 Mon Sep 17 00:00:00 2001 From: Agnelo Vaz Date: Wed, 27 Jul 2016 14:29:52 +0100 Subject: [PATCH 1/1] Adding Visual namespace and Visual becomes Visual::Base Change-Id: I1cbf83ef020f0a64aef638538fb0ae53142c6255 --- .../src/dali-toolkit/utc-Dali-DebugVisual.cpp | 32 ++++++------- .../src/dali-toolkit/utc-Dali-ToolBar.cpp | 4 +- .../src/dali-toolkit/utc-Dali-Visual.cpp | 52 +++++++++++----------- .../src/dali-toolkit/utc-Dali-VisualFactory.cpp | 44 +++++++++--------- dali-toolkit/devel-api/file.list | 4 +- .../visual-factory/{visual.cpp => visual-base.cpp} | 39 +++++++++------- .../visual-factory/{visual.h => visual-base.h} | 27 ++++++----- .../devel-api/visual-factory/visual-factory.cpp | 6 +-- .../devel-api/visual-factory/visual-factory.h | 52 +++++++++++----------- .../internal/controls/buttons/button-impl.cpp | 2 +- .../controls/effects-view/effects-view-impl.cpp | 24 +++++----- .../controls/effects-view/effects-view-impl.h | 14 +++--- .../controls/image-view/image-view-impl.cpp | 48 ++++++++++---------- .../internal/controls/image-view/image-view-impl.h | 6 +-- .../internal/controls/magnifier/magnifier-impl.cpp | 6 +-- .../super-blur-view/super-blur-view-impl.cpp | 35 +++++++-------- .../super-blur-view/super-blur-view-impl.h | 6 +-- .../controls/video-view/video-view-impl.cpp | 18 ++++---- .../internal/controls/video-view/video-view-impl.h | 2 +- dali-toolkit/internal/file.list | 4 +- dali-toolkit/internal/filters/emboss-filter.cpp | 12 ++--- dali-toolkit/internal/filters/emboss-filter.h | 22 ++++----- .../internal/visuals/border/border-visual.cpp | 6 +-- .../internal/visuals/border/border-visual.h | 4 +- .../internal/visuals/color/color-visual.cpp | 8 ++-- dali-toolkit/internal/visuals/color/color-visual.h | 4 +- .../internal/visuals/debug/debug-visual.cpp | 4 +- dali-toolkit/internal/visuals/debug/debug-visual.h | 4 +- .../internal/visuals/gradient/gradient-visual.cpp | 8 ++-- .../internal/visuals/gradient/gradient-visual.h | 4 +- .../internal/visuals/image/image-visual.cpp | 10 ++--- dali-toolkit/internal/visuals/image/image-visual.h | 4 +- dali-toolkit/internal/visuals/mesh/mesh-visual.cpp | 8 ++-- dali-toolkit/internal/visuals/mesh/mesh-visual.h | 4 +- .../internal/visuals/npatch/npatch-visual.cpp | 8 ++-- .../internal/visuals/npatch/npatch-visual.h | 4 +- .../visuals/primitive/primitive-visual.cpp | 8 ++-- .../internal/visuals/primitive/primitive-visual.h | 4 +- dali-toolkit/internal/visuals/svg/svg-visual.cpp | 4 +- dali-toolkit/internal/visuals/svg/svg-visual.h | 4 +- ...ual-data-impl.cpp => visual-base-data-impl.cpp} | 16 +++---- ...{visual-data-impl.h => visual-base-data-impl.h} | 15 ++++--- .../{visual-impl.cpp => visual-base-impl.cpp} | 49 +++++++++++--------- .../visuals/{visual-impl.h => visual-base-impl.h} | 51 +++++++++++---------- .../internal/visuals/visual-factory-impl.cpp | 26 +++++------ .../internal/visuals/visual-factory-impl.h | 8 ++-- dali-toolkit/public-api/controls/control-impl.cpp | 2 +- 47 files changed, 376 insertions(+), 350 deletions(-) rename dali-toolkit/devel-api/visual-factory/{visual.cpp => visual-base.cpp} (65%) rename dali-toolkit/devel-api/visual-factory/{visual.h => visual-base.h} (91%) rename dali-toolkit/internal/visuals/{visual-data-impl.cpp => visual-base-data-impl.cpp} (92%) rename dali-toolkit/internal/visuals/{visual-data-impl.h => visual-base-data-impl.h} (84%) rename dali-toolkit/internal/visuals/{visual-impl.cpp => visual-base-impl.cpp} (75%) rename dali-toolkit/internal/visuals/{visual-impl.h => visual-base-impl.h} (82%) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-DebugVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-DebugVisual.cpp index 5310467..338a99c 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-DebugVisual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-DebugVisual.cpp @@ -30,13 +30,13 @@ namespace const char* TEST_IMAGE_FILE_NAME = "image_01.jpg"; const char* TEST_NPATCH_FILE_NAME = "image_01.9.jpg"; -bool IsDebugVisual( Visual& renderer ) +bool IsDebugVisual( Visual::Base& visual ) { bool isDebugVisualType = false; bool isGeometryLineType = false; Property::Map propertyMap; - renderer.CreatePropertyMap( propertyMap ); + visual.CreatePropertyMap( propertyMap ); Property::Value* typeValue = propertyMap.Find( "rendererType", Property::STRING ); if ( typeValue ) { @@ -44,7 +44,7 @@ bool IsDebugVisual( Visual& renderer ) } Actor actor = Actor::New(); - renderer.SetOnStage( actor ); + visual.SetOnStage( actor ); Geometry geometry = actor.GetRendererAt( 0 ).GetGeometry(); isGeometryLineType = ( geometry.GetGeometryType() == Geometry::LINES ); @@ -75,16 +75,16 @@ int UtcDaliDebugVisualGetRenderer1(void) Property::Map propertyMap1; propertyMap1.Insert("rendererType", "COLOR"); propertyMap1.Insert("mixColor", Color::BLUE); - Visual colorRenderer = factory.CreateVisual(propertyMap1); - DALI_TEST_CHECK( colorRenderer ); - DALI_TEST_CHECK( IsDebugVisual( colorRenderer ) ); + Visual::Base colorVisual = factory.CreateVisual(propertyMap1); + DALI_TEST_CHECK( colorVisual ); + DALI_TEST_CHECK( IsDebugVisual( colorVisual ) ); // Test that border renderer is replaced with debug renderer Property::Map propertyMap2; propertyMap2.Insert("rendererType", "BORDER"); propertyMap2.Insert("borderColor", Color::BLUE); propertyMap2.Insert("borderSize", 2.f); - Visual borderRenderer = factory.CreateVisual(propertyMap2); + Visual::Base borderRenderer = factory.CreateVisual(propertyMap2); DALI_TEST_CHECK( borderRenderer ); DALI_TEST_CHECK( IsDebugVisual( borderRenderer ) ); @@ -104,7 +104,7 @@ int UtcDaliDebugVisualGetRenderer1(void) stopColors.PushBack( Color::RED ); stopColors.PushBack( Color::GREEN ); propertyMap3.Insert("stopColor", stopColors); - Visual gradientRenderer = factory.CreateVisual(propertyMap3); + Visual::Base gradientRenderer = factory.CreateVisual(propertyMap3); DALI_TEST_CHECK( gradientRenderer ); DALI_TEST_CHECK( IsDebugVisual( gradientRenderer ) ); @@ -112,7 +112,7 @@ int UtcDaliDebugVisualGetRenderer1(void) Property::Map propertyMap4; propertyMap4.Insert( "rendererType", "IMAGE" ); propertyMap4.Insert( "url", TEST_IMAGE_FILE_NAME ); - Visual imageRenderer = factory.CreateVisual( propertyMap4 ); + Visual::Base imageRenderer = factory.CreateVisual( propertyMap4 ); DALI_TEST_CHECK( imageRenderer ); DALI_TEST_CHECK( IsDebugVisual( imageRenderer ) ); @@ -120,7 +120,7 @@ int UtcDaliDebugVisualGetRenderer1(void) Property::Map propertyMap5; propertyMap5.Insert( "rendererType", "IMAGE" ); propertyMap5.Insert( "url", TEST_NPATCH_FILE_NAME ); - Visual nPatchRenderer = factory.CreateVisual( propertyMap4 ); + Visual::Base nPatchRenderer = factory.CreateVisual( propertyMap4 ); DALI_TEST_CHECK( nPatchRenderer ); DALI_TEST_CHECK( IsDebugVisual( nPatchRenderer ) ); @@ -142,27 +142,27 @@ int UtcDaliDebugVisualGetRenderer2(void) map[ "rendererType" ] = "COLOR"; map[ "mixColor" ] = Color::CYAN; - Visual colorRenderer = factory.CreateVisual( map); - DALI_TEST_CHECK( colorRenderer ); - DALI_TEST_CHECK( IsDebugVisual( colorRenderer ) ); + Visual::Base colorVisual = factory.CreateVisual( map); + DALI_TEST_CHECK( colorVisual ); + DALI_TEST_CHECK( IsDebugVisual( colorVisual ) ); // Test that border renderer is replaced with debug renderer map.Clear(); map[ "rendererType" ] = "BORDER"; map[ "borderColor" ] = Color::GREEN; map[ "borderSize" ] = 2.f; - Visual borderRenderer = factory.CreateVisual( map ); + Visual::Base borderRenderer = factory.CreateVisual( map ); DALI_TEST_CHECK( borderRenderer ); DALI_TEST_CHECK( IsDebugVisual( borderRenderer ) ); // Test that image renderer is replaced with debug renderer Image image = ResourceImage::New(TEST_IMAGE_FILE_NAME); - Visual imageRenderer = factory.CreateVisual( image ); + Visual::Base imageRenderer = factory.CreateVisual( image ); DALI_TEST_CHECK( imageRenderer ); DALI_TEST_CHECK( IsDebugVisual( imageRenderer ) ); // Test that n patch renderer is replaced with debug renderer - Visual nPatchRenderer = factory.CreateVisual( TEST_NPATCH_FILE_NAME, ImageDimensions() ); + Visual::Base nPatchRenderer = factory.CreateVisual( TEST_NPATCH_FILE_NAME, ImageDimensions() ); DALI_TEST_CHECK( nPatchRenderer ); DALI_TEST_CHECK( IsDebugVisual( nPatchRenderer ) ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp index 2418f49..aa19e76 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp @@ -43,8 +43,8 @@ Actor CreateColorActor( const Vector4& color ) Dali::Property::Map map; map[ "rendererType" ] = "COLOR"; map[ "mixColor" ] = color; - Visual colorRenderer = factory.CreateVisual( map ); - colorRenderer.SetOnStage( solidColorActor ); + Visual::Base colorVisual = factory.CreateVisual( map ); + colorVisual.SetOnStage( solidColorActor ); return solidColorActor; } diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp index 6807fb3..becec49 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp @@ -54,20 +54,20 @@ int UtcDaliVisualCopyAndAssignment(void) Property::Map propertyMap; propertyMap.Insert("rendererType", "COLOR"); propertyMap.Insert("mixColor", Color::BLUE); - Visual visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual( propertyMap ); - Visual visualCopy( visual ); + Visual::Base visualCopy( visual ); DALI_TEST_CHECK(visual == visualCopy); - Visual emptyVisual; - Visual emptyVisualCopy( emptyVisual ); + Visual::Base emptyVisual; + Visual::Base emptyVisualCopy( emptyVisual ); DALI_TEST_CHECK(emptyVisual == emptyVisualCopy); - Visual visualEquals; + Visual::Base visualEquals; visualEquals = visual; DALI_TEST_CHECK(visual == visualEquals); - Visual emptyVisualEquals; + Visual::Base emptyVisualEquals; emptyVisualEquals = emptyVisual; DALI_TEST_CHECK( emptyVisual == emptyVisualEquals ); @@ -87,7 +87,7 @@ int UtcDaliVisualSetGetDepthIndex(void) Property::Map propertyMap; propertyMap.Insert("rendererType", "COLOR"); propertyMap.Insert("mixColor", Color::BLUE); - Visual visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual( propertyMap ); visual.SetDepthIndex( 1.f ); @@ -117,11 +117,11 @@ int UtcDaliVisualSize(void) Vector2 visualSize( 20.f, 30.f ); Vector2 naturalSize; - // color colorVisual + // color colorVisual Dali::Property::Map map; map[ "rendererType" ] = "COLOR"; map[ "mixColor" ] = Color::MAGENTA; - Visual colorVisual = factory.CreateVisual( map ); + Visual::Base colorVisual = factory.CreateVisual( map ); colorVisual.SetSize( visualSize ); DALI_TEST_EQUALS( colorVisual.GetSize(), visualSize, TEST_LOCATION ); colorVisual.GetNaturalSize(naturalSize); @@ -129,7 +129,7 @@ int UtcDaliVisualSize(void) // image visual Image image = ResourceImage::New(TEST_IMAGE_FILE_NAME, ImageDimensions(100, 200)); - Visual imageVisual = factory.CreateVisual( image ); + Visual::Base imageVisual = factory.CreateVisual( image ); imageVisual.SetSize( visualSize ); DALI_TEST_EQUALS( imageVisual.GetSize(), visualSize, TEST_LOCATION ); imageVisual.GetNaturalSize(naturalSize); @@ -140,7 +140,7 @@ int UtcDaliVisualSize(void) Vector2 testSize(80.f, 160.f); platform.SetClosestImageSize(testSize); image = ResourceImage::New(TEST_NPATCH_FILE_NAME); - Visual nPatchVisual = factory.CreateVisual( image ); + Visual::Base nPatchVisual = factory.CreateVisual( image ); nPatchVisual.SetSize( visualSize ); DALI_TEST_EQUALS( nPatchVisual.GetSize(), visualSize, TEST_LOCATION ); nPatchVisual.GetNaturalSize(naturalSize); @@ -152,7 +152,7 @@ int UtcDaliVisualSize(void) map[ "rendererType" ] = "BORDER"; map[ "borderColor" ] = Color::RED; map[ "borderSize" ] = borderSize; - Visual borderVisual = factory.CreateVisual( map ); + Visual::Base borderVisual = factory.CreateVisual( map ); borderVisual.SetSize( visualSize ); DALI_TEST_EQUALS( borderVisual.GetSize(), visualSize, TEST_LOCATION ); borderVisual.GetNaturalSize(naturalSize); @@ -170,14 +170,14 @@ int UtcDaliVisualSize(void) stopColors.PushBack( Color::RED ); stopColors.PushBack( Color::GREEN ); propertyMap.Insert("stopColor", stopColors); - Visual gradientVisual = factory.CreateVisual(propertyMap); + Visual::Base 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 visual - Visual svgVisual = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions() ); + Visual::Base svgVisual = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions() ); svgVisual.SetSize( visualSize ); DALI_TEST_EQUALS( svgVisual.GetSize(), visualSize, TEST_LOCATION ); svgVisual.GetNaturalSize(naturalSize); @@ -198,7 +198,7 @@ int UtcDaliVisualSetOnOffStage(void) Property::Map propertyMap; propertyMap.Insert("rendererType", "COLOR"); propertyMap.Insert("mixColor", Color::BLUE); - Visual visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual( propertyMap ); Actor actor = Actor::New(); actor.SetSize(200.f, 200.f); @@ -232,7 +232,7 @@ int UtcDaliVisualRemoveAndReset(void) actor.SetSize(200.f, 200.f); Stage::GetCurrent().Add( actor ); - Visual imageVisual; + Visual::Base imageVisual; // test calling RemoveAndReset with an empty handle try { @@ -271,7 +271,7 @@ int UtcDaliVisualGetPropertyMap1(void) Property::Map propertyMap; propertyMap.Insert("rendererType", "COLOR"); propertyMap.Insert("mixColor", Color::BLUE); - Visual colorVisual = factory.CreateVisual( propertyMap ); + Visual::Base colorVisual = factory.CreateVisual( propertyMap ); Property::Map resultMap; colorVisual.CreatePropertyMap( resultMap ); @@ -308,7 +308,7 @@ int UtcDaliVisualGetPropertyMap2(void) propertyMap.Insert("rendererType", "BORDER"); propertyMap.Insert("borderColor", Color::BLUE); propertyMap.Insert("borderSize", 5.f); - Visual borderVisual = factory.CreateVisual( propertyMap ); + Visual::Base borderVisual = factory.CreateVisual( propertyMap ); Property::Map resultMap; borderVisual.CreatePropertyMap( resultMap ); @@ -372,7 +372,7 @@ int UtcDaliVisualGetPropertyMap3(void) stopColors.PushBack( Color::GREEN ); propertyMap.Insert("stopColor", stopColors); - Visual gradientVisual = factory.CreateVisual(propertyMap); + Visual::Base gradientVisual = factory.CreateVisual(propertyMap); Property::Map resultMap; gradientVisual.CreatePropertyMap( resultMap ); @@ -439,7 +439,7 @@ int UtcDaliVisualGetPropertyMap4(void) stopColors.PushBack( Color::GREEN ); propertyMap.Insert("stopColor", stopColors); - Visual gradientVisual = factory.CreateVisual(propertyMap); + Visual::Base gradientVisual = factory.CreateVisual(propertyMap); DALI_TEST_CHECK( gradientVisual ); Property::Map resultMap; @@ -501,7 +501,7 @@ int UtcDaliVisualGetPropertyMap5(void) propertyMap.Insert( "samplingMode", "BOX_THEN_NEAREST" ); propertyMap.Insert( "synchronousLoading", true ); - Visual imageVisual = factory.CreateVisual(propertyMap); + Visual::Base imageVisual = factory.CreateVisual(propertyMap); DALI_TEST_CHECK( imageVisual ); Property::Map resultMap; @@ -582,7 +582,7 @@ int UtcDaliVisualGetPropertyMap6(void) propertyMap.Insert( "rendererType", "IMAGE" ); propertyMap.Insert( "url", TEST_NPATCH_FILE_NAME ); propertyMap.Insert( "borderOnly", true ); - Visual nPatchVisual = factory.CreateVisual( propertyMap ); + Visual::Base nPatchVisual = factory.CreateVisual( propertyMap ); Property::Map resultMap; nPatchVisual.CreatePropertyMap( resultMap ); @@ -613,7 +613,7 @@ int UtcDaliVisualGetPropertyMap7(void) Property::Map propertyMap; propertyMap.Insert( "rendererType", "IMAGE" ); propertyMap.Insert( "url", TEST_SVG_FILE_NAME ); - Visual svgVisual = factory.CreateVisual( propertyMap ); + Visual::Base svgVisual = factory.CreateVisual( propertyMap ); Property::Map resultMap; svgVisual.CreatePropertyMap( resultMap ); @@ -627,7 +627,7 @@ int UtcDaliVisualGetPropertyMap7(void) DALI_TEST_CHECK( value->Get() == TEST_SVG_FILE_NAME ); // request SvgVisual with an URL - Visual svgVisual2 = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions() ); + Visual::Base svgVisual2 = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions() ); resultMap.Clear(); svgVisual2.CreatePropertyMap( resultMap ); // check the property values from the returned map from a visual @@ -657,7 +657,7 @@ int UtcDaliVisualGetPropertyMap8(void) propertyMap.Insert( "texturesPath", TEST_RESOURCE_LOCATION ); propertyMap.Insert( "shaderType", "TEXTURELESS" ); propertyMap.Insert( "lightPosition", Vector3( 5.0f, 10.0f, 15.0f) ); - Visual meshVisual = factory.CreateVisual( propertyMap ); + Visual::Base meshVisual = factory.CreateVisual( propertyMap ); Property::Map resultMap; meshVisual.CreatePropertyMap( resultMap ); @@ -715,7 +715,7 @@ int UtcDaliVisualGetPropertyMap9(void) propertyMap.Insert( "bevelPercentage", 0.3f ); propertyMap.Insert( "bevelSmoothness", 0.6f ); propertyMap.Insert( "lightPosition", Vector3( 5.0f, 10.0f, 15.0f) ); - Visual primitiveVisual = factory.CreateVisual( propertyMap ); + Visual::Base primitiveVisual = factory.CreateVisual( propertyMap ); Property::Map resultMap; primitiveVisual.CreatePropertyMap( resultMap ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp index 657c0ce..dd0aaed 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp @@ -175,7 +175,7 @@ Integration::ResourcePointer CustomizeNinePatch( TestApplication& application, void TestVisualRender( ToolkitTestApplication& application, Actor& actor, - Visual& visual, + Visual::Base& visual, std::size_t expectedSamplers = 0, ImageDimensions imageDimensions = ImageDimensions(), Integration::ResourcePointer resourcePtr = Integration::ResourcePointer()) @@ -297,7 +297,7 @@ int UtcDaliVisualFactoryGetColorVisual1(void) propertyMap.Insert("rendererType", "COLOR"); propertyMap.Insert("mixColor", testColor); - Visual visual = factory.CreateVisual(propertyMap); + Visual::Base visual = factory.CreateVisual(propertyMap); DALI_TEST_CHECK( visual ); Actor actor = Actor::New(); @@ -323,7 +323,7 @@ int UtcDaliVisualFactoryGetColorVisual2(void) Dali::Property::Map map; map[ "rendererType" ] = "COLOR"; map[ "mixColor" ] = testColor; - Visual visual = factory.CreateVisual( map ); + Visual::Base visual = factory.CreateVisual( map ); DALI_TEST_CHECK( visual ); Actor actor = Actor::New(); @@ -355,7 +355,7 @@ int UtcDaliVisualFactoryGetBorderVisual1(void) propertyMap.Insert("borderColor", testColor); propertyMap.Insert("borderSize", testSize); - Visual visual = factory.CreateVisual(propertyMap); + Visual::Base visual = factory.CreateVisual(propertyMap); DALI_TEST_CHECK( visual ); Actor actor = Actor::New(); @@ -402,7 +402,7 @@ int UtcDaliVisualFactoryGetBorderVisual2(void) propertyMap[ "rendererType" ] = "BORDER"; propertyMap[ "borderColor" ] = testColor; propertyMap[ "borderSize" ] = testSize; - Visual visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual( propertyMap ); DALI_TEST_CHECK( visual ); Actor actor = Actor::New(); @@ -475,7 +475,7 @@ int UtcDaliVisualFactoryGetLinearGradientVisual(void) stopColors.PushBack( Color::GREEN ); propertyMap.Insert("stopColor", stopColors); - Visual visual = factory.CreateVisual(propertyMap); + Visual::Base visual = factory.CreateVisual(propertyMap); DALI_TEST_CHECK( visual ); // A lookup texture is generated and pass to shader as sampler @@ -515,7 +515,7 @@ int UtcDaliVisualFactoryGetRadialGradientVisual(void) stopColors.PushBack( Color::GREEN ); propertyMap.Insert("stopColor", stopColors); - Visual visual = factory.CreateVisual(propertyMap); + Visual::Base visual = factory.CreateVisual(propertyMap); DALI_TEST_CHECK( visual ); // A lookup texture is generated and pass to shader as sampler @@ -555,7 +555,7 @@ int UtcDaliVisualFactoryDefaultOffsetsGradientVisual(void) stopColors.PushBack( Color::GREEN ); propertyMap.Insert("stopColor", stopColors); - Visual visual = factory.CreateVisual(propertyMap); + Visual::Base visual = factory.CreateVisual(propertyMap); DALI_TEST_CHECK( visual ); // A lookup texture is generated and pass to shader as sampler @@ -580,7 +580,7 @@ int UtcDaliVisualFactoryGetImageVisual1(void) propertyMap.Insert( "rendererType", "IMAGE" ); propertyMap.Insert( "url", TEST_IMAGE_FILE_NAME ); - Visual visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual( propertyMap ); DALI_TEST_CHECK( visual ); Actor actor = Actor::New(); @@ -617,7 +617,7 @@ int UtcDaliVisualFactoryGetImageVisual2(void) DALI_TEST_CHECK( factory ); Image image = ResourceImage::New(TEST_IMAGE_FILE_NAME); - Visual visual = factory.CreateVisual( image ); + Visual::Base visual = factory.CreateVisual( image ); Actor actor = Actor::New(); // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied. @@ -663,7 +663,7 @@ int UtcDaliVisualFactoryGetNPatchVisual1(void) propertyMap.Insert( "url", TEST_NPATCH_FILE_NAME ); { tet_infoline( "whole grid" ); - Visual visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual( propertyMap ); DALI_TEST_CHECK( visual ); Actor actor = Actor::New(); @@ -682,7 +682,7 @@ int UtcDaliVisualFactoryGetNPatchVisual1(void) propertyMap.Insert( "borderOnly", true ); { tet_infoline( "border only" ); - Visual visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual( propertyMap ); DALI_TEST_CHECK( visual ); Actor actor = Actor::New(); @@ -726,7 +726,7 @@ int UtcDaliVisualFactoryGetNPatchVisual2(void) propertyMap.Insert( "rendererType", "IMAGE" ); propertyMap.Insert( "url", TEST_NPATCH_FILE_NAME ); { - Visual visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual( propertyMap ); DALI_TEST_CHECK( visual ); Actor actor = Actor::New(); @@ -748,7 +748,7 @@ int UtcDaliVisualFactoryGetNPatchVisual2(void) propertyMap.Insert( "borderOnly", true ); { tet_infoline( "border only" ); - Visual visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual( propertyMap ); DALI_TEST_CHECK( visual ); TestGlAbstraction& gl = application.GetGlAbstraction(); @@ -785,7 +785,7 @@ int UtcDaliVisualFactoryGetNPatchVisual3(void) stretchRangesY.PushBack( Uint16Pair( 4, 5 ) ); Integration::ResourcePointer ninePatchResource = CustomizeNinePatch( application, ninePatchImageWidth, ninePatchImageHeight, stretchRangesX, stretchRangesY ); - Visual visual = factory.CreateVisual( TEST_NPATCH_FILE_NAME, ImageDimensions() ); + Visual::Base visual = factory.CreateVisual( TEST_NPATCH_FILE_NAME, ImageDimensions() ); DALI_TEST_CHECK( visual ); Actor actor = Actor::New(); @@ -824,7 +824,7 @@ int UtcDaliVisualFactoryGetNPatchVisual4(void) stretchRangesY.PushBack( Uint16Pair( 25, 27 ) ); Integration::ResourcePointer ninePatchResource = CustomizeNinePatch( application, ninePatchImageWidth, ninePatchImageHeight, stretchRangesX, stretchRangesY ); - Visual visual = factory.CreateVisual( TEST_NPATCH_FILE_NAME, ImageDimensions() ); + Visual::Base visual = factory.CreateVisual( TEST_NPATCH_FILE_NAME, ImageDimensions() ); DALI_TEST_CHECK( visual ); Actor actor = Actor::New(); @@ -852,7 +852,7 @@ int UtcDaliVisualFactoryGetNPatchVisualN1(void) VisualFactory factory = VisualFactory::Get(); DALI_TEST_CHECK( factory ); - Visual visual = factory.CreateVisual( "ERROR.9.jpg", ImageDimensions() ); + Visual::Base visual = factory.CreateVisual( "ERROR.9.jpg", ImageDimensions() ); DALI_TEST_CHECK( visual ); Actor actor = Actor::New(); @@ -888,7 +888,7 @@ int UtcDaliVisualFactoryGetNPatchVisualN2(void) propertyMap.Insert( "rendererType", 111 ); propertyMap.Insert( "url", "ERROR.9.jpg" ); - Visual visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual( propertyMap ); DALI_TEST_CHECK( visual ); Actor actor = Actor::New(); @@ -916,7 +916,7 @@ int UtcDaliVisualFactoryGetSvgVisual(void) tet_infoline( "UtcDaliVisualFactoryGetSvgVisual: Request svg visual with a svg url" ); VisualFactory factory = VisualFactory::Get(); - Visual visual = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions() ); + Visual::Base visual = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions() ); DALI_TEST_CHECK( visual ); TestGlAbstraction& gl = application.GetGlAbstraction(); @@ -958,7 +958,7 @@ void MeshVisualLoadsCorrectlyTest( Property::Map& propertyMap, ToolkitTestApplic DALI_TEST_CHECK( factory ); //Create a mesh visual. - Visual visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual( propertyMap ); DALI_TEST_CHECK( visual ); //Create an actor on stage to house the visual. @@ -1004,7 +1004,7 @@ void MeshVisualDoesNotLoadCorrectlyTest( Property::Map& propertyMap, ToolkitTest DALI_TEST_CHECK( factory ); //Create a mesh visual. - Visual visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual( propertyMap ); DALI_TEST_CHECK( visual ); //Create an actor on stage to house the visual. @@ -1284,7 +1284,7 @@ void TestPrimitiveVisualWithProperties( Property::Map& propertyMap, ToolkitTestA DALI_TEST_CHECK( factory ); //Create a primitive visual. - Visual visual = factory.CreateVisual( propertyMap ); + Visual::Base visual = factory.CreateVisual( propertyMap ); DALI_TEST_CHECK( visual ); //Create an actor on stage to house the visual. diff --git a/dali-toolkit/devel-api/file.list b/dali-toolkit/devel-api/file.list index 4c1b3d7..0dca497 100755 --- a/dali-toolkit/devel-api/file.list +++ b/dali-toolkit/devel-api/file.list @@ -23,7 +23,7 @@ devel_api_src_files = \ $(devel_api_src_dir)/transition-effects/cube-transition-fold-effect.cpp \ $(devel_api_src_dir)/transition-effects/cube-transition-wave-effect.cpp \ $(devel_api_src_dir)/visual-factory/visual-factory.cpp \ - $(devel_api_src_dir)/visual-factory/visual.cpp + $(devel_api_src_dir)/visual-factory/visual-base.cpp # Add devel header files here @@ -53,7 +53,7 @@ devel_api_popup_header_files = \ devel_api_visual_factory_header_files = \ $(devel_api_src_dir)/visual-factory/visual-factory.h \ - $(devel_api_src_dir)/visual-factory/visual.h + $(devel_api_src_dir)/visual-factory/visual-base.h devel_api_shadow_view_header_files = \ $(devel_api_src_dir)/controls/shadow-view/shadow-view.h diff --git a/dali-toolkit/devel-api/visual-factory/visual.cpp b/dali-toolkit/devel-api/visual-factory/visual-base.cpp similarity index 65% rename from dali-toolkit/devel-api/visual-factory/visual.cpp rename to dali-toolkit/devel-api/visual-factory/visual-base.cpp index f61d4cb..0b3193f 100644 --- a/dali-toolkit/devel-api/visual-factory/visual.cpp +++ b/dali-toolkit/devel-api/visual-factory/visual-base.cpp @@ -16,8 +16,10 @@ */ // CLASS HEADER -#include -#include "visual.h" +#include + +// INTERAL INCLUDES +#include namespace Dali { @@ -25,66 +27,69 @@ namespace Dali namespace Toolkit { -Visual::Visual() +namespace Visual +{ + +Base::Base() { } -Visual::~Visual() +Base::~Base() { } -Visual::Visual( const Visual& handle ) +Base::Base( const Base& handle ) : BaseHandle( handle ) { } -Visual& Visual::operator=( const Visual& handle ) +Base& Base::operator=( const Base& handle ) { BaseHandle::operator=( handle ); return *this; } -Visual::Visual(Internal::Visual *impl) +Base::Base(Internal::Visual::Base *impl) : BaseHandle( impl ) { } -void Visual::SetSize( const Vector2& size ) +void Base::SetSize( const Vector2& size ) { GetImplementation( *this ).SetSize( size ); } -const Vector2& Visual::GetSize() const +const Vector2& Base::GetSize() const { return GetImplementation( *this ).GetSize(); } -void Visual::GetNaturalSize(Vector2& naturalSize ) const +void Base::GetNaturalSize(Vector2& naturalSize ) const { GetImplementation( *this ).GetNaturalSize( naturalSize ); } -void Visual::SetDepthIndex( float index ) +void Base::SetDepthIndex( float index ) { GetImplementation( *this ).SetDepthIndex( index ); } -float Visual::GetDepthIndex() const +float Base::GetDepthIndex() const { return GetImplementation( *this ).GetDepthIndex(); } -void Visual::SetOnStage( Actor& actor ) +void Base::SetOnStage( Actor& actor ) { GetImplementation( *this ).SetOnStage( actor ); } -void Visual::SetOffStage( Actor& actor ) +void Base::SetOffStage( Actor& actor ) { GetImplementation( *this ).SetOffStage( actor ); } -void Visual::RemoveAndReset( Actor& actor ) +void Base::RemoveAndReset( Actor& actor ) { if( actor && *this ) { @@ -93,11 +98,13 @@ void Visual::RemoveAndReset( Actor& actor ) Reset(); } -void Visual::CreatePropertyMap( Property::Map& map ) const +void Base::CreatePropertyMap( Property::Map& map ) const { GetImplementation( *this ).CreatePropertyMap( map ); } +} // namespace Visual + } // namespace Toolkit } // namespace Dali diff --git a/dali-toolkit/devel-api/visual-factory/visual.h b/dali-toolkit/devel-api/visual-factory/visual-base.h similarity index 91% rename from dali-toolkit/devel-api/visual-factory/visual.h rename to dali-toolkit/devel-api/visual-factory/visual-base.h index 8591d2a..0cf9175 100644 --- a/dali-toolkit/devel-api/visual-factory/visual.h +++ b/dali-toolkit/devel-api/visual-factory/visual-base.h @@ -1,5 +1,5 @@ -#ifndef __DALI_TOOLKIT_CONTROL_RENDERER_H__ -#define __DALI_TOOLKIT_CONTROL_RENDERER_H__ +#ifndef DALI_TOOLKIT_VISUAL_BASE_H +#define DALI_TOOLKIT_VISUAL_BASE_H /* * Copyright (c) 2015 Samsung Electronics Co., Ltd. * @@ -29,9 +29,14 @@ namespace Toolkit namespace Internal DALI_INTERNAL { -class Visual; +namespace Visual +{ +class Base; +} } +namespace Visual +{ /** * @brief Visual provides renderer for rendering the controls. A control may have multiple ControlRenders. * @@ -39,28 +44,28 @@ class Visual; * It also responds to actor size and color change, and provides the clipping at the renderer level. * Note: The control renderer responds to the the Actor::COLOR by blending it with the 'Multiply' operator. */ -class DALI_IMPORT_API Visual : public BaseHandle +class DALI_IMPORT_API Base : public BaseHandle { public: /** * @brief Create an empty Visual Handle */ - Visual(); + Base(); /** * @brief Destructor * * This is non-virtual since derived Handle types must not contain data or virtual methods. */ - ~Visual(); + ~Base(); /** * @brief This copy constructor is required for (smart) pointer semantics. * * @param[in] handle A reference to the copied handle. */ - Visual( const Visual& handle ); + Base( const Base& handle ); /** * @brief This assignment operator is required for (smart) pointer semantics. @@ -68,7 +73,7 @@ public: * @param [in] handle A reference to the copied handle. * @return A reference to this. */ - Visual& operator=( const Visual& handle ); + Base& operator=( const Base& handle ); /** * @brief Set the size of the painting area. @@ -147,12 +152,14 @@ public: public: // Not intended for application developers - explicit DALI_INTERNAL Visual(Internal::Visual *impl); + explicit DALI_INTERNAL Base(Internal::Visual::Base *impl); }; +} // namespace Visual + } // namespace Toolkit } // namespace Dali -#endif /*__DALI_TOOLKIT_CONTROL_RENDERER_H__*/ +#endif /*DALI_TOOLKIT_VISUAL_BASE_H*/ diff --git a/dali-toolkit/devel-api/visual-factory/visual-factory.cpp b/dali-toolkit/devel-api/visual-factory/visual-factory.cpp index ca763e9..b91d79d 100644 --- a/dali-toolkit/devel-api/visual-factory/visual-factory.cpp +++ b/dali-toolkit/devel-api/visual-factory/visual-factory.cpp @@ -94,17 +94,17 @@ VisualFactory::VisualFactory(Internal::VisualFactory *impl) { } -Visual VisualFactory::CreateVisual( const Property::Map& propertyMap ) +Visual::Base VisualFactory::CreateVisual( const Property::Map& propertyMap ) { return GetImplementation( *this ).CreateVisual( propertyMap ); } -Visual VisualFactory::CreateVisual( const Image& image ) +Visual::Base VisualFactory::CreateVisual( const Image& image ) { return GetImplementation( *this ).CreateVisual( image ); } -Visual VisualFactory::CreateVisual( const std::string& url, ImageDimensions size ) +Visual::Base VisualFactory::CreateVisual( const std::string& url, ImageDimensions size ) { return GetImplementation( *this ).CreateVisual( url, size ); } diff --git a/dali-toolkit/devel-api/visual-factory/visual-factory.h b/dali-toolkit/devel-api/visual-factory/visual-factory.h index 76e963c..677f683 100644 --- a/dali-toolkit/devel-api/visual-factory/visual-factory.h +++ b/dali-toolkit/devel-api/visual-factory/visual-factory.h @@ -23,7 +23,7 @@ #include // INTERNAL INCLUDES -#include +#include namespace Dali { @@ -41,9 +41,9 @@ class VisualFactory; /** * @brief VisualFactory is a singleton object that provides and shares visuals between controls * - * By setting environment variable 'DALI_DEBUG_RENDERING', all concrete renderer is replaced with the debug renderer which renders a quad wireframe. + * By setting environment variable 'DALI_DEBUG_RENDERING', a debug visual is used which renders a quad wireframe. * - * The renderer type is required in the property map for requesting a control renderer. + * The visual type is required in the property map for requesting a visual. * * | %Property Name | Type | * |--------------------------|------------------| @@ -90,30 +90,30 @@ public: VisualFactory& operator=( const VisualFactory& handle ); /** - * @brief Request the control renderer + * @brief Request the visual * * @param[in] propertyMap The map contains the properties required by the control renderer * Depends on the content of the map, different kind of renderer would be returned. - * @return The pointer pointing to control renderer + * @return The pointer pointing to visual */ - Visual CreateVisual( const Property::Map& propertyMap ); + Visual::Base CreateVisual( const Property::Map& propertyMap ); /** - * @brief Request the control renderer to render the image. + * @brief Request the visual to render the image. * * @param[in] image The image to be rendered. - * @return The pointer pointing to the control renderer + * @return The pointer pointing to the visual */ - Visual CreateVisual( const Image& image ); + Visual::Base CreateVisual( const Image& image ); /** - * @brief Request the control renderer to render the given resource at the url. + * @brief Request the visual to render the given resource at the url. * * @param[in] url The URL to the resource to be rendered. * @param[in] size The width and height to fit the loaded image to. - * @return The pointer pointing to the control renderer + * @return The pointer pointing to the visual */ - Visual CreateVisual( const std::string& url, ImageDimensions size ); + Visual::Base CreateVisual( const std::string& url, ImageDimensions size ); private: @@ -123,44 +123,44 @@ private: /** - * @brief Template to allow discard old renderer, get new one and set it on stage if possible + * @brief Template to allow discard old visual, get new one and set it on stage if possible * * @tparam ParameterType0 The type of first argument passed to the CreateVisual() * @tparam ParameterType1 The type of second argument passed to the CreateVisual() * @SINCE_1_0.39 * @param[in] actor Actor for which the renderer will be replaced - * @param[in,out] renderer The renderer object to be replaced + * @param[in,out] visual The visual to be replaced * @param[in] param0 First template based argument passed to the renderer factory * @param[in] param1 Second template based argument passed to the renderer factory */ template< class ParameterType0, class ParameterType1 > -void InitializeVisual( Actor& actor, Visual& renderer, ParameterType0& param0, ParameterType1& param1 ) +void InitializeVisual( Actor& actor, Visual::Base& visual, ParameterType0& param0, ParameterType1& param1 ) { - renderer.RemoveAndReset( actor ); - renderer = Toolkit::VisualFactory::Get().CreateVisual( param0, param1 ); - if( renderer && actor && actor.OnStage() ) + visual.RemoveAndReset( actor ); + visual = Toolkit::VisualFactory::Get().CreateVisual( param0, param1 ); + if( visual && actor && actor.OnStage() ) { - renderer.SetOnStage( actor ); + visual.SetOnStage( actor ); } } /** - * @brief Template to allow discard old renderer, get new one and set it on stage if possible + * @brief Template to allow discard old visual, get new one and set it on stage if possible * * @tparam ParameterType The type of argument passed to the CreateVisual() * @SINCE_1_0.39 * @param[in] actor Actor for which the renderer will be replaced - * @param[in,out] renderer The renderer object to be replaced + * @param[in,out] visual The visual to be replaced * @param[in] param Template based argument passed to the renderer factory */ template< class ParameterType > -void InitializeVisual( Actor& actor, Visual& renderer, ParameterType& param ) +void InitializeVisual( Actor& actor, Visual::Base& visual, ParameterType& param ) { - renderer.RemoveAndReset( actor ); - renderer = Toolkit::VisualFactory::Get().CreateVisual( param ); - if( renderer && actor && actor.OnStage() ) + visual.RemoveAndReset( actor ); + visual = Toolkit::VisualFactory::Get().CreateVisual( param ); + if( visual && actor && actor.OnStage() ) { - renderer.SetOnStage( actor ); + visual.SetOnStage( actor ); } } diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp index 30034fd..2350489 100644 --- a/dali-toolkit/internal/controls/buttons/button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp @@ -563,7 +563,7 @@ void Button::SetColor( const Vector4& color, Button::PaintState selectedState ) // If there is no existing content, create a new actor to use for flat color. Actor placementActor = Actor::New(); Toolkit::VisualFactory rendererFactory = Toolkit::VisualFactory::Get(); - Toolkit::Visual colorRenderer; + Toolkit::Visual::Base colorRenderer; Property::Map map; map["rendererType"] = "COLOR"; diff --git a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp index 85058a1..e55eda6 100644 --- a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp +++ b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp @@ -188,7 +188,7 @@ void EffectsView::SetType( Toolkit::EffectsView::EffectType type ) customShader[ "vertexShader" ] = EFFECTS_VIEW_VERTEX_SOURCE; customShader[ "fragmentShader" ] = EFFECTS_VIEW_FRAGMENT_SOURCE; rendererMap[ "shader" ] = customShader; - InitializeVisual( self, mRendererPostFilter, rendererMap ); + InitializeVisual( self, mVisualPostFilter, rendererMap ); mEffectType = type; } @@ -302,13 +302,13 @@ void EffectsView::OnStageConnection( int depth ) Enable(); Actor self = Self(); - if( mRendererPostFilter ) + if( mVisualPostFilter ) { - mRendererPostFilter.SetOnStage( self ); + mVisualPostFilter.SetOnStage( self ); } - if( mRendererForChildren ) + if( mVisualForChildren ) { - mRendererForChildren.SetOnStage( self ); + mVisualForChildren.SetOnStage( self ); } } @@ -323,13 +323,13 @@ void EffectsView::OnStageDisconnection() } Actor self = Self(); - if( mRendererPostFilter ) + if( mVisualPostFilter ) { - mRendererPostFilter.SetOffStage( self ); + mVisualPostFilter.SetOffStage( self ); } - if( mRendererForChildren ) + if( mVisualForChildren ) { - mRendererForChildren.SetOffStage( self ); + mVisualForChildren.SetOffStage( self ); } Control::OnStageDisconnection(); @@ -435,14 +435,14 @@ void EffectsView::AllocateResources() Actor self( Self() ); mImageForChildren = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Dali::Image::UNUSED ); - InitializeVisual( self, mRendererForChildren, mImageForChildren ); - mRendererForChildren.SetDepthIndex( DepthIndex::CONTENT+1 ); + InitializeVisual( self, mVisualForChildren, mImageForChildren ); + mVisualForChildren.SetDepthIndex( DepthIndex::CONTENT+1 ); mImagePostFilter = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Dali::Image::UNUSED ); TextureSet textureSet = TextureSet::New(); TextureSetImage( textureSet, 0u, mImagePostFilter ); self.GetRendererAt( 0 ).SetTextures( textureSet ); - mRendererPostFilter.SetDepthIndex( DepthIndex::CONTENT ); + mVisualPostFilter.SetDepthIndex( DepthIndex::CONTENT ); SetupFilters(); } diff --git a/dali-toolkit/internal/controls/effects-view/effects-view-impl.h b/dali-toolkit/internal/controls/effects-view/effects-view-impl.h index e8476e7..5c49da3 100644 --- a/dali-toolkit/internal/controls/effects-view/effects-view-impl.h +++ b/dali-toolkit/internal/controls/effects-view/effects-view-impl.h @@ -215,11 +215,11 @@ private: // attributes/properties ///////////////////////////////////////////////////////////// // for rendering all user added children to offscreen target - FrameBufferImage mImageForChildren; - Toolkit::Visual mRendererForChildren; - RenderTask mRenderTaskForChildren; - CameraActor mCameraForChildren; - Actor mChildrenRoot; // for creating a subtree for all user added child actors + FrameBufferImage mImageForChildren; + Toolkit::Visual::Base mVisualForChildren; + RenderTask mRenderTaskForChildren; + CameraActor mCameraForChildren; + Actor mChildrenRoot; // for creating a subtree for all user added child actors ///////////////////////////////////////////////////////////// // background fill color @@ -231,8 +231,8 @@ private: // attributes/properties Vector2 mLastSize; ///////////////////////////////////////////////////////////// // post blur image - FrameBufferImage mImagePostFilter; - Toolkit::Visual mRendererPostFilter; + FrameBufferImage mImagePostFilter; + Toolkit::Visual::Base mVisualPostFilter; Vector mFilters; diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp index c0aece7..688e1e5 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include namespace Dali { @@ -81,7 +81,7 @@ void ImageView::SetImage( Image image ) mImage = image; Actor self( Self() ); - InitializeVisual( self, mRenderer, image ); + InitializeVisual( self, mVisual, image ); mImageSize = image ? ImageDimensions( image.GetWidth(), image.GetHeight() ) : ImageDimensions( 0, 0 ); RelayoutRequest(); @@ -95,7 +95,7 @@ void ImageView::SetImage( Property::Map map ) mPropertyMap = map; Actor self( Self() ); - InitializeVisual( self, mRenderer, mPropertyMap ); + InitializeVisual( self, mVisual, mPropertyMap ); Property::Value* widthValue = mPropertyMap.Find( "width" ); if( widthValue ) @@ -137,9 +137,9 @@ void ImageView::SetImage( const std::string& url, ImageDimensions size ) } Actor self( Self() ); - InitializeVisual( self, mRenderer, url, size ); + InitializeVisual( self, mVisual, url, size ); - mRenderer.SetSize( mSizeSet ); + mVisual.SetSize( mSizeSet ); RelayoutRequest(); } @@ -152,35 +152,35 @@ Image ImageView::GetImage() const void ImageView::EnablePreMultipliedAlpha( bool preMultipled ) { - if( mRenderer ) + if( mVisual ) { - GetImplementation( mRenderer ).EnablePreMultipliedAlpha( preMultipled ); + Toolkit::GetImplementation( mVisual ).EnablePreMultipliedAlpha( preMultipled ); } } bool ImageView::IsPreMultipliedAlphaEnabled() const { - if( mRenderer ) + if( mVisual ) { - return GetImplementation( mRenderer ).IsPreMultipliedAlphaEnabled(); + return Toolkit::GetImplementation( mVisual ).IsPreMultipliedAlphaEnabled(); } return false; } void ImageView::SetDepthIndex( int depthIndex ) { - if( mRenderer ) + if( mVisual ) { - mRenderer.SetDepthIndex( depthIndex ); + mVisual.SetDepthIndex( depthIndex ); } } Vector3 ImageView::GetNaturalSize() { - if( mRenderer ) + if( mVisual ) { Vector2 rendererNaturalSize; - mRenderer.GetNaturalSize( rendererNaturalSize ); + mVisual.GetNaturalSize( rendererNaturalSize ); return Vector3( rendererNaturalSize ); } @@ -234,19 +234,19 @@ void ImageView::OnStageConnection( int depth ) { Control::OnStageConnection( depth ); - if( mRenderer ) + if( mVisual ) { CustomActor self = Self(); - mRenderer.SetOnStage( self ); + mVisual.SetOnStage( self ); } } void ImageView::OnStageDisconnection() { - if( mRenderer ) + if( mVisual ) { CustomActor self = Self(); - mRenderer.SetOffStage( self ); + mVisual.SetOffStage( self ); } Control::OnStageDisconnection(); @@ -257,10 +257,10 @@ void ImageView::OnSizeSet( const Vector3& targetSize ) Control::OnSizeSet( targetSize ); mSizeSet = targetSize; - if( mRenderer ) + if( mVisual ) { Vector2 size( targetSize ); - mRenderer.SetSize( size ); + mVisual.SetSize( size ); } } @@ -306,18 +306,18 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr impl.SetImage( map ); } // the property map contains only the custom shader - else if( impl.mRenderer && map.Count() == 1u && shaderValue ) + else if( impl.mVisual && map.Count() == 1u && shaderValue ) { Property::Map shaderMap; if( shaderValue->Get( shaderMap ) ) { - Internal::Visual& renderer = GetImplementation( impl.mRenderer ); - renderer.SetCustomShader( shaderMap ); + Internal::Visual::Base& visual = Toolkit::GetImplementation( impl.mVisual ); + visual.SetCustomShader( shaderMap ); if( imageView.OnStage() ) { // force to create new core renderer to use the newly set shader - renderer.SetOffStage( imageView ); - renderer.SetOnStage( imageView ); + visual.SetOffStage( imageView ); + visual.SetOnStage( imageView ); } } } diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.h b/dali-toolkit/internal/controls/image-view/image-view-impl.h index d75509a..669a84f 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.h +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.h @@ -158,9 +158,9 @@ private: ImageView& operator=( const ImageView& ); private: - Toolkit::Visual mRenderer; - ImageDimensions mImageSize; - Vector2 mSizeSet; + Toolkit::Visual::Base mVisual; + ImageDimensions mImageSize; + Vector2 mSizeSet; std::string mUrl; ///< the url for the image if the image came from a URL, empty otherwise Image mImage; ///< the Image if the image came from a Image, null otherwise diff --git a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp index b35f5de..b69313c 100644 --- a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp +++ b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp @@ -263,14 +263,14 @@ void Magnifier::SetFrameVisibility(bool visible) Vector3 sizeOffset(IMAGE_BORDER_INDENT*2.f - 2.f, IMAGE_BORDER_INDENT*2.f - 2.f, 0.0f); mFrame.SetSizeModeFactor( sizeOffset ); - Toolkit::VisualFactory rendererFactory = Toolkit::VisualFactory::Get(); + Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get(); Property::Map map; map[ RENDERER_TYPE ] = BORDER_RENDERER; map[ "borderColor" ] = Color::WHITE; map[ "borderSize" ] = IMAGE_BORDER_INDENT; - Toolkit::Visual borderRenderer = rendererFactory.CreateVisual( map ); - borderRenderer.SetOnStage( mFrame ); + Toolkit::Visual::Base borderVisual = visualFactory.CreateVisual( map ); + borderVisual.SetOnStage( mFrame ); Constraint constraint = Constraint::New( mFrame, Actor::Property::POSITION, EqualToConstraint() ); constraint.AddSource( ParentSource( Actor::Property::WORLD_POSITION ) ); diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp index 1bdb61d..c88636f 100644 --- a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp +++ b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp @@ -30,7 +30,7 @@ #include // INTERNAL_INCLUDES -#include +#include namespace //Unnamed namespace { @@ -132,7 +132,7 @@ SuperBlurView::SuperBlurView( unsigned int blurLevels ) DALI_ASSERT_ALWAYS( mBlurLevels > 0 && " Minimal blur level is one, otherwise no blur is needed" ); mGaussianBlurView.assign( blurLevels, Toolkit::GaussianBlurView() ); mBlurredImage.assign( blurLevels, FrameBufferImage() ); - mRenderers.assign( blurLevels+1, Toolkit::Visual() ); + mVisuals.assign( blurLevels+1, Toolkit::Visual::Base() ); } SuperBlurView::~SuperBlurView() @@ -170,12 +170,12 @@ void SuperBlurView::SetImage(Image inputImage) mInputImage = inputImage; Actor self( Self() ); - InitializeVisual( self, mRenderers[0], mInputImage ); - mRenderers[0].SetDepthIndex(0); - SetShaderEffect( mRenderers[0] ); + InitializeVisual( self, mVisuals[0], mInputImage ); + mVisuals[0].SetDepthIndex(0); + SetShaderEffect( mVisuals[0] ); if( self.OnStage() ) { - mRenderers[0].SetOnStage( self ); + mVisuals[0].SetOnStage( self ); } BlurImage( 0, inputImage); @@ -259,13 +259,13 @@ void SuperBlurView::ClearBlurResource() mResourcesCleared = true; } } -void SuperBlurView::SetShaderEffect( Toolkit::Visual& renderer ) +void SuperBlurView::SetShaderEffect( Toolkit::Visual::Base& visual ) { Property::Map shaderMap; std::stringstream verterShaderString; shaderMap[ "fragmentShader" ] = FRAGMENT_SHADER; - Internal::Visual& rendererImpl = GetImplementation( renderer ); + Internal::Visual::Base& rendererImpl = Toolkit::GetImplementation( visual ); rendererImpl.SetCustomShader( shaderMap ); } @@ -275,16 +275,15 @@ void SuperBlurView::OnSizeSet( const Vector3& targetSize ) { mTargetSize = Vector2(targetSize); - Toolkit::VisualFactory rendererFactory = Toolkit::VisualFactory::Get(); Actor self = Self(); for( unsigned int i = 1; i <= mBlurLevels; i++ ) { float exponent = static_cast(i); mBlurredImage[i-1] = FrameBufferImage::New( mTargetSize.width/std::pow(2.f,exponent) , mTargetSize.height/std::pow(2.f,exponent), GAUSSIAN_BLUR_RENDER_TARGET_PIXEL_FORMAT, Dali::Image::NEVER ); - InitializeVisual( self, mRenderers[i], mBlurredImage[i - 1] ); - mRenderers[ i ].SetDepthIndex( i ); - SetShaderEffect( mRenderers[ i ] ); + InitializeVisual( self, mVisuals[i], mBlurredImage[i - 1] ); + mVisuals[ i ].SetDepthIndex( i ); + SetShaderEffect( mVisuals[ i ] ); } if( mInputImage ) @@ -296,7 +295,7 @@ void SuperBlurView::OnSizeSet( const Vector3& targetSize ) { for( unsigned int i = 1; i <= mBlurLevels; i++ ) { - mRenderers[i].SetOnStage( self ); + mVisuals[i].SetOnStage( self ); } } } @@ -312,15 +311,15 @@ void SuperBlurView::OnStageConnection( int depth ) } Actor self = Self(); - if( mRenderers[0] ) + if( mVisuals[0] ) { - mRenderers[0].SetOnStage( self ); + mVisuals[0].SetOnStage( self ); } for(unsigned int i=1; i<=mBlurLevels;i++) { - if( mRenderers[i] ) + if( mVisuals[i] ) { - mRenderers[i].SetOnStage( self ); + mVisuals[i].SetOnStage( self ); } Renderer renderer = self.GetRendererAt( i ); @@ -341,7 +340,7 @@ void SuperBlurView::OnStageDisconnection( ) Actor self = Self(); for(unsigned int i=0; i mGaussianBlurView; std::vector mBlurredImage; - std::vector mRenderers; + std::vector mVisuals; Image mInputImage; Vector2 mTargetSize; diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp index 671ebb7..692048d 100644 --- a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp +++ b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp @@ -120,7 +120,7 @@ void VideoView::SetPropertyMap( Property::Map map ) mPropertyMap = map; Actor self( Self() ); - InitializeVisual( self, mRenderer, mPropertyMap ); + InitializeVisual( self, mVisual, mPropertyMap ); Property::Value* widthValue = mPropertyMap.Find( "width" ); if( widthValue ) @@ -430,9 +430,9 @@ Property::Value VideoView::GetProperty( BaseObject* object, Property::Index prop void VideoView::SetDepthIndex( int depthIndex ) { - if( mRenderer ) + if( mVisual ) { - mRenderer.SetDepthIndex( depthIndex ); + mVisual.SetDepthIndex( depthIndex ); } } @@ -440,19 +440,19 @@ void VideoView::OnStageConnection( int depth ) { Control::OnStageConnection( depth ); - if( mRenderer ) + if( mVisual ) { CustomActor self = Self(); - mRenderer.SetOnStage( self ); + mVisual.SetOnStage( self ); } } void VideoView::OnStageDisconnection() { - if( mRenderer ) + if( mVisual ) { CustomActor self = Self(); - mRenderer.SetOffStage( self ); + mVisual.SetOffStage( self ); } Control::OnStageDisconnection(); @@ -505,7 +505,7 @@ void VideoView::SetWindowSurfaceTarget() int curPos = mVideoPlayer.GetPlayPosition(); mSetRenderingTarget = true; - mRenderer.RemoveAndReset( self ); + mVisual.RemoveAndReset( self ); mVideoPlayer.SetRenderingTarget( Dali::Adaptor::Get().GetNativeWindowHandle() ); mVideoPlayer.SetUrl( mUrl ); @@ -538,7 +538,7 @@ void VideoView::SetNativeImageTarget() mVideoPlayer.SetUrl( mUrl ); mVideoPlayer.FinishedSignal().Connect( this, &VideoView::EmitSignalFinish ); - InitializeVisual( self, mRenderer, mNativeImage ); + InitializeVisual( self, mVisual, mNativeImage ); if( mIsPlay ) { diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.h b/dali-toolkit/internal/controls/video-view/video-view-impl.h index 3e0567b..57641cd 100644 --- a/dali-toolkit/internal/controls/video-view/video-view-impl.h +++ b/dali-toolkit/internal/controls/video-view/video-view-impl.h @@ -240,7 +240,7 @@ private: Dali::VideoPlayer mVideoPlayer; Dali::ImageDimensions mVideoSize; - Toolkit::Visual mRenderer; + Toolkit::Visual::Base mVisual; Dali::Property::Map mPropertyMap; Dali::NativeImage mNativeImage; ///< Native image handle for video rendering by texture streaming Dali::Toolkit::VideoView::VideoViewSignalType mFinishedSignal; diff --git a/dali-toolkit/internal/file.list b/dali-toolkit/internal/file.list index 15c9865..2c22b61 100644 --- a/dali-toolkit/internal/file.list +++ b/dali-toolkit/internal/file.list @@ -10,8 +10,8 @@ toolkit_src_files = \ $(toolkit_src_dir)/builder/json-parser-impl.cpp \ $(toolkit_src_dir)/builder/tree-node-manipulator.cpp \ $(toolkit_src_dir)/builder/replacement.cpp \ - $(toolkit_src_dir)/visuals/visual-impl.cpp \ - $(toolkit_src_dir)/visuals/visual-data-impl.cpp \ + $(toolkit_src_dir)/visuals/visual-base-impl.cpp \ + $(toolkit_src_dir)/visuals/visual-base-data-impl.cpp \ $(toolkit_src_dir)/visuals/image-atlas-manager.cpp \ $(toolkit_src_dir)/visuals/visual-factory-cache.cpp \ $(toolkit_src_dir)/visuals/visual-factory-impl.cpp \ diff --git a/dali-toolkit/internal/filters/emboss-filter.cpp b/dali-toolkit/internal/filters/emboss-filter.cpp index dcf7164..bb227f5 100644 --- a/dali-toolkit/internal/filters/emboss-filter.cpp +++ b/dali-toolkit/internal/filters/emboss-filter.cpp @@ -127,8 +127,8 @@ void EmbossFilter::Enable() mRootActor.Add( mActorForComposite ); - InitializeVisual( mActorForComposite, mRendererForEmboss1, rendererMap ); - InitializeVisual( mActorForComposite, mRendererForEmboss2, rendererMap ); + InitializeVisual( mActorForComposite, mVisualForEmboss1, rendererMap ); + InitializeVisual( mActorForComposite, mVisualForEmboss2, rendererMap ); TextureSet textureSet1 = TextureSet::New(); TextureSetImage( textureSet1, 0, mImageForEmboss1 ); @@ -168,10 +168,10 @@ void EmbossFilter::Disable() if( mActorForComposite ) { - mRendererForEmboss1.SetOffStage( mActorForComposite ); - mRendererForEmboss2.SetOffStage( mActorForComposite ); - mRendererForEmboss1.Reset(); - mRendererForEmboss2.Reset(); + mVisualForEmboss1.SetOffStage( mActorForComposite ); + mVisualForEmboss2.SetOffStage( mActorForComposite ); + mVisualForEmboss1.Reset(); + mVisualForEmboss2.Reset(); mRootActor.Remove( mActorForComposite ); mActorForComposite.Reset(); } diff --git a/dali-toolkit/internal/filters/emboss-filter.h b/dali-toolkit/internal/filters/emboss-filter.h index 1e83c1a..ace7114 100644 --- a/dali-toolkit/internal/filters/emboss-filter.h +++ b/dali-toolkit/internal/filters/emboss-filter.h @@ -21,7 +21,7 @@ // EXTERNAL INCLUDES #include #include -#include +#include #include "image-filter.h" namespace Dali @@ -74,16 +74,16 @@ private: private: // Attributes - RenderTask mRenderTaskForEmboss1; - RenderTask mRenderTaskForEmboss2; - RenderTask mRenderTaskForOutput; - FrameBufferImage mImageForEmboss1; - FrameBufferImage mImageForEmboss2; - Toolkit::ImageView mActorForInput1; - Toolkit::ImageView mActorForInput2; - Toolkit::Visual mRendererForEmboss1; - Toolkit::Visual mRendererForEmboss2; - Actor mActorForComposite; + RenderTask mRenderTaskForEmboss1; + RenderTask mRenderTaskForEmboss2; + RenderTask mRenderTaskForOutput; + FrameBufferImage mImageForEmboss1; + FrameBufferImage mImageForEmboss2; + Toolkit::ImageView mActorForInput1; + Toolkit::ImageView mActorForInput2; + Toolkit::Visual::Base mVisualForEmboss1; + Toolkit::Visual::Base mVisualForEmboss2; + Actor mActorForComposite; }; // class EmbossFilter } // namespace Internal diff --git a/dali-toolkit/internal/visuals/border/border-visual.cpp b/dali-toolkit/internal/visuals/border/border-visual.cpp index 3cb1688..feb19f3 100644 --- a/dali-toolkit/internal/visuals/border/border-visual.cpp +++ b/dali-toolkit/internal/visuals/border/border-visual.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include namespace Dali { @@ -102,7 +102,7 @@ const char* FRAGMENT_SHADER_ANTI_ALIASING = DALI_COMPOSE_SHADER( } BorderVisual::BorderVisual( VisualFactoryCache& factoryCache ) -: Visual( factoryCache ), +: Visual::Base( factoryCache ), mBorderColor( Color::TRANSPARENT ), mBorderSize( 0.f ), mBorderColorIndex( Property::INVALID_INDEX ), @@ -138,7 +138,7 @@ void BorderVisual::DoInitialize( Actor& actor, const Property::Map& propertyMap void BorderVisual::SetClipRect( const Rect& clipRect ) { - Visual::SetClipRect( clipRect ); + Visual::Base::SetClipRect( clipRect ); //ToDo: renderer responds to the clipRect change } diff --git a/dali-toolkit/internal/visuals/border/border-visual.h b/dali-toolkit/internal/visuals/border/border-visual.h index d85ae95..6973a79 100644 --- a/dali-toolkit/internal/visuals/border/border-visual.h +++ b/dali-toolkit/internal/visuals/border/border-visual.h @@ -22,7 +22,7 @@ #include // INTERNAL INCLUDES -#include +#include namespace Dali { @@ -45,7 +45,7 @@ namespace Internal * | antiAliasing | BOOLEAN | */ -class BorderVisual : public Visual +class BorderVisual : public Visual::Base { public: diff --git a/dali-toolkit/internal/visuals/color/color-visual.cpp b/dali-toolkit/internal/visuals/color/color-visual.cpp index 2146e50..b27306d 100644 --- a/dali-toolkit/internal/visuals/color/color-visual.cpp +++ b/dali-toolkit/internal/visuals/color/color-visual.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include namespace Dali { @@ -65,7 +65,7 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( } ColorVisual::ColorVisual( VisualFactoryCache& factoryCache ) -: Visual( factoryCache ), +: Visual::Base( factoryCache ), mMixColorIndex( Property::INVALID_INDEX ) { } @@ -85,14 +85,14 @@ void ColorVisual::DoInitialize( Actor& actor, const Property::Map& propertyMap ) void ColorVisual::SetSize( const Vector2& size ) { - Visual::SetSize( size ); + Visual::Base::SetSize( size ); // ToDo: renderer responds to the size change } void ColorVisual::SetClipRect( const Rect& clipRect ) { - Visual::SetClipRect( clipRect ); + Visual::Base::SetClipRect( clipRect ); //ToDo: renderer responds to the clipRect change } diff --git a/dali-toolkit/internal/visuals/color/color-visual.h b/dali-toolkit/internal/visuals/color/color-visual.h index ea02a2d..f458152 100644 --- a/dali-toolkit/internal/visuals/color/color-visual.h +++ b/dali-toolkit/internal/visuals/color/color-visual.h @@ -19,7 +19,7 @@ */ // INTERNAL INCLUDES -#include +#include namespace Dali { @@ -39,7 +39,7 @@ namespace Internal * |-----------------|-------------| * | mixColor | VECTOR4 | */ -class ColorVisual: public Visual +class ColorVisual: public Visual::Base { public: diff --git a/dali-toolkit/internal/visuals/debug/debug-visual.cpp b/dali-toolkit/internal/visuals/debug/debug-visual.cpp index d7e3882..cd8f8ef 100644 --- a/dali-toolkit/internal/visuals/debug/debug-visual.cpp +++ b/dali-toolkit/internal/visuals/debug/debug-visual.cpp @@ -22,8 +22,8 @@ //INTERNAL INCLUDES #include #include -#include #include +#include namespace Dali { @@ -65,7 +65,7 @@ void main()\n DebugVisual::DebugVisual( VisualFactoryCache& factoryCache ) -: Visual( factoryCache ) +: Visual::Base( factoryCache ) { } diff --git a/dali-toolkit/internal/visuals/debug/debug-visual.h b/dali-toolkit/internal/visuals/debug/debug-visual.h index e407583..c4c6248 100644 --- a/dali-toolkit/internal/visuals/debug/debug-visual.h +++ b/dali-toolkit/internal/visuals/debug/debug-visual.h @@ -19,7 +19,7 @@ */ // INTERNAL INCLUDES -#include +#include namespace Dali { @@ -34,7 +34,7 @@ namespace Internal * The visual which renders a wireframe outline to the control's quad for debugging * */ -class DebugVisual: public Visual +class DebugVisual: public Visual::Base { public: diff --git a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp index 0e7610d..8c0de84 100644 --- a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp +++ b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp @@ -28,10 +28,10 @@ //INTERNAL INCLUDES #include #include -#include #include #include #include +#include namespace Dali { @@ -180,7 +180,7 @@ Dali::WrapMode::Type GetWrapMode( Gradient::SpreadMethod spread ) GradientVisual::GradientVisual( VisualFactoryCache& factoryCache ) -: Visual( factoryCache ), +: Visual::Base( factoryCache ), mGradientType( LINEAR ) { mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA; @@ -221,12 +221,12 @@ void GradientVisual::DoInitialize( Actor& actor, const Property::Map& propertyMa void GradientVisual::SetSize( const Vector2& size ) { - Visual::SetSize( size ); + Visual::Base::SetSize( size ); } void GradientVisual::SetClipRect( const Rect& clipRect ) { - Visual::SetClipRect( clipRect ); + Visual::Base::SetClipRect( clipRect ); //ToDo: renderer responds to the clipRect change } diff --git a/dali-toolkit/internal/visuals/gradient/gradient-visual.h b/dali-toolkit/internal/visuals/gradient/gradient-visual.h index 6a6c60b..be191be 100644 --- a/dali-toolkit/internal/visuals/gradient/gradient-visual.h +++ b/dali-toolkit/internal/visuals/gradient/gradient-visual.h @@ -19,7 +19,7 @@ */ // INTERNAL INCLUDES -#include +#include #include namespace Dali @@ -66,7 +66,7 @@ class Gradient; * Valid values for spreadMethod are 'pad', 'repeat' and 'reflect.' * If not provided, 'objectBoundingBox' is used as default gradient units, and 'pad' is used as default spread method. */ -class GradientVisual: public Visual +class GradientVisual: public Visual::Base { public: diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp index 569646f..46fd94c 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/image-visual.cpp @@ -31,9 +31,9 @@ #include #include #include -#include -#include +#include #include +#include namespace Dali { @@ -132,7 +132,7 @@ Geometry CreateGeometry( VisualFactoryCache& factoryCache, ImageDimensions gridS } //unnamed namespace ImageVisual::ImageVisual( VisualFactoryCache& factoryCache, ImageAtlasManager& atlasManager ) -: Visual( factoryCache ), +: Visual::Base( factoryCache ), mAtlasManager( atlasManager ), mDesiredSize(), mFittingMode( FittingMode::DEFAULT ), @@ -306,7 +306,7 @@ void ImageVisual::DoInitialize( Actor& actor, const Property::Map& propertyMap ) void ImageVisual::SetSize( const Vector2& size ) { - Visual::SetSize( size ); + Visual::Base::SetSize( size ); } void ImageVisual::GetNaturalSize( Vector2& naturalSize ) const @@ -336,7 +336,7 @@ void ImageVisual::GetNaturalSize( Vector2& naturalSize ) const void ImageVisual::SetClipRect( const Rect& clipRect ) { - Visual::SetClipRect( clipRect ); + Visual::Base::SetClipRect( clipRect ); } void ImageVisual::SetOffset( const Vector2& offset ) diff --git a/dali-toolkit/internal/visuals/image/image-visual.h b/dali-toolkit/internal/visuals/image/image-visual.h index 1b9e84a..baad92f 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.h +++ b/dali-toolkit/internal/visuals/image/image-visual.h @@ -19,7 +19,7 @@ */ // INTERNAL INCLUDES -#include +#include #include // EXTERNAL INCLUDES @@ -73,7 +73,7 @@ typedef IntrusivePtr< ImageVisual > ImageVisualPtr; * "DEFAULT" * */ -class ImageVisual: public Visual, public ConnectionTracker +class ImageVisual: public Visual::Base, public ConnectionTracker { public: diff --git a/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp index e815ae1..1f0d9e0 100644 --- a/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp +++ b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp @@ -27,7 +27,7 @@ //INTERNAL INCLUDES #include -#include +#include namespace Dali { @@ -278,7 +278,7 @@ const char* NORMAL_MAP_FRAGMENT_SHADER = DALI_COMPOSE_SHADER( } // namespace MeshVisual::MeshVisual( VisualFactoryCache& factoryCache ) -: Visual( factoryCache ), +: Visual::Base( factoryCache ), mShaderType( ALL_TEXTURES ), mUseTexture( true ), mUseMipmapping( true ), @@ -370,14 +370,14 @@ void MeshVisual::DoInitialize( Actor& actor, const Property::Map& propertyMap ) void MeshVisual::SetSize( const Vector2& size ) { - Visual::SetSize( size ); + Visual::Base::SetSize( size ); // ToDo: renderer responds to the size change } void MeshVisual::SetClipRect( const Rect& clipRect ) { - Visual::SetClipRect( clipRect ); + Visual::Base::SetClipRect( clipRect ); //ToDo: renderer responds to the clipRect change } diff --git a/dali-toolkit/internal/visuals/mesh/mesh-visual.h b/dali-toolkit/internal/visuals/mesh/mesh-visual.h index 972f24e..a07c02b 100644 --- a/dali-toolkit/internal/visuals/mesh/mesh-visual.h +++ b/dali-toolkit/internal/visuals/mesh/mesh-visual.h @@ -23,7 +23,7 @@ #include // INTERNAL INCLUDES -#include +#include #include namespace Dali @@ -50,7 +50,7 @@ namespace Internal * | useSoftNormals | BOOLEAN | If true, average normals at points for smooth textures. Default true. | * | lightPosition | VECTOR3 | The position (on stage) of the light | */ -class MeshVisual: public Visual +class MeshVisual: public Visual::Base { public: diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp index fa37422..893841a 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include namespace Dali @@ -200,7 +200,7 @@ void RegisterStretchProperties( Renderer& renderer, const char * uniformName, co /////////////////NPatchVisual//////////////// NPatchVisual::NPatchVisual( VisualFactoryCache& factoryCache ) -: Visual( factoryCache ), +: Visual::Base( factoryCache ), mBorderOnly( false ) { } @@ -255,7 +255,7 @@ void NPatchVisual::GetNaturalSize( Vector2& naturalSize ) const void NPatchVisual::SetClipRect( const Rect& clipRect ) { - Visual::SetClipRect( clipRect ); + Visual::Base::SetClipRect( clipRect ); //ToDo: renderer responds to the clipRect change } diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.h b/dali-toolkit/internal/visuals/npatch/npatch-visual.h index 3a43277..d8ad11c 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.h +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.h @@ -19,7 +19,7 @@ */ // INTERNAL INCLUDES -#include +#include // EXTERNAL INCLUDES #include @@ -49,7 +49,7 @@ namespace Internal * | borderOnly | BOOLEAN * */ -class NPatchVisual: public Visual +class NPatchVisual: public Visual::Base { public: diff --git a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp index c27b516..7634ce5 100644 --- a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp +++ b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp @@ -25,7 +25,7 @@ //INTERNAL INCLUDES #include -#include +#include namespace Dali { @@ -137,7 +137,7 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( } // namespace PrimitiveVisual::PrimitiveVisual( VisualFactoryCache& factoryCache ) -: Visual( factoryCache ), +: Visual::Base( factoryCache ), mColor( DEFAULT_COLOR ), mScaleDimensions( Vector3::ONE ), mScaleTopRadius( DEFAULT_SCALE_TOP_RADIUS ), @@ -371,14 +371,14 @@ void PrimitiveVisual::DoInitialize( Actor& actor, const Property::Map& propertyM void PrimitiveVisual::SetSize( const Vector2& size ) { - Visual::SetSize( size ); + Visual::Base::SetSize( size ); // ToDo: renderer responds to the size change } void PrimitiveVisual::SetClipRect( const Rect& clipRect ) { - Visual::SetClipRect( clipRect ); + Visual::Base::SetClipRect( clipRect ); //ToDo: renderer responds to the clipRect change } diff --git a/dali-toolkit/internal/visuals/primitive/primitive-visual.h b/dali-toolkit/internal/visuals/primitive/primitive-visual.h index ecee880..8c75394 100644 --- a/dali-toolkit/internal/visuals/primitive/primitive-visual.h +++ b/dali-toolkit/internal/visuals/primitive/primitive-visual.h @@ -46,7 +46,7 @@ // INTERNAL INCLUDES -#include +#include namespace Dali { @@ -89,7 +89,7 @@ namespace Internal * |-----------------|-------------|-----------------------------------------| * | lightPosition | VECTOR3 | The position (on stage) of the light | */ -class PrimitiveVisual: public Visual +class PrimitiveVisual: public Visual::Base { public: diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.cpp b/dali-toolkit/internal/visuals/svg/svg-visual.cpp index ace3bc3..d13e1e1 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.cpp +++ b/dali-toolkit/internal/visuals/svg/svg-visual.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include namespace @@ -52,7 +52,7 @@ namespace Internal { SvgVisual::SvgVisual( VisualFactoryCache& factoryCache, ImageAtlasManager& atlasManager ) -: Visual( factoryCache ), +: Visual::Base( factoryCache ), mAtlasRect( FULL_TEXTURE_RECT ), mAtlasManager( atlasManager ), mParsedImage( NULL ) diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.h b/dali-toolkit/internal/visuals/svg/svg-visual.h index d6dfef5..e4e97da 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.h +++ b/dali-toolkit/internal/visuals/svg/svg-visual.h @@ -19,7 +19,7 @@ */ // INTERNAL INCLUDES -#include +#include #include struct NSVGimage; @@ -43,7 +43,7 @@ namespace Internal * | url | STRING | * */ -class SvgVisual: public Visual +class SvgVisual: public Visual::Base { public: diff --git a/dali-toolkit/internal/visuals/visual-data-impl.cpp b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp similarity index 92% rename from dali-toolkit/internal/visuals/visual-data-impl.cpp rename to dali-toolkit/internal/visuals/visual-base-data-impl.cpp index 319c825..8e610f1 100644 --- a/dali-toolkit/internal/visuals/visual-data-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp @@ -16,15 +16,13 @@ */ // CLASS HEADER -#include "visual-data-impl.h" +#include -// EXTERNAL HEADER +// EXTERNAL INCLUDES #include #include #include -// EXTERNAL HEADER - namespace Dali { @@ -75,26 +73,26 @@ Shader::Hint::Value HintFromString( std::string hintString ) }// unnamed namespace -Internal::Visual::Impl::Impl() +Internal::Visual::Base::Impl::Impl() : mCustomShader(NULL), mDepthIndex( 0.0f ), mFlags( 0 ) { } -Internal::Visual::Impl::~Impl() +Internal::Visual::Base::Impl::~Impl() { delete mCustomShader; } -Internal::Visual::Impl::CustomShader::CustomShader( const Property::Map& map ) +Internal::Visual::Base::Impl::CustomShader::CustomShader( const Property::Map& map ) : mGridSize( 1, 1 ), mHints( Shader::Hint::NONE ) { SetPropertyMap( map ); } -void Internal::Visual::Impl::CustomShader::SetPropertyMap( const Property::Map& shaderMap ) +void Internal::Visual::Base::Impl::CustomShader::SetPropertyMap( const Property::Map& shaderMap ) { mVertexShader.clear(); mFragmentShader.clear(); @@ -182,7 +180,7 @@ void Internal::Visual::Impl::CustomShader::SetPropertyMap( const Property::Map& } } -void Internal::Visual::Impl::CustomShader::CreatePropertyMap( Property::Map& map ) const +void Internal::Visual::Base::Impl::CustomShader::CreatePropertyMap( Property::Map& map ) const { if( !mVertexShader.empty() || !mFragmentShader.empty() ) { diff --git a/dali-toolkit/internal/visuals/visual-data-impl.h b/dali-toolkit/internal/visuals/visual-base-data-impl.h similarity index 84% rename from dali-toolkit/internal/visuals/visual-data-impl.h rename to dali-toolkit/internal/visuals/visual-base-data-impl.h index fa700c5..3ffdafb 100644 --- a/dali-toolkit/internal/visuals/visual-data-impl.h +++ b/dali-toolkit/internal/visuals/visual-base-data-impl.h @@ -1,5 +1,5 @@ -#ifndef DALI_TOOLKIT_INTERNAL_VISUAL_DATA_IMPL_H -#define DALI_TOOLKIT_INTERNAL_VISUAL_DATA_IMPL_H +#ifndef DALI_TOOLKIT_INTERNAL_VISUAL_BASE_DATA_IMPL_H +#define DALI_TOOLKIT_INTERNAL_VISUAL_BASE_DATA_IMPL_H /* * Copyright (c) 2016 Samsung Electronics Co., Ltd. @@ -23,7 +23,7 @@ #include // INTERNAL INCLUDES -#include +#include namespace Dali { @@ -34,7 +34,10 @@ namespace Toolkit namespace Internal { -struct Internal::Visual::Impl +namespace Visual +{ + +struct Base::Impl { enum Flags { @@ -69,10 +72,12 @@ struct Internal::Visual::Impl ~Impl(); }; +} // namespace Visual + } // namespace Internal } // namespace Toolkit } // namespace Dali -#endif // DALI_TOOLKIT_INTERNAL_VISUAL_DATA_IMPL_H +#endif // DALI_TOOLKIT_INTERNAL_VISUAL_BASE_DATA_IMPL_H diff --git a/dali-toolkit/internal/visuals/visual-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp similarity index 75% rename from dali-toolkit/internal/visuals/visual-impl.cpp rename to dali-toolkit/internal/visuals/visual-base-impl.cpp index 46ef92d..d9e19de 100644 --- a/dali-toolkit/internal/visuals/visual-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp @@ -16,14 +16,14 @@ */ // CLASS HEADER -#include "visual-impl.h" +#include "visual-base-impl.h" // EXTERNAL HEADER #include #include //INTERNAL HEARDER -#include +#include namespace { @@ -45,18 +45,21 @@ namespace Toolkit namespace Internal { -Visual::Visual( VisualFactoryCache& factoryCache ) +namespace Visual +{ + +Base::Base( VisualFactoryCache& factoryCache ) : mImpl( new Impl() ), mFactoryCache( factoryCache ) { } -Visual::~Visual() +Base::~Base() { delete mImpl; } -void Visual::SetCustomShader( const Property::Map& shaderMap ) +void Base::SetCustomShader( const Property::Map& shaderMap ) { if( mImpl->mCustomShader ) { @@ -68,7 +71,7 @@ void Visual::SetCustomShader( const Property::Map& shaderMap ) } } -void Visual::Initialize( Actor& actor, const Property::Map& propertyMap ) +void Base::Initialize( Actor& actor, const Property::Map& propertyMap ) { Property::Value* customShaderValue = propertyMap.Find( CUSTOM_SHADER ); if( customShaderValue ) @@ -83,31 +86,31 @@ void Visual::Initialize( Actor& actor, const Property::Map& propertyMap ) DoInitialize( actor, propertyMap ); } -void Visual::SetSize( const Vector2& size ) +void Base::SetSize( const Vector2& size ) { mImpl->mSize = size; } -const Vector2& Visual::GetSize() const +const Vector2& Base::GetSize() const { return mImpl->mSize; } -void Visual::GetNaturalSize( Vector2& naturalSize ) const +void Base::GetNaturalSize( Vector2& naturalSize ) const { naturalSize = Vector2::ZERO; } -void Visual::SetClipRect( const Rect& clipRect ) +void Base::SetClipRect( const Rect& clipRect ) { } -void Visual::SetOffset( const Vector2& offset ) +void Base::SetOffset( const Vector2& offset ) { mImpl->mOffset = offset; } -void Visual::SetDepthIndex( float index ) +void Base::SetDepthIndex( float index ) { mImpl->mDepthIndex = index; if( mImpl->mRenderer ) @@ -116,12 +119,12 @@ void Visual::SetDepthIndex( float index ) } } -float Visual::GetDepthIndex() const +float Base::GetDepthIndex() const { return mImpl->mDepthIndex; } -void Visual::SetOnStage( Actor& actor ) +void Base::SetOnStage( Actor& actor ) { DoSetOnStage( actor ); @@ -131,7 +134,7 @@ void Visual::SetOnStage( Actor& actor ) mImpl->mFlags |= Impl::IS_ON_STAGE; } -void Visual::SetOffStage( Actor& actor ) +void Base::SetOffStage( Actor& actor ) { if( GetIsOnStage() ) { @@ -141,7 +144,7 @@ void Visual::SetOffStage( Actor& actor ) } } -void Visual::EnablePreMultipliedAlpha( bool preMultipled ) +void Base::EnablePreMultipliedAlpha( bool preMultipled ) { if(preMultipled) { @@ -158,22 +161,22 @@ void Visual::EnablePreMultipliedAlpha( bool preMultipled ) } } -bool Visual::IsPreMultipliedAlphaEnabled() const +bool Base::IsPreMultipliedAlphaEnabled() const { return mImpl->mFlags & Impl::IS_PREMULTIPLIED_ALPHA; } -void Visual::DoSetOnStage( Actor& actor ) +void Base::DoSetOnStage( Actor& actor ) { } -void Visual::DoSetOffStage( Actor& actor ) +void Base::DoSetOffStage( Actor& actor ) { actor.RemoveRenderer( mImpl->mRenderer ); mImpl->mRenderer.Reset(); } -void Visual::CreatePropertyMap( Property::Map& map ) const +void Base::CreatePropertyMap( Property::Map& map ) const { DoCreatePropertyMap( map ); @@ -183,16 +186,18 @@ void Visual::CreatePropertyMap( Property::Map& map ) const } } -bool Visual::GetIsOnStage() const +bool Base::GetIsOnStage() const { return mImpl->mFlags & Impl::IS_ON_STAGE; } -bool Visual::GetIsFromCache() const +bool Base::GetIsFromCache() const { return mImpl->mFlags & Impl::IS_FROM_CACHE; } +} // namespace Visual + } // namespace Internal } // namespace Toolkit diff --git a/dali-toolkit/internal/visuals/visual-impl.h b/dali-toolkit/internal/visuals/visual-base-impl.h similarity index 82% rename from dali-toolkit/internal/visuals/visual-impl.h rename to dali-toolkit/internal/visuals/visual-base-impl.h index 6d9f94f..2622a82 100644 --- a/dali-toolkit/internal/visuals/visual-impl.h +++ b/dali-toolkit/internal/visuals/visual-base-impl.h @@ -26,7 +26,7 @@ // INTERNAL INCLUDES #include #include -#include +#include namespace Dali { @@ -37,6 +37,9 @@ namespace Toolkit namespace Internal { +namespace Visual +{ + /** * Base class for all Control rendering logic. A control may have multiple visuals. * @@ -57,12 +60,12 @@ namespace Internal * | subdivideGridY | INT | * | shaderHints | INT | */ -class Visual : public BaseObject +class Base : public BaseObject { public: /** - * Initialisation of the visual, this API should only called by the VisualFactory: + * Initialisation of the visual, this API should only called by the VisualFactory: * request the geometry and shader from the cache, if not available, create and save to the cache for sharing; * record the property values. * @@ -72,17 +75,17 @@ public: void Initialize( Actor& actor, const Property::Map& propertyMap ); /** - * @copydoc Toolkit::Visual::SetSize + * @copydoc Toolkit::Visual::Base::SetSize */ virtual void SetSize( const Vector2& size ); /** - * @copydoc Toolkit::Visual::GetSize + * @copydoc Toolkit::Visual::Base::GetSize */ const Vector2& GetSize() const; /** - * @copydoc Toolkit::Visual::GetNaturalSize + * @copydoc Toolkit::Visual::Base::GetNaturalSize */ virtual void GetNaturalSize( Vector2& naturalSize ) const; @@ -106,28 +109,28 @@ public: virtual void SetOffset( const Vector2& offset ); /** - * @copydoc Toolkit::Visual::SetDepthIndex + * @copydoc Toolkit::Visual::Base::SetDepthIndex */ void SetDepthIndex( float index ); /** - * @copydoc Toolkit::Visual::GetDepthIndex + * @copydoc Toolkit::Visual::Base::GetDepthIndex */ float GetDepthIndex() const; /** - * @copydoc Toolkit::Visual::SetOnStage + * @copydoc Toolkit::Visual::Base::SetOnStage * @pre Impl->mGeometry must be created before this method is called */ void SetOnStage( Actor& actor ); /** - * @copydoc Toolkit::Visual::SetOffStage + * @copydoc Toolkit::Visual::Base::SetOffStage */ void SetOffStage( Actor& actor ); /** - * @copydoc Toolkit::Visual::CreatePropertyMap + * @copydoc Toolkit::Visual::Base::CreatePropertyMap */ void CreatePropertyMap( Property::Map& map ) const; @@ -158,12 +161,12 @@ protected: * * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object */ - Visual( VisualFactoryCache& factoryCache ); + Base( VisualFactoryCache& factoryCache ); /** * @brief A reference counted object may only be deleted by calling Unreference(). */ - virtual ~Visual(); + virtual ~Base(); protected: /** @@ -215,10 +218,10 @@ protected: private: // Undefined - Visual( const Visual& visual ); + Base( const Visual::Base& visual ); // Undefined - Visual& operator=( const Visual& visual ); + Base& operator=( const Visual::Base& visual ); protected: struct Impl; @@ -226,24 +229,26 @@ protected: VisualFactoryCache& mFactoryCache; }; +} // namspace Visual + } // namespace Internal -inline const Internal::Visual& GetImplementation(const Toolkit::Visual& visual) +inline const Internal::Visual::Base& GetImplementation(const Toolkit::Visual::Base& visualBase ) { - DALI_ASSERT_ALWAYS( visual && "Visual handle is empty" ); + DALI_ASSERT_ALWAYS( visualBase && "visual base handle is empty" ); - const BaseObject& handle = visual.GetBaseObject(); + const BaseObject& handle = visualBase.GetBaseObject(); - return static_cast(handle); + return static_cast(handle); } -inline Internal::Visual& GetImplementation(Toolkit::Visual& visual) +inline Internal::Visual::Base& GetImplementation(Toolkit::Visual::Base& visualBase) { - DALI_ASSERT_ALWAYS( visual && "Visual handle is empty" ); + DALI_ASSERT_ALWAYS( visualBase && "visual base handle is empty" ); - BaseObject& handle = visual.GetBaseObject(); + BaseObject& handle = visualBase.GetBaseObject(); - return static_cast(handle); + return static_cast(handle); } } // namespace Toolkit diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp index 2ccc1d6..cbf752f 100644 --- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp @@ -135,9 +135,9 @@ VisualFactory::RendererType VisualFactory::GetRendererType( const Property::Map& return rendererType; } -Toolkit::Visual VisualFactory::CreateVisual( const Property::Map& propertyMap ) +Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& propertyMap ) { - Visual* rendererPtr = NULL; + Visual::Base* rendererPtr = NULL; RendererType type = GetRendererType( propertyMap ); if( type != UNDEFINED) @@ -149,7 +149,7 @@ Toolkit::Visual VisualFactory::CreateVisual( const Property::Map& propertyMap ) if( mDebugEnabled ) { - return Toolkit::Visual( new DebugVisual( *( mFactoryCache.Get() ) ) ); + return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) ); } } @@ -214,10 +214,10 @@ Toolkit::Visual VisualFactory::CreateVisual( const Property::Map& propertyMap ) DALI_LOG_ERROR( "Renderer type unknown" ); } - return Toolkit::Visual( rendererPtr ); + return Toolkit::Visual::Base( rendererPtr ); } -Toolkit::Visual VisualFactory::CreateVisual( const Image& image ) +Toolkit::Visual::Base VisualFactory::CreateVisual( const Image& image ) { if( !mFactoryCache ) { @@ -226,7 +226,7 @@ Toolkit::Visual VisualFactory::CreateVisual( const Image& image ) if( mDebugEnabled ) { - return Toolkit::Visual( new DebugVisual( *( mFactoryCache.Get() ) ) ); + return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) ); } NinePatchImage npatchImage = NinePatchImage::DownCast( image ); @@ -235,7 +235,7 @@ Toolkit::Visual VisualFactory::CreateVisual( const Image& image ) NPatchVisual* rendererPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); rendererPtr->SetImage( npatchImage ); - return Toolkit::Visual( rendererPtr ); + return Toolkit::Visual::Base( rendererPtr ); } else { @@ -244,11 +244,11 @@ Toolkit::Visual VisualFactory::CreateVisual( const Image& image ) Actor actor; rendererPtr->SetImage( actor, image ); - return Toolkit::Visual( rendererPtr ); + return Toolkit::Visual::Base( rendererPtr ); } } -Toolkit::Visual VisualFactory::CreateVisual( const std::string& url, ImageDimensions size ) +Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, ImageDimensions size ) { if( !mFactoryCache ) { @@ -257,7 +257,7 @@ Toolkit::Visual VisualFactory::CreateVisual( const std::string& url, ImageDimens if( mDebugEnabled ) { - return Toolkit::Visual( new DebugVisual( *( mFactoryCache.Get() ) ) ); + return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) ); } if( NinePatchImage::IsNinePatchUrl( url ) ) @@ -265,14 +265,14 @@ Toolkit::Visual VisualFactory::CreateVisual( const std::string& url, ImageDimens NPatchVisual* rendererPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); rendererPtr->SetImage( url ); - return Toolkit::Visual( rendererPtr ); + return Toolkit::Visual::Base( rendererPtr ); } else if( SvgVisual::IsSvgUrl( url ) ) { CreateAtlasManager(); SvgVisual* rendererPtr = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); rendererPtr->SetImage( url, size ); - return Toolkit::Visual( rendererPtr ); + return Toolkit::Visual::Base( rendererPtr ); } else { @@ -281,7 +281,7 @@ Toolkit::Visual VisualFactory::CreateVisual( const std::string& url, ImageDimens Actor actor; rendererPtr->SetImage( actor, url, size ); - return Toolkit::Visual( rendererPtr ); + return Toolkit::Visual::Base( rendererPtr ); } } diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.h b/dali-toolkit/internal/visuals/visual-factory-impl.h index 5a54a68..d0c2308 100644 --- a/dali-toolkit/internal/visuals/visual-factory-impl.h +++ b/dali-toolkit/internal/visuals/visual-factory-impl.h @@ -22,7 +22,7 @@ // INTERNAL INCLUDES #include -#include +#include namespace Dali { @@ -69,17 +69,17 @@ public: /** * @copydoc Toolkit::RenderFactory::CreateVisual( const Property::Map& ) */ - Toolkit::Visual CreateVisual( const Property::Map& propertyMap ); + Toolkit::Visual::Base CreateVisual( const Property::Map& propertyMap ); /** * @copydoc Toolkit::RenderFactory::CreateVisual( const Image& ) */ - Toolkit::Visual CreateVisual( const Image& image ); + Toolkit::Visual::Base CreateVisual( const Image& image ); /** * @copydoc Toolkit::RenderFactory::CreateVisual( const std::string&, ImageDimensions ) */ - Toolkit::Visual CreateVisual( const std::string& image, ImageDimensions size ); + Toolkit::Visual::Base CreateVisual( const std::string& image, ImageDimensions size ); public: /** diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index c19f8e3..a736f7d 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -368,7 +368,7 @@ public: Control& mControlImpl; std::string mStyleName; - Toolkit::Visual mBackgroundRenderer; ///< The control renderer to render the background + Toolkit::Visual::Base mBackgroundRenderer; ///< The control renderer to render the background Vector4 mBackgroundColor; ///< The color of the background renderer Vector3* mStartingPinchScale; ///< The scale when a pinch gesture starts, TODO: consider removing this Toolkit::Control::KeyEventSignalType mKeyEventSignal; -- 2.7.4