Merge remote-tracking branch 'origin/tizen' into new_text

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / shader-effects / carousel-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/carousel-effect.cpp b/dali-toolkit/public-api/shader-effects/carousel-effect.cpp
index 6707ae5..49246cd 100644 (file)
--- 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 <dali-toolkit/public-api/shader-effects/carousel-effect.h>
 
@@ -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"
@@ -68,7 +69,7 @@ CarouselEffect CarouselEffect::New()
 
   ShaderEffect shaderEffectCustom = ShaderEffect::New(vertexShader,
           "",
-          GeometryType( GEOMETRY_TYPE_IMAGE | GEOMETRY_TYPE_TEXT ),
+          GeometryType( GEOMETRY_TYPE_IMAGE ),
           ShaderEffect::GeometryHints( ShaderEffect::HINT_GRID | ShaderEffect::HINT_DEPTH_BUFFER ));
 
   // Pass ownership to CarouselEffect through overloaded constructor, So that it now has access to the