X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpage-turn-view%2Fpage-turn-view-impl.h;h=078859d9f1bf681533102496492a90e321b4bd7b;hb=d00a250741411c386d988e7ac34525cf94a1918e;hp=e17f2a0660daef8cc1b658d038bb04b999a41435;hpb=322ff9dad8e2227d2df555a2b36242ba4bf287ca;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
index e17f2a0..078859d 100644
--- a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
+++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_PAGE_TURN_VIEW_IMPL_H__
-#define __DALI_TOOLKIT_INTERNAL_PAGE_TURN_VIEW_IMPL_H__
+#ifndef DALI_TOOLKIT_INTERNAL_PAGE_TURN_VIEW_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_PAGE_TURN_VIEW_IMPL_H
 
 /*
- * Copyright (c) 2014 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.
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/devel-api/common/map-wrapper.h>
 #include <dali/public-api/actors/layer.h>
-#include <dali/devel-api/rendering/renderer.h>
+#include <dali/public-api/rendering/renderer.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
@@ -64,16 +64,16 @@ protected:
 
     /**
      * Apply an effect onto the page actor.
-     * @param[in] shader The shader for rendering effect.
+     * @param[in] newShader The shader for rendering effect.
      */
-    void UseEffect(Shader shader);
+    void UseEffect(Shader newShader);
 
     /**
      * Apply an effect onto the page actor.
-     * @param[in] shader The shader for rendering effect.
+     * @param[in] newShader The shader for rendering effect.
      * @param[in] geometry The geometry for rendering effect.
      */
-    void UseEffect(Shader shader, Geometry geometry);
+    void UseEffect(Shader newShader, Geometry geometry);
 
     /**
      * Change the page turning direction.
@@ -105,7 +105,8 @@ protected:
     void SetCurrentCenter( const Vector2& value );
 
     Actor actor;                              ///< The page actor
-    Material material;                        ///< The material of the actor
+    Shader shader;                            ///< The shader used by the actor
+    TextureSet textureSet;                    ///< The set of textures used by the actor
     Renderer renderer;                        ///< The renderer of the actor
     bool isTurnBack;                          ///< The turning direction
     Property::Index propertyPanDisplacement;  ///< The horizontal displacement of the pan
@@ -453,4 +454,5 @@ inline const Toolkit::Internal::PageTurnView& GetImplementation(const Toolkit::P
 } // namespace Toolkit
 
 } // namespace Dali
-#endif /* __DALI_TOOLKIT_INTERNAL_PAGE_TURN_VIEW_IMPL_H__ */
+
+#endif // DALI_TOOLKIT_INTERNAL_PAGE_TURN_VIEW_IMPL_H