BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Indentation style changed to Horstmann"

Browse Source 
This reverts commit f2259f712d.

Conflicts:

	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
This commit is contained in:
sippeangelo
2014-04-12 01:48:15 +02:00
parent d7e65ff118
commit 3470a80f40
61 changed files with 697 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Util/GLError.h
+4 -2
View File
@@ -5,9 +5,11 @@
#include <iostream>
inline bool _GLERROR(char* info, char* file, char* func, unsigned int line)
{ GLenum error = glGetError();
{
GLenum error = glGetError();
if (error != GL_NO_ERROR)
{ _LOG(LOG_LEVEL_ERROR, file, func, line, "GL Error: %s %i %s", info, error, gluErrorString(error));
{
_LOG(LOG_LEVEL_ERROR, file, func, line, "GL Error: %s %i %s", info, error, gluErrorString(error));
return true;
}
src/Util/Logging.h
+10 -5
View File
@@ -20,7 +20,8 @@
#include <stdarg.h>
enum _LOG_LEVEL
{ LOG_LEVEL_ERROR,
{
LOG_LEVEL_ERROR,
LOG_LEVEL_WARNING,
LOG_LEVEL_INFO,
LOG_LEVEL_DEBUG
@@ -33,14 +34,16 @@ static _LOG_LEVEL LOG_LEVEL = LOG_LEVEL_INFO;
#endif
const static char* _LOG_LEVEL_PREFIX[] =
{ "E: ",
{
"E: ",
"W: ",
"",
"D: "
};
static void _LOG(_LOG_LEVEL logLevel, char* file, char* func, unsigned int line, const char* format, ...)
{ if (logLevel > LOG_LEVEL)
{
if (logLevel > LOG_LEVEL)
return;
va_list args;
@@ -53,11 +56,13 @@ static void _LOG(_LOG_LEVEL logLevel, char* file, char* func, unsigned int line,
va_end(args);
if (logLevel == LOG_LEVEL_ERROR)
{ std::cerr << file << ":" << line << " " << func << std::endl;
{
std::cerr << file << ":" << line << " " << func << std::endl;
std::cerr << _LOG_LEVEL_PREFIX[logLevel] << message << std::endl;
}
else
{ std::cout << _LOG_LEVEL_PREFIX[logLevel] << message << std::endl;
{
std::cout << _LOG_LEVEL_PREFIX[logLevel] << message << std::endl;
}
delete[] message;