X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fmath%2Frandom.h;h=bc6fcbd68100f28ca8bc800919f1dfe4046b9f30;hb=a17c4357f76f24d334fccde990de4daebf43e164;hp=b270f8ac44d8523a3968048d161214f4caea4c25;hpb=4468cbf6d9b84a613616f25970c64d843ce91d34;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/public-api/math/random.h b/dali/public-api/math/random.h
old mode 100644
new mode 100755
index b270f8a..bc6fcbd
--- a/dali/public-api/math/random.h
+++ b/dali/public-api/math/random.h
@@ -2,7 +2,7 @@
 #define __DALI_RANDOM_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -17,6 +17,8 @@
  * limitations under the License.
  *
  */
+// EXTERNAL INCLUDES
+#include <ctime>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/math/vector4.h>
@@ -30,6 +32,7 @@ namespace Dali
 
 /**
  * @brief Provides methods to generate and use random values.
+ * @SINCE_1_0.0
  */
 namespace Random
 {
@@ -38,21 +41,35 @@ namespace Random
  * @brief Returns a random number between f0 and f1.
  *
  * Note, uses a limited number of values.
- * @param[in] f0 the lower bound
- * @param[in] f1 the upper bound
- * @return a random value between the lower and upper bound
+ * @SINCE_1_0.0
+ * @param[in] f0 The lower bound
+ * @param[in] f1 The upper bound
+ * @return A random value between the lower and upper bound
  */
 inline float Range(float f0, float f1)
 {
   float min = std::min(f0, f1);
   float max = std::max(f0, f1);
-  return min + (rand() & 0xfff) * (max-min) * (1.0f/4095.0f);
+
+  // Ensure we initialize only once. As it's inlined, this static variable will exist in the code-block using it, thus,
+  // will be created and then initialized again when another code-block uses this.
+  static bool initialized( false );
+  if( !initialized )
+  {
+    auto seed = time( NULL );
+    srand( seed );
+    initialized = true;
+  }
+
+  auto randValue = rand();
+  return (randValue & 0xfff) * (1.0f/4095.0f) * (max-min) + min;
 }
 
 /**
  * @brief Function to return a normalized axis in a random direction.
  *
- * @return the axis
+ * @SINCE_1_0.0
+ * @return The axis
  */
 inline Vector4 Axis()
 {