Reworking the logging system.

library/PolyVoxCore/include/PolyVoxCore/BaseVolume.h

@@ -24,7 +24,6 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_BaseVolume_H__
 #define __PolyVox_BaseVolume_H__
 
-#include "PolyVoxCore/Log.h"
 #include "PolyVoxCore/Region.h"
 #include "PolyVoxCore/Vector.h"
 

library/PolyVoxCore/include/PolyVoxCore/Impl/Config.h

@@ -25,6 +25,7 @@ freely, subject to the following restrictions:
 #define __PolyVox_Config_H__
 
 #define POLYVOX_ASSERTS_ENABLED
+#define POLYVOX_LOGGING_ENABLED
 #define POLYVOX_THROW_ENABLED
 
 #endif

library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h

@@ -55,6 +55,37 @@ freely, subject to the following restrictions:
 
 #define POLYVOX_UNUSED(x) do { (void)sizeof(x); } while(0)
 
+/*
+ * Logging
+ * --------
+ * PolyVox provides basic logging facilities which can be redirected by your application.
+ */
+
+namespace PolyVox
+{
+	class LogLevels
+	{
+	public:
+		enum LogLevel
+		{
+			Debug,
+			Info,
+			Warning,
+			Error,
+			Fatal
+		};
+	};
+	typedef LogLevels::LogLevel LogLevel;
+
+	typedef void (*LogHandler)(const std::string& message, LogLevel logLevel);
+
+	LogHandler getLogHandler();
+	void setLogHandler(LogHandler newHandler);
+
+	//The actual logging function
+	void log(const std::string& message, LogLevel logLevel);
+}
+
 /*
  * Assertions
  * ----------
@@ -134,7 +165,9 @@ freely, subject to the following restrictions:
  * ...
  */
 #ifdef POLYVOX_THROW_ENABLED
-	#define POLYVOX_THROW(type, message) throw type((message))
+	#define POLYVOX_THROW(type, message) \
+		log(message, LogLevels::Error); \
+		throw type((message))
 #else
 	namespace PolyVox
 	{
@@ -145,6 +178,7 @@ freely, subject to the following restrictions:
 	}
 
 	#define POLYVOX_THROW(type, message) \
+		log(message, LogLevels::Error); \
 		type except = (type)((message)); \
 		getThrowHandler()((except), __FILE__, __LINE__)
 #endif

library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h

@@ -27,7 +27,6 @@ freely, subject to the following restrictions:
 #include "PolyVoxCore/BaseVolume.h"
 #include "Impl/Block.h"
 #include "PolyVoxCore/Compressor.h"
-#include "PolyVoxCore/Log.h"
 #include "PolyVoxCore/Region.h"
 #include "PolyVoxCore/Vector.h"
 

library/PolyVoxCore/include/PolyVoxCore/Log.h

@@ -1,63 +0,0 @@
-/*******************************************************************************
-Copyright (c) 2005-2009 David Williams
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-    1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
-
-    2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
-
-    3. This notice may not be removed or altered from any source
-    distribution. 	
-*******************************************************************************/
-
-#ifndef __PolyVox_Log_H__
-#define __PolyVox_Log_H__
-
-#include "Impl/TypeDef.h"
-
-#include <string>
-
-//Note: The functions in this file are not for the user to call - they are 
-//intended for internal use only. The only exception is that you may set the
-//logHandler pointer to point at your own handling funtion for printing, etc.
-
-namespace PolyVox
-{
-	////////////////////////////////////////////////////////////////////////////////
-	/// Log levels for filtering logging events
-	////////////////////////////////////////////////////////////////////////////////
-	enum LogSeverity
-	{
-		LS_DEBUG, ///< Only displayed if it is a debug build
-		LS_INFO,
-		LS_WARN,
-		LS_ERROR
-	};	
-
-	POLYVOX_API extern void (*logHandler)(std::string, int severity);
-}
-
-//Debug severity messages are only used if we are a debug build
-#ifdef _DEBUG
-	#define POLYVOX_LOG_DEBUG(message) if(logHandler){logHandler(message, LS_DEBUG);}
-#else
-	#define POLYVOX_LOG_DEBUG(message)
-#endif
-
-//Other severity levels work in both debug and release
-#define POLYVOX_LOG_INFO(message) if(logHandler){logHandler(message, LS_INFO);}
-#define POLYVOX_LOG_WARN(message) if(logHandler){logHandler(message, LS_WARN);}
-#define POLYVOX_LOG_ERROR(message) if(logHandler){logHandler(message, LS_ERROR);}
-
-#endif

library/PolyVoxCore/include/PolyVoxCore/RawVolume.h

@@ -25,7 +25,6 @@ freely, subject to the following restrictions:
 #define __PolyVox_RawVolume_H__
 
 #include "PolyVoxCore/BaseVolume.h"
-#include "PolyVoxCore/Log.h"
 #include "PolyVoxCore/Region.h"
 #include "PolyVoxCore/Vector.h"
 

library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h

@@ -27,7 +27,6 @@ freely, subject to the following restrictions:
 #include "Impl/Utility.h"
 
 #include "PolyVoxCore/BaseVolume.h"
-#include "PolyVoxCore/Log.h"
 #include "PolyVoxCore/Region.h"
 #include "PolyVoxCore/Vector.h"