Commit Graph

656 Commits

Author SHA1 Message Date
e05cb1fefc Fix for zero length normals causing a crash. 2013-01-14 23:12:48 +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
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
9c970bd11a Added missing .cpp file to cubiquity version of PolyVox. 2012-12-29 21:16:36 +01:00
50c9934376 Bringing minor improvements from Cubiquity's PolyVox into the main branch. 2012-12-29 17:02:07 +00:00
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
ed614802fe Merge branch 'develop' of https://bitbucket.org/volumesoffun/polyvox into develop 2012-12-29 14:07:11 +00:00
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
25a4ff1c8e Added comment. 2012-12-26 20:27:29 +00:00
ecad915001 Tidied up some code. 2012-12-26 20:18:46 +00:00
64cd6e31b0 The non-C++11 implemention of POLYVOX_STATIC_ASSERT is no longer dependent on Boost. 2012-12-26 18:16:43 +00:00
cc0b3ae2c0 Merge branch 'develop' into feature/error-handling 2012-12-26 17:18:42 +00:00
3653528ae5 POLYVOX_HALT() implementation for Linux. 2012-12-26 16:44:34 +01:00
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
03de39b8dd Add some documentation to the CompilerCapabilities.h files 2012-12-26 15:37:16 +00:00
bc8240fe63 These checks are no longer needed since it's checked in the top level file 2012-12-26 15:09:54 +00:00
a3cb8f7a76 Now using new assert in Vector. 2012-12-26 15:02:03 +00:00
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
e17271a2c7 Work on new asserts. 2012-12-26 10:34:09 +00:00
c74c1a2b44 Work on new assert macro. 2012-12-26 02:03:32 +00:00
c78a8595fb Initial work on new assert macro. 2012-12-26 01:33:05 +00:00
eb380b84c7 Compile fix for windows. 2012-12-24 21:54:49 +00:00
ef4cb38fbe Merge branch 'develop' of https://bitbucket.org/volumesoffun/polyvox into develop 2012-12-24 20:20:52 +00:00
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
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
f22410ed9a Linux compile fix. 2012-12-23 13:53:00 +01:00
2ae111a67f Fix compile error 2012-12-23 12:29:45 +00:00
edfbac122c Merge branch 'develop' into feature/wrap-modes 2012-12-21 09:17:12 +00:00
b71b4dd032 Undefine POLYVOX_DEPRECATED when compiling with SWIG
We want to wrap the deprecated functions but we don't want to be told
off for it.

See issue #19
2012-12-19 16:14:31 +00:00
898aa24126 Removed code which is redundant after previous commit. 2012-12-19 11:46:44 +01:00
44dcb0ba89 Different method of controlling the war mode of the MarchingCubesSurfaceExtractor. 2012-12-19 11:32:45 +01:00
933c211d47 Added wrap mode support to CubicSurfaceExtractorWithNormals. 2012-12-19 11:23:55 +01:00
4396c609bb Added wrap mode support to CubicSurfaceExtractor. 2012-12-18 16:46:57 +01:00
8b018be2dc Fix for LargeVolumeSampler. 2012-12-18 16:25:31 +01:00
1c61329e67 Fix compilation in Linux 2012-12-18 15:13:41 +00:00
2a12bcd6d6 Fixed behavior of SimpleVolumeSampler.inl 2012-12-18 14:34:36 +01:00
db16a3d602 Started implementing a more mathematically correct volume resampler. 2012-12-17 23:42:03 +01:00
8473b1e3e6 Added support for getting interpolated voxel value. 2012-12-16 18:04:33 +01:00