summaryrefslogtreecommitdiffstats
path: root/src/Vector3.h
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-09-04 01:22:04 +0200
committerarchshift <admin@archshift.com>2014-09-04 01:23:03 +0200
commite1206568ec71c0e7017c1f764fdc146ba86ce30a (patch)
treef3e6dcfd16d1d1dc4cea4717efc30e04857a1111 /src/Vector3.h
parentIn 1.8, carrots and potatoes yield one less hunger point. (diff)
downloadcuberite-e1206568ec71c0e7017c1f764fdc146ba86ce30a.tar
cuberite-e1206568ec71c0e7017c1f764fdc146ba86ce30a.tar.gz
cuberite-e1206568ec71c0e7017c1f764fdc146ba86ce30a.tar.bz2
cuberite-e1206568ec71c0e7017c1f764fdc146ba86ce30a.tar.lz
cuberite-e1206568ec71c0e7017c1f764fdc146ba86ce30a.tar.xz
cuberite-e1206568ec71c0e7017c1f764fdc146ba86ce30a.tar.zst
cuberite-e1206568ec71c0e7017c1f764fdc146ba86ce30a.zip
Diffstat (limited to 'src/Vector3.h')
-rw-r--r--src/Vector3.h33
1 files changed, 17 insertions, 16 deletions
diff --git a/src/Vector3.h b/src/Vector3.h
index 782b0d1c9..1dcb38f64 100644
--- a/src/Vector3.h
+++ b/src/Vector3.h
@@ -4,6 +4,7 @@
#define _USE_MATH_DEFINES // Enable non-standard math defines (MSVC)
+#include <math.h>
#include <list>
#include <vector>
@@ -28,9 +29,9 @@ public:
// Hardcoded copy constructors (tolua++ does not support function templates .. yet)
- Vector3(const Vector3<float> & a_Rhs) : x(static_cast<T>(a_Rhs.x)), y(static_cast<T>(a_Rhs.y)), z(static_cast<T>(a_Rhs.z)) {}
- Vector3(const Vector3<double> & a_Rhs) : x(static_cast<T>(a_Rhs.x)), y(static_cast<T>(a_Rhs.y)), z(static_cast<T>(a_Rhs.z)) {}
- Vector3(const Vector3<int> & a_Rhs) : x(static_cast<T>(a_Rhs.x)), y(static_cast<T>(a_Rhs.y)), z(static_cast<T>(a_Rhs.z)) {}
+ Vector3(const Vector3<float> & a_Rhs) : x((T) a_Rhs.x), y((T) a_Rhs.y), z((T) a_Rhs.z) {}
+ Vector3(const Vector3<double> & a_Rhs) : x((T) a_Rhs.x), y((T) a_Rhs.y), z((T) a_Rhs.z) {}
+ Vector3(const Vector3<int> & a_Rhs) : x((T) a_Rhs.x), y((T) a_Rhs.y), z((T) a_Rhs.z) {}
// tolua_end
@@ -52,9 +53,9 @@ public:
{
double Len = 1.0 / Length();
- x = static_cast<T>(x * Len);
- y = static_cast<T>(y * Len);
- z = static_cast<T>(z * Len);
+ x = (T)(x * Len);
+ y = (T)(y * Len);
+ z = (T)(z * Len);
}
inline Vector3<T> NormalizeCopy(void) const
@@ -62,9 +63,9 @@ public:
double Len = 1.0 / Length();
return Vector3<T>(
- static_cast<T>(x * Len),
- static_cast<T>(y * Len),
- static_cast<T>(z * Len)
+ (T)(x * Len),
+ (T)(y * Len),
+ (T)(z * Len)
);
}
@@ -73,15 +74,15 @@ public:
double Len = 1.0 / Length();
a_Rhs.Set(
- static_cast<T>(x * Len),
- static_cast<T>(y * Len),
- static_cast<T>(z * Len)
+ (T)(x * Len),
+ (T)(y * Len),
+ (T)(z * Len)
);
}
inline double Length(void) const
{
- return sqrt(static_cast<double>(x * x + y * y + z * z));
+ return sqrt((double)(x * x + y * y + z * z));
}
inline double SqrLength(void) const
@@ -137,9 +138,9 @@ public:
inline Vector3<int> Floor(void) const
{
return Vector3<int>(
- static_cast<int>(floor(x)),
- static_cast<int>(floor(y)),
- static_cast<int>(floor(z))
+ (int)floor(x),
+ (int)floor(y),
+ (int)floor(z)
);
}