- Removing "Common.h" from every file

- Removing using namespace for std and boost
- Other major refactoring
It will compile

src/Core/App.cpp

@@ -2,6 +2,7 @@
 #include <sstream>
 #include <SDL/SDL.h>
 #include <iostream>
+#include <iomanip>
 #include <boost/filesystem.hpp>
 #include "App.h"
 #include "Scene.h"
@@ -20,9 +21,10 @@ bool App::isCreated = false;
 //======================================================================================================================
 void App::handleMessageHanlderMsgs(const char* file, int line, const char* func, const std::string& msg)
 {
-	std::cout << file << ":" << line << " " << func << ": " << msg << std::endl;
+	std::cout << "(" << file << ":" << line << " "<< func << ") " << msg << std::endl;
 }
 
+
 //======================================================================================================================
 // parseCommandLineArgs                                                                                                =
 //======================================================================================================================
@@ -41,7 +43,8 @@ void App::parseCommandLineArgs(int argc, char* argv[])
 		}
 		else
 		{
-			FATAL("Incorrect command line argument \"" << arg << "\"");
+			std::cerr << "Incorrect command line argument \"" << arg << "\"" << std::endl;
+			abort();
 		}
 	}
 }
@@ -68,7 +71,7 @@ App::App(int argc, char* argv[], Object* parent):
 
 	if(isCreated)
 	{
-		FATAL("You cannot init a second App instance");
+		throw EXCEPTION("You cannot init a second App instance");
 	}
 
 	isCreated = true;
@@ -78,18 +81,18 @@ App::App(int argc, char* argv[], Object* parent):
 	if(!boost::filesystem::exists(settingsPath))
 	{
 		INFO("Creating settings dir \"" + settingsPath.string() + "\"");
-		filesystem::create_directory(settingsPath);
+		boost::filesystem::create_directory(settingsPath);
 	}
 
 	cachePath = settingsPath / "cache";
-	if(filesystem::exists(cachePath))
+	if(boost::filesystem::exists(cachePath))
 	{
 		INFO("Deleting dir \"" + cachePath.string() + "\"");
-		filesystem::remove_all(cachePath);
+		boost::filesystem::remove_all(cachePath);
 	}
 
 	INFO("Creating cache dir \"" + cachePath.string() + "\"");
-	filesystem::create_directory(cachePath);
+	boost::filesystem::create_directory(cachePath);
 
 	// create the subsystems. WATCH THE ORDER
 	scriptingEngine = new ScriptingEngine(this);
