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%2Fimage-region-effect.cpp;h=ee9b25694d1255f708effbd4bbf91477db36bd20;hp=18bb1c3cef93b33b0745871a27a37d76fadf57a2;hb=2ddfbb9e23a7c3fc30e604236c41e0ef6d2ed6a2;hpb=e2eda444afbe82e9591fe198eef339227f90a616 diff --git a/dali-toolkit/public-api/shader-effects/image-region-effect.cpp b/dali-toolkit/public-api/shader-effects/image-region-effect.cpp index 18bb1c3..ee9b256 100644 --- a/dali-toolkit/public-api/shader-effects/image-region-effect.cpp +++ b/dali-toolkit/public-api/shader-effects/image-region-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 @@ -48,11 +49,11 @@ ImageRegionEffect::~ImageRegionEffect() ImageRegionEffect ImageRegionEffect::New() { std::string vertexShader( - "uniform vec2 uTopLeft;\n" - "uniform vec2 uBottomRight;\n" + "uniform mediump vec2 uTopLeft;\n" + "uniform mediump vec2 uBottomRight;\n" "void main()\n" "{\n" - " vec4 position = vec4(aPosition,1.0);\n" + " mediump vec4 position = vec4(aPosition,1.0);\n" " gl_Position = uMvpMatrix * position;\n" // The line below is doing the same as the following commented lines: //" vec2 imageSize = sTextureRect.zw - sTextureRect.xy;\n" @@ -97,4 +98,3 @@ const std::string& ImageRegionEffect::GetBottomRightPropertyName() const } // namespace Toolkit } // namespace Dali -