Merge "Remove scene graph property buffer" into devel/master

diff --git a/automated-tests/src/dali/utc-Dali-Quaternion.cpp b/automated-tests/src/dali/utc-Dali-Quaternion.cpp
index aac64e6..280a23d 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Quaternion.cpp
+++ b/automated-tests/src/dali/utc-Dali-Quaternion.cpp
@@ -344,7 +344,7 @@ int UtcDaliQuaternionSetEulerP(void)
   Vector4 r2( 0.0f, 0.609f, 0.0f, 0.793f );
 
   Quaternion e3;
-  e3.SetEuler( Dali::ANGLE_0, Dali::ANGLE_0, Dali::ANGLE_135 );
+  e3.SetEuler( Dali::ANGLE_0, Dali::ANGLE_0, Radian( Degree( 135 ) ) );
   Vector4 r3( 0.0f, 0.0f, 0.924f, 0.383f );
 
   Quaternion e4;

diff --git a/dali/public-api/math/degree.cpp b/dali/public-api/math/degree.cpp
index 3e56ea3..49f2545 100644 (file)
--- a/dali/public-api/math/degree.cpp
+++ b/dali/public-api/math/degree.cpp
@@ -29,4 +29,13 @@ Degree::Degree( Radian radian )
 {
 }
 
+const Radian ANGLE_360 = Radian( Math::PI * 2.f     ); ///< 360 degree turn in radians
+const Radian ANGLE_180 = Radian( Math::PI           ); ///< 180 degree turn in radians
+const Radian ANGLE_120 = Radian( Math::PI * 2.f/3.f ); ///< 120 degree turn in radians
+const Radian ANGLE_90  = Radian( Math::PI_2         ); ///< 90 degree turn in radians
+const Radian ANGLE_60  = Radian( Math::PI / 3.f     ); ///< 60 degree turn in radians
+const Radian ANGLE_45  = Radian( Math::PI_4         ); ///< 45 degree turn in radians
+const Radian ANGLE_30  = Radian( Math::PI / 6.f     ); ///< 30 degree turn in radians
+const Radian ANGLE_0   = Radian( 0.0f               ); ///< 0 degree turn in radians
+
 } // namespace Dali

diff --git a/dali/public-api/math/degree.h b/dali/public-api/math/degree.h
index d0a7c5e..a93f0a1 100644 (file)
--- a/dali/public-api/math/degree.h
+++ b/dali/public-api/math/degree.h
@@ -71,6 +71,16 @@ public:
 
 // compiler generated destructor, copy constructor and assignment operators are ok as this class is POD
 
+// useful constant angles
+DALI_EXPORT_API extern const Radian ANGLE_360; ///< 360 degree turn in radians
+DALI_EXPORT_API extern const Radian ANGLE_180; ///< 180 degree turn in radians
+DALI_EXPORT_API extern const Radian ANGLE_120; ///< 120 degree turn in radians
+DALI_EXPORT_API extern const Radian ANGLE_90;  ///< 90 degree turn in radians
+DALI_EXPORT_API extern const Radian ANGLE_60;  ///< 60 degree turn in radians
+DALI_EXPORT_API extern const Radian ANGLE_45;  ///< 45 degree turn in radians
+DALI_EXPORT_API extern const Radian ANGLE_30;  ///< 30 degree turn in radians
+DALI_EXPORT_API extern const Radian ANGLE_0;   ///< 0 degree turn in radians
+
 /**
  * @brief Compare equality between two degrees.
  *

diff --git a/dali/public-api/math/radian.h b/dali/public-api/math/radian.h
index 83a4e73..be89a06 100644 (file)
--- a/dali/public-api/math/radian.h
+++ b/dali/public-api/math/radian.h
@@ -105,20 +105,6 @@ public:
 
 // compiler generated destructor, copy constructor and assignment operators are ok as this class is POD
 
-// useful constant angles
-static const Radian ANGLE_360 = Radian( Math::PI * 2.f     ); ///< 360 degree turn in radians
-static const Radian ANGLE_315 = Radian( Math::PI * 1.75f   ); ///< 315 degree turn in radians
-static const Radian ANGLE_270 = Radian( Math::PI * 1.50f   ); ///< 270 degree turn in radians
-static const Radian ANGLE_225 = Radian( Math::PI * 1.25f   ); ///< 225 degree turn in radians
-static const Radian ANGLE_180 = Radian( Math::PI           ); ///< 180 degree turn in radians
-static const Radian ANGLE_135 = Radian( Math::PI * 0.75f   ); ///< 135 degree turn in radians
-static const Radian ANGLE_120 = Radian( Math::PI * 2.f/3.f ); ///< 120 degree turn in radians
-static const Radian ANGLE_90  = Radian( Math::PI_2         ); ///< 90 degree turn in radians
-static const Radian ANGLE_45  = Radian( Math::PI_4         ); ///< 45 degree turn in radians
-static const Radian ANGLE_60  = Radian( Math::PI / 3.f     ); ///< 60 degree turn in radians
-static const Radian ANGLE_30  = Radian( Math::PI / 6.f     ); ///< 30 degree turn in radians
-static const Radian ANGLE_0   = Radian( 0.0f               ); ///< 0 degree turn in radians
-
 /**
  * @brief Compare equality between two radians.
  *