X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=optional%2Fdali-toolkit%2Fpublic-api%2Fshader-effects%2Fdissolve-local-effect.cpp;h=5d85ebf2dde993b680fb6de45a99b4a565f34b07;hp=5646390dbaf9028b93db44b5e7218dcd3092acf9;hb=0cd043d5fe3d330798ea5bdb0711b841535718e0;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e diff --git a/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp index 5646390..5d85ebf 100644 --- a/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp +++ b/optional/dali-toolkit/public-api/shader-effects/dissolve-local-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 @@ -35,12 +36,14 @@ namespace } DissolveLocalEffect::DissolveLocalEffect() +: mNumberOfDimples( 1 ) { } //Call the Parent copy constructor to add reference to the implementation for this object DissolveLocalEffect::DissolveLocalEffect( ShaderEffect handle ) -: ShaderEffect( handle ) +: ShaderEffect( handle ), + mNumberOfDimples( 1 ) { } @@ -53,6 +56,7 @@ DissolveLocalEffect DissolveLocalEffect::New( unsigned int numberOfDimples ) std::ostringstream vertexShaderStringStream; vertexShaderStringStream << "#define NUMBER_OF_DIMPLE "<< numberOfDimples << "\n"; std::string vertexShader( + "precision highp float;\n" "uniform vec2 uCenter[ NUMBER_OF_DIMPLE ];\n" "uniform float uRadius[ NUMBER_OF_DIMPLE ]; \n" "uniform float uPercentage[ NUMBER_OF_DIMPLE ]; \n"