change DALI_COMPILE_TIME_ASSERT to use static_assert from C++ 11

[platform/core/uifw/dali-core.git] / dali / public-api / common / constants.h

diff --git a/dali/public-api/common/constants.h b/dali/public-api/common/constants.h
index 2f98174..14da714 100644 (file)
--- a/dali/public-api/common/constants.h
+++ b/dali/public-api/common/constants.h
@@ -2,7 +2,7 @@
 #define __DALI_CONSTANTS_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * 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.
@@ -24,15 +24,19 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/math/vector3.h>
 #include <dali/public-api/math/vector4.h>
-#include <dali/public-api/math/radian.h>
 
 namespace Dali
 {
+/**
+ * @addtogroup dali_core_common
+ * @{
+ */
 
 /**
- * @brief ParentOrigin constants
+ * @brief ParentOrigin constants.
  *
- * Note that for 2D layouting, the typical Z position is 0.5f (not 0.0f)
+ * Note that for 2D layouting, the typical Z position is 0.5f (not 0.0f).
+ * @SINCE_1_0.0
  */
 namespace ParentOrigin
 {
@@ -56,9 +60,10 @@ DALI_IMPORT_API extern const Vector3 BOTTOM_RIGHT;       ///< 1.0f, 1.0f, 0.5f
 }
 
 /**
- * @brief AnchorPoint constants
+ * @brief AnchorPoint constants.
  *
- * Note that for 2D layouting, the typical Z position is 0.5f (not 0.0f)
+ * Note that for 2D layouting, the typical Z position is 0.5f (not 0.0f).
+ * @SINCE_1_0.0
  */
 namespace AnchorPoint
 {
@@ -86,6 +91,7 @@ DALI_IMPORT_API extern const Vector3 BOTTOM_RIGHT;       ///< 1.0f, 1.0f, 0.5f
  * @brief Color Constants.
  *
  * Color is represented by the Vector4 class (see vector4.h).
+ * @SINCE_1_0.0
  */
 namespace Color
 {
@@ -105,7 +111,8 @@ DALI_IMPORT_API extern const Vector4 TRANSPARENT; ///< Black transparent (0.0f,
 } // namespace Color
 
 /**
- * @brief Math constants
+ * @brief Math constants.
+ * @SINCE_1_0.0
  */
 namespace Math
 {
@@ -117,20 +124,17 @@ DALI_IMPORT_API extern const float MACHINE_EPSILON_1000;   ///< Epsilon for valu
 DALI_IMPORT_API extern const float MACHINE_EPSILON_10000;  ///< Epsilon for values near 10000
 
 // float is preferred to double for performance on ARM targets
-static const float PI   = static_cast<float>(M_PI);   ///< Constant representing PI
-static const float PI_2 = static_cast<float>(M_PI_2); ///< Constant representing PI/2
-static const float PI_4 = static_cast<float>(M_PI_4); ///< Constant representing PI/4
+static const float PI   = static_cast<float>(M_PI);       ///< Constant representing PI
+static const float PI_2 = static_cast<float>(M_PI_2);     ///< Constant representing PI/2
+static const float PI_4 = static_cast<float>(M_PI_4);     ///< Constant representing PI/4
+static const float PI_OVER_180 = Dali::Math::PI/180.0f;   ///< Constant used to convert degree to radian
+static const float ONE80_OVER_PI = 180.0f/Dali::Math::PI; ///< Constant used to convert radian to degree
 
 } // namespace Math
 
 /**
- * @brief String Constants
+ * @}
  */
-namespace String
-{
-extern const std::string EMPTY; ///< The empty string
-}
-
 } // namespace Dali
 
 #endif // __DALI_CONSTANTS_H__