David Williams
							
						 
					 | 
					
						
						
							
						
						7cad8388b9
					 | 
					
						
						
							
							Merge branch 'develop' into feature/cubiquity-version
						
						
						
						
						
						
						
						Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/Region.h
	library/PolyVoxCore/source/Region.cpp 
						
						
					 | 
					
						2013-06-27 21:40:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						72b3cd5154
					 | 
					
						
						
							
							Tidying up and comments.
						
						
						
						
						
						
					 | 
					
						2013-06-26 23:39:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						885a50e781
					 | 
					
						
						
							
							Merge branch 'develop' into feature/paging
						
						
						
						
						
						
					 | 
					
						2013-06-26 22:49:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						56cf423bfd
					 | 
					
						
						
							
							Added POLYVOX_THROW_IF macro to simplify error handling.
						
						
						
						
						
						
					 | 
					
						2013-06-26 22:39:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						1064ea1c47
					 | 
					
						
						
							
							Stripped out unused code.
						
						
						
						
						
						
					 | 
					
						2013-06-26 22:14:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						938eea7c8e
					 | 
					
						
						
							
							Work on tidying LargeVolume...
						
						
						
						
						
						
					 | 
					
						2013-06-26 22:01:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						44d525f591
					 | 
					
						
						
							
							Tidying up and refactoring LargeVolume.
						
						
						
						
						
						
					 | 
					
						2013-06-26 17:02:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						8ab6d73f0a
					 | 
					
						
						
							
							Work on LargeVolume refactoring - getting FilePager working.
						
						
						
						
						
						
					 | 
					
						2013-06-25 23:34:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						0cf3de4e76
					 | 
					
						
						
							
							Removed LoadedBlock and put timestamp into regular Block.
						
						
						
						
						
						
					 | 
					
						2013-06-25 22:54:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						900e4e0ecd
					 | 
					
						
						
							
							Refactoring some LargeVolume code...
						
						
						
						
						
						
					 | 
					
						2013-06-25 21:18:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						a2210fc3f0
					 | 
					
						
						
							
							Renamed compress and uncompress functions.
						
						
						
						
						
						
					 | 
					
						2013-06-25 20:57:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						6b92a5ab51
					 | 
					
						
						
							
							More tidying/refaxctoring of Block class.
						
						
						
						
						
						
					 | 
					
						2013-06-25 17:04:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						baed7ddccc
					 | 
					
						
						
							
							Tidying up and refactoring of block class.
						
						
						
						
						
						
					 | 
					
						2013-06-25 16:45:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						c346d19d77
					 | 
					
						
						
							
							Doing some tidying in the Block class.
						
						
						
						
						
						
					 | 
					
						2013-06-25 16:20:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						59505d47e9
					 | 
					
						
						
							
							Tidying up Block and FilePager.
						
						
						
						
						
						
					 | 
					
						2013-06-23 23:17:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						e80fa3de7d
					 | 
					
						
						
							
							Added functions for accessing compressed data in block.
						
						
						
						
						
						
					 | 
					
						2013-06-22 12:16:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						5643140882
					 | 
					
						
						
							
							Work on paging to file.
						
						
						
						
						
						
					 | 
					
						2013-06-22 11:19:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						d9ebe96c5a
					 | 
					
						
						
							
							Work on FilePager.
						
						
						
						
						
						
					 | 
					
						2013-06-22 10:16:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						288b448b9f
					 | 
					
						
						
							
							Brought across Region operator<< from Cubiquity branch.
						
						
						
						
						
						
					 | 
					
						2013-06-22 10:16:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						20db75fb75
					 | 
					
						
						
							
							Added null pointer check.
						
						
						
						
						
						
						
						Added files to CMakeLists.txt 
						
						
					 | 
					
						2013-06-22 07:24:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						51f9898467
					 | 
					
						
						
							
							Reenabled unused vertex removal.
						
						
						
						
						
						
					 | 
					
						2013-06-22 06:32:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						a14de4a72e
					 | 
					
						
						
							
							Replaced std::functions with Pager class for paging.
						
						
						
						
						
						
					 | 
					
						2013-06-16 19:48:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						414a012230
					 | 
					
						
						
							
							Creating a Perlin noise generator as a 'pager'.
						
						
						
						
						
						
					 | 
					
						2013-06-16 19:12:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						f86ec57e14
					 | 
					
						
						
							
							Adding skeletons of new paging classes.
						
						
						
						
						
						
					 | 
					
						2013-06-16 18:25:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						1e55859107
					 | 
					
						
						
							
							Renamed WrapMode::None (and others) to avoid conflict with Python reserved word 'None'.
						
						
						
						
						
						
					 | 
					
						2013-06-13 16:49:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						dc7c7eb552
					 | 
					
						
						
							
							Removed old BoundsCheck enum.
						
						
						
						
						
						
					 | 
					
						2013-06-13 16:27:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						6e8030f4b5
					 | 
					
						
						
							
							Changes to hopefully fix Linux compile problems.
						
						
						
						
						
						
					 | 
					
						2013-06-13 15:55:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						62f273bd74
					 | 
					
						
						
							
							Small changes, hoping to help the Linux version compile.
						
						
						
						
						
						
					 | 
					
						2013-06-12 16:52:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Williams
							
						 
					 | 
					
						
						
							
						
						0a4ffc2351
					 | 
					
						
						
							
							Linux compile fixes.
						
						
						
						
						
						
					 | 
					
						2013-06-12 16:38:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						28f81a8ae1
					 | 
					
						
						
							
							Replaced call to getVoxelAt with getVoxel.
						
						
						
						
						
						
					 | 
					
						2013-06-12 15:57:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						2f62a7de8d
					 | 
					
						
						
							
							Marked getVoxelAt functions as deprecated.
						
						
						
						
						
						
					 | 
					
						2013-06-12 15:51:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						27833ee03f
					 | 
					
						
						
							
							Fixed compiler warnings.
						
						
						
						
						
						
					 | 
					
						2013-06-12 15:45:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						3249562d97
					 | 
					
						
						
							
							Removing more calls to getVoxelAt()...
						
						
						
						
						
						
					 | 
					
						2013-06-12 15:41:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						3a9b393459
					 | 
					
						
						
							
							Renamed getVoxelAt in volume samplers to avoid confusion with the version in volumes.
						
						
						
						
						
						
					 | 
					
						2013-06-12 15:10:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						7276b872c4
					 | 
					
						
						
							
							More work replacing getVoxelAt with getVoxel.
						
						
						
						
						
						
					 | 
					
						2013-06-12 15:03:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						60d6658e1a
					 | 
					
						
						
							
							Changed a couple of 'getVoxelAt()' to 'getVoxel()'.
						
						
						
						
						
						
					 | 
					
						2013-06-12 13:38:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						1f2b7e4742
					 | 
					
						
						
							
							Added modified setVoxel functions to SimpleVolume and LargeVolume.
						
						
						
						
						
						
					 | 
					
						2013-06-07 16:57:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						d98856b276
					 | 
					
						
						
							
							setVoxel for RawVolume now takes WrapMode instead of bounds check.
						
						
						
						
						
						
					 | 
					
						2013-06-07 16:49:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						292b21dcdf
					 | 
					
						
						
							
							Added merging of BoundsCheck and WrapMode changes into LargeVolume.
						
						
						
						
						
						
					 | 
					
						2013-06-07 16:13:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						3d82b9643f
					 | 
					
						
						
							
							Applied BoundsCheck and WrapMode merging changes to SimpleVolume.
						
						
						
						
						
						
					 | 
					
						2013-06-07 15:58:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						8ed5edf85f
					 | 
					
						
						
							
							Documentation fix.
						
						
						
						
						
						
					 | 
					
						2013-06-07 15:47:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						900b693e25
					 | 
					
						
						
							
							More work combining BoundsCheck with WrapMode.
						
						
						
						
						
						
					 | 
					
						2013-06-07 15:43:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						745f24eab8
					 | 
					
						
						
							
							More work on wrap modes.
						
						
						
						
						
						
					 | 
					
						2013-06-06 16:39:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						6bc379f0df
					 | 
					
						
						
							
							More work combining WrapMode and BoundsCheck
						
						
						
						
						
						
					 | 
					
						2013-06-06 16:26:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						2b03e84f83
					 | 
					
						
						
							
							Combining BoundsChecks and WrapMode into a single enum.
						
						
						
						
						
						
					 | 
					
						2013-06-06 16:07:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						073c415a38
					 | 
					
						
						
							
							Work on new getVoxel() functions.
						
						
						
						
						
						
					 | 
					
						2013-05-29 16:07:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						de8c69456f
					 | 
					
						
						
							
							Added macro to throw an exception but not log it. Useful in some high-performance scenarios.
						
						
						
						
						
						
					 | 
					
						2013-05-27 15:09:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						0c7002a1ce
					 | 
					
						
						
							
							Avoided double bounds check.
						
						
						
						
						
						
					 | 
					
						2013-05-27 14:24:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						869f5f6c49
					 | 
					
						
						
							
							Added function to check whether one region is inside of another.
						
						
						
						
						
						
					 | 
					
						2013-05-27 14:01:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daviw Williams
							
						 
					 | 
					
						
						
							
						
						61dd59c9bc
					 | 
					
						
						
							
							Merge branch 'develop' into feature/bounds-checks
						
						
						
						
						
						
					 | 
					
						2013-05-27 13:00:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |