Merge branch 'develop' into feature/cubiquity-version

library/PolyVoxCore/source/Impl/MinizWrapper.cpp

@@ -0,0 +1,29 @@
+/*******************************************************************************
+Copyright (c) 2005-2013 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. 	
+*******************************************************************************/
+
+// Please see this header file for comment about the purpose of MinizWrapper.h/cpp
+#include "PolyVoxCore/Impl/MinizWrapper.h"
+
+// Get the full definitions, not just the declarations.
+#undef MINIZ_HEADER_FILE_ONLY
+#include "PolyVoxCore/Impl/miniz.c"

library/PolyVoxCore/source/Impl/Timer.cpp

@@ -78,16 +78,19 @@ namespace PolyVox
 
 	void Timer::start(void)
 	{
+		m_start = clock::now();
 	}
 
 	float Timer::elapsedTimeInSeconds(void)
 	{
-		return 0.0f;
+		std::chrono::duration<float> elapsed_seconds = clock::now() - m_start;
+		return elapsed_seconds.count();
 	}
 
 	uint32_t Timer::elapsedTimeInMilliSeconds(void)
 	{
-		return 0;
+		std::chrono::duration<float, std::milli> elapsed_milliseconds = clock::now() - m_start;
+		return elapsed_milliseconds.count();
 	}
 #endif //_MSC_VER
 }