X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbubble-effect%2Fbubble-renderer.cpp;h=364e0c310de16f57b5be9805782678546c8f9da8;hp=88b1a85f58f25709cbb6f118eac32ad8c781c488;hb=076f84a43592f26ff0aa2bced54583f712800fe3;hpb=28ee17686d2f44d5a901e87a8cada9ccd1f151e8

diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-renderer.cpp b/dali-toolkit/internal/controls/bubble-effect/bubble-renderer.cpp
index 88b1a85..364e0c3 100644
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-renderer.cpp
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-renderer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -26,68 +26,65 @@
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal
 {
-
 BubbleRenderer::BubbleRenderer()
 : mRenderer(),
   mIndicesOffset(),
   mIndiceStartEndPos(),
   mIndicesPercentage(),
-  mIndexGravity( Property::INVALID_INDEX ),
-  mIndexDynamicScale( Property::INVALID_INDEX ),
-  mIndexInvertedMovementArea( Property::INVALID_INDEX )
+  mIndexGravity(Property::INVALID_INDEX),
+  mIndexDynamicScale(Property::INVALID_INDEX),
+  mIndexInvertedMovementArea(Property::INVALID_INDEX)
 {
 }
 
-void BubbleRenderer::Initialize( unsigned int numberOfBubble, const Vector2& movementArea, Geometry geometry, TextureSet textureSet, Shader shader  )
+void BubbleRenderer::Initialize(unsigned int numberOfBubble, const Vector2& movementArea, Geometry geometry, TextureSet textureSet, Shader shader)
 {
-  if( mRenderer )
+  if(mRenderer)
   {
     // This function is supposed to be called once
     return;
   }
 
-  mRenderer = Renderer::New( geometry, shader );
-  mRenderer.SetTextures( textureSet );
+  mRenderer = Renderer::New(geometry, shader);
+  mRenderer.SetTextures(textureSet);
 
   // register uniforms
-  mIndexGravity = mRenderer.RegisterProperty( "uGravity", 50.f );
-  mIndexDynamicScale = mRenderer.RegisterProperty( "uDynamicScale", 1.f );
+  mIndexGravity      = mRenderer.RegisterUniqueProperty("uGravity", 50.f);
+  mIndexDynamicScale = mRenderer.RegisterUniqueProperty("uDynamicScale", 1.f);
 
-  mIndexInvertedMovementArea = mRenderer.RegisterProperty( "uInvertedMovementArea", Vector2(1.f,1.f) / movementArea );
+  mIndexInvertedMovementArea = mRenderer.RegisterUniqueProperty("uInvertedMovementArea", Vector2(1.f, 1.f) / movementArea);
 
   mIndicesOffset.resize(9);
   int offset = movementArea.Length() / 10.f;
 
-  unsigned int seed = time( NULL );
+  unsigned int seed = time(NULL);
 
-  mIndicesOffset[0] = mRenderer.RegisterProperty( "uOffset[0]", Vector2( 0.f,0.f ) );
-  mIndicesOffset[1] = mRenderer.RegisterProperty( "uOffset[1]", Vector2( rand_r( &seed ) % offset,  rand_r( &seed ) % offset ) );
-  mIndicesOffset[2] = mRenderer.RegisterProperty( "uOffset[2]", Vector2( rand_r( &seed ) % offset, -rand_r( &seed ) % offset ) );
-  mIndicesOffset[3] = mRenderer.RegisterProperty( "uOffset[3]", Vector2(-rand_r( &seed ) % offset,  rand_r( &seed ) % offset ) );
-  mIndicesOffset[4] = mRenderer.RegisterProperty( "uOffset[4]", Vector2(-rand_r( &seed ) % offset, -rand_r( &seed ) % offset ) );
-  mIndicesOffset[5] = mRenderer.RegisterProperty( "uOffset[5]", Vector2( rand_r( &seed ) % offset, 0.f ) );
-  mIndicesOffset[6] = mRenderer.RegisterProperty( "uOffset[6]", Vector2(-rand_r( &seed ) % offset, 0.f ) );
-  mIndicesOffset[7] = mRenderer.RegisterProperty( "uOffset[7]", Vector2( 0.f,  rand_r( &seed ) % offset ) );
-  mIndicesOffset[8] = mRenderer.RegisterProperty( "uOffset[8]", Vector2( 0.f, -rand_r( &seed ) % offset ) );
+  mIndicesOffset[0] = mRenderer.RegisterUniqueProperty("uOffset[0]", Vector2(0.f, 0.f));
+  mIndicesOffset[1] = mRenderer.RegisterUniqueProperty("uOffset[1]", Vector2(rand_r(&seed) % offset, rand_r(&seed) % offset));
+  mIndicesOffset[2] = mRenderer.RegisterUniqueProperty("uOffset[2]", Vector2(rand_r(&seed) % offset, -rand_r(&seed) % offset));
+  mIndicesOffset[3] = mRenderer.RegisterUniqueProperty("uOffset[3]", Vector2(-rand_r(&seed) % offset, rand_r(&seed) % offset));
+  mIndicesOffset[4] = mRenderer.RegisterUniqueProperty("uOffset[4]", Vector2(-rand_r(&seed) % offset, -rand_r(&seed) % offset));
+  mIndicesOffset[5] = mRenderer.RegisterUniqueProperty("uOffset[5]", Vector2(rand_r(&seed) % offset, 0.f));
+  mIndicesOffset[6] = mRenderer.RegisterUniqueProperty("uOffset[6]", Vector2(-rand_r(&seed) % offset, 0.f));
+  mIndicesOffset[7] = mRenderer.RegisterUniqueProperty("uOffset[7]", Vector2(0.f, rand_r(&seed) % offset));
+  mIndicesOffset[8] = mRenderer.RegisterUniqueProperty("uOffset[8]", Vector2(0.f, -rand_r(&seed) % offset));
 
   Vector4 zeroVector;
-  mIndiceStartEndPos.resize( numberOfBubble );
-  mIndicesPercentage.resize( numberOfBubble );
-  for( unsigned int i=0; i<numberOfBubble; i++ )
+  mIndiceStartEndPos.resize(numberOfBubble);
+  mIndicesPercentage.resize(numberOfBubble);
+  for(unsigned int i = 0; i < numberOfBubble; i++)
   {
     std::ostringstream ossProperty;
-    ossProperty<< "uStartEndPosition["<< i << "]";
-    mIndiceStartEndPos[i] = mRenderer.RegisterProperty( ossProperty.str(), zeroVector );
+    ossProperty << "uStartEndPosition[" << i << "]";
+    mIndiceStartEndPos[i] = mRenderer.RegisterUniqueProperty(ossProperty.str(), zeroVector);
 
     ossProperty.str("");
-    ossProperty<< "uPercentage["<< i << "]";
-    mIndicesPercentage[i] = mRenderer.RegisterProperty( ossProperty.str(), 0.f );
+    ossProperty << "uPercentage[" << i << "]";
+    mIndicesPercentage[i] = mRenderer.RegisterUniqueProperty(ossProperty.str(), 0.f);
   }
 }
 
@@ -96,43 +93,43 @@ Renderer& BubbleRenderer::GetRenderer()
   return mRenderer;
 }
 
