X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpage-turn-view%2Fpage-turn-effect.cpp;h=15a48daa20e5a8fcbd120bbfea2090a8480eddae;hp=f4d11267da1af0b7679e606180d95b795d1a5db6;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=e5ca10134c73ca0588f893adde82694ad907dd8d diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-effect.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-effect.cpp index f4d1126..15a48da 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-effect.cpp +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-effect.cpp @@ -1,5 +1,5 @@ /* - * 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. @@ -15,13 +15,14 @@ * */ -//EXTERNAL INCLUDES +// EXTERNAL INCLUDES #include #include #include #include -//INTERNAL INCLUDES +// INTERNAL INCLUDES +#include #include using namespace Dali; @@ -331,13 +332,12 @@ Property::Map Dali::Toolkit::Internal::CreatePageTurnEffect() Property::Map customShader; - customShader[ "vertexShader" ] = vertexShader; - customShader[ "fragmentShader" ] = fragmentShader; - customShader[ "subdivideGridX" ] = 20; - customShader[ "subdivideGridY" ] = 20; + customShader[ Toolkit::Visual::Shader::Property::VERTEX_SHADER ] = vertexShader; + customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = fragmentShader; + customShader[ Toolkit::Visual::Shader::Property::SUBDIVIDE_GRID_X ] = 20; + customShader[ Toolkit::Visual::Shader::Property::SUBDIVIDE_GRID_Y ] = 20; - map[ "shader" ] = customShader; + map[ Toolkit::Visual::Property::SHADER ] = customShader; return map; } -