@@ -226,7 +229,7 @@ void App::waitForNextFrame()
 
 void App::printAppInfo()
 {
-	stringstream msg;
+	std::stringstream msg;
 	msg << "App info: debugging ";
 	#if DEBUG_ENABLED == 1
 		msg << "on, ";
@@ -289,7 +292,7 @@ void App::execStdinScpripts()
 {
 	while(1)
 	{
-		string cmd = app->getStdinLintener().getLine();
+		std::string cmd = app->getStdinLintener().getLine();
 
 		if(cmd.length() < 1)
 		{

src/Core/App.h

@@ -137,7 +137,7 @@ inline MainRenderer& App::getMainRenderer()
 
 inline MessageHandler& App::getMessageHandler()
 {
-	RASSERT_THROW_EXCEPTION(mainRenderer == NULL);
+	RASSERT_THROW_EXCEPTION(messageHandler == NULL);
 	return *messageHandler;
 }
 

src/Core/Common.cpp

@@ -1,147 +0,0 @@
-#include <iostream>
-#include <GL/glew.h>
-#include <GL/glu.h>
-#include <boost/filesystem.hpp>
-#include "Common.h"
-#include "App.h"
-#include "Util.h"
-
-
-// for the colors and formating see http://www.dreamincode.net/forums/showtopic75171.htm
-static const char* terminalColors [MT_NUM + 1] = {
-	"\033[1;31;6m", // error
-	"\033[1;33;6m", // warning
-	"\033[1;31;6m", // fatal
-	"\033[1;31;6m", // dbg error
-	"\033[1;32;6m", // info
-	"\033[0;;m" // default color
-};
-
-
-//======================================================================================================================
-// getFunctionFromPrettyFunction                                                                                       =
-//======================================================================================================================
-/**
- * The function gets __PRETTY_FUNCTION__ and strips it to get only the function name with its namespace
- */
-static std::string getFunctionFromPrettyFunction(const char* prettyFunction)
-{
-	string ret(prettyFunction);
-
-	size_t index = ret.find("(");
-
-	if (index != string::npos)
-		ret.erase(index);
-
-	index = ret.rfind(" ");
-	if (index != string::npos)
-		ret.erase(0, index + 1);
-
-	return ret;
-}
-
-
-//======================================================================================================================
-// msgPrefix                                                                                                           =
-//======================================================================================================================
-std::ostream& msgPrefix(MsgType msgType, const char* file, int line, const char* func)
-{
-	// select c stream
-	ostream* cs;
-
-	switch(msgType)
-	{
-		case MT_ERROR:
-		case MT_WARNING:
-		case MT_FATAL:
-		case MT_DEBUG_ERR:
-			cs = &cerr;
-			break;
-
-		case MT_INFO:
-			cs = &cout;
-			break;
-
-		default:
-			break;
-	}
-
-
-	// print terminal color
-	if(app && app->isTerminalColoringEnabled())
-	{
-		(*cs) << terminalColors[msgType];
-	}
-
-
-	// print message info
-	switch(msgType)
-	{
-		case MT_ERROR:
-			(*cs) << "Error";
-			break;
-
-		case MT_WARNING:
-			(*cs) << "Warning";
-			break;
-
-		case MT_FATAL:
-			(*cs) << "Fatal";
-			break;
-
-		case MT_DEBUG_ERR:
-			(*cs) << "Debug Err";
-			break;
-
-		case MT_INFO:
-			(*cs) << "Info";
-			break;
-
-		default:
-			break;
-	}
-
-	// print caller info
-	(*cs) << " (" << filesystem::path(file).filename() << ":" << line << " " << func <<
-	         "): ";
-
-	return (*cs);
-}
-
-
-//======================================================================================================================
-// msgSuffix                                                                                                           =
-//======================================================================================================================
-ostream& msgSuffix(ostream& cs)
-{
-	if(app && app->isTerminalColoringEnabled())
-		cs << terminalColors[MT_NUM];
-
-	cs << endl;
-	return cs;
-}
-
-
-//======================================================================================================================
-// msgSuffixFatal                                                                                                      =
-//======================================================================================================================
-ostream& msgSuffixFatal(ostream& cs)
-{
-	msgSuffix(cs);
-	::abort();
-	return cs;
-}
-
-
-//======================================================================================================================
-// msgGlError                                                                                                          =
-//======================================================================================================================
-bool msgGlError(const char* file, int line, const char* func)
-{
-	GLenum errId = glGetError();
-	if(errId == GL_NO_ERROR)
-		return true;
-	msgPrefix(MT_ERROR, file, line, func) << "OpenGL Err: " << gluErrorString(errId) << msgSuffix;
-	return false;
-}
-

src/Core/Common.h

@@ -1,120 +0,0 @@
-#ifndef COMMON_H
-#define COMMON_H
-
-/*#include <iostream>
-#include "StdTypes.h"
-#include "Properties.h"
-#include "Exception.h"
-
-// dummy define just to use the namespace
-namespace boost
-{}
-
-namespace M
-{}
-
-
-//======================================================================================================================
-// Defines sanity checks                                                                                               =
-//======================================================================================================================
-#if !defined(DEBUG_ENABLED)
-	#error "DEBUG_ENABLED is not defined"
-#endif
-
-#if !defined(PLATFORM_LINUX)
-	#if !defined(PLATFORM_WIN)
-		#error "PLATFORM not defined"
-	#endif
-#endif
-
-
-//======================================================================================================================
-// MACROS                                                                                                              =
-//======================================================================================================================
-
-enum MsgType
-{
-	MT_ERROR,
-	MT_WARNING,
-	MT_FATAL,
-	MT_DEBUG_ERR,
-	MT_INFO,
-	MT_NUM
-};
-
-extern std::ostream& msgPrefix(MsgType msgType, const char* file, int line, const char* func);
-extern std::ostream& msgSuffix(std::ostream& cs);
-extern std::ostream& msgSuffixFatal(std::ostream& cs);
-extern bool msgGlError(const char* file, int line, const char* func);
-
-#ifdef __GNUG__
-	#define FUNCTION __func__
-#else
-	#define FUNCTION __func__
-#endif
-
-/// Use it like this: ERROR("tralala" << 10 << ' ')
-#define ERROR(x) msgPrefix(MT_ERROR, __FILE__, __LINE__, FUNCTION) << x << msgSuffix
-
-/// Show a warning
-#define WARNING(x) msgPrefix(MT_WARNING, __FILE__, __LINE__, FUNCTION) << x << msgSuffix
-
-/// Show an error and exit application
-#define FATAL(x) msgPrefix(MT_FATAL, __FILE__, __LINE__, FUNCTION) << x << ". Bye!" << msgSuffixFatal
-
-/// Show an info message
-#define INFO(x) msgPrefix(MT_INFO, __FILE__, __LINE__, FUNCTION) << x << msgSuffix
-
-/// Reverse assertion
-#if DEBUG_ENABLED == 1
-	#define DEBUG_ERR(x) \
-		if(x) \
-			msgPrefix(MT_DEBUG_ERR, __FILE__, __LINE__, FUNCTION) << #x << msgSuffix
-#else
-	#define DEBUG_ERR(x)
-#endif
-
-
-/// code that executes on debug
-#if DEBUG_ENABLED == 1
-	#define DEBUG_CODE if(true)
-#else
-	#define DEBUG_CODE if(false)
-#endif
-
-/// OpenGL check
-#define GL_OK() msgGlError(__FILE__, __LINE__, FUNCTION)
-
-
-/// a line so I dont have to write the same crap all the time
-#define FOREACH(x) for(int i=0; i<x; i++)
-
-
-/// Just print
-#define PRINT(x) std::cout << x << std::endl
-
-
-/// BUFFER_OFFSET
-#define BUFFER_OFFSET(i) ((char *)NULL + (i))
-
-
-//======================================================================================================================
-// memZero                                                                                                             =
-//======================================================================================================================
-/// sets memory to zero
-template <typename Type> inline void memZero(Type& t)
-{
-	memset(&t, 0, sizeof(Type));
-}
-
-
-//======================================================================================================================
-// Application                                                                                                         =
-//======================================================================================================================
-*
- * The only public variable @see App
-
-extern class App* app;*/
-
-
-#endif

src/Input/Input.cpp

@@ -25,8 +25,8 @@ bool hideCursor = true;
 //======================================================================================================================
 void reset(void)
 {
-	DEBUG_ERR(keys.size() < 1);
-	DEBUG_ERR(mouseBtns.size() < 1);
+	RASSERT_THROW_EXCEPTION(keys.size() < 1);
+	RASSERT_THROW_EXCEPTION(mouseBtns.size() < 1);
 	memset(&keys[0], 0, keys.size()*sizeof(short));
 	memset(&mouseBtns[0], 0, mouseBtns.size()*sizeof(short));
 	mousePosNdc = Vec2(0.0);

src/Input/Input.h

@@ -2,7 +2,6 @@
 #define INPUT_H
 
 #include <SDL/SDL_scancode.h>
-#include "Common.h"
 #include "Vec.h"
 #include "App.h"
 #include "Math.h"

src/Main.cpp

@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <iostream>
 #include <fstream>
-#include "Common.h"
 
 #include "Input.h"
 #include "Camera.h"

src/Misc/map.h

@@ -2,7 +2,6 @@
 #ifndef _MAP_H_
 #define _MAP_H_
 
-#include "Common.h"
 #include "collision.h"
 #include "Vec.h"
 #include "RsrcPtr.h"

src/Misc/skybox.h

@@ -1,7 +1,6 @@
 #ifndef _SKYBOX_H_
 #define _SKYBOX_H_
 
-#include "Common.h"
 #include "Texture.h"
 #include "Math.h"
 #include "RsrcPtr.h"

src/Physics/BtAndAnkiConvertors.h

@@ -3,7 +3,6 @@
 
 #include <btBulletCollisionCommon.h>
 #include <btBulletDynamicsCommon.h>
-#include "Common.h"
 #include "Math.h"
 
 

src/Physics/DebugDrawer.cpp

@@ -2,6 +2,7 @@
 #include "MainRenderer.h"
 #include "App.h"
 #include "BtAndAnkiConvertors.h"
+#include "Messaging.h"
 
 
 //======================================================================================================================
@@ -43,8 +44,7 @@ void DebugDrawer::drawBox(const btVector3& min, const btVector3& max, const btVe
 //======================================================================================================================
 // drawBox                                                                                                             =
 //======================================================================================================================
-void DebugDrawer::drawBox(const btVector3& min, const btVector3& max, const btTransform& trans,
-                                 const btVector3& color)
+void DebugDrawer::drawBox(const btVector3& min, const btVector3& max, const btTransform& trans, const btVector3& color)
 {
 	Mat4 trf(Mat4::getIdentity());
 	trf(0, 0) = max.getX() - min.getX();
@@ -66,7 +66,7 @@ void DebugDrawer::drawBox(const btVector3& min, const btVector3& max, const btTr
 void DebugDrawer::drawContactPoint(const btVector3& /*pointOnB*/, const btVector3& /*normalOnB*/,
                                           btScalar /*distance*/, int /*lifeTime*/, const btVector3& /*color*/)
 {
-	WARNING("Unimplemented");
+	//WARNING("Unimplemented");
 }
 
 
@@ -75,7 +75,7 @@ void DebugDrawer::drawContactPoint(const btVector3& /*pointOnB*/, const btVector
 //======================================================================================================================
 void DebugDrawer::reportErrorWarning(const char* warningString)
 {
-	ERROR(warningString);
+	throw EXCEPTION(warningString);
 }
 
 
@@ -84,5 +84,5 @@ void DebugDrawer::reportErrorWarning(const char* warningString)
 //======================================================================================================================
 void DebugDrawer::draw3dText(const btVector3& /*location*/, const char* /*textString*/)
 {
-	WARNING("Unimplemented");
+	//WARNING("Unimplemented");
 }

src/Physics/DebugDrawer.h

@@ -2,7 +2,6 @@
 #define DEBUGDRAWER_H
 
 #include <LinearMath/btIDebugDraw.h>
-#include "Common.h"
 
 
 /**

src/Physics/MotionState.h

@@ -2,7 +2,6 @@
 #define MOTIONSTATE_H
 
 #include <LinearMath/btMotionState.h>
-#include "Common.h"
 #include "SceneNode.h"
 #include "Object.h"
 

src/Physics/PhyCharacter.h

@@ -1,7 +1,6 @@
 #ifndef PHY_CHARACTER_H
 #define PHY_CHARACTER_H
 
-#include "Common.h"
 #include "Physics.h"
 #include "Math.h"
 #include "Object.h"

src/Physics/Physics.h

@@ -3,7 +3,6 @@
 
 #include <btBulletCollisionCommon.h>
 #include <btBulletDynamicsCommon.h>
-#include "Common.h"
 #include "Object.h"
 #include "BtAndAnkiConvertors.h"
 #include "DebugDrawer.h"

src/Physics/Ragdoll.h

@@ -1,7 +1,6 @@
 #ifndef _RAGDOLL_H_
 #define _RAGDOLL_H_
 
-#include "Common.h"
 #include "PhyCommon.h"
 
 

src/Physics/RigidBody.h

@@ -4,7 +4,6 @@
 #include <memory>
 #include <btBulletDynamicsCommon.h>
 #include <btBulletCollisionCommon.h>
-#include "Common.h"
 #include "Math.h"
 #include "Object.h"
 

src/Renderer/Ez.h

@@ -1,7 +1,6 @@
 #ifndef EZ_H
 #define EZ_H
 
-#include "Common.h"
 #include "RenderingStage.h"
 #include "Fbo.h"
 

src/Renderer/Ms.h

@@ -1,7 +1,6 @@
 #ifndef MS_H
 #define MS_H
 
-#include "Common.h"
 #include "RenderingStage.h"
 #include "Ez.h"
 #include "Texture.h"

src/Renderer/Pps.h

@@ -1,7 +1,6 @@
 #ifndef PPS_H
 #define PPS_H
 
-#include "Common.h"
 #include "RenderingStage.h"
 #include "Fbo.h"
 #include "Hdr.h"

src/Renderer/RendererInitializer.h

@@ -2,12 +2,9 @@
 #define RENDERER_INITIALIZER_H
 
 #include <cstring>
-#include "Common.h"
 
 
-/**
- * A struct to initialize the renderer. It contains a few extra params for the MainRenderer
- */
+/// A struct to initialize the renderer. It contains a few extra params for the MainRenderer
 struct RendererInitializer
 {
 	// Ms

src/Renderer/RenderingStage.h

@@ -1,16 +1,12 @@
 #ifndef RENDERING_STAGE_H
 #define RENDERING_STAGE_H
 
-#include "Common.h"
-
 
 class Renderer;
 class RendererInitializer;
 
 
-/**
- * Rendering stage
- */
+/// Rendering stage
 class RenderingStage
 {
 	public:

src/Renderer/Sm.h

@@ -1,7 +1,6 @@
 #ifndef SM_H
 #define SM_H
 
-#include "Common.h"
 #include "RenderingStage.h"
 #include "Fbo.h"
 #include "Texture.h"

src/Renderer/Smo.h

@@ -1,7 +1,6 @@
 #ifndef SMO_H
 #define SMO_H
 
-#include "Common.h"
 #include "RenderingStage.h"
 #include "Fbo.h"
 #include "Vbo.h"

src/Renderer/Ssao.h

@@ -1,7 +1,6 @@
 #ifndef SSAO_H
 #define SSAO_H
 
-#include "Common.h"
 #include "RenderingStage.h"
 #include "Fbo.h"
 #include "Texture.h"

src/Resources/Material.cpp

@@ -140,7 +140,7 @@ void Material::load(const char* filename)
 			}
 
 			token = &scanner.getNextToken();
-			string shaderFilename;
+			std::string shaderFilename;
 			// Just a string
 			if(token->getCode() == Scanner::TC_STRING)
 			{
@@ -162,11 +162,11 @@ void Material::load(const char* filename)
 				{
 					throw PARSER_EXCEPTION_EXPECTED("string");
 				}
-				string sProgFilename = token->getValue().getString();
+				std::string sProgFilename = token->getValue().getString();
 
 				// get the switches
-				string source;
-				string prefix;
+				std::string source;
+				std::string prefix;
 				while(true)
 				{
 					token = &scanner.getNextToken();
@@ -198,7 +198,7 @@ void Material::load(const char* filename)
 						throw PARSER_EXCEPTION("Incorrect switch " + token->getString());
 					}
 
-					source += string("#define ") + token->getString() + "\n";
+					source += std::string("#define ") + token->getString() + "\n";
 					prefix.push_back(mss->prefix);
 				} // end get the switches
 
@@ -344,7 +344,7 @@ void Material::load(const char* filename)
 					throw PARSER_EXCEPTION_EXPECTED("identifier");
 				}
 
-				string varName;
+				std::string varName;
 				varName = token->getValue().getString();
 
 				userDefinedVars.push_back(new UserDefinedUniVar); // create new var

src/Resources/ShaderProg.cpp

@@ -5,6 +5,7 @@
 #include "ShaderPrePreprocessor.h"
 #include "Texture.h" // For certain setters
 #include "App.h" // To get cache dir
+#include "GlException.h"
 
 
 #define SPROG_EXCEPTION(x) EXCEPTION("Shader prog \"" + getRsrcName() + "\": " + x)
@@ -161,11 +162,11 @@ void ShaderProg::link()
 	{
 		int info_len = 0;
 		int charsWritten = 0;
-		string infoLogTxt;
+		std::string infoLogTxt;
 
 		glGetProgramiv(glId, GL_INFO_LOG_LENGTH, &info_len);
 
-		infoLogTxt.reserve(info_len + 1);
+		infoLogTxt.resize(info_len + 1);
 		glGetProgramInfoLog(glId, info_len, &charsWritten, &infoLogTxt[0]);
 		throw SPROG_EXCEPTION("Link error log follows:\n" + infoLogTxt);
 	}
@@ -196,7 +197,7 @@ void ShaderProg::getUniAndAttribVars()
 		int loc = glGetAttribLocation(glId, name_);
 		if(loc == -1) // if -1 it means that its an FFP var
 		{
-			std::cout << "You are using FFP vertex attributes (\"" << name_ << "\")" << endl; /// @todo fix this
+			std::cout << "You are using FFP vertex attributes (\"" << name_ << "\")" << std::endl; /// @todo fix this
 			continue;
 		}
 
@@ -239,7 +240,11 @@ void ShaderProg::bindCustomAttribLocs(const ShaderPrePreprocessor& pars) const
 		glBindAttribLocation(glId, loc, name.c_str());
 
 		// check for error
-		if(!GL_OK())
+		try
+		{
+			ON_GL_FAIL_THROW_EXCEPTION();
+		}
+		catch(std::exception& e)
 		{
 			throw SPROG_EXCEPTION("Something went wrong for attrib \"" + name + "\" and location " +
 			                      boost::lexical_cast<std::string>(loc));
@@ -350,10 +355,10 @@ bool ShaderProg::attribVarExists(const char* name) const
 std::string ShaderProg::createSrcCodeToCache(const char* sProgFPathName, const char* preAppendedSrcCode,
                                              const char* newFNamePrefix)
 {
-	filesystem::path newfPathName = app->getCachePath() /
-	                                (std::string(newFNamePrefix) + "_" + filesystem::path(sProgFPathName).filename());
+	boost::filesystem::path newfPathName = app->getCachePath() /
+			(std::string(newFNamePrefix) + "_" + boost::filesystem::path(sProgFPathName).filename());
 
-	if(filesystem::exists(newfPathName))
+	if(boost::filesystem::exists(newfPathName))
 	{
 		return newfPathName.string();
 	}
@@ -361,7 +366,7 @@ std::string ShaderProg::createSrcCodeToCache(const char* sProgFPathName, const c
 	std::string src_ = Util::readFile(sProgFPathName);
 	std::string src = preAppendedSrcCode + src_;
 
-	ofstream f(newfPathName.string().c_str());
+	std::ofstream f(newfPathName.string().c_str());
 	if(!f.good())
 	{
 		throw EXCEPTION("Cannot open file for writing \"" + newfPathName.string() + "\"");

src/Scene/GhostNode.h

@@ -1,7 +1,6 @@
-#ifndef _GHOSTNODE_H_
-#define _GHOSTNODE_H_
+#ifndef GHOST_NODE_H
+#define GHOST_NODE_H
 
-#include "Common.h"
 #include "SceneNode.h"
 
 /**

src/Scene/SkelModelNode.h

@@ -1,7 +1,6 @@
-#ifndef _SKEL_MODEL_NODE_H_
-#define _SKEL_MODEL_NODE_H_
+#ifndef SKEL_MODEL_NODE_H
+#define SKEL_MODEL_NODE_H
 
-#include "Common.h"
 #include "MeshNode.h" 
 
 

src/Scene/SkelNode.h

@@ -2,7 +2,6 @@
 #define SKEL_NODE_H
 
 #include <memory>
-#include "Common.h"
 #include "SceneNode.h"
 #include "SkelAnimCtrl.h"
 #include "RsrcPtr.h"

src/Ui/Ui.h

@@ -1,7 +1,6 @@
-#ifndef _UI_H_
-#define _UI_H_
+#ifndef UI_H
+#define UI_H
 
-#include "Common.h"
 
 namespace M {
 	class Vec4;

src/Util/Exception.cpp

@@ -9,7 +9,7 @@
 void Exception::init(const char* err_, const char* file, int line, const char* func)
 {
 	char tmpStr[1024];
-	sprintf(tmpStr, "%s:%d %s: exception: %s", file, line, func, err_);
+	sprintf(tmpStr, "(%s:%d %s) Exception: %s", file, line, func, err_);
 	//sprintf(tmpStr, "%s", err_);
 	err = tmpStr;
 }

src/Util/LinuxMalinfo.h

@@ -1,8 +1,6 @@
 #ifndef LINUXMALINFO_H
 #define LINUXMALINFO_H
 
-#include "Common.h"
-
 
 #if defined(PLATFORM_LINUX)