Delete Exceptions.h and its last user: Renderer.cpp

src/CMakeLists.txt

@@ -190,7 +190,6 @@ set (INPUT_HEADERS
 )
 
 set (RENDERERS_SRC
-	renderers/Renderer.cpp
 )
 
 set (RENDERERS_HEADERS

src/Crown.h

@@ -26,7 +26,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 #pragma once
 
 // Core
-#include "Exceptions.h"
 #include "Types.h"
 #include "Args.h"
 

src/Device.cpp

@@ -34,6 +34,8 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "String.h"
 #include "Args.h"
 #include <cstdlib>
+#include "GLRenderer.h"
+//#include "GLESRenderer.h"
 
 namespace crown
 {
@@ -91,7 +93,11 @@ bool Device::Init(int argc, char** argv)
 	// Creates the renderer
 	if (!mRenderer)
 	{
-		mRenderer = Renderer::CreateRenderer();
+		#ifdef CROWN_USE_OPENGL
+		mRenderer = new GLRenderer;
+		#elif CROWN_USE_OPENGLES
+		mRenderer = new GLESRenderer;
+		#endif
 	}
 	Log::D("Renderer created.");
 
@@ -120,7 +126,7 @@ void Device::Shutdown()
 
 	if (mRenderer)
 	{
-		Renderer::DestroyRenderer(mRenderer);
+		delete mRenderer;
 	}
 
 	Log::I("Releasing Render Window...");

src/core/Exceptions.h

@@ -1,95 +0,0 @@
-/*
-Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#pragma once
-
-#include <exception>
-#include <string.h>
-#include "Types.h"
-
-class Exception: public std::exception
-{
-public:
-	Exception(const char* message): mMessage(AllocErrorMsg(message)) { }
-	virtual ~Exception() throw()
-	{
-		delete mMessage;
-	}
-
-	const char* what() const throw()
-	{
-		return mMessage;
-	}
-
-	inline const char* GetMessage() const throw()
-	{
-		return what();
-	}
-
-	static char* AllocErrorMsg(const char* msg)
-	{
-		char* m = new char[strlen(msg)+1];
-		strcpy(m, msg);
-		return m;
-	}
-
-private:
-	char* mMessage;
-};
-
-class NullPoint32_terException: public Exception
-{
-public:
-	NullPoint32_terException(const char* message): Exception(message) { }
-	virtual ~NullPoint32_terException() throw() { }
-};
-
-class ArgumentException: public Exception
-{
-public:
-	ArgumentException(const char* message): Exception(message) { }
-	virtual ~ArgumentException() throw() { }
-};
-
-class FileOpenException: public Exception
-{
-public:
-	FileOpenException(const char* message): Exception(message) { }
-	virtual ~FileOpenException() throw() { }
-};
-
-class FileIOException: public Exception
-{
-public:
-	FileIOException(const char* message): Exception(message) { }
-	virtual ~FileIOException() throw() { }
-};
-
-class InvalidOperationException: public Exception
-{
-public:
-	InvalidOperationException(const char* message): Exception(message) { }
-	virtual ~InvalidOperationException() throw() { }
-};

src/renderers/Renderer.cpp

@@ -1,63 +0,0 @@
-/*
-Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include "Renderer.h"
-#include "Config.h"
-#include "Exceptions.h"
-
-#if defined(CROWN_USE_OPENGL)
-	#include "GLRenderer.h"
-#elif defined(CROWN_USE_OPENGLES)
-	#include "GLESRenderer.h"
-#endif
-
-namespace crown
-{
-
-Renderer* Renderer::CreateRenderer()
-{
-	Renderer* renderer = NULL;
-
-	#if (defined(LINUX) || defined(WINDOWS)) && defined(CROWN_USE_OPENGL)
-	renderer = new GLRenderer;
-	#elif defined(CROWN_OS_ANDROID) || (defined(LINUX) && defined(CROWN_USE_OPENGLES))
-	renderer = new GLESRenderer;
-	#endif
-
-	return renderer;
-}
-
-void Renderer::DestroyRenderer(Renderer* renderer)
-{
-	if (renderer == NULL)
-	{
-		throw NullPoint32_terException("Renderer::DestroyRenderer: renderer == NULL");
-	}
-
-	delete renderer;
-}
-
-} // namespace crown
-