From 638cc5c949cd2a31ddfd189c30b9a4b37e3e0a29 Mon Sep 17 00:00:00 2001 From: Xiangyin Ma Date: Tue, 10 Nov 2015 15:13:30 +0000 Subject: [PATCH] Debug renderer Change-Id: Id7dafc9872e5a4f1478641f60a0e2ba1bfff905f --- automated-tests/src/dali-toolkit/CMakeLists.txt | 2 + .../toolkit-environment-variable.cpp | 53 ++++++ .../toolkit-environment-variable.h | 39 ++++ .../src/dali-toolkit/utc-Dali-DebugRenderer.cpp | 201 +++++++++++++++++++++ .../controls/renderer-factory/renderer-factory.cpp | 20 +- .../controls/renderer-factory/renderer-factory.h | 2 + .../controls/renderers/control-renderer-impl.cpp | 3 +- .../controls/renderers/control-renderer-impl.h | 2 +- .../controls/renderers/debug/debug-renderer.cpp | 140 ++++++++++++++ .../controls/renderers/debug/debug-renderer.h | 94 ++++++++++ .../controls/renderers/renderer-factory-cache.cpp | 10 + .../controls/renderers/renderer-factory-cache.h | 12 ++ .../controls/renderers/renderer-factory-impl.cpp | 51 +++++- .../controls/renderers/renderer-factory-impl.h | 7 +- dali-toolkit/internal/file.list | 1 + 15 files changed, 625 insertions(+), 12 deletions(-) create mode 100644 automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp create mode 100644 automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.h create mode 100644 automated-tests/src/dali-toolkit/utc-Dali-DebugRenderer.cpp create mode 100644 dali-toolkit/internal/controls/renderers/debug/debug-renderer.cpp create mode 100644 dali-toolkit/internal/controls/renderers/debug/debug-renderer.h diff --git a/automated-tests/src/dali-toolkit/CMakeLists.txt b/automated-tests/src/dali-toolkit/CMakeLists.txt index aaefe8e..3b7b51a 100644 --- a/automated-tests/src/dali-toolkit/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit/CMakeLists.txt @@ -50,6 +50,7 @@ SET(TC_SOURCES utc-Dali-Model3dView.cpp utc-Dali-ControlRenderer.cpp utc-Dali-RendererFactory.cpp + utc-Dali-DebugRenderer.cpp utc-Dali-ImageAtlas.cpp ) @@ -60,6 +61,7 @@ LIST(APPEND TC_SOURCES dali-toolkit-test-utils/toolkit-application.cpp dali-toolkit-test-utils/toolkit-clipboard.cpp dali-toolkit-test-utils/toolkit-event-thread-callback.cpp + dali-toolkit-test-utils/toolkit-environment-variable.cpp dali-toolkit-test-utils/toolkit-imf-manager.cpp dali-toolkit-test-utils/toolkit-physical-keyboard.cpp dali-toolkit-test-utils/toolkit-style-monitor.cpp diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp new file mode 100644 index 0000000..f02bfb4 --- /dev/null +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// CLASS HEADER +#include "toolkit-environment-variable.h" + +// EXTERNAL INCLUDE +#include + +namespace Dali +{ + +namespace EnvironmentVariable +{ + +namespace +{ +const char * gReturnValue = NULL; +} + +const char * GetEnvironmentVariable( const char * variable ) +{ + return gReturnValue; +} + +void SetTestingEnvironmentVariable( bool testing) +{ + if( testing ) + { + gReturnValue = "1"; + } + else + { + gReturnValue = NULL; + } +} + +} // namespace EnvironmentVariable + +} // namespace Dali diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.h new file mode 100644 index 0000000..ae968d3 --- /dev/null +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.h @@ -0,0 +1,39 @@ +#ifndef __DALI_TOOLKIT_ENVIRONMENT_VARIABLE_H__ +#define __DALI_TOOLKIT_ENVIRONMENT_VARIABLE_H__ + +/* + * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +#define __DALI_ENVIRONMENT_VARIABLE_H__ + +#include + +namespace Dali +{ + +namespace EnvironmentVariable +{ + +const char * GetEnvironmentVariable( const char * variable ); + +void SetTestingEnvironmentVariable( bool ); + +} // namespace EnvironmentVariable + +} // namespace Dali + + +#endif /* __DALI_TOOLKIT_ENVIRONMENT_VARIABLE_H__ */ diff --git a/automated-tests/src/dali-toolkit/utc-Dali-DebugRenderer.cpp b/automated-tests/src/dali-toolkit/utc-Dali-DebugRenderer.cpp new file mode 100644 index 0000000..45e166c --- /dev/null +++ b/automated-tests/src/dali-toolkit/utc-Dali-DebugRenderer.cpp @@ -0,0 +1,201 @@ +/* + * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +#include +#include +#include +#include + +#include // for setting environment variable: DALI_DEBUG_RENDERING + +using namespace Dali; +using namespace Dali::Toolkit; + +namespace +{ +const char* TEST_IMAGE_FILE_NAME = "image_01.jpg"; +const char* TEST_NPATCH_FILE_NAME = "image_01.9.jpg"; + +bool IsDebugRenderer( ControlRenderer& renderer ) +{ + bool isDebugRendererType = false; + bool isGeometryLineType = false; + + Property::Map propertyMap; + renderer.CreatePropertyMap( propertyMap ); + Property::Value* typeValue = propertyMap.Find( "rendererType", Property::STRING ); + if ( typeValue ) + { + isDebugRendererType = ( typeValue->Get() == "debugRenderer" ); + } + + Actor actor = Actor::New(); + renderer.SetOnStage( actor ); + Geometry geometry = actor.GetRendererAt( 0 ).GetGeometry(); + isGeometryLineType = ( geometry.GetGeometryType() == Geometry::LINES ); + + return isDebugRendererType && isGeometryLineType; +} +} + +void dali_debug_renderer_startup(void) +{ + test_return_value = TET_UNDEF; +} + +void dali_debug_renderer_cleanup(void) +{ + test_return_value = TET_PASS; +} + +int UtcDaliDebugRendererGetRenderer1(void) +{ + EnvironmentVariable::SetTestingEnvironmentVariable(true); + ToolkitTestApplication application; + tet_infoline( "UtcDaliDebugRendererGetRenderer1: Request renderer with a Property::Map" ); + + RendererFactory factory = RendererFactory::Get(); + DALI_TEST_CHECK( factory ); + + // Test that color renderer is replaced with debug renderer + Property::Map propertyMap1; + propertyMap1.Insert("rendererType", "colorRenderer"); + propertyMap1.Insert("blendColor", Color::BLUE); + ControlRenderer colorRenderer = factory.GetControlRenderer(propertyMap1); + DALI_TEST_CHECK( colorRenderer ); + DALI_TEST_CHECK( IsDebugRenderer( colorRenderer ) ); + + // Test that border renderer is replaced with debug renderer + Property::Map propertyMap2; + propertyMap2.Insert("rendererType", "borderRenderer"); + propertyMap2.Insert("borderColor", Color::BLUE); + propertyMap2.Insert("borderSize", 2.f); + ControlRenderer borderRenderer = factory.GetControlRenderer(propertyMap2); + DALI_TEST_CHECK( borderRenderer ); + DALI_TEST_CHECK( IsDebugRenderer( borderRenderer ) ); + + // Test that gradient renderer is replaced with debug renderer + Property::Map propertyMap3; + propertyMap3.Insert("rendererType", "gradientRenderer"); + Vector2 start(-1.f, -1.f); + Vector2 end(1.f, 1.f); + propertyMap3.Insert("gradientStartPosition", start); + propertyMap3.Insert("gradientEndPosition", end); + propertyMap3.Insert("gradientSpreadMethod", "repeat"); + Property::Array stopOffsets; + stopOffsets.PushBack( 0.2f ); + stopOffsets.PushBack( 0.8f ); + propertyMap3.Insert("gradientStopOffset", stopOffsets); + Property::Array stopColors; + stopColors.PushBack( Color::RED ); + stopColors.PushBack( Color::GREEN ); + propertyMap3.Insert("gradientStopColor", stopColors); + ControlRenderer gradientRenderer = factory.GetControlRenderer(propertyMap3); + DALI_TEST_CHECK( gradientRenderer ); + DALI_TEST_CHECK( IsDebugRenderer( gradientRenderer ) ); + + // Test that image renderer is replaced with debug renderer + Property::Map propertyMap4; + propertyMap4.Insert( "rendererType", "imageRenderer" ); + propertyMap4.Insert( "imageUrl", TEST_IMAGE_FILE_NAME ); + ControlRenderer imageRenderer = factory.GetControlRenderer( propertyMap4 ); + DALI_TEST_CHECK( imageRenderer ); + DALI_TEST_CHECK( IsDebugRenderer( imageRenderer ) ); + + // Test that n patch renderer is replaced with debug renderer + Property::Map propertyMap5; + propertyMap5.Insert( "rendererType", "nPatchRenderer" ); + propertyMap5.Insert( "imageUrl", TEST_NPATCH_FILE_NAME ); + ControlRenderer nPatchRenderer = factory.GetControlRenderer( propertyMap4 ); + DALI_TEST_CHECK( nPatchRenderer ); + DALI_TEST_CHECK( IsDebugRenderer( nPatchRenderer ) ); + + EnvironmentVariable::SetTestingEnvironmentVariable(false); + END_TEST; +} + +int UtcDaliDebugRendererGetRenderer2(void) +{ + EnvironmentVariable::SetTestingEnvironmentVariable(true); + ToolkitTestApplication application; + tet_infoline( "UtcDaliDebugRendererGetRenderer2: Request renderer with various parameters" ); + + RendererFactory factory = RendererFactory::Get(); + DALI_TEST_CHECK( factory ); + + // Test that color renderer is replaced with debug renderer + ControlRenderer colorRenderer = factory.GetControlRenderer(Color::CYAN); + DALI_TEST_CHECK( colorRenderer ); + DALI_TEST_CHECK( IsDebugRenderer( colorRenderer ) ); + + // Test that border renderer is replaced with debug renderer + ControlRenderer borderRenderer = factory.GetControlRenderer(2.f, Color::GREEN); + DALI_TEST_CHECK( borderRenderer ); + DALI_TEST_CHECK( IsDebugRenderer( borderRenderer ) ); + + // Test that image renderer is replaced with debug renderer + Image image = ResourceImage::New(TEST_IMAGE_FILE_NAME); + ControlRenderer imageRenderer = factory.GetControlRenderer( image ); + DALI_TEST_CHECK( imageRenderer ); + DALI_TEST_CHECK( IsDebugRenderer( imageRenderer ) ); + + // Test that n patch renderer is replaced with debug renderer + ControlRenderer nPatchRenderer = factory.GetControlRenderer( TEST_NPATCH_FILE_NAME ); + DALI_TEST_CHECK( nPatchRenderer ); + DALI_TEST_CHECK( IsDebugRenderer( nPatchRenderer ) ); + + EnvironmentVariable::SetTestingEnvironmentVariable(false); + END_TEST; +} + +int UtcDaliDebugRendererResetRenderer(void) +{ + EnvironmentVariable::SetTestingEnvironmentVariable(true); + ToolkitTestApplication application; + tet_infoline( "UtcDaliDebugRendererResetRenderer: Reset renderer with various parameters" ); + + RendererFactory factory = RendererFactory::Get(); + DALI_TEST_CHECK( factory ); + + // Test that color renderer is replaced with debug renderer + ControlRenderer controlRenderer = factory.GetControlRenderer(Color::CYAN); + DALI_TEST_CHECK( controlRenderer ); + DALI_TEST_CHECK( IsDebugRenderer( controlRenderer ) ); + + Actor actor; + // Reset to render another color + // Test that color renderer is replaced with debug renderer + factory.ResetRenderer( controlRenderer, actor, Color::BLUE ); + DALI_TEST_CHECK( IsDebugRenderer( controlRenderer ) ); + + // Reset to render an image + // Test that image renderer is replaced with debug renderer + Image image = ResourceImage::New(TEST_IMAGE_FILE_NAME); + factory.ResetRenderer( controlRenderer, actor, image ); + DALI_TEST_CHECK( IsDebugRenderer( controlRenderer ) ); + + // Reset with a property map of border renderer + // Test that border renderer is replaced with debug renderer + Property::Map propertyMap; + propertyMap.Insert("rendererType", "borderRenderer"); + propertyMap.Insert("borderColor", Color::BLUE); + propertyMap.Insert("borderSize", 2.f); + factory.ResetRenderer( controlRenderer, actor, propertyMap ); + DALI_TEST_CHECK( IsDebugRenderer( controlRenderer ) ); + + EnvironmentVariable::SetTestingEnvironmentVariable(false); + END_TEST; +} diff --git a/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.cpp b/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.cpp index 6eaaea2..084ddcb 100644 --- a/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.cpp +++ b/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.cpp @@ -20,17 +20,22 @@ // EXTERNAL INCLUDES #include +#include // INTERNAL INCLUDES #include - namespace Dali { namespace Toolkit { +namespace +{ + const char * const DALI_DEBUG_RENDERING("DALI_DEBUG_RENDERING"); +} + RendererFactory RendererFactory::Get() { RendererFactory factory; @@ -46,10 +51,17 @@ RendererFactory RendererFactory::Get() factory = RendererFactory( dynamic_cast(handle.GetObjectPtr()) ); } - if( !factory ) + if( !factory )// If not, create the RendererFactory and register it as a singleton { - // If not, create the RendererFactory and register it as a singleton - factory = RendererFactory( new Internal::RendererFactory() ); + // Check whether debug rendering is required + if( EnvironmentVariable::GetEnvironmentVariable( DALI_DEBUG_RENDERING ) ) + { + factory = RendererFactory( new Internal::RendererFactory(true) ); + } + else + { + factory = RendererFactory( new Internal::RendererFactory(false) ); + } singletonService.Register( typeid(RendererFactory), factory ); } diff --git a/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.h b/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.h index 5d4052b..6dffc9a 100644 --- a/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.h +++ b/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.h @@ -40,6 +40,8 @@ class RendererFactory; /** * @brief RendererFactory is a singleton object that provides and shares renderers for controls * + * By setting environment variable 'DALI_DEBUG_RENDERING', all concrete renderer is replaced with the debug renderer which renders a quad wireframe. + * * The renderer type is required in the property map for requesting a control renderer. * * | %Property Name | Type | diff --git a/dali-toolkit/internal/controls/renderers/control-renderer-impl.cpp b/dali-toolkit/internal/controls/renderers/control-renderer-impl.cpp index 3b4a949..7ac2490 100644 --- a/dali-toolkit/internal/controls/renderers/control-renderer-impl.cpp +++ b/dali-toolkit/internal/controls/renderers/control-renderer-impl.cpp @@ -147,11 +147,12 @@ void ControlRenderer::DoSetOffStage( Actor& actor ) void ControlRenderer::CreatePropertyMap( Property::Map& map ) const { + DoCreatePropertyMap( map ); + if( mImpl->mCustomShader ) { mImpl->mCustomShader->CreatePropertyMap( map ); } - DoCreatePropertyMap( map ); } bool ControlRenderer::GetIsOnStage() const diff --git a/dali-toolkit/internal/controls/renderers/control-renderer-impl.h b/dali-toolkit/internal/controls/renderers/control-renderer-impl.h index 883d4d6..5e19bc2 100644 --- a/dali-toolkit/internal/controls/renderers/control-renderer-impl.h +++ b/dali-toolkit/internal/controls/renderers/control-renderer-impl.h @@ -160,7 +160,7 @@ protected: * @param[in] actor The Actor the renderer is applied to if, empty if the renderer has not been applied to any Actor * @param[in] propertyMap The properties for the requested ControlRenderer object. */ - virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap ) = 0; + virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap ) {}; protected: diff --git a/dali-toolkit/internal/controls/renderers/debug/debug-renderer.cpp b/dali-toolkit/internal/controls/renderers/debug/debug-renderer.cpp new file mode 100644 index 0000000..c1449dc --- /dev/null +++ b/dali-toolkit/internal/controls/renderers/debug/debug-renderer.cpp @@ -0,0 +1,140 @@ +/* + * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + + +// CLASS HEADER +#include "debug-renderer.h" + +//INTERNAL INCLUDES +#include +#include +#include + +namespace Dali +{ + +namespace Toolkit +{ + +namespace Internal +{ + +namespace +{ +const char * const RENDERER_TYPE("rendererType"); +const char * const RENDERER_TYPE_VALUE("debugRenderer"); + +const char * const POSITION_ATTRIBUTE_NAME("aPosition"); +const char * const INDEX_NAME("indices"); + +const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( +attribute mediump vec2 aPosition;\n +uniform mediump mat4 uMvpMatrix;\n +uniform mediump vec3 uSize;\n +\n +void main()\n +{\n + mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0);\n + vertexPosition.xyz *= uSize;\n + gl_Position = uMvpMatrix * vertexPosition;\n +}\n +); + +const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(\n +uniform lowp vec4 uColor;\n +\n +void main()\n +{\n + gl_FragColor = uColor;\n +}\n +); + +} + + +DebugRenderer::DebugRenderer( RendererFactoryCache& factoryCache ) +: ControlRenderer( factoryCache ) +{ +} + +DebugRenderer::~DebugRenderer() +{} + +void DebugRenderer::DoSetOnStage( Actor& actor ) +{ + InitializeRenderer(); +} + +void DebugRenderer::DoCreatePropertyMap( Property::Map& map ) const +{ + map.Clear(); + map.Insert( RENDERER_TYPE, RENDERER_TYPE_VALUE ); +} + +void DebugRenderer::InitializeRenderer() +{ + mImpl->mRenderer = mFactoryCache.GetDebugRenderer(); + if( !mImpl->mRenderer ) + { + Geometry geometry = CreateQuadWireframeGeometry(); + Shader shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER ); + Material material = Material::New( shader ); + mImpl->mRenderer = Renderer::New( geometry, + material ); + mFactoryCache.CacheDebugRenderer( mImpl->mRenderer ); + } +} + +Geometry DebugRenderer::CreateQuadWireframeGeometry() +{ + const float halfWidth = 0.5f; + const float halfHeight = 0.5f; + struct QuadVertex { Vector2 position;}; + QuadVertex quadVertexData[4] = + { + { Vector2(-halfWidth, -halfHeight) }, + { Vector2( halfWidth, -halfHeight) }, + { Vector2( halfWidth, halfHeight) }, + { Vector2(-halfWidth, halfHeight) } + }; + + Property::Map quadVertexFormat; + quadVertexFormat[POSITION_ATTRIBUTE_NAME] = Property::VECTOR2; + PropertyBuffer quadVertices = PropertyBuffer::New( quadVertexFormat, 4 ); + quadVertices.SetData(quadVertexData); + + // Create indices + unsigned int indexData[10] = { 0, 1, 1, 2, 2, 3, 3, 0 }; + Property::Map indexFormat; + indexFormat[INDEX_NAME] = Property::INTEGER; + PropertyBuffer indices = PropertyBuffer::New( indexFormat, sizeof(indexData)/sizeof(indexData[0]) ); + indices.SetData(indexData); + + // Create the geometry object + Geometry geometry = Geometry::New(); + geometry.AddVertexBuffer( quadVertices ); + geometry.SetIndexBuffer( indices ); + geometry.SetGeometryType( Geometry::LINES ); + + return geometry; +} + +} // namespace Internal + +} // namespace Toolkit + +} // namespace Dali diff --git a/dali-toolkit/internal/controls/renderers/debug/debug-renderer.h b/dali-toolkit/internal/controls/renderers/debug/debug-renderer.h new file mode 100644 index 0000000..e287a9a --- /dev/null +++ b/dali-toolkit/internal/controls/renderers/debug/debug-renderer.h @@ -0,0 +1,94 @@ +#ifndef __DALI_TOOLKIT_INTERNAL_DEBUG_RENDERER_H__ +#define __DALI_TOOLKIT_INTERNAL_DEBUG_RENDERER_H__ + +/* + * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +// INTERNAL INCLUDES +#include + +namespace Dali +{ + +namespace Toolkit +{ + +namespace Internal +{ + +/** + * The renderer which renders a wireframe outline to the control's quad for debugging + * + */ +class DebugRenderer: public ControlRenderer +{ +public: + + /** + * @brief Constructor. + * + * @param[in] factoryCache A pointer pointing to the RendererFactoryCache object + */ + DebugRenderer( RendererFactoryCache& factoryCache ); + + /** + * @brief A reference counted object may only be deleted by calling Unreference(). + */ + virtual ~DebugRenderer(); + +protected: + + /** + * @copydoc ControlRenderer::DoSetOnStage + */ + virtual void DoSetOnStage( Actor& actor ); + + /** + * @copydoc ControlRenderer::CreatePropertyMap + */ + virtual void DoCreatePropertyMap( Property::Map& map ) const; + + +private: + /** + * Create the geometry which presents the quad wireframe. + * @return The border geometry + */ + Geometry CreateQuadWireframeGeometry(); + + /** + * @brief Initialise the renderer from the cache, if not available, create and save to the cache for sharing. + */ + void InitializeRenderer(); + +private: + + // Undefined + DebugRenderer( const DebugRenderer& debugRenderer ); + + // Undefined + DebugRenderer& operator=( const DebugRenderer& debugRenderer ); + +}; + +} // namespace Internal + +} // namespace Toolkit + +} // namespace Dali + +#endif /* __DALI_TOOLKIT_INTERNAL_DEBUG_RENDERER_H__ */ diff --git a/dali-toolkit/internal/controls/renderers/renderer-factory-cache.cpp b/dali-toolkit/internal/controls/renderers/renderer-factory-cache.cpp index 524137a..47fd771 100644 --- a/dali-toolkit/internal/controls/renderers/renderer-factory-cache.cpp +++ b/dali-toolkit/internal/controls/renderers/renderer-factory-cache.cpp @@ -140,6 +140,16 @@ bool RendererFactoryCache::CleanRendererCache( const std::string& key ) return false; } +void RendererFactoryCache::CacheDebugRenderer( Renderer& renderer ) +{ + mDebugRenderer = renderer; +} + +Renderer RendererFactoryCache::GetDebugRenderer() +{ + return mDebugRenderer; +} + Geometry RendererFactoryCache::CreateQuadGeometry() { const float halfWidth = 0.5f; diff --git a/dali-toolkit/internal/controls/renderers/renderer-factory-cache.h b/dali-toolkit/internal/controls/renderers/renderer-factory-cache.h index d1c26ee..14ae4a5 100644 --- a/dali-toolkit/internal/controls/renderers/renderer-factory-cache.h +++ b/dali-toolkit/internal/controls/renderers/renderer-factory-cache.h @@ -141,6 +141,16 @@ public: */ bool CleanRendererCache( const std::string& key ); + /** + * @brief Cache the debug renderer + */ + void CacheDebugRenderer( Renderer& renderer ); + + /** + * @brief Request the debug renderer; + */ + Renderer GetDebugRenderer(); + protected: /** @@ -189,6 +199,8 @@ private: HashVector mRendererHashes; CachedRenderers mRenderers; + + Renderer mDebugRenderer; }; } // namespace Internal diff --git a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp index 6b2e22e..41b3060 100644 --- a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp +++ b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp @@ -27,6 +27,7 @@ // Internal HEADER #include #include +#include #include #include #include @@ -72,7 +73,8 @@ DALI_TYPE_REGISTRATION_END() } // namespace -RendererFactory::RendererFactory() +RendererFactory::RendererFactory( bool debugEnabled ) +:mDebugEnabled( debugEnabled ) { } @@ -93,6 +95,11 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Property::Ma mFactoryCache = new RendererFactoryCache(); } + if( mDebugEnabled ) + { + return Toolkit::ControlRenderer( new DebugRenderer( *( mFactoryCache.Get() ) ) ); + } + if( typeValue == COLOR_RENDERER ) { rendererPtr = new ColorRenderer( *( mFactoryCache.Get() ) ); @@ -136,6 +143,11 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Vector4& col mFactoryCache = new RendererFactoryCache(); } + if( mDebugEnabled ) + { + return Toolkit::ControlRenderer( new DebugRenderer( *( mFactoryCache.Get() ) ) ); + } + ColorRenderer* rendererPtr = new ColorRenderer( *( mFactoryCache.Get() ) ); rendererPtr->SetColor( color ); @@ -144,6 +156,11 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Vector4& col void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Vector4& color ) { + if( mDebugEnabled && renderer ) + { + return; + } + if( renderer ) { ColorRenderer* rendererPtr = dynamic_cast< ColorRenderer* >( &GetImplementation( renderer ) ); @@ -169,13 +186,14 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( float borderSize, { mFactoryCache = new RendererFactoryCache(); } - BorderRenderer* rendererPtr = new BorderRenderer( *mFactoryCache.Get() ); - if( !mFactoryCache ) + if( mDebugEnabled ) { - mFactoryCache = new RendererFactoryCache(); + return Toolkit::ControlRenderer( new DebugRenderer( *( mFactoryCache.Get() ) ) ); } + BorderRenderer* rendererPtr = new BorderRenderer( *mFactoryCache.Get() ); + rendererPtr->SetBorderSize( borderSize ); rendererPtr->SetBorderColor( borderColor ); @@ -189,6 +207,11 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Image& image mFactoryCache = new RendererFactoryCache(); } + if( mDebugEnabled ) + { + return Toolkit::ControlRenderer( new DebugRenderer( *( mFactoryCache.Get() ) ) ); + } + NinePatchImage npatchImage = NinePatchImage::DownCast( image ); if( npatchImage ) { @@ -210,6 +233,11 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Image& image void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Image& image ) { + if( mDebugEnabled && renderer ) + { + return; + } + if( renderer ) { if( ! image ) @@ -256,6 +284,11 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const std::string& mFactoryCache = new RendererFactoryCache(); } + if( mDebugEnabled ) + { + return Toolkit::ControlRenderer( new DebugRenderer( *( mFactoryCache.Get() ) ) ); + } + if( NinePatchImage::IsNinePatchUrl( url ) ) { NPatchRenderer* rendererPtr = new NPatchRenderer( *( mFactoryCache.Get() ) ); @@ -276,6 +309,11 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const std::string& void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const std::string& url, ImageDimensions size ) { + if( mDebugEnabled && renderer ) + { + return; + } + if( renderer ) { if( url.empty() ) @@ -315,6 +353,11 @@ void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Property::Map& propertyMap ) { + if( mDebugEnabled && renderer ) + { + return; + } + if( renderer ) { ControlRenderer& controlRenderer = GetImplementation( renderer ); diff --git a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.h b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.h index 9b55182..033b904 100644 --- a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.h +++ b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.h @@ -49,8 +49,10 @@ public: /** * @brief Constructor + * + * @param[in] debugEnabled If true, use debug renderer to replace all the concrete renderer. */ - RendererFactory(); + RendererFactory( bool debugEnabled ); /** * @copydoc Toolkit::RenderFactory::GetControlRenderer( const Property::Map& ) @@ -130,7 +132,8 @@ private: private: RendererFactoryCachePtr mFactoryCache; - ImageAtlasManagerPtr mAtlasManager; + ImageAtlasManagerPtr mAtlasManager; + bool mDebugEnabled; }; } // namespace Internal diff --git a/dali-toolkit/internal/file.list b/dali-toolkit/internal/file.list index a30cf52..ad19367 100644 --- a/dali-toolkit/internal/file.list +++ b/dali-toolkit/internal/file.list @@ -17,6 +17,7 @@ toolkit_src_files = \ $(toolkit_src_dir)/controls/renderers/renderer-factory-impl.cpp \ $(toolkit_src_dir)/controls/renderers/border/border-renderer.cpp \ $(toolkit_src_dir)/controls/renderers/color/color-renderer.cpp \ + $(toolkit_src_dir)/controls/renderers/debug/debug-renderer.cpp \ $(toolkit_src_dir)/controls/renderers/image/image-renderer.cpp \ $(toolkit_src_dir)/controls/renderers/npatch/npatch-renderer.cpp \ $(toolkit_src_dir)/controls/renderers/gradient/gradient.cpp \ -- 2.7.4