flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #1376 from mc-server/static_cast

Browse Source 
Use static casts instead of C casts, add floor-cast functions
This commit is contained in:
archshift 2014-10-09 15:12:51 -07:00
commit ae5d311609
3 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Entities/Entity.h
View File

@ -27,9 +27,9 @@
return super::GetClass(); \
}
#define POSX_TOINT (int)floor(GetPosX())
#define POSY_TOINT (int)floor(GetPosY())
#define POSZ_TOINT (int)floor(GetPosZ())
#define POSX_TOINT FloorC(GetPosX())
#define POSY_TOINT FloorC(GetPosY())
#define POSZ_TOINT FloorC(GetPosZ())
#define POS_TOINT Vector3i(POSXTOINT, POSYTOINT, POSZTOINT)
#define GET_AND_VERIFY_CURRENT_CHUNK(ChunkVarName, X, Z) cChunk * ChunkVarName = a_Chunk.GetNeighborChunk(X, Z); if ((ChunkVarName == NULL) || !ChunkVarName->IsValid()) { return; }

26
src/Globals.h
View File

@ -226,10 +226,10 @@ template class SizeChecker<UInt16, 2>;
// CRT stuff:
#include <sys/stat.h>
#include <assert.h>
#include <stdio.h>
#include <math.h>
#include <stdarg.h>
#include <cassert>
#include <cstdio>
#include <cmath>
#include <cstdarg>
@ -400,6 +400,24 @@ T Clamp(T a_Value, T a_Min, T a_Max)
/** Floors a value, then casts it to C (an int by default) */
template <typename C = int, typename T>
typename std::enable_if<std::is_arithmetic<T>::value, C>::type FloorC(T a_Value)
{
return static_cast<C>(std::floor(a_Value));
}
/** Ceils a value, then casts it to C (an int by default) */
template <typename C = int, typename T>
typename std::enable_if<std::is_arithmetic<T>::value, C>::type CeilC(T a_Value)
{
return static_cast<C>(std::ceil(a_Value));
}
#ifndef TOLUA_TEMPLATE_BIND
#define TOLUA_TEMPLATE_BIND(x)
#endif

33
src/Vector3.h
View File

@ -4,7 +4,6 @@
#define _USE_MATH_DEFINES // Enable non-standard math defines (MSVC)
#include <math.h>
#include <list>
#include <vector>
@ -29,9 +28,9 @@ public:
// Hardcoded copy constructors (tolua++ does not support function templates .. yet)
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) {}
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)) {}
// tolua_end
@ -53,9 +52,9 @@ public:
{
double Len = 1.0 / Length();
x = (T)(x * Len);
y = (T)(y * Len);
z = (T)(z * Len);
x = static_cast<T>(x * Len);
y = static_cast<T>(y * Len);
z = static_cast<T>(z * Len);
}
inline Vector3<T> NormalizeCopy(void) const
@ -63,9 +62,9 @@ public:
double Len = 1.0 / Length();
return Vector3<T>(
(T)(x * Len),
(T)(y * Len),
(T)(z * Len)
static_cast<T>(x * Len),
static_cast<T>(y * Len),
static_cast<T>(z * Len)
);
}
@ -74,15 +73,15 @@ public:
double Len = 1.0 / Length();
a_Rhs.Set(
(T)(x * Len),
(T)(y * Len),
(T)(z * Len)
static_cast<T>(x * Len),
static_cast<T>(y * Len),
static_cast<T>(z * Len)
);
}
inline double Length(void) const
{
return sqrt((double)(x * x + y * y + z * z));
return sqrt(static_cast<double>(x * x + y * y + z * z));
}
inline double SqrLength(void) const
@ -138,9 +137,9 @@ public:
inline Vector3<int> Floor(void) const
{
return Vector3<int>(
(int)floor(x),
(int)floor(y),
(int)floor(z)
FloorC(x),
FloorC(y),
FloorC(z)
);
}