mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-28 08:29:00 +02:00
Code Issues Projects Releases Wiki Activity

- fixed mod center image previews in cases where userdata folder was non default

Browse Source 
- removed commented out old code
This commit is contained in:
Mark Vejvoda
2013-10-03 05:44:50 +00:00
parent 312c2db483
commit 53a557d8d1
15 changed files with 80 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/shared_lib/include/graphics/vec.h
View File

@@ -33,20 +33,6 @@ namespace Shared{ namespace Graphics{
template<typename T>
inline T truncateDecimal(const T &value, int precision=6) {
/*
int iSigned = value >= 0 ? 1: -1;
#ifdef USE_STREFLOP
unsigned int uiTemp = (unsigned int)(value * streflop::pow((streflop::Simple)10, (streflop::Simple)precision)) * iSigned; //Note I'm using unsigned int so that I can increase the precision of the truncate
T result = (((T)uiTemp) / streflop::pow((streflop::Simple)10,(streflop::Simple)precision) * iSigned);
#else
unsigned int uiTemp = (value * pow((T)10, precision)) * iSigned; //Note I'm using unsigned int so that I can increase the precision of the truncate
T result = (((double)uiTemp) / pow((T)10,precision) * iSigned);
#endif
return result;
*/
T precNum = 0;
if(precision == 0) {
precNum = 1;
@@ -269,14 +255,6 @@ public:
}
inline float length() const {
//#ifdef USE_STREFLOP
// if(requireAccuracy == true) {
// return static_cast<float>(streflop::sqrt(static_cast<streflop::Simple>(x*x + y*y)));
// }
// return static_cast<float>(std::sqrt(static_cast<float>(x*x + y*y)));
//#else
// return static_cast<float>(sqrt(static_cast<float>(x*x + y*y)));
//#endif
float len = static_cast<float>(std::sqrt(static_cast<float>(x*x + y*y)));
len = truncateDecimal<float>(len,6);
return len;
@@ -289,14 +267,6 @@ public:
}
inline Vec2<T> rotate(float rad) {
// const float
//#ifdef USE_STREFLOP
// c = streflop::cosf(rad),
// s = streflop::sinf(rad);
//#else
// c = cosf(rad),
// s = sinf(rad);
//#endif
float c = std::cos(rad),
s = std::sin(rad);
@@ -514,14 +484,6 @@ public:
}
inline float length() const {
//#ifdef USE_STREFLOP
// if(requireAccuracy == true) {
// return static_cast<float>(streflop::sqrt(static_cast<streflop::Simple>(x*x + y*y + z*z)));
// }
// return static_cast<float>(std::sqrt(x*x + y*y + z*z));
//#else
// return static_cast<float>(sqrt(x*x + y*y + z*z));
//#endif
float len = static_cast<float>(std::sqrt(x*x + y*y + z*z));
len = truncateDecimal<float>(len,6);
return len;