X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpage-turn-view%2Fpage-turn-book-spine-effect.h;h=100c2c853976227aba42dc412fffbacbff7cef38;hb=f546dd5d83a968e573f8f053a01ce43df32c71a0;hp=f9e87fbb8c8dbb42b64cd0e24650a379345809f9;hpb=278493dcbeb50938256b776d84c41ae4665d9a29;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-book-spine-effect.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-book-spine-effect.h index f9e87fb..100c2c8 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-book-spine-effect.h +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-book-spine-effect.h @@ -1,8 +1,8 @@ -#ifndef __DALI_PAGE_TURN_BOOK_SPINE_EFFECT_H__ -#define __DALI_PAGE_TURN_BOOK_SPINE_EFFECT_H__ +#ifndef DALI_PAGE_TURN_BOOK_SPINE_EFFECT_H +#define DALI_PAGE_TURN_BOOK_SPINE_EFFECT_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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,6 +18,9 @@ * */ +// INTERNAL INCLUDES +#include + #define DALI_COMPOSE_SHADER(STR) #STR namespace Dali @@ -35,7 +38,7 @@ namespace Internal * * When the page is turned over in landscape, call * SetIsBackImageVisible(true), this effect can display the back image - * correctly after the imageActor been rotated 180 degrees. To + * correctly after the page been rotated 180 degrees. To * display the pages visually consistent with its turning state, * please set the uniforms with the same values as the PageTurnEffect. * @@ -98,10 +101,10 @@ inline Property::Map CreatePageTurnBookSpineEffect() Property::Map customShader; - customShader[ "vertexShader" ] = vertexSource; - customShader[ "fragmentShader" ] = fragmentSource; + customShader[ Toolkit::Visual::Shader::Property::VERTEX_SHADER ] = vertexSource; + customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = fragmentSource; - map[ "shader" ] = customShader; + map[ Toolkit::Visual::Property::SHADER ] = customShader; return map; } @@ -111,4 +114,4 @@ inline Property::Map CreatePageTurnBookSpineEffect() } // namespace Dali -#endif /* __DALI_PAGE_TURN_BOOK_SPINE_EFFECT_H__ */ +#endif // DALI_PAGE_TURN_BOOK_SPINE_EFFECT_H