remove obsolete functions from public API

[Problem]
[Cause]
[Solution]

Change-Id: I693adda565c19532919d9d4146915add89e41e47

diff --git a/dali/public-api/animation/animator-functions.cpp b/dali/public-api/animation/animator-functions.cpp
deleted file mode 100644 (file)
index dc3b874..0000000
--- a/dali/public-api/animation/animator-functions.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * 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.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali/public-api/common/constants.h>
-#include <dali/public-api/animation/animator-functions.h>
-
-namespace Dali
-{
-
-namespace AnimatorFunctions
-{
-
-BounceFunc::BounceFunc(float x, float y, float z)
-: mDistance(Vector3(x, y, z))
-{
-}
-
-Vector3 BounceFunc::operator()(float alpha, const Vector3& current)
-{
-  if (alpha>0.001f && alpha<1.0f)
-  {
-    const float flip = 0.5f - cosf(alpha * Math::PI * 2.0f) * 0.5f;
-
-    Vector3 newTranslation(current);
-
-    newTranslation += mDistance * flip;
-
-    return newTranslation;
-  }
-
-  return current;
-}
-
-TumbleFunc TumbleFunc::GetRandom()
-{
-  return TumbleFunc(Randomize(0.5f, 1.0f), Randomize(0.0f, 0.5f), Randomize(0.0f, 0.6f));
-}
-
-float TumbleFunc::Randomize(float f0, float f1)
-{
-  return f0 + (rand() & 0xfff) * (f1-f0) / 4096.0f;
-}
-
-TumbleFunc::TumbleFunc(float x, float y, float z)
-: tumbleAxis(Vector4(x,y,z,0))
-{
-  tumbleAxis.Normalize();
-}
-
-Quaternion TumbleFunc::operator()(float alpha, const Quaternion& current)
-{
-  if (alpha>0.001f && alpha<1.0f)
-  {
-    Quaternion tumbleRotation(Quaternion::FromAxisAngle(tumbleAxis, alpha * Math::PI * 2.0f));
-
-    return tumbleRotation * current;
-  }
-
-  return current;
-}
-
-Timer::Timer(float scale)
-: mLoopCounter( 0u ),
-  mPrevious( 0.f ),
-  mScale( scale )
-{
-}
-
-float Timer::operator()(float progress, const float& current)
-{
-  if ( progress < mPrevious )
-  {
-    ++mLoopCounter;
-  }
-  mPrevious = progress;
-  return mScale * (progress + mLoopCounter);
-}
-
-} // namespace AnimatorFunctions
-
-} // namespace Dali

diff --git a/dali/public-api/animation/animator-functions.h b/dali/public-api/animation/animator-functions.h
deleted file mode 100644 (file)
index 1d92f88..0000000
--- a/dali/public-api/animation/animator-functions.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef __DALI_ANIMATOR_FUNCTIONS_H__
-#define __DALI_ANIMATOR_FUNCTIONS_H__
-
-/*
- * 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.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali/public-api/common/constants.h>
-#include <dali/public-api/math/quaternion.h>
-
-
-namespace Dali DALI_IMPORT_API
-{
-
-namespace AnimatorFunctions
-{
-
-/**
- * @brief Function object that interpolates using a bounce shape.
- */
-struct BounceFunc
-{
-  /**
-   * @brief Constructor.
-   */
-  BounceFunc(float x, float y, float z);
-
-  /**
-   * @brief functor
-   */
-  Vector3 operator()(float alpha, const Vector3& current);
-
-  Vector3 mDistance; ///< Distance to bounce
-};
-
-/**
- * @brief Function object that rotates about a random axis twice.
- */
-struct TumbleFunc
-{
-  /**
-   * @brief Factory method to create a functor with a random axis.
-   */
-  static TumbleFunc GetRandom();
-
-  /**
-   * @brief Class method to return a random float in the given range
-   */
-  static float Randomize(float f0, float f1);
-
-  /**
-   * @brief Constructor.
-   *
-   * @param[in] x The x component of the axis
-   * @param[in] y The y component of the axis
-   * @param[in] z The z component of the axis
-   */
-  TumbleFunc(float x, float y, float z);
-
-  /**
-   * @brief Functor to get the current rotation.
-   * @param[in] alpha The alpha value (the output of an alpha function)
-   * @param[in] current The current property value
-   * @return The output rotation
-   */
-  Quaternion operator()(float alpha, const Quaternion& current);
-
-  Vector4 tumbleAxis; ///< The axis about which to rotate
-};
-
-/**
- * @brief Animator functor that allows provide a timer as input to an animation.
- *
- * The functor returns: scale * ( numberOfLoops + progress )
- */
-struct Timer
-{
-  /**
-   * @brief Constructor
-   *
-   * @param[in] scale Factor by which to multiply progress.
-   */
-  Timer(float scale);
-
-  /**
-   * @brief Functor to return the time.
-   * @param[in] progress The animation progress (0-1)
-   * @param[in] current The current property value.
-   * @return Time since start of animation
-   */
-  float operator()(float progress, const float& current);
-
-private:
-  unsigned int mLoopCounter; ///< Number of times this functor has seen looping progress
-  float mPrevious;           ///< The last progress value
-  float mScale;              ///< factor by which to multiply progress.
-};
-
-} // namespace AnimatorFunctions
-
-} // namespace Dali
-
-
-#endif // __DALI_ANIMATOR_FUNCTIONS_H__

diff --git a/dali/public-api/dali-core.h b/dali/public-api/dali-core.h
index 23b1912..f5be552 100644 (file)
--- a/dali/public-api/dali-core.h
+++ b/dali/public-api/dali-core.h
@@ -38,7 +38,6 @@
 #include <dali/public-api/animation/active-constraint.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/animation.h>
-#include <dali/public-api/animation/animator-functions.h>
 #include <dali/public-api/animation/constraint-functions.h>
 #include <dali/public-api/animation/constraint-source.h>
 #include <dali/public-api/animation/constraint.h>

diff --git a/dali/public-api/file.list b/dali/public-api/file.list
index f7f4053..98c3599 100644 (file)
--- a/dali/public-api/file.list
+++ b/dali/public-api/file.list
@@ -15,7 +15,6 @@ public_api_src_files = \
   $(public_api_src_dir)/actors/renderable-actor.cpp \
   $(public_api_src_dir)/animation/active-constraint.cpp \
   $(public_api_src_dir)/animation/animation.cpp \
-  $(public_api_src_dir)/animation/animator-functions.cpp \
   $(public_api_src_dir)/animation/alpha-functions.cpp \
   $(public_api_src_dir)/animation/constraint.cpp \
   $(public_api_src_dir)/animation/constraints.cpp \
@@ -147,7 +146,6 @@ public_api_core_animation_header_files = \
   $(public_api_src_dir)/animation/active-constraint-declarations.h \
   $(public_api_src_dir)/animation/alpha-functions.h \
   $(public_api_src_dir)/animation/animation.h \
-  $(public_api_src_dir)/animation/animator-functions.h \
   $(public_api_src_dir)/animation/constraint.h \
   $(public_api_src_dir)/animation/constraints.h \
   $(public_api_src_dir)/animation/constraint-functions.h \