X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fshader-effects%2Fcarousel-effect.cpp;h=9e360c21a6b038e54f4759d13e7907b439d50fe9;hp=6707ae57e460eb955ba84a4ee61652735cc53a56;hb=2ddfbb9e23a7c3fc30e604236c41e0ef6d2ed6a2;hpb=9a450f332b63de22521e3e2a70c3378e574ad77f diff --git a/dali-toolkit/public-api/shader-effects/carousel-effect.cpp b/dali-toolkit/public-api/shader-effects/carousel-effect.cpp index 6707ae5..9e360c2 100644 --- a/dali-toolkit/public-api/shader-effects/carousel-effect.cpp +++ b/dali-toolkit/public-api/shader-effects/carousel-effect.cpp @@ -1,18 +1,19 @@ -// -// 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. + * + */ #include @@ -56,10 +57,10 @@ CarouselEffect CarouselEffect::New() "\n" "void main()\n" "{\n" - " vec4 world = uModelView * vec4(aPosition,1.0);\n" - " vec2 d = (world.xy - uCenter) * uAnglePerUnit;\n" - " float a = length(d);\n" - " float cs = cos(radians(a));\n" + " mediump vec4 world = uModelView * vec4(aPosition,1.0);\n" + " mediump vec2 d = (world.xy - uCenter) * uAnglePerUnit;\n" + " mediump float a = length(d);\n" + " mediump float cs = cos(radians(a));\n" " world.z -= cs * uRadius;\n" " gl_Position = uProjection * world;\n" " \n"