Commit Graph

1101 Commits

Author SHA1 Message Date
2f2475ad0c Avoid ambiguous function resolution of getVoxelImpl
Clang was complaining that the function couldn't access the *Volumes*'s
``getVoxelImpl``. Since we actually want the ``BaseVolume::Sampler``'s
version this solves the problem.
2013-07-04 22:05:06 +01:00
8027f9904d On systems that support it, raise SIGTRAP to drop into the debugger
Clang was being clever and giving a warning for this line so it prompted me
to fix it. I believe that SIGTRAP is the correct way to get the debugger to
work here.

It does a compile-time check for the platform when not using MSVC.

Discussed at http://www.volumesoffun.com/phpBB3/viewtopic.php?p=3766#p3766
2013-07-04 19:35:09 +01:00
9f7f893b68 Change the types of the edgeTable and triTable
The range on values in these tables is much less than needs an int so
making them specific width types packs them smaller.

I measure a 5% decrease in the size of the .so file created at -O3.
2013-07-04 19:35:09 +01:00
bd60f34bd7 Removing explicit functions to control the number of compressed and uncompressed blocks in memory, and letting the user set a memory limit instead. 2013-07-04 16:23:58 +02:00
c843e7e705 Remove unnecessary consts.
Since a copy is being made in the return, the const qualifiers are
ignored anyway.
2013-07-01 12:23:21 +01:00
aab1149e8f Merge branch 'develop' into feature/cubiquity-version 2013-06-28 20:26:25 +02:00
edf1f5d665 Fix compile error caused by missing #include. 2013-06-28 16:47:02 +01:00
059a4b9465 Reverted accidental commit of test code. 2013-06-28 16:58:31 +02:00
e38aa3b1b9 Unit tests now test FilePager. 2013-06-28 16:16:08 +02:00
839f366174 Compile fixes for Linux.
Added SWIG files to make bindings build.
2013-06-28 15:07:19 +02:00
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
72b3cd5154 Tidying up and comments. 2013-06-26 23:39:21 +02:00
885a50e781 Merge branch 'develop' into feature/paging 2013-06-26 22:49:36 +02:00
56cf423bfd Added POLYVOX_THROW_IF macro to simplify error handling. 2013-06-26 22:39:15 +02:00
1064ea1c47 Stripped out unused code. 2013-06-26 22:14:01 +02:00
938eea7c8e Work on tidying LargeVolume... 2013-06-26 22:01:44 +02:00
44d525f591 Tidying up and refactoring LargeVolume. 2013-06-26 17:02:06 +02:00
8ab6d73f0a Work on LargeVolume refactoring - getting FilePager working. 2013-06-25 23:34:58 +02:00
0cf3de4e76 Removed LoadedBlock and put timestamp into regular Block. 2013-06-25 22:54:40 +02:00
900e4e0ecd Refactoring some LargeVolume code... 2013-06-25 21:18:06 +02:00
a2210fc3f0 Renamed compress and uncompress functions. 2013-06-25 20:57:50 +02:00
6b92a5ab51 More tidying/refaxctoring of Block class. 2013-06-25 17:04:10 +02:00
baed7ddccc Tidying up and refactoring of block class. 2013-06-25 16:45:53 +02:00
c346d19d77 Doing some tidying in the Block class. 2013-06-25 16:20:58 +02:00
59505d47e9 Tidying up Block and FilePager. 2013-06-23 23:17:40 +02:00
e80fa3de7d Added functions for accessing compressed data in block. 2013-06-22 12:16:52 +02:00
5643140882 Work on paging to file. 2013-06-22 11:19:30 +02:00
d9ebe96c5a Work on FilePager. 2013-06-22 10:16:33 +02:00
288b448b9f Brought across Region operator<< from Cubiquity branch. 2013-06-22 10:16:16 +02:00
20db75fb75 Added null pointer check.
Added files to CMakeLists.txt
2013-06-22 07:24:19 +02:00
51f9898467 Reenabled unused vertex removal. 2013-06-22 06:32:26 +02:00
a14de4a72e Replaced std::functions with Pager class for paging. 2013-06-16 19:48:14 +02:00
414a012230 Creating a Perlin noise generator as a 'pager'. 2013-06-16 19:12:37 +02:00
f86ec57e14 Adding skeletons of new paging classes. 2013-06-16 18:25:20 +02:00
1e55859107 Renamed WrapMode::None (and others) to avoid conflict with Python reserved word 'None'. 2013-06-13 16:49:02 +02:00
dc7c7eb552 Removed old BoundsCheck enum. 2013-06-13 16:27:46 +02:00
6e8030f4b5 Changes to hopefully fix Linux compile problems. 2013-06-13 15:55:15 +02:00
62f273bd74 Small changes, hoping to help the Linux version compile. 2013-06-12 16:52:17 +02:00
0a4ffc2351 Linux compile fixes. 2013-06-12 16:38:27 +02:00
28f81a8ae1 Replaced call to getVoxelAt with getVoxel. 2013-06-12 15:57:51 +02:00
2f62a7de8d Marked getVoxelAt functions as deprecated. 2013-06-12 15:51:06 +02:00
27833ee03f Fixed compiler warnings. 2013-06-12 15:45:57 +02:00
3249562d97 Removing more calls to getVoxelAt()... 2013-06-12 15:41:45 +02:00
3a9b393459 Renamed getVoxelAt in volume samplers to avoid confusion with the version in volumes. 2013-06-12 15:10:14 +02:00
7276b872c4 More work replacing getVoxelAt with getVoxel. 2013-06-12 15:03:34 +02:00
60d6658e1a Changed a couple of 'getVoxelAt()' to 'getVoxel()'. 2013-06-12 13:38:36 +02:00
1f2b7e4742 Added modified setVoxel functions to SimpleVolume and LargeVolume. 2013-06-07 16:57:45 +02:00
d98856b276 setVoxel for RawVolume now takes WrapMode instead of bounds check. 2013-06-07 16:49:06 +02:00
292b21dcdf Added merging of BoundsCheck and WrapMode changes into LargeVolume. 2013-06-07 16:13:11 +02:00
3d82b9643f Applied BoundsCheck and WrapMode merging changes to SimpleVolume. 2013-06-07 15:58:24 +02:00