Merge lp:~unity-team/nux/nux.constants-namespace into lp:nux/2.0

[Jay Taoko]

* Added namespace nux::constants for constant values such as pi.

[lp:~unity-team/nux/nux.constants-namespace]

579. By Jay Taoko on 2012-02-19

* Removed redundant constant Pi.

[Jay Taoko (jaytaoko)]

review: Approve

=== modified file 'Nux/Coverflow.cpp'
--- Nux/Coverflow.cpp	2012-02-13 10:15:35 +0000
+++ Nux/Coverflow.cpp	2012-02-19 04:29:19 +0000
@@ -44,7 +44,7 @@
 {
   float EaseSin(float x)
   {
-    return sin(x * nux::Const::pi / 2.0f);
+    return sin(x * nux::constants::pi / 2.0f);
   }
 
   float RoundFloor(float x)
@@ -666,13 +666,13 @@
 
       if (x < flat_left)
       {
-        cover.position.rot = (atan((x - flat_left) * parent_->folding_rate) / (nux::Const::pi / 2)) * -parent_->folding_angle;
+        cover.position.rot = (atan((x - flat_left) * parent_->folding_rate) / (nux::constants::pi / 2)) * -parent_->folding_angle;
         float scale_in_factor = neg_pinch + (1.0f - (std::abs(cover.position.rot) / parent_->folding_angle)) * parent_->pinching;
         cover.position.x = flat_left - ((flat_left - x) * scale_in_factor);
       }
       else if (x > flat_right)
       {
-        cover.position.rot = (atan((x - flat_right) * parent_->folding_rate) / (nux::Const::pi / 2)) * -parent_->folding_angle;
+        cover.position.rot = (atan((x - flat_right) * parent_->folding_rate) / (nux::constants::pi / 2)) * -parent_->folding_angle;
         float scale_in_factor = neg_pinch+ (1.0f - (std::abs(cover.position.rot) / parent_->folding_angle)) * parent_->pinching;
         cover.position.x = flat_right + ((x - flat_right) * scale_in_factor);
       }

=== modified file 'NuxCore/Math/Algo.cpp'
--- NuxCore/Math/Algo.cpp	2011-04-06 21:54:09 +0000
+++ NuxCore/Math/Algo.cpp	2012-02-19 04:29:19 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Inalogic® Inc.
+ * Copyright 2010-2012 Inalogic® Inc.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License, as
@@ -81,7 +81,7 @@
             double xinters = (pt.y - p1.y) * (p2.x - p1.x) / (p2.y - p1.y) + p1.x;
 
             //overlies on a ray
-            if(fabs(pt.x - xinters) < Const::dbl_epsilon) return onedge;
+            if(fabs(pt.x - xinters) < constants::dbl_epsilon) return onedge;
 
             //before ray
             if(pt.x < xinters) ++__count;

=== modified file 'NuxCore/Math/Constants.cpp'
--- NuxCore/Math/Constants.cpp	2011-04-06 21:54:09 +0000
+++ NuxCore/Math/Constants.cpp	2012-02-19 04:29:19 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Inalogic® Inc.
+ * Copyright 2010-2012 Inalogic® Inc.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License, as
@@ -19,36 +19,38 @@
  *
  */
 
-
 #include "../NuxCore.h"
 #include "Constants.h"
 
+#include <limits>
 namespace nux
 {
-  const float Const::pi       = 3.1415926535f;
-  const float Const::Pi       = 3.1415926535f;
-  const float Const::e        = 2.7182817f;
-  const float Const::sqrt2    = 1.414214f;
-  const float Const::sqrt3    = 1.732051f;
-  const float Const::golden   = 1.618034f;
+  namespace constants
+  {
+    const float pi       = 3.1415926535f;
+    const float e        = 2.7182817f;
+    const float sqrt2    = 1.414214f;
+    const float sqrt3    = 1.732051f;
+    const float golden   = 1.618034f;
 
-  const double Const::EpsilonMilli  =   0.001;
-  const double Const::EpsilonMicro  =   0.000001;
-  const double Const::EpsilonNano   =   0.000000001;
-  const double Const::EpsilonPico   =   0.000000000001;
-  const double Const::EpsilonFemto  =   0.000000000000001;
+    const double epsilon_milli  =   0.001;
+    const double epsilon_micro  =   0.000001;
+    const double epsilon_nano   =   0.000000001;
+    const double epsilon_pico   =   0.000000000001;
+    const double epsilon_femto  =   0.000000000000001;
 
 #if defined(NUX_OS_WINDOWS)
-  const float Const::flt_epsilon    = FLT_EPSILON;
-  const float Const::dbl_epsilon    = DBL_EPSILON;
+    const float flt_epsilon     = FLT_EPSILON;
+    const double dbl_epsilon    = DBL_EPSILON;
 #elif defined(NUX_OS_LINUX)
-  const float Const::flt_epsilon    = __FLT_EPSILON__;
-  const float Const::dbl_epsilon    = __DBL_EPSILON__;
+    const float flt_epsilon     = __FLT_EPSILON__;
+    const double dbl_epsilon    = __DBL_EPSILON__;
 #elif defined(NUX_OS_MACOSX)
-  const float Const::dbl_epsilon    = _FLT_EPSILON_;
-  const float Const::dbl_epsilon    = _DBL_EPSILON_;
+    const float dbl_epsilon     = _FLT_EPSILON_;
+    const double dbl_epsilon    = _DBL_EPSILON_;
 #else
-  #error Undefined OS.
+#error Undefined OS.
 #endif
 
+  } // namespace constants
 }

=== modified file 'NuxCore/Math/Constants.h'
--- NuxCore/Math/Constants.h	2011-04-06 21:54:09 +0000
+++ NuxCore/Math/Constants.h	2012-02-19 04:29:19 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Inalogic® Inc.
+ * Copyright 2010-2012 Inalogic® Inc.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License, as
@@ -19,57 +19,27 @@
  *
  */
 
-
 #ifndef CONSTANTS_H
 #define CONSTANTS_H
 
-#include <limits>
-
-/*
-PI with 500 decimals (from http://www.ex.ac.uk/cimt/general/pi10000.htm)
-
-      3.1415926535   8979323846   2643383279   5028841971   6939937510
-        5820974944   5923078164   0628620899   8628034825   3421170679
-        8214808651   3282306647   0938446095   5058223172   5359408128
-        4811174502   8410270193   8521105559   6446229489   5493038196
-        4428810975   6659334461   2847564823   3786783165   2712019091
-        4564856692   3460348610   4543266482   1339360726   0249141273
-        7245870066   0631558817   4881520920   9628292540   9171536436
-        7892590360   0113305305   4882046652   1384146951   9415116094
-        3305727036   5759591953   0921861173   8193261179   3105118548
-        0744623799   6274956735   1885752724   8912279381   8301194912
-*/
-// 2.7182818284590452353602874713526624977572470936999595749669676277
-
-
-
 namespace nux
 {
-
-  class Const
+  namespace constants
   {
-  public:
-    static const float pi;
-    static const float Pi;
-    static const float e;
-    static const float sqrt2;
-    static const float sqrt3;
-    static const float golden;
-
-    static const double EpsilonMilli;
-    static const double EpsilonMicro;
-    static const double EpsilonNano;
-    static const double EpsilonPico;
-    static const double EpsilonFemto;
-
-    static const float flt_epsilon;
-    static const float dbl_epsilon;
-
-  private:
-    Const();
-    ~Const();
-    Const (const Const &);
-    Const &operator = (const Const &);
+    extern const float pi;
+    extern const float e;
+    extern const float sqrt2;
+    extern const float sqrt3;
+    extern const float golden;
+
+    extern const double epsilon_milli;
+    extern const double epsilon_micro;
+    extern const double epsilon_nano;
+    extern const double epsilon_pico;
+    extern const double epsilon_femto;
+
+    extern const float flt_epsilon;
+    extern const double dbl_epsilon;
   };
 
 }

=== modified file 'NuxCore/Math/MathUtility.h'
--- NuxCore/Math/MathUtility.h	2012-02-19 00:02:14 +0000
+++ NuxCore/Math/MathUtility.h	2012-02-19 04:29:19 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Inalogic® Inc.
+ * Copyright 2010-2012 Inalogic® Inc.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License, as
@@ -32,8 +32,8 @@
 
 #include "Constants.h"
 
-#define DEGTORAD(d) (d) * nux::Const::pi / 180.0f
-#define RADTODEG(d) (d) * 180.0f / nux::Const::pi
+#define DEGTORAD(d) (d) * nux::constants::pi / 180.0f
+#define RADTODEG(d) (d) * 180.0f / nux::constants::pi
 
 namespace nux
 {
@@ -164,7 +164,7 @@
   */
   inline double RandomGaussian()
   {
-    return std::sqrt (-2 * std::log ((double) (1e-10 + (1 - 2e-10) * std::rand()))) * std::cos ((double) (2 * 3.14f/*Const::pi*/*std::rand()));
+    return std::sqrt (-2 * std::log ((double) (1e-10 + (1 - 2e-10) * std::rand()))) * std::cos ((double) (2 * constants::pi * std::rand()));
   }
 
   inline unsigned int RandomUInt()

=== modified file 'NuxCore/Math/Matrix4.h'
--- NuxCore/Math/Matrix4.h	2012-01-17 04:34:19 +0000
+++ NuxCore/Math/Matrix4.h	2012-02-19 04:29:19 +0000
@@ -1230,7 +1230,7 @@
     // note: adapted from david eberly's code without permission
     //TODO: make sure it is correct
     
-    if (axis.LengthSquared() < Const::EpsilonMicro)
+    if (axis.LengthSquared() < constants::epsilon_micro)
     {
       Identity();
     }

=== modified file 'NuxCore/Math/Trigonometry.cpp'
--- NuxCore/Math/Trigonometry.cpp	2011-04-06 21:54:09 +0000
+++ NuxCore/Math/Trigonometry.cpp	2012-02-19 04:29:19 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Inalogic® Inc.
+ * Copyright 2010-2012 Inalogic® Inc.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License, as
@@ -34,9 +34,9 @@
   Vector3 SphericalToCartesianXBaseDeg (float r, float theta, float phi)
   {
     Vector3 v;
-    v.x = r * std::cos (theta * Const::pi / 180.0f) * std::sin (phi * Const::pi / 180.0f);
-    v.y = r * std::sin (theta * Const::pi / 180.0f) * std::sin (phi * Const::pi / 180.0f);
-    v.z = r * std::cos (phi * Const::pi / 180.0f);
+    v.x = r * std::cos (theta * constants::pi / 180.0f) * std::sin (phi * constants::pi / 180.0f);
+    v.y = r * std::sin (theta * constants::pi / 180.0f) * std::sin (phi * constants::pi / 180.0f);
+    v.z = r * std::cos (phi * constants::pi / 180.0f);
     return v;
   }
 
@@ -56,9 +56,9 @@
   Vector3 SphericalToCartesianZBaseDeg (float r, float theta, float phi)
   {
     Vector3 v;
-    v.z = r * std::cos (theta * Const::pi / 180.0f) * std::sin (phi * Const::pi / 180.0f);
-    v.x = r * std::sin (theta * Const::pi / 180.0f) * std::sin (phi * Const::pi / 180.0f);
-    v.y = r * std::cos (phi * Const::pi / 180.0f);
+    v.z = r * std::cos (theta * constants::pi / 180.0f) * std::sin (phi * constants::pi / 180.0f);
+    v.x = r * std::sin (theta * constants::pi / 180.0f) * std::sin (phi * constants::pi / 180.0f);
+    v.y = r * std::cos (phi * constants::pi / 180.0f);
     return v;
   }
 

=== modified file 'NuxCore/Math/Tweening.cpp'
--- NuxCore/Math/Tweening.cpp	2011-04-06 21:54:09 +0000
+++ NuxCore/Math/Tweening.cpp	2012-02-19 04:29:19 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Inalogic® Inc.
+ * Copyright 2010-2012 Inalogic® Inc.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License, as
@@ -166,10 +166,10 @@
       s = p / 4;
     }
     else
-      s = p / (2 * nux::Const::pi) * std::asin (c / a);
+      s = p / (2 * constants::pi) * std::asin (c / a);
 
     t -= 1.0;
-    return - (a * std::pow (2, 10 * t) * std::sin ( (t * d - s) * (2 * nux::Const::pi) / p ) ) + b;
+    return - (a * std::pow (2, 10 * t) * std::sin ( (t * d - s) * (2 * constants::pi) / p ) ) + b;
   }
 
   double ElasticEaseOut (double t, double b, double c, double d, double a, double p)
