From 3f42994af46957ed04ea29af60c541f561120b01 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Fri, 15 Jul 2016 12:28:46 +0100 Subject: [PATCH] (Renderer) Add a property range for Renderer properties This is required so that we can distinguish between Actor and Renderer properties in toolkit. Change-Id: Id6d37c25b11eaa156dc6fe23ecb063d2020d85bb --- dali/internal/event/rendering/renderer-impl.cpp | 2 +- dali/public-api/object/property-index-ranges.h | 3 +++ dali/public-api/rendering/renderer.h | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dali/internal/event/rendering/renderer-impl.cpp b/dali/internal/event/rendering/renderer-impl.cpp index 268808e..1f6ceb2 100644 --- a/dali/internal/event/rendering/renderer-impl.cpp +++ b/dali/internal/event/rendering/renderer-impl.cpp @@ -64,7 +64,7 @@ DALI_PROPERTY( "stencilOperationOnFail", INTEGER, true, false, false DALI_PROPERTY( "stencilOperationOnZFail", INTEGER, true, false, false, Dali::Renderer::Property::STENCIL_OPERATION_ON_Z_FAIL ) DALI_PROPERTY( "stencilOperationOnZPass", INTEGER, true, false, false, Dali::Renderer::Property::STENCIL_OPERATION_ON_Z_PASS ) DALI_PROPERTY( "writeToColorBuffer", BOOLEAN, true, false, false, Dali::Renderer::Property::WRITE_TO_COLOR_BUFFER ) -DALI_PROPERTY_TABLE_END( DEFAULT_OBJECT_PROPERTY_START_INDEX ) +DALI_PROPERTY_TABLE_END( DEFAULT_RENDERER_PROPERTY_START_INDEX ) const ObjectImplHelper RENDERER_IMPL = { DEFAULT_PROPERTY_DETAILS }; diff --git a/dali/public-api/object/property-index-ranges.h b/dali/public-api/object/property-index-ranges.h index 404d115..548992c 100644 --- a/dali/public-api/object/property-index-ranges.h +++ b/dali/public-api/object/property-index-ranges.h @@ -48,6 +48,9 @@ enum PropertyRanges DEFAULT_GESTURE_DETECTOR_PROPERTY_START_INDEX = DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX, ///< Used by PanGestureDetector. @SINCE_1_0.0 + DEFAULT_RENDERER_PROPERTY_START_INDEX = 9000000, ///< Start index for Renderer. @SINCE_1_1.44 + DEFAULT_RENDERER_PROPERTY_MAX_INDEX = DEFAULT_RENDERER_PROPERTY_START_INDEX + 100000, ///< Renderer range: 9000000 to 9100000 @SINCE_1_1.44 + PROPERTY_REGISTRATION_START_INDEX = 10000000, ///< The index when registering a property should start from this number. @SINCE_1_0.0 DEFAULT_PROPERTY_MAX_COUNT = PROPERTY_REGISTRATION_START_INDEX, ///< Default Property Range: 0 to 9999999 @SINCE_1_0.0 diff --git a/dali/public-api/rendering/renderer.h b/dali/public-api/rendering/renderer.h index 3a7a7fb..3b5d7d0 100644 --- a/dali/public-api/rendering/renderer.h +++ b/dali/public-api/rendering/renderer.h @@ -20,7 +20,7 @@ // INTERNAL INCLUDES #include // Dali::Handle -#include // DEFAULT_OBJECT_PROPERTY_START_INDEX +#include // DEFAULT_RENDERER_PROPERTY_START_INDEX #include // Dali::Geometry #include // Dali::TextureSet @@ -242,7 +242,7 @@ public: * @note The default value is 0 * @SINCE_1_1.43 */ - DEPTH_INDEX = DEFAULT_OBJECT_PROPERTY_START_INDEX, + DEPTH_INDEX = DEFAULT_RENDERER_PROPERTY_START_INDEX, /** * @brief name "faceCullingMode", type INTEGER -- 2.7.4