Merge "update bouncing-effect-actor to use new mesh" into devel/new_mesh

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

diff --git a/dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp b/dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp
index 5646390..26430d0 100644 (file)
--- a/dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp
+++ b/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) 2015 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 <sstream>
 
@@ -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"
@@ -104,7 +108,7 @@ DissolveLocalEffect DissolveLocalEffect::New( unsigned int numberOfDimples )
     handle.SetRadius(i, 0.f);
     handle.SetDistortion( i, 0.f );
   }
-  handle.SetProperty( ShaderEffect::GRID_DENSITY, Property::Value(5.f) );
+  handle.SetProperty( ShaderEffect::Property::GRID_DENSITY, Dali::Property::Value(5.f) );
   handle.SetTransparency( 0.5f );
 
   return handle;