@@ -191,9 +191,9 @@
       s = p / 4;
     }
     else
-      s = p / (2 * nux::Const::pi) * std::asin (c / a);
+      s = p / (2 * constants::pi) * std::asin (c / a);
 
-    return (a * std::pow (2, -10 * t) * std::sin ( (t * d - s) * (2 * nux::Const::pi) / p ) + c + b);
+    return (a * std::pow (2, -10 * t) * std::sin ( (t * d - s) * (2 * constants::pi) / p ) + c + b);
   }
 
   double ElasticEaseInOut (double t, double b, double c, double d, double a, double p)
@@ -216,17 +216,17 @@
     }
     else
     {
-      s = p / (2 * nux::Const::pi) * std::asin (c / a);
+      s = p / (2 * constants::pi) * std::asin (c / a);
     }
 
     if (t < 1.0)
     {
       t -= 1;
-      return -0.5 * (a * std::pow (2, 10.0 * t) * std::sin ( (t * d - s) * (2 * nux::Const::pi) / p ) ) + b;
+      return -0.5 * (a * std::pow (2, 10.0 * t) * std::sin ( (t * d - s) * (2 * constants::pi) / p ) ) + b;
     }
 
     t -= 1;
-    return a * std::pow (2, -10 * t) * std::sin ( (t * d - s) * (2 * nux::Const::pi) / p ) * .5 + c + b;
+    return a * std::pow (2, -10 * t) * std::sin ( (t * d - s) * (2 * constants::pi) / p ) * .5 + c + b;
   }
 
 // Expo