-void BubbleRenderer::SetGeometry( Geometry geometry )
+void BubbleRenderer::SetGeometry(Geometry geometry)
 {
-  mRenderer.SetGeometry( geometry );
+  mRenderer.SetGeometry(geometry);
 }
 
-void BubbleRenderer::SetStartAndEndPosition( unsigned int index, const Vector4& startAndEndPosition )
+void BubbleRenderer::SetStartAndEndPosition(unsigned int index, const Vector4& startAndEndPosition)
 {
-  mRenderer.SetProperty( mIndiceStartEndPos[index], startAndEndPosition );
+  mRenderer.SetProperty(mIndiceStartEndPos[index], startAndEndPosition);
 }
 
-void BubbleRenderer::SetPercentage( unsigned int index, float percentage )
+void BubbleRenderer::SetPercentage(unsigned int index, float percentage)
 {
-  mRenderer.SetProperty( mIndicesPercentage[index], percentage );
+  mRenderer.SetProperty(mIndicesPercentage[index], percentage);
 }
 
-void BubbleRenderer::SetGravity( float gravity )
+void BubbleRenderer::SetGravity(float gravity)
 {
-  mRenderer.SetProperty( mIndexGravity, gravity );
+  mRenderer.SetProperty(mIndexGravity, gravity);
 }
 
-void BubbleRenderer::SetDynamicScale( float scale )
+void BubbleRenderer::SetDynamicScale(float scale)
 {
-  mRenderer.SetProperty( mIndexDynamicScale, scale );
+  mRenderer.SetProperty(mIndexDynamicScale, scale);
 }
 
-Property BubbleRenderer::GetPercentageProperty( unsigned int index )
+Property BubbleRenderer::GetPercentageProperty(unsigned int index)
 {
-  return Property( mRenderer, mIndicesPercentage[index] );
+  return Property(mRenderer, mIndicesPercentage[index]);
 }
 
 void BubbleRenderer::ResetProperties()
 {
   Vector4 zeroVector;
-  for( unsigned int i=0; i<mIndicesPercentage.size(); i++ )
+  for(unsigned int i = 0; i < mIndicesPercentage.size(); i++)
   {
-    SetPercentage( i, 0.f);
-    SetStartAndEndPosition( i, zeroVector );
+    SetPercentage(i, 0.f);
+    SetStartAndEndPosition(i, zeroVector);
   }
 }