David Williams
							
						 
					 | 
					
						
						
							
						
						a38ac6b895
					 | 
					
						
						
							
							Merge branch 'develop' into feature/cubiquity-version
						
						
						
						
						
						
					 | 
					
						2013-02-07 23:02:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						36968bdd79
					 | 
					
						
						
							
							Merge branch 'develop' into feature/large-volume-work
						
						
						
						
						
						
					 | 
					
						2013-02-07 16:11:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						50c1c7c64b
					 | 
					
						
						
							
							Removed setCompressionEnabled() from LargeVolume.
						
						
						
						
						
						
					 | 
					
						2013-02-07 15:55:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						8d2061bdb5
					 | 
					
						
						
							
							Fixed crash with MaxVerticesPerPosition being set too low.
						
						
						
						
						
						
					 | 
					
						2013-02-04 16:38:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						09c6e2bf26
					 | 
					
						
						
							
							More work making the compression more robust.
						
						
						
						
						
						
					 | 
					
						2013-02-01 16:10:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						a5b768e5f9
					 | 
					
						
						
							
							Working to make compression handing more robust.
						
						
						
						
						
						
					 | 
					
						2013-02-01 15:43:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						3d66db50e0
					 | 
					
						
						
							
							Fixes and comments for RLE compression.
						
						
						
						
						
						
					 | 
					
						2013-02-01 14:09:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						dadcf03d8d
					 | 
					
						
						
							
							Added note.
						
						
						
						
						
						
					 | 
					
						2013-01-31 21:04:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						46e38c4714
					 | 
					
						
						
							
							Work on compression.
						
						
						
						
						
						
					 | 
					
						2013-01-31 16:56:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						a81ec68714
					 | 
					
						
						
							
							Work on compression interface.
						
						
						
						
						
						
					 | 
					
						2013-01-31 16:35:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						36676433be
					 | 
					
						
						
							
							Work on compression interface.
						
						
						
						
						
						
					 | 
					
						2013-01-31 15:54:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						924744c5e6
					 | 
					
						
						
							
							Looks like RLECompressor works as well.
						
						
						
						
						
						
					 | 
					
						2013-01-30 16:58:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						a1cdf78250
					 | 
					
						
						
							
							Block now working with new MinizCompressor. Removing some old compression code.
						
						
						
						
						
						
					 | 
					
						2013-01-30 16:49:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						804a766037
					 | 
					
						
						
							
							Added my two new compressor classes - one based on Miniz and the other based on RLE.
						
						
						
						
						
						
					 | 
					
						2013-01-30 16:04:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						f76be64d6b
					 | 
					
						
						
							
							Work on VolumeResampler (using real convolution).
						
						
						
						
						
						
					 | 
					
						2013-01-27 22:02:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						d3aed35d81
					 | 
					
						
						
							
							Added some (temporary) interpolation code.
						
						
						
						
						
						
					 | 
					
						2013-01-27 13:03:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						4df159dfd7
					 | 
					
						
						
							
							Changed volume sampler wrap mode.
						
						
						
						
						
						
					 | 
					
						2013-01-17 23:51:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						1d1dcc875a
					 | 
					
						
						
							
							Added 'intersects' function to Region.
						
						
						
						
						
						
					 | 
					
						2013-01-14 23:13:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						e05cb1fefc
					 | 
					
						
						
							
							Fix for zero length normals causing a crash.
						
						
						
						
						
						
					 | 
					
						2013-01-14 23:12:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						68ee094cec
					 | 
					
						
						
							
							More work on block compression with miniz.
						
						
						
						
						
						
					 | 
					
						2013-01-11 13:29:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						7bb7be0dec
					 | 
					
						
						
							
							Work on block compression.
						
						
						
						
						
						
					 | 
					
						2013-01-10 16:37:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						c7937b176d
					 | 
					
						
						
							
							Very bad (but functional!) initial implementation of LargeVolume compression with miniz.
						
						
						
						
						
						
					 | 
					
						2013-01-10 16:20:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						575f4824cc
					 | 
					
						
						
							
							Added 'upperPowerOfTwo' function.
						
						
						
						
						
						
					 | 
					
						2013-01-03 00:05:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						bf5a9f7ab8
					 | 
					
						
						
							
							Added getCentre() to Region class.
						
						
						
						
						
						
					 | 
					
						2013-01-02 23:03:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						8fe824eb58
					 | 
					
						
						
							
							Allowing boundary values to be negative.
						
						
						
						
						
						
					 | 
					
						2013-01-02 21:52:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						1e9bb88337
					 | 
					
						
						
							
							Fixed compile errors in VS2008.
						
						
						
						
						
						
					 | 
					
						2013-01-02 14:13:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						ff789d296d
					 | 
					
						
						
							
							Removed remaining traces of assert()
						
						
						
						
						
						
					 | 
					
						2013-01-01 18:08:59 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						4ee55bba2e
					 | 
					
						
						
							
							More replacing assert() with POLYVOX_ASSERT
						
						
						
						
						
						
					 | 
					
						2013-01-01 15:34:34 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						29720c4568
					 | 
					
						
						
							
							More replacing assert() with POLYVOX_ASSERT.
						
						
						
						
						
						
					 | 
					
						2013-01-01 14:50:58 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						4fcc8a15d7
					 | 
					
						
						
							
							Merge branch 'develop' of https://bitbucket.org/volumesoffun/polyvox into develop
						
						
						
						
						
						
					 | 
					
						2013-01-01 14:10:24 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						858a9c0e1b
					 | 
					
						
						
							
							Replaced some assert()s with POLYVOX_ASSERT()s.
						
						
						
						
						
						
					 | 
					
						2013-01-01 14:09:40 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						8e5a09d0fc
					 | 
					
						
						
							
							Android compile fixes.
						
						
						
						
						
						
					 | 
					
						2012-12-29 23:47:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						7e8af71e52
					 | 
					
						
						
							
							Not quite sure what the difference is here...
						
						
						
						
						
						
					 | 
					
						2012-12-29 23:39:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						195a7a17a8
					 | 
					
						
						
							
							Merge branch 'develop' into feature/cubiquity-version
						
						
						
						
						
						
						
						Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h
	library/PolyVoxCore/include/PolyVoxCore/Interpolation.h 
						
						
					 | 
					
						2012-12-29 23:34:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						d5b03cdbc3
					 | 
					
						
						
							
							Made use of POLYVOX_THROW where appropriate.
						
						
						
						
						
						
					 | 
					
						2012-12-29 23:29:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						0c78d97ba5
					 | 
					
						
						
							
							Better defaults for compiler capabilities.
						
						
						
						
						
						
					 | 
					
						2012-12-29 23:16:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						9273094ebd
					 | 
					
						
						
							
							Added config.h to control exceptions and asserts.
						
						
						
						
						
						
					 | 
					
						2012-12-29 22:56:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						161835f42b
					 | 
					
						
						
							
							Boost is no longer needed if <cstdint> is not found.
						
						
						
						
						
						
					 | 
					
						2012-12-29 22:26:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						d6c4cfb9f3
					 | 
					
						
						
							
							Eliminating some of the differences between this branch and 'develop'.
						
						
						
						
						
						
					 | 
					
						2012-12-29 21:48:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						5be6a8ba44
					 | 
					
						
						
							
							Updated default compiler capabilities as used by Visual Studio - these are subject to change further.
						
						
						
						
						
						
					 | 
					
						2012-12-29 20:41:23 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						9051e7558e
					 | 
					
						
						
							
							Setting appropriate build variables for Android version.
						
						
						
						
						
						
					 | 
					
						2012-12-29 21:32:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						50c9934376
					 | 
					
						
						
							
							Bringing minor improvements from Cubiquity's PolyVox into the main branch.
						
						
						
						
						
						
					 | 
					
						2012-12-29 17:02:07 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						d9dcf8a33c
					 | 
					
						
						
							
							Merge branch 'develop' into feature/cubiquity-version
						
						
						
						
						
						
						
						Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h
	library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl
	library/PolyVoxCore/include/PolyVoxCore/DefaultMarchingCubesController.h
	library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h
	library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
	library/PolyVoxCore/include/PolyVoxCore/Vector.inl
	library/PolyVoxCore/source/Impl/Utility.cpp 
						
						
					 | 
					
						2012-12-29 16:44:32 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						ed614802fe
					 | 
					
						
						
							
							Merge branch 'develop' of https://bitbucket.org/volumesoffun/polyvox into develop
						
						
						
						
						
						
					 | 
					
						2012-12-29 14:07:11 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						4f7a6256a9
					 | 
					
						
						
							
							The throwing of exceptions can now be disabled, and in this case a handler function is called instead.
						
						
						
						
						
						
					 | 
					
						2012-12-29 00:11:23 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						25a4ff1c8e
					 | 
					
						
						
							
							Added comment.
						
						
						
						
						
						
					 | 
					
						2012-12-26 20:27:29 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						ecad915001
					 | 
					
						
						
							
							Tidied up some code.
						
						
						
						
						
						
					 | 
					
						2012-12-26 20:18:46 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						64cd6e31b0
					 | 
					
						
						
							
							The non-C++11 implemention of POLYVOX_STATIC_ASSERT is no longer dependent on Boost.
						
						
						
						
						
						
					 | 
					
						2012-12-26 18:16:43 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						cc0b3ae2c0
					 | 
					
						
						
							
							Merge branch 'develop' into feature/error-handling
						
						
						
						
						
						
					 | 
					
						2012-12-26 17:18:42 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						3653528ae5
					 | 
					
						
						
							
							POLYVOX_HALT() implementation for Linux.
						
						
						
						
						
						
					 | 
					
						2012-12-26 16:44:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |