X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=optional%2Fdali-toolkit%2Finternal%2Fshader-effects%2Fpage-turn-effect-impl.cpp;h=d3d5ecfb9845009d01bccd003394241d7a71a024;hp=275356fbb96b11086ffe4debfe83415a9955ca90;hb=7d138e405ea2e5a116855616d3d9a5078dd56df0;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e diff --git a/optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp b/optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp index 275356f..d3d5ecf 100644 --- a/optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp +++ b/optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp @@ -1,25 +1,26 @@ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2014 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ // CLASS HEADER #include "page-turn-effect-impl.h" // EXTERNAL HEADERS #include - +#include namespace Dali { @@ -128,6 +129,8 @@ struct CommonParametersConstraint }//namespace PageTurnEffect::PageTurnEffect() +: mOriginalCenterPropertyIndex(Property::INVALID_INDEX), + mCurrentCenterPropertyIndex(Property::INVALID_INDEX) { } @@ -155,6 +158,7 @@ Toolkit::PageTurnEffect PageTurnEffect::CreateShaderEffect( bool enableBlending * ([3][2]) float curveHeight: The height of the interpolated hermite curve. * ([3][3]) float currentLength: The length from the current center to the curveEnd. */ + precision mediump float;\n uniform mat4 uCommonParameters;\n \n uniform vec2 uPageSize;\n @@ -318,6 +322,7 @@ Toolkit::PageTurnEffect PageTurnEffect::CreateShaderEffect( bool enableBlending std::string vertexShaderEnd("}"); std::string fragmentShaderPartOne = MAKE_STRING( + precision mediump float;\n uniform vec2 uPageSize;\n uniform vec2 uSpineShadowParameter;\n varying vec3 vNormal;\n