X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbubble-effect%2Fbubble-actor.h;h=3033032bf386bb67590a52d1deb98c4c10100bd1;hb=d00a250741411c386d988e7ac34525cf94a1918e;hp=39f6156dd789e18e2b3a82139e81b3a3656562a9;hpb=6e44b7e1d2a1ba9f24fb48751e8969eb63cfa716;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-actor.h b/dali-toolkit/internal/controls/bubble-effect/bubble-actor.h
index 39f6156..3033032 100644
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-actor.h
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-actor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_BUBBLE_ACTOR_H_
-#define __DALI_TOOLKIT_INTERNAL_BUBBLE_ACTOR_H_
+#ifndef DALI_TOOLKIT_INTERNAL_BUBBLE_ACTOR_H
+#define DALI_TOOLKIT_INTERNAL_BUBBLE_ACTOR_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -18,11 +18,11 @@
  *
  */
 
+// EXTERNAL INCLUDES
 #include <dali/public-api/actors/actor.h>
-#include <dali/public-api/actors/renderer.h>
-#include <dali/public-api/object/property-buffer.h>
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/property-map.h>
-#include <dali/public-api/shader-effects/material.h>
+#include <dali/public-api/rendering/renderer.h>
 
 namespace Dali
 {
@@ -49,7 +49,7 @@ public:
    * Ideally use one group of uniform to control one bubble.
    * If the num of patches in the MeshActor is more than groups of uniforms,
    * the uniform values will be shared by multiple bubbles. Allow up to 9 times.
-   * @param[in] movementArea The size of the bubble moving area, usually the same size as the background image actor.
+   * @param[in] movementArea The size of the bubble moving area, usually the same size as the background.
    * @return A newly allocated object.
    */
   BubbleActor( unsigned int numberOfBubble,
@@ -63,9 +63,10 @@ public:
   /**
    * Prepare for the rendering: create and add renderer, and register properties
    * @param[in] geometry The geometry to be used by the renderer
-   * @param[in] material The material to be used by the renderer
+   * @param[in] textureSet The texture set to be used by the renderer
+   * @param[in] textureSet The shader set to be used by the renderer
    */
-  void MakeRenderable( Geometry geometry, Material material  );
+  void MakeRenderable( Geometry geometry, TextureSet textureSet, Shader shader  );
 
   /**
    * Return the mesh actor which is used to display the bubbles
@@ -130,7 +131,7 @@ private:
   Actor        mActor;
   Renderer     mRenderer;
 
-  Vector2      mMovementArea;      ///< The size of the bubble moving area, usually the same size as the background image actor.
+  Vector2      mMovementArea;      ///< The size of the bubble moving area, usually the same size as the background.
 
   //properties mapped as uniforms
   std::vector<Property::Index> mIndicesOffset;             ///< Indices of the properties mapping to uniform array 'uOffset'
@@ -141,6 +142,7 @@ private:
   Property::Index              mIndexInvertedMovementArea; ///< Index of the property mapping to uniform 'uInvertedMovementArea'
 
   unsigned int mNumBubble;  ///< How many groups of uniforms are used to control the bubble movement.
+  unsigned int mRandomSeed; ///< Seed to generate random number.
 };
 
 } // namespace Internal
@@ -149,4 +151,4 @@ private:
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_INTERNAL_BUBBLE_ACTOR_H_ */
+#endif // DALI_TOOLKIT_INTERNAL_BUBBLE_ACTOR_H