Renderer property enum clean-up

Change-Id: Ice8c18282db8910b43b71366a1a940d04210ee39

diff --git a/automated-tests/src/dali-devel/utc-Dali-Renderer.cpp b/automated-tests/src/dali-devel/utc-Dali-Renderer.cpp
index 96fd229..b350bc8 100644 (file)
--- a/automated-tests/src/dali-devel/utc-Dali-Renderer.cpp
+++ b/automated-tests/src/dali-devel/utc-Dali-Renderer.cpp
@@ -1951,7 +1951,7 @@ int UtcDaliRendererRenderOrder2DLayerOverlay(void)
   END_TEST;
 }
 
-int UtcDaliRendererSetIndicesRange(void)
+int UtcDaliRendererSetIndexRange(void)
 {
   std::string
       vertexShader(
@@ -2027,7 +2027,7 @@ int UtcDaliRendererSetIndicesRange(void)
 
   // LINE_LOOP, first 0, count 5
   {
-    renderer.SetIndicesRange( 0, 5 );
+    renderer.SetIndexRange( 0, 5 );
     application.SendNotification();
     application.Render();
     sprintf( buffer, "%u, 5, %u, indices", GL_LINE_LOOP, GL_UNSIGNED_SHORT );
@@ -2037,7 +2037,7 @@ int UtcDaliRendererSetIndicesRange(void)
 
   // LINE_LOOP, first 5, count 10
   {
-    renderer.SetIndicesRange( 5, 10 );
+    renderer.SetIndexRange( 5, 10 );
     sprintf( buffer, "%u, 10, %u, indices", GL_LINE_LOOP, GL_UNSIGNED_SHORT );
     application.SendNotification();
     application.Render();
@@ -2047,7 +2047,7 @@ int UtcDaliRendererSetIndicesRange(void)
 
   // LINE_STRIP, first 15, count 6
   {
-    renderer.SetIndicesRange( 15, 6 );
+    renderer.SetIndexRange( 15, 6 );
     geometry.SetGeometryType( Geometry::LINE_STRIP );
     sprintf( buffer, "%u, 6, %u, indices", GL_LINE_STRIP, GL_UNSIGNED_SHORT );
     application.SendNotification();

diff --git a/dali/devel-api/rendering/renderer.h b/dali/devel-api/rendering/renderer.h
index ff0d7ae..814471b 100644 (file)
--- a/dali/devel-api/rendering/renderer.h
+++ b/dali/devel-api/rendering/renderer.h
@@ -69,8 +69,8 @@ public:
       BLENDING_DEST_FACTOR_ALPHA,                         ///< name "destinationBlendFactorAlpha",    type INTEGER
       BLENDING_COLOR,                                     ///< name "blendingColor",                  type VECTOR4
       BLEND_PRE_MULTIPLIED_ALPHA,                         ///< name "blendPreMultipledAlpha",         type BOOLEAN
-      INDEXED_DRAW_FIRST_ELEMENT,                         ///< name "indexedDrawFirstElement",        type INTEGER
-      INDEXED_DRAW_ELEMENTS_COUNT                         ///< name "indexedDrawElementsCount",       type INTEGER
+      INDEX_RANGE_FIRST,                                  ///< name "indexRangeFirst",                type INTEGER
+      INDEX_RANGE_COUNT                                   ///< name "indexRangeCount",                type INTEGER
     };
   };
 
@@ -135,10 +135,10 @@ public:
    * @param [in] firstElement first element to draw
    * @param [in] elementsCount number of elements to draw
    */
-  inline void SetIndicesRange( int firstElement, int elementsCount )
+  inline void SetIndexRange( int firstElement, int elementsCount )
   {
-    SetProperty( Property::INDEXED_DRAW_FIRST_ELEMENT, firstElement );
-    SetProperty( Property::INDEXED_DRAW_ELEMENTS_COUNT, elementsCount );
+    SetProperty( Property::INDEX_RANGE_FIRST, firstElement );
+    SetProperty( Property::INDEX_RANGE_COUNT, elementsCount );
   }
 
   /**

diff --git a/dali/internal/event/rendering/renderer-impl.cpp b/dali/internal/event/rendering/renderer-impl.cpp
index c1d6e98..e109bf6 100644 (file)
--- a/dali/internal/event/rendering/renderer-impl.cpp
+++ b/dali/internal/event/rendering/renderer-impl.cpp
@@ -50,8 +50,8 @@ DALI_PROPERTY( "sourceBlendFactorAlpha",          INTEGER,   true, false,  false
 DALI_PROPERTY( "destinationBlendFactorAlpha",     INTEGER,   true, false,  false, Dali::Renderer::Property::BLENDING_DEST_FACTOR_ALPHA )
 DALI_PROPERTY( "blendingColor",                   VECTOR4,   true, false,  false, Dali::Renderer::Property::BLENDING_COLOR )
 DALI_PROPERTY( "blendPreMultipliedAlpha",         BOOLEAN,   true, false,  false, Dali::Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA )
-DALI_PROPERTY( "indexedDrawFirstElement",         INTEGER,   true, false,  false, Dali::Renderer::Property::INDEXED_DRAW_FIRST_ELEMENT )
-DALI_PROPERTY( "indexedDrawElementsCount",        INTEGER,   true, false,  false, Dali::Renderer::Property::INDEXED_DRAW_ELEMENTS_COUNT )
+DALI_PROPERTY( "indexRangeFirst",                 INTEGER,   true, false,  false, Dali::Renderer::Property::INDEX_RANGE_FIRST )
+DALI_PROPERTY( "indexRangeCount",                 INTEGER,   true, false,  false, Dali::Renderer::Property::INDEX_RANGE_COUNT )
 DALI_PROPERTY_TABLE_END( DEFAULT_OBJECT_PROPERTY_START_INDEX )
 
 const ObjectImplHelper<DEFAULT_PROPERTY_COUNT> RENDERER_IMPL = { DEFAULT_PROPERTY_DETAILS };
@@ -440,7 +440,7 @@ void Renderer::SetDefaultProperty( Property::Index index,
       }
       break;
     }
-    case Dali::Renderer::Property::INDEXED_DRAW_FIRST_ELEMENT:
+    case Dali::Renderer::Property::INDEX_RANGE_FIRST:
     {
       int firstElement;
       if( propertyValue.Get( firstElement ) )
@@ -449,7 +449,7 @@ void Renderer::SetDefaultProperty( Property::Index index,
       }
       break;
     }
-    case Dali::Renderer::Property::INDEXED_DRAW_ELEMENTS_COUNT:
+    case Dali::Renderer::Property::INDEX_RANGE_COUNT:
     {
       int elementsCount;
       if( propertyValue.Get( elementsCount ) )
@@ -556,12 +556,12 @@ Property::Value Renderer::GetDefaultProperty( Property::Index index ) const
       value = IsPreMultipliedAlphaEnabled();
       break;
     }
-    case Dali::Renderer::Property::INDEXED_DRAW_FIRST_ELEMENT:
+    case Dali::Renderer::Property::INDEX_RANGE_FIRST:
     {
       value = static_cast<int>( mIndexedDrawFirstElement );
       break;
     }
-    case Dali::Renderer::Property::INDEXED_DRAW_ELEMENTS_COUNT:
+    case Dali::Renderer::Property::INDEX_RANGE_COUNT:
     {
       value = static_cast<int>( mIndexedDrawElementCount );
       break;