Commit Graph

691 Commits

Author SHA1 Message Date
328d40f712 Merge branch 'develop' into feature/cubiquity-version
Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl
	library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
2013-02-08 21:46:33 +01:00
b7eeda3370 Find and replace all instance of getLowerCorner().getX(), etc with getLowerX(), etc has resulted in all tests now running in 120 seconds instead of 144 seconds because it avoids creating temporary objects. 2013-02-08 16:15:53 +01:00
7327220b1c Performance enhancements identified through profiling. 2013-02-08 15:43:37 +01:00
608777bb9b Performance improvements for CubicSurfaceExtractor 2013-02-08 15:14:15 +01:00
7e08ed7aec Updated the CubicSurfaceExtractor test to make it a bit more performance intensive, Cubiquity is showing a need for some improvements here. Also added a performance improvement to the CubicsurfaceExtractor. 2013-02-08 15:05:45 +01:00
c5023ff623 Changed void* to uint8_t*. 2013-02-08 13:29:49 +01:00
a38ac6b895 Merge branch 'develop' into feature/cubiquity-version 2013-02-07 23:02:23 +01:00
36968bdd79 Merge branch 'develop' into feature/large-volume-work 2013-02-07 16:11:03 +01:00
50c1c7c64b Removed setCompressionEnabled() from LargeVolume. 2013-02-07 15:55:10 +01:00
8d2061bdb5 Fixed crash with MaxVerticesPerPosition being set too low. 2013-02-04 16:38:50 +01:00
aef5373e8b Fixed case problem in folder name. 2013-02-01 16:37:13 +01:00
09c6e2bf26 More work making the compression more robust. 2013-02-01 16:10:10 +01:00
a5b768e5f9 Working to make compression handing more robust. 2013-02-01 15:43:20 +01:00
3d66db50e0 Fixes and comments for RLE compression. 2013-02-01 14:09:29 +01:00
dadcf03d8d Added note. 2013-01-31 21:04:01 +01:00
46e38c4714 Work on compression. 2013-01-31 16:56:32 +01:00
a81ec68714 Work on compression interface. 2013-01-31 16:35:50 +01:00
36676433be Work on compression interface. 2013-01-31 15:54:04 +01:00
924744c5e6 Looks like RLECompressor works as well. 2013-01-30 16:58:13 +01:00
a1cdf78250 Block now working with new MinizCompressor. Removing some old compression code. 2013-01-30 16:49:06 +01:00
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
f76be64d6b Work on VolumeResampler (using real convolution). 2013-01-27 22:02:13 +01:00
d3aed35d81 Added some (temporary) interpolation code. 2013-01-27 13:03:30 +01:00
4df159dfd7 Changed volume sampler wrap mode. 2013-01-17 23:51:52 +01:00
1d1dcc875a Added 'intersects' function to Region. 2013-01-14 23:13:17 +01:00
e05cb1fefc Fix for zero length normals causing a crash. 2013-01-14 23:12:48 +01:00
7b64c0c3c0 Move Compression.cpp to folder with correct case 2013-01-14 12:27:04 +00:00
68ee094cec More work on block compression with miniz. 2013-01-11 13:29:33 +01:00
7bb7be0dec Work on block compression. 2013-01-10 16:37:02 +01:00
c7937b176d Very bad (but functional!) initial implementation of LargeVolume compression with miniz. 2013-01-10 16:20:29 +01:00
575f4824cc Added 'upperPowerOfTwo' function. 2013-01-03 00:05:28 +01:00
bf5a9f7ab8 Added getCentre() to Region class. 2013-01-02 23:03:07 +01:00
8fe824eb58 Allowing boundary values to be negative. 2013-01-02 21:52:44 +01:00
1e9bb88337 Fixed compile errors in VS2008. 2013-01-02 14:13:42 +01:00
ff789d296d Removed remaining traces of assert() 2013-01-01 18:08:59 +00:00
4ee55bba2e More replacing assert() with POLYVOX_ASSERT 2013-01-01 15:34:34 +00:00
29720c4568 More replacing assert() with POLYVOX_ASSERT. 2013-01-01 14:50:58 +00:00
4fcc8a15d7 Merge branch 'develop' of https://bitbucket.org/volumesoffun/polyvox into develop 2013-01-01 14:10:24 +00:00
858a9c0e1b Replaced some assert()s with POLYVOX_ASSERT()s. 2013-01-01 14:09:40 +00:00
8e5a09d0fc Android compile fixes. 2012-12-29 23:47:32 +01:00
7e8af71e52 Not quite sure what the difference is here... 2012-12-29 23:39:13 +01:00
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
d5b03cdbc3 Made use of POLYVOX_THROW where appropriate. 2012-12-29 23:29:28 +01:00
0c78d97ba5 Better defaults for compiler capabilities. 2012-12-29 23:16:29 +01:00
9273094ebd Added config.h to control exceptions and asserts. 2012-12-29 22:56:15 +01:00
161835f42b Boost is no longer needed if <cstdint> is not found. 2012-12-29 22:26:21 +01:00
d6c4cfb9f3 Eliminating some of the differences between this branch and 'develop'. 2012-12-29 21:48:55 +01:00
5be6a8ba44 Updated default compiler capabilities as used by Visual Studio - these are subject to change further. 2012-12-29 20:41:23 +00:00
2b70f81a9a Added missing .cpp file... thought I did this already?! 2012-12-29 20:32:21 +00:00
9051e7558e Setting appropriate build variables for Android version. 2012-12-29 21:32:07 +01:00