Alpha function changes

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

diff --git a/dali-toolkit/public-api/shader-effects/displacement-effect.h b/dali-toolkit/public-api/shader-effects/displacement-effect.h
index ee163b3..aabb087 100644 (file)
--- a/dali-toolkit/public-api/shader-effects/displacement-effect.h
+++ b/dali-toolkit/public-api/shader-effects/displacement-effect.h
@@ -1,26 +1,27 @@
 #ifndef __DALI_TOOLKIT_SHADER_EFFECT_DISPLACEMENT_H__
 #define __DALI_TOOLKIT_SHADER_EFFECT_DISPLACEMENT_H__
 
-//
-// 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.
-//
-
-// INTERNAL INCLUDES
-#include <dali/dali.h>
-
-namespace Dali DALI_IMPORT_API
+/*
+ * 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.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>
+
+namespace Dali
 {
 
 namespace Toolkit
@@ -61,15 +62,15 @@ namespace Toolkit
  * ImageActor fancyButton = ImageActor::New( ... );\n
  * fancyButton.SetShaderEffect( buttonEffect );
  *
- * // animate a button push, using e.g. AlphaFunctions::Bounce. With these values the button pushes in and out (animates to and fro between the two states)
+ * // animate a button push, using e.g. AlphaFunction::BOUNCE. With these values the button pushes in and out (animates to and fro between the two states)
  *
  *
  * Animation animation = Animation::New( ... );\n
- * animation.AnimateTo( Property(buttonEffect, buttonEffect.GetStatePropertyName()), 1.0f, AlphaFunctions::Bounce, ... );\n
+ * animation.AnimateTo( Property(buttonEffect, buttonEffect.GetStatePropertyName()), 1.0f, AlphaFunction::BOUNCE, ... );\n
  * animation.Play();\n
  *
  */
-class DisplacementEffect : public ShaderEffect
+class DALI_IMPORT_API DisplacementEffect : public ShaderEffect
 {
 
 public:
@@ -87,9 +88,11 @@ public:
   DisplacementEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~DisplacementEffect();
+  ~DisplacementEffect();
 
   /**
    * Create an initialized DisplacementEffect
@@ -210,7 +213,7 @@ public:
 
 private:
   // Not intended for application developers
-  DisplacementEffect(ShaderEffect handle);
+  DALI_INTERNAL DisplacementEffect(ShaderEffect handle);
 };
 
 }
@@ -218,4 +221,3 @@ private:
 }
 
 #endif //#ifndef __DALI_TOOLKIT_SHADER_EFFECT_DISPLACEMENT_H__
-