1294 Commits

Author SHA1 Message Date
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
2b70f81a9a Added missing .cpp file... thought I did this already?! 2012-12-29 20:32:21 +00:00
David Williams
9051e7558e Setting appropriate build variables for Android version. 2012-12-29 21:32:07 +01:00
David Williams
9c970bd11a Added missing .cpp file to cubiquity version of PolyVox. 2012-12-29 21:16:36 +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
607febb673 Merge branch 'feature/error-handling' into develop 2012-12-29 14:06:15 +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
Matt Williams
de26bb4b9c Merge branch 'hotfix/v0.2.1' into develop
Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
	library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl
	library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl
2012-12-27 01:08:46 +00:00
Matt Williams
8747c05be9 Bump version number to 0.2.1 2012-12-27 00:04:40 +00:00
Matt Williams
f0e2924c42 Fixed potential bug with negative voxel positions in large volume.
See commit 1f9264a
2012-12-26 23:39:06 +00:00
Matt Williams
c10e992bf2 Fixed bug with SimpleVolume and negative positions.
See commit 3f87fc780f6b60f6bf574833921bfca6
2012-12-26 23:24:09 +00:00
David Williams
7f4be2929e Changed type of single quotes used for link. I'm not sure if this makes a difference but it's for consistency. 2012-12-26 21:14:46 +00:00
David Williams
da77fa8432 Updated readme with some real information for BitBucket. 2012-12-26 21:03:31 +00:00
Matt Williams
3b46aaa5d3 Fix LowPassFilter test
The implicit default kernel size for the non-SAT version was 3 but the SAT
version was using an explicit kernel of 5 which caused a discrepancy.

Now just use a kernel of 3.
2012-12-26 21:02:57 +00:00
David Williams
9a30fa54a5 Fixed bug with peek function checking in wrong direction. 2012-12-26 21:01:30 +00:00
David Williams
f87b19bd58 Fixed build error on VS2008 2012-12-26 21:01:07 +00:00
Matt Williams
81a4294a7d Enable SWIG generation of C# bindings 2012-12-26 20:53:44 +00:00
David Williams
25a4ff1c8e Added comment. 2012-12-26 20:27:29 +00:00
David Williams
9ca84dc0e1 Updated CHANGELOG.txt 2012-12-26 20:24:55 +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
Matt Williams
59d415e305 Pave way for C# bindings
This callback implementation is Python-specific and so should be disabled
2012-12-26 17:11:08 +00:00
David Williams
3653528ae5 POLYVOX_HALT() implementation for Linux. 2012-12-26 16:44:34 +01:00
Matt Williams
9e7bb75687 Disable the C++11 feature detection on Visual Studio
There seems to be a bug in the interaction between CMake and Visual Studio
which floods the 'recent projects' list with the TRY_COMPILE projects.

If in the future this is fixed then it can re-enabled.
2012-12-26 15:40:59 +00:00
Matt Williams
03de39b8dd Add some documentation to the CompilerCapabilities.h files 2012-12-26 15:37:16 +00:00
Matt Williams
bc8240fe63 These checks are no longer needed since it's checked in the top level file 2012-12-26 15:09:54 +00:00
Matt Williams
a419c4f4e6 Mark Vector::operator< as deprecated in the Python bindings 2012-12-26 15:07:15 +00:00
David Williams
a3cb8f7a76 Now using new assert in Vector. 2012-12-26 15:02:03 +00:00
Matt Williams
f5ea8878c2 Add a default CompilerCapabilities.h
This file assumes that the compiler doesn't support anything. If building
without CMake, it will be used and if you want to enable things, the file
can be edited.

When using CMake, a proper CompilerCapabilites.h will be generated and
CMake will set the include path order correctly in order to source the
correct file.
2012-12-26 12:54:52 +00:00
David Williams
e17271a2c7 Work on new asserts. 2012-12-26 10:34:09 +00:00
David Williams
c74c1a2b44 Work on new assert macro. 2012-12-26 02:03:32 +00:00
David Williams
c78a8595fb Initial work on new assert macro. 2012-12-26 01:33:05 +00:00
Matt Williams
831689bd17 Fix tests
The names of some of the bound classes have changed and this fixes the
tests to match it.
2012-12-26 00:31:10 +00:00
David Williams
eb380b84c7 Compile fix for windows. 2012-12-24 21:54:49 +00:00
David Williams
ef4cb38fbe Merge branch 'develop' of https://bitbucket.org/volumesoffun/polyvox into develop 2012-12-24 20:20:52 +00:00
David Williams
b0b0216e67 Merge branch 'feature/cmake-cxx11-detect' into develop 2012-12-24 20:08:47 +00:00
David Williams
74f25eac23 Merge branch 'develop' into feature/cmake-cxx11-detect
Conflicts:
	examples/Basic/CMakeLists.txt
	examples/OpenGL/CMakeLists.txt
	examples/Paging/CMakeLists.txt
	examples/SmoothLOD/CMakeLists.txt
	library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h
2012-12-24 20:08:31 +00:00
Matt Williams
fc74ec5f0f The static_assert() methods are now not bound in SWIG
The ReducedStorageType here is to work around a bug in SWIG.
2012-12-24 15:51:40 +00:00
David Williams
f22410ed9a Linux compile fix. 2012-12-23 13:53:00 +01:00
Matt Williams
2ae111a67f Fix compile error 2012-12-23 12:29:45 +00:00
David Williams
d61ea322c7 Merge branch 'feature/wrap-modes' into develop 2012-12-21 09:17:46 +00:00