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

- code cleanup (removing / commenting uneeded items)

Browse Source
This commit is contained in:
Mark Vejvoda
2011-10-17 20:56:11 +00:00
parent d07e5ef859
commit 26afb589a3
6 changed files with 13 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/shared_lib/sources/graphics/font.cpp
View File

@@ -40,9 +40,9 @@ bool Font::fontIsRightToLeft = false;
// This value is used to scale the font text rendering
// in 3D render mode
float Font::scaleFontValue = 0.80;
float Font::scaleFontValue = 0.80f;
// This value is used for centering font text vertically (height)
float Font::scaleFontValueCenterHFactor = 4.0;
float Font::scaleFontValueCenterHFactor = 4.0f;
//float Font::scaleFontValue = 1.0;
//float Font::scaleFontValueCenterHFactor = 4.0;

1
source/shared_lib/sources/graphics/gl/font_textFTGL.cpp
View File

@@ -234,6 +234,7 @@ void TextFTGL::Render(const char* str, const int len) {
if(len != 0) {
//printf("FTGL Render [%s] facesize = %d\n",str,ftFont->FaceSize());
assertGl();
ftFont->Render(str, len);
//assertGl();
GLenum error = glGetError();

40
source/shared_lib/sources/util/string_utils.cpp
View File

@@ -18,21 +18,12 @@
//#include "../stdafx.h"
#include "string_utils.h"
#if TA3D_USE_BOOST == 1
# include <boost/algorithm/string.hpp>
# include <boost/algorithm/string/trim.hpp>
# include <boost/algorithm/string/split.hpp>
#else
# include <algorithm>
#endif
#include <algorithm>
#include <assert.h>
//#include "../logs/logs.h"
namespace Shared { namespace Util {
#if TA3D_USE_BOOST != 1
namespace
{
int stdLowerCase (int c)
@@ -45,7 +36,6 @@ namespace Shared { namespace Util {
return toupper(c);
}
}
#endif
String&
String::operator << (const wchar_t* v)
@@ -66,22 +56,14 @@ namespace Shared { namespace Util {
String&
String::toLower()
{
#if TA3D_USE_BOOST == 1
boost::to_lower(*this);
#else
std::transform (this->begin(), this->end(), this->begin(), stdLowerCase);
#endif
return *this;
}
String&
String::toUpper()
{
#if TA3D_USE_BOOST == 1
boost::to_upper(*this);
#else
std::transform (this->begin(), this->end(), this->begin(), stdUpperCase);
#endif
return *this;
}
@@ -120,15 +102,6 @@ namespace Shared { namespace Util {
// Empty the container
if (emptyBefore)
out.clear();
#if TA3D_USE_BOOST == 1
// TODO : Avoid string duplication
// Split
std::vector<std::string> v;
boost::algorithm::split(v, *this, boost::is_any_of(separators.c_str()));
// Copying
for(std::vector<std::string>::const_iterator i = v.begin(); i != v.end(); ++i)
out.push_back(*i);
#else
// TODO This method should be rewritten for better performance
String s(*this);
while (!s.empty())
@@ -145,7 +118,6 @@ namespace Shared { namespace Util {
s = s.substr(i + 1, s.size() - i - 1);
}
}
#endif
}
void
@@ -154,15 +126,6 @@ namespace Shared { namespace Util {
// Empty the container
if (emptyBefore)
out.clear();
#if TA3D_USE_BOOST == 1
// TODO : Avoid string duplication
// Split
std::vector<std::string> v;
boost::algorithm::split(v, *this, boost::is_any_of(separators.c_str()));
// Copying
for(std::vector<std::string>::const_iterator i = v.begin(); i != v.end(); ++i)
out.push_back(*i);
#else
// TODO This method should be rewritten for better performance
String s(*this);
while (!s.empty())
@@ -179,7 +142,6 @@ namespace Shared { namespace Util {
s = s.substr(i + 1, s.size() - i - 1);
}
}
#endif
}