Merge branch 'develop' into feature/wrap-modes
This commit is contained in:
commit
d5a5242409
@ -1,4 +1,5 @@
|
||||
PolyVox - The voxel management and manipulation library
|
||||
=======================================================
|
||||
PolyVox is the core technology which lies behind our games. It is a fast, lightweight C++ library for the storage and processing of volumetric (voxel-based) environments. It has applications in both games and medical/scientific visualisation, and is released under the terms of the `zlib license <http://www.tldrlegal.com/l/ZLIB>`_.
|
||||
|
||||
For installation instructions, please see INSTALL.txt
|
||||
PolyVox is a relatively low-level library, and you will need experience in C++ and computer graphics/shaders to use it effectively. It is designed to be easily integrated into existing applications and is independent of your chosen graphics API. For more details please see `this page <http://www.volumesoffun.com/polyvox-about/>`_ on our website.
|
@ -77,7 +77,7 @@ freely, subject to the following restrictions:
|
||||
#define polyvox_placeholder_2 _2
|
||||
|
||||
#include <boost/static_assert.hpp>
|
||||
#define static_assert BOOST_STATIC_ASSERT
|
||||
#define static_assert(condition, message) BOOST_STATIC_ASSERT(condition)
|
||||
|
||||
|
||||
//As long as we're requiring boost, we'll use it to compensate
|
||||
|
Loading…
x
Reference in New Issue
Block a user