@@ -350,17 +350,17 @@
 // Sine
   double SineEaseIn (double t, double b, double c, double d)
   {
-    return -c * std::cos (t / d * (nux::Const::pi / 2) ) + c + b;
+    return -c * std::cos (t / d * (constants::pi / 2) ) + c + b;
   }
 
   double SineEaseOut (double t, double b, double c, double d)
   {
-    return c * std::sin (t / d * (nux::Const::pi / 2) ) + b;
+    return c * std::sin (t / d * (constants::pi / 2) ) + b;
   }
 
   double SineEaseInOut (double t, double b, double c, double d)
   {
-    return -c / 2 * (std::cos (nux::Const::pi * t / d) - 1) + b;
+    return -c / 2 * (std::cos (constants::pi * t / d) - 1) + b;
   }
 
 }

=== modified file 'configure.ac'
--- configure.ac	2012-02-19 00:02:14 +0000
+++ configure.ac	2012-02-19 04:29:19 +0000
@@ -22,7 +22,7 @@
 # The number format is : year/month/day
 # e.g.: december 5th, 2011 is: 20111205
 # To make more than one API change in a day, add a number to the date. Like 20111205.xx
-m4_define([nux_abi_version], [20120218.01])
+m4_define([nux_abi_version], [20120218.02])
 
 m4_define([nux_version],
           [nux_major_version.nux_minor_version.nux_micro_version])