From 8065b709d17964a401dcba5a09b1b648b163eeb9 Mon Sep 17 00:00:00 2001 From: David Williams Date: Fri, 6 Feb 2015 00:07:32 +0100 Subject: [PATCH 01/19] Made Region header only. --- examples/Paging/main.cpp | 2 +- library/PolyVoxCore/CMakeLists.txt | 2 +- .../include/PolyVoxCore/PagedVolume.inl | 2 +- .../PolyVoxCore/include/PolyVoxCore/Region.h | 6 +- .../PolyVoxCore/Region.inl} | 95 +++++++++---------- 5 files changed, 54 insertions(+), 53 deletions(-) rename library/PolyVoxCore/{source/Region.cpp => include/PolyVoxCore/Region.inl} (83%) diff --git a/examples/Paging/main.cpp b/examples/Paging/main.cpp index 86e52aff..a3e60356 100644 --- a/examples/Paging/main.cpp +++ b/examples/Paging/main.cpp @@ -147,7 +147,7 @@ int main(int argc, char *argv[]) openGLWidget.show(); PerlinNoisePager* pager = new PerlinNoisePager(); - PagedVolume volData(PolyVox::Region::MaxRegion, pager, 64); + PagedVolume volData(PolyVox::Region::MaxRegion(), pager, 64); volData.setMemoryUsageLimit(8 * 1024 * 1024); // 8Mb //createSphereInVolume(volData, 30); diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index 35478777..f44550ab 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -25,7 +25,6 @@ PROJECT(PolyVoxCore) #Projects source files SET(CORE_SRC_FILES source/AStarPathfinder.cpp - source/Region.cpp ) #Projects headers files @@ -71,6 +70,7 @@ SET(CORE_INC_FILES include/PolyVoxCore/Raycast.h include/PolyVoxCore/Raycast.inl include/PolyVoxCore/Region.h + include/PolyVoxCore/Region.inl include/PolyVoxCore/SimpleVolume.h include/PolyVoxCore/Vector.h include/PolyVoxCore/Vector.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/PagedVolume.inl b/library/PolyVoxCore/include/PolyVoxCore/PagedVolume.inl index 6ee86f1c..642c1ff8 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/PagedVolume.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/PagedVolume.inl @@ -52,7 +52,7 @@ namespace PolyVox { // If the user is creating a vast (almost infinite) volume then we can bet they will be // expecting a high memory usage and will want a fair number of chunks to play around with. - if (regValid == Region::MaxRegion) + if (regValid == Region::MaxRegion()) { m_uChunkCountLimit = 1024; } diff --git a/library/PolyVoxCore/include/PolyVoxCore/Region.h b/library/PolyVoxCore/include/PolyVoxCore/Region.h index 2e8d113b..6221b87b 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Region.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Region.h @@ -58,9 +58,9 @@ namespace PolyVox public: /// A Region with the lower corner set as low as possible and the upper corner set as high as possible. - static const Region MaxRegion; + static Region MaxRegion(); /// A Region with the lower corner set as high as possible and the upper corner set as low as possible. - static const Region InvertedRegion; + static Region InvertedRegion(); /// Constructor Region(); @@ -458,4 +458,6 @@ namespace PolyVox } } +#include "PolyVoxCore/Region.inl" + #endif diff --git a/library/PolyVoxCore/source/Region.cpp b/library/PolyVoxCore/include/PolyVoxCore/Region.inl similarity index 83% rename from library/PolyVoxCore/source/Region.cpp rename to library/PolyVoxCore/include/PolyVoxCore/Region.inl index ca2d7337..e327f6f6 100644 --- a/library/PolyVoxCore/source/Region.cpp +++ b/library/PolyVoxCore/include/PolyVoxCore/Region.inl @@ -21,8 +21,6 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#include "PolyVoxCore/Region.h" - #include #include @@ -30,29 +28,31 @@ namespace PolyVox { /** */ - const Region Region::MaxRegion - ( - Vector3DInt32((std::numeric_limits::min)(), (std::numeric_limits::min)(), (std::numeric_limits::min)()), - Vector3DInt32((std::numeric_limits::max)(), (std::numeric_limits::max)(), (std::numeric_limits::max)()) - ); + inline Region Region::MaxRegion() + { + return Region( + (std::numeric_limits::min)(), (std::numeric_limits::min)(), (std::numeric_limits::min)(), + (std::numeric_limits::max)(), (std::numeric_limits::max)(), (std::numeric_limits::max)()); + } /** * This Region is not considered valid as defined by isValid(). It's main application * is to initialise a Region to this value and then() accumulate positions. The result * of this will be a Region which encompasses all positions specified. */ - const Region Region::InvertedRegion - ( - Vector3DInt32((std::numeric_limits::max)(), (std::numeric_limits::max)(), (std::numeric_limits::max)()), - Vector3DInt32((std::numeric_limits::min)(), (std::numeric_limits::min)(), (std::numeric_limits::min)()) - ); + inline Region Region::InvertedRegion() + { + return Region( + (std::numeric_limits::max)(), (std::numeric_limits::max)(), (std::numeric_limits::max)(), + (std::numeric_limits::min)(), (std::numeric_limits::min)(), (std::numeric_limits::min)()); + } /** * \param iX The 'x' component of the position to accumulate. * \param iY The 'y' component of the position to accumulate. * \param iZ The 'z' component of the position to accumulate. */ - void Region::accumulate(int32_t iX, int32_t iY, int32_t iZ) + inline void Region::accumulate(int32_t iX, int32_t iY, int32_t iZ) { m_iLowerX = ((std::min)(m_iLowerX, iX)); m_iLowerY = ((std::min)(m_iLowerY, iY)); @@ -65,7 +65,7 @@ namespace PolyVox /** * \param v3dPos The position to accumulate. */ - void Region::accumulate(const Vector3DInt32& v3dPos) + inline void Region::accumulate(const Vector3DInt32& v3dPos) { accumulate(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ()); } @@ -77,7 +77,7 @@ namespace PolyVox * \param reg The Region to accumulate. This must be valid as defined by the isValid() function. * \sa isValid() */ - void Region::accumulate(const Region& reg) + inline void Region::accumulate(const Region& reg) { if(!reg.isValid()) { @@ -95,7 +95,7 @@ namespace PolyVox /** * Constructs a Region and clears all extents to zero. */ - Region::Region() + inline Region::Region() :m_iLowerX(0) ,m_iLowerY(0) ,m_iLowerZ(0) @@ -110,7 +110,7 @@ namespace PolyVox * \param v3dLowerCorner The desired lower corner of the Region. * \param v3dUpperCorner The desired upper corner of the Region. */ - Region::Region(const Vector3DInt32& v3dLowerCorner, const Vector3DInt32& v3dUpperCorner) + inline Region::Region(const Vector3DInt32& v3dLowerCorner, const Vector3DInt32& v3dUpperCorner) :m_iLowerX(v3dLowerCorner.getX()) ,m_iLowerY(v3dLowerCorner.getY()) ,m_iLowerZ(v3dLowerCorner.getZ()) @@ -129,7 +129,7 @@ namespace PolyVox * \param iUpperY The desired upper 'y' extent of the Region. * \param iUpperZ The desired upper 'z' extent of the Region. */ - Region::Region(int32_t iLowerX, int32_t iLowerY, int32_t iLowerZ, int32_t iUpperX, int32_t iUpperY, int32_t iUpperZ) + inline Region::Region(int32_t iLowerX, int32_t iLowerY, int32_t iLowerZ, int32_t iUpperX, int32_t iUpperY, int32_t iUpperZ) :m_iLowerX(iLowerX) ,m_iLowerY(iLowerY) ,m_iLowerZ(iLowerZ) @@ -145,7 +145,7 @@ namespace PolyVox * \return true if the Regions match. * \sa operator!= */ - bool Region::operator==(const Region& rhs) const + inline bool Region::operator==(const Region& rhs) const { return ((m_iLowerX == rhs.m_iLowerX) && (m_iLowerY == rhs.m_iLowerY) && (m_iLowerZ == rhs.m_iLowerZ) && (m_iUpperX == rhs.m_iUpperX) && (m_iUpperY == rhs.m_iUpperY) && (m_iUpperZ == rhs.m_iUpperZ)); @@ -157,7 +157,7 @@ namespace PolyVox * \return true if the Regions are different. * \sa operator== */ - bool Region::operator!=(const Region& rhs) const + inline bool Region::operator!=(const Region& rhs) const { return !(*this == rhs); } @@ -171,7 +171,7 @@ namespace PolyVox * \param fZ The 'z' position of the point to test. * \param boundary The desired boundary value. */ - bool Region::containsPoint(float fX, float fY, float fZ, float boundary) const + inline bool Region::containsPoint(float fX, float fY, float fZ, float boundary) const { return (fX <= m_iUpperX - boundary) && (fY <= m_iUpperY - boundary) @@ -188,7 +188,7 @@ namespace PolyVox * \param pos The position to test. * \param boundary The desired boundary value. */ - bool Region::containsPoint(const Vector3DFloat& pos, float boundary) const + inline bool Region::containsPoint(const Vector3DFloat& pos, float boundary) const { return containsPoint(pos.getX(), pos.getY(), pos.getZ(), boundary); } @@ -202,7 +202,7 @@ namespace PolyVox * \param iZ The 'z' position of the point to test. * \param boundary The desired boundary value. */ - bool Region::containsPoint(int32_t iX, int32_t iY, int32_t iZ, uint8_t boundary) const + inline bool Region::containsPoint(int32_t iX, int32_t iY, int32_t iZ, uint8_t boundary) const { return (iX <= m_iUpperX - boundary) && (iY <= m_iUpperY - boundary) @@ -219,7 +219,7 @@ namespace PolyVox * \param pos The position to test. * \param boundary The desired boundary value. */ - bool Region::containsPoint(const Vector3DInt32& pos, uint8_t boundary) const + inline bool Region::containsPoint(const Vector3DInt32& pos, uint8_t boundary) const { return containsPoint(pos.getX(), pos.getY(), pos.getZ(), boundary); } @@ -231,7 +231,7 @@ namespace PolyVox * \param pos The position to test. * \param boundary The desired boundary value. */ - bool Region::containsPointInX(float pos, float boundary) const + inline bool Region::containsPointInX(float pos, float boundary) const { return (pos <= m_iUpperX - boundary) && (pos >= m_iLowerX + boundary); @@ -244,7 +244,7 @@ namespace PolyVox * \param pos The position to test. * \param boundary The desired boundary value. */ - bool Region::containsPointInX(int32_t pos, uint8_t boundary) const + inline bool Region::containsPointInX(int32_t pos, uint8_t boundary) const { return (pos <= m_iUpperX - boundary) && (pos >= m_iLowerX + boundary); @@ -257,7 +257,7 @@ namespace PolyVox * \param pos The position to test. * \param boundary The desired boundary value. */ - bool Region::containsPointInY(float pos, float boundary) const + inline bool Region::containsPointInY(float pos, float boundary) const { return (pos <= m_iUpperY - boundary) && (pos >= m_iLowerY + boundary); @@ -270,7 +270,7 @@ namespace PolyVox * \param pos The position to test. * \param boundary The desired boundary value. */ - bool Region::containsPointInY(int32_t pos, uint8_t boundary) const + inline bool Region::containsPointInY(int32_t pos, uint8_t boundary) const { return (pos <= m_iUpperY - boundary) && (pos >= m_iLowerY + boundary); @@ -283,7 +283,7 @@ namespace PolyVox * \param pos The position to test. * \param boundary The desired boundary value. */ - bool Region::containsPointInZ(float pos, float boundary) const + inline bool Region::containsPointInZ(float pos, float boundary) const { return (pos <= m_iUpperZ - boundary) && (pos >= m_iLowerZ + boundary); @@ -296,7 +296,7 @@ namespace PolyVox * \param pos The position to test. * \param boundary The desired boundary value. */ - bool Region::containsPointInZ(int32_t pos, uint8_t boundary) const + inline bool Region::containsPointInZ(int32_t pos, uint8_t boundary) const { return (pos <= m_iUpperZ - boundary) && (pos >= m_iLowerZ + boundary); @@ -309,7 +309,7 @@ namespace PolyVox * \param reg The region to test. * \param boundary The desired boundary value. */ - bool Region::containsRegion(const Region& reg, uint8_t boundary) const + inline bool Region::containsRegion(const Region& reg, uint8_t boundary) const { return (reg.m_iUpperX <= m_iUpperX - boundary) && (reg.m_iUpperY <= m_iUpperY - boundary) @@ -324,7 +324,7 @@ namespace PolyVox * of this Region and the one it was cropped to. * \param other The Region to crop to. */ - void Region::cropTo(const Region& other) + inline void Region::cropTo(const Region& other) { m_iLowerX = ((std::max)(m_iLowerX, other.m_iLowerX)); m_iLowerY = ((std::max)(m_iLowerY, other.m_iLowerY)); @@ -339,7 +339,7 @@ namespace PolyVox * is possible but you should prefer the shrink() function for clarity. * \param iAmount The amount to grow by. */ - void Region::grow(int32_t iAmount) + inline void Region::grow(int32_t iAmount) { m_iLowerX -= iAmount; m_iLowerY -= iAmount; @@ -357,7 +357,7 @@ namespace PolyVox * \param iAmountY The amount to grow by in 'y'. * \param iAmountZ The amount to grow by in 'z'. */ - void Region::grow(int32_t iAmountX, int32_t iAmountY, int32_t iAmountZ) + inline void Region::grow(int32_t iAmountX, int32_t iAmountY, int32_t iAmountZ) { m_iLowerX -= iAmountX; m_iLowerY -= iAmountY; @@ -373,14 +373,14 @@ namespace PolyVox * is possible but you should prefer the shrink() function for clarity. * \param v3dAmount The amount to grow by (one component for each direction). */ - void Region::grow(const Vector3DInt32& v3dAmount) + inline void Region::grow(const Vector3DInt32& v3dAmount) { grow(v3dAmount.getX(), v3dAmount.getY(), v3dAmount.getZ()); } /** */ - bool Region::isValid(void) const + inline bool Region::isValid(void) const { return (m_iUpperX >= m_iLowerX) && (m_iUpperY >= m_iLowerY) && (m_iUpperZ >= m_iLowerZ); } @@ -390,7 +390,7 @@ namespace PolyVox * \param iAmountY The amount to move the Region by in 'y'. * \param iAmountZ The amount to move the Region by in 'z'. */ - void Region::shift(int32_t iAmountX, int32_t iAmountY, int32_t iAmountZ) + inline void Region::shift(int32_t iAmountX, int32_t iAmountY, int32_t iAmountZ) { shiftLowerCorner(iAmountX, iAmountY, iAmountZ); shiftUpperCorner(iAmountX, iAmountY, iAmountZ); @@ -399,7 +399,7 @@ namespace PolyVox /** * \param v3dAmount The amount to move the Region by. */ - void Region::shift(const Vector3DInt32& v3dAmount) + inline void Region::shift(const Vector3DInt32& v3dAmount) { shiftLowerCorner(v3dAmount); shiftUpperCorner(v3dAmount); @@ -410,7 +410,7 @@ namespace PolyVox * \param iAmountY The amount to move the lower corner by in 'y'. * \param iAmountZ The amount to move the lower corner by in 'z'. */ - void Region::shiftLowerCorner(int32_t iAmountX, int32_t iAmountY, int32_t iAmountZ) + inline void Region::shiftLowerCorner(int32_t iAmountX, int32_t iAmountY, int32_t iAmountZ) { m_iLowerX += iAmountX; m_iLowerY += iAmountY; @@ -420,7 +420,7 @@ namespace PolyVox /** * \param v3dAmount The amount to move the lower corner by. */ - void Region::shiftLowerCorner(const Vector3DInt32& v3dAmount) + inline void Region::shiftLowerCorner(const Vector3DInt32& v3dAmount) { shiftLowerCorner(v3dAmount.getX(), v3dAmount.getY(), v3dAmount.getZ()); } @@ -430,7 +430,7 @@ namespace PolyVox * \param iAmountY The amount to move the upper corner by in 'y'. * \param iAmountZ The amount to move the upper corner by in 'z'. */ - void Region::shiftUpperCorner(int32_t iAmountX, int32_t iAmountY, int32_t iAmountZ) + inline void Region::shiftUpperCorner(int32_t iAmountX, int32_t iAmountY, int32_t iAmountZ) { m_iUpperX += iAmountX; m_iUpperY += iAmountY; @@ -440,7 +440,7 @@ namespace PolyVox /** * \param v3dAmount The amount to move the upper corner by. */ - void Region::shiftUpperCorner(const Vector3DInt32& v3dAmount) + inline void Region::shiftUpperCorner(const Vector3DInt32& v3dAmount) { shiftUpperCorner(v3dAmount.getX(), v3dAmount.getY(), v3dAmount.getZ()); } @@ -450,7 +450,7 @@ namespace PolyVox * is possible but you should prefer the grow() function for clarity. * \param iAmount The amount to shrink by. */ - void Region::shrink(int32_t iAmount) + inline void Region::shrink(int32_t iAmount) { m_iLowerX += iAmount; m_iLowerY += iAmount; @@ -468,7 +468,7 @@ namespace PolyVox * \param iAmountY The amount to shrink by in 'y'. * \param iAmountZ The amount to shrink by in 'z'. */ - void Region::shrink(int32_t iAmountX, int32_t iAmountY, int32_t iAmountZ) + inline void Region::shrink(int32_t iAmountX, int32_t iAmountY, int32_t iAmountZ) { m_iLowerX += iAmountX; m_iLowerY += iAmountY; @@ -484,7 +484,7 @@ namespace PolyVox * is possible but you should prefer the grow() function for clarity. * \param v3dAmount The amount to shrink by (one component for each direction). */ - void Region::shrink(const Vector3DInt32& v3dAmount) + inline void Region::shrink(const Vector3DInt32& v3dAmount) { shrink(v3dAmount.getX(), v3dAmount.getY(), v3dAmount.getZ()); } @@ -492,8 +492,7 @@ namespace PolyVox /** * This function only returns true if the regions are really intersecting and not simply touching. */ - - bool intersects(const Region& a, const Region& b) + inline bool intersects(const Region& a, const Region& b) { // No intersection if seperated along an axis. if(a.getUpperX() < b.getLowerX() || a.getLowerX() > b.getUpperX()) return false; @@ -510,7 +509,7 @@ namespace PolyVox * \param region The Region to write to the stream. * \return A reference to the output stream to allow chaining. */ - std::ostream& operator<<(std::ostream& os, const Region& region) + inline std::ostream& operator<<(std::ostream& os, const Region& region) { os << "(" << region.getLowerX() << "," << region.getLowerY() << "," << region.getLowerZ() << ") to (" << region.getUpperX() << "," << region.getUpperY() << "," << region.getUpperZ() << ")"; From d480935e38e1429e92085db6898073e1568d411e Mon Sep 17 00:00:00 2001 From: David Williams Date: Fri, 6 Feb 2015 16:08:05 +0100 Subject: [PATCH 02/19] Moved A* pathfinder data from .cpp to header. --- library/PolyVoxCore/CMakeLists.txt | 2 +- .../include/PolyVoxCore/AStarPathfinder.h | 40 ++++++++++- .../PolyVoxCore/source/AStarPathfinder.cpp | 67 ------------------- 3 files changed, 38 insertions(+), 71 deletions(-) delete mode 100644 library/PolyVoxCore/source/AStarPathfinder.cpp diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index f44550ab..27dbaa31 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -24,7 +24,7 @@ PROJECT(PolyVoxCore) #Projects source files SET(CORE_SRC_FILES - source/AStarPathfinder.cpp + #source/AStarPathfinder.cpp ) #Projects headers files diff --git a/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h index dce2aaf7..0c9d7a89 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h +++ b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h @@ -37,9 +37,43 @@ namespace PolyVox const float sqrt_2 = 1.4143f; const float sqrt_3 = 1.7321f; - extern const POLYVOX_API Vector3DInt32 arrayPathfinderFaces[6]; - extern const POLYVOX_API Vector3DInt32 arrayPathfinderEdges[12]; - extern const POLYVOX_API Vector3DInt32 arrayPathfinderCorners[8]; + const Vector3DInt32 arrayPathfinderFaces[6] = + { + Vector3DInt32(0, 0, -1), + Vector3DInt32(0, 0, +1), + Vector3DInt32(0, -1, 0), + Vector3DInt32(0, +1, 0), + Vector3DInt32(-1, 0, 0), + Vector3DInt32(+1, 0, 0) + }; + + const Vector3DInt32 arrayPathfinderEdges[12] = + { + Vector3DInt32(0, -1, -1), + Vector3DInt32(0, -1, +1), + Vector3DInt32(0, +1, -1), + Vector3DInt32(0, +1, +1), + Vector3DInt32(-1, 0, -1), + Vector3DInt32(-1, 0, +1), + Vector3DInt32(+1, 0, -1), + Vector3DInt32(+1, 0, +1), + Vector3DInt32(-1, -1, 0), + Vector3DInt32(-1, +1, 0), + Vector3DInt32(+1, -1, 0), + Vector3DInt32(+1, +1, 0) + }; + + const Vector3DInt32 arrayPathfinderCorners[8] = + { + Vector3DInt32(-1, -1, -1), + Vector3DInt32(-1, -1, +1), + Vector3DInt32(-1, +1, -1), + Vector3DInt32(-1, +1, +1), + Vector3DInt32(+1, -1, -1), + Vector3DInt32(+1, -1, +1), + Vector3DInt32(+1, +1, -1), + Vector3DInt32(+1, +1, +1) + }; /// This function provides the default method for checking whether a given voxel /// is valid for the path computed by the AStarPathfinder. diff --git a/library/PolyVoxCore/source/AStarPathfinder.cpp b/library/PolyVoxCore/source/AStarPathfinder.cpp deleted file mode 100644 index 83d42db1..00000000 --- a/library/PolyVoxCore/source/AStarPathfinder.cpp +++ /dev/null @@ -1,67 +0,0 @@ -/******************************************************************************* -Copyright (c) 2005-2009 David Williams - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -*******************************************************************************/ - -#include "PolyVoxCore/AStarPathfinder.h" - -using namespace PolyVox; - -namespace PolyVox -{ - const Vector3DInt32 arrayPathfinderFaces[6] = - { - Vector3DInt32(0, 0, -1), - Vector3DInt32(0, 0, +1), - Vector3DInt32(0, -1, 0), - Vector3DInt32(0, +1, 0), - Vector3DInt32(-1, 0, 0), - Vector3DInt32(+1, 0, 0) - }; - - const Vector3DInt32 arrayPathfinderEdges[12] = - { - Vector3DInt32(0, -1, -1), - Vector3DInt32(0, -1, +1), - Vector3DInt32(0, +1, -1), - Vector3DInt32(0, +1, +1), - Vector3DInt32(-1, 0, -1), - Vector3DInt32(-1, 0, +1), - Vector3DInt32(+1, 0, -1), - Vector3DInt32(+1, 0, +1), - Vector3DInt32(-1, -1, 0), - Vector3DInt32(-1, +1, 0), - Vector3DInt32(+1, -1, 0), - Vector3DInt32(+1, +1, 0) - }; - - const Vector3DInt32 arrayPathfinderCorners[8] = - { - Vector3DInt32(-1, -1, -1), - Vector3DInt32(-1, -1, +1), - Vector3DInt32(-1, +1, -1), - Vector3DInt32(-1, +1, +1), - Vector3DInt32(+1, -1, -1), - Vector3DInt32(+1, -1, +1), - Vector3DInt32(+1, +1, -1), - Vector3DInt32(+1, +1, +1) - }; -} From eb45c97a61e4a9bc7aa142862c5bf0fa4991285d Mon Sep 17 00:00:00 2001 From: David Williams Date: Fri, 6 Feb 2015 16:37:08 +0100 Subject: [PATCH 03/19] Moved marching cubes tables to header file. --- library/PolyVoxCore/CMakeLists.txt | 2 +- .../PolyVoxCore/Impl/MarchingCubesTables.h | 302 +++++++++++++++- .../source/Impl/MarchingCubesTables.cpp | 328 ------------------ 3 files changed, 301 insertions(+), 331 deletions(-) delete mode 100644 library/PolyVoxCore/source/Impl/MarchingCubesTables.cpp diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index 27dbaa31..ed717e07 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -84,7 +84,7 @@ SET(CORE_INC_FILES SET(IMPL_SRC_FILES source/Impl/ErrorHandling.cpp source/Impl/Logging.cpp - source/Impl/MarchingCubesTables.cpp + #source/Impl/MarchingCubesTables.cpp source/Impl/RandomUnitVectors.cpp source/Impl/RandomVectors.cpp source/Impl/Timer.cpp diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/MarchingCubesTables.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/MarchingCubesTables.h index 2f29ae43..2a251120 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Impl/MarchingCubesTables.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/MarchingCubesTables.h @@ -30,8 +30,306 @@ freely, subject to the following restrictions: namespace PolyVox { - extern const POLYVOX_API uint16_t edgeTable[256]; - extern const POLYVOX_API int8_t triTable[256][16]; + //These tables were based on the article "Polygonising a scalar field". + //They have been optimised to allow a more efficient algorithm via bitwise operations. + + // http://local.wasp.uwa.edu.au/~pbourke/geometry/polygonise/index.html + + const uint16_t edgeTable[256] = + { + 0x000, 0x109, 0x203, 0x30a, 0x80c, 0x905, 0xa0f, 0xb06, + 0x406, 0x50f, 0x605, 0x70c, 0xc0a, 0xd03, 0xe09, 0xf00, + 0x190, 0x099, 0x393, 0x29a, 0x99c, 0x895, 0xb9f, 0xa96, + 0x596, 0x49f, 0x795, 0x69c, 0xd9a, 0xc93, 0xf99, 0xe90, + 0x230, 0x339, 0x033, 0x13a, 0xa3c, 0xb35, 0x83f, 0x936, + 0x636, 0x73f, 0x435, 0x53c, 0xe3a, 0xf33, 0xc39, 0xd30, + 0x3a0, 0x2a9, 0x1a3, 0x0aa, 0xbac, 0xaa5, 0x9af, 0x8a6, + 0x7a6, 0x6af, 0x5a5, 0x4ac, 0xfaa, 0xea3, 0xda9, 0xca0, + 0x8c0, 0x9c9, 0xac3, 0xbca, 0x0cc, 0x1c5, 0x2cf, 0x3c6, + 0xcc6, 0xdcf, 0xec5, 0xfcc, 0x4ca, 0x5c3, 0x6c9, 0x7c0, + 0x950, 0x859, 0xb53, 0xa5a, 0x15c, 0x055, 0x35f, 0x256, + 0xd56, 0xc5f, 0xf55, 0xe5c, 0x55a, 0x453, 0x759, 0x650, + 0xaf0, 0xbf9, 0x8f3, 0x9fa, 0x2fc, 0x3f5, 0x0ff, 0x1f6, + 0xef6, 0xfff, 0xcf5, 0xdfc, 0x6fa, 0x7f3, 0x4f9, 0x5f0, + 0xb60, 0xa69, 0x963, 0x86a, 0x36c, 0x265, 0x16f, 0x066, + 0xf66, 0xe6f, 0xd65, 0xc6c, 0x76a, 0x663, 0x569, 0x460, + 0x460, 0x569, 0x663, 0x76a, 0xc6c, 0xd65, 0xe6f, 0xf66, + 0x066, 0x16f, 0x265, 0x36c, 0x86a, 0x963, 0xa69, 0xb60, + 0x5f0, 0x4f9, 0x7f3, 0x6fa, 0xdfc, 0xcf5, 0xfff, 0xef6, + 0x1f6, 0x0ff, 0x3f5, 0x2fc, 0x9fa, 0x8f3, 0xbf9, 0xaf0, + 0x650, 0x759, 0x453, 0x55a, 0xe5c, 0xf55, 0xc5f, 0xd56, + 0x256, 0x35f, 0x055, 0x15c, 0xa5a, 0xb53, 0x859, 0x950, + 0x7c0, 0x6c9, 0x5c3, 0x4ca, 0xfcc, 0xec5, 0xdcf, 0xcc6, + 0x3c6, 0x2cf, 0x1c5, 0x0cc, 0xbca, 0xac3, 0x9c9, 0x8c0, + 0xca0, 0xda9, 0xea3, 0xfaa, 0x4ac, 0x5a5, 0x6af, 0x7a6, + 0x8a6, 0x9af, 0xaa5, 0xbac, 0x0aa, 0x1a3, 0x2a9, 0x3a0, + 0xd30, 0xc39, 0xf33, 0xe3a, 0x53c, 0x435, 0x73f, 0x636, + 0x936, 0x83f, 0xb35, 0xa3c, 0x13a, 0x033, 0x339, 0x230, + 0xe90, 0xf99, 0xc93, 0xd9a, 0x69c, 0x795, 0x49f, 0x596, + 0xa96, 0xb9f, 0x895, 0x99c, 0x29a, 0x393, 0x099, 0x190, + 0xf00, 0xe09, 0xd03, 0xc0a, 0x70c, 0x605, 0x50f, 0x406, + 0xb06, 0xa0f, 0x905, 0x80c, 0x30a, 0x203, 0x109, 0x000 + }; + + const int8_t triTable[256][16] = + { + { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 8, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 1, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 1, 8, 3, 9, 8, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 3, 11, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 11, 2, 8, 11, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 1, 9, 0, 2, 3, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 1, 11, 2, 1, 9, 11, 9, 8, 11, -1, -1, -1, -1, -1, -1, -1, }, + { 1, 2, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 8, 3, 1, 2, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 2, 10, 0, 2, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 2, 8, 3, 2, 10, 8, 10, 9, 8, -1, -1, -1, -1, -1, -1, -1, }, + { 3, 10, 1, 11, 10, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 10, 1, 0, 8, 10, 8, 11, 10, -1, -1, -1, -1, -1, -1, -1, }, + { 3, 9, 0, 3, 11, 9, 11, 10, 9, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 8, 10, 10, 8, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 4, 7, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 4, 3, 0, 7, 3, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 1, 9, 8, 4, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 4, 1, 9, 4, 7, 1, 7, 3, 1, -1, -1, -1, -1, -1, -1, -1, }, + { 8, 4, 7, 3, 11, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 11, 4, 7, 11, 2, 4, 2, 0, 4, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 0, 1, 8, 4, 7, 2, 3, 11, -1, -1, -1, -1, -1, -1, -1, }, + { 4, 7, 11, 9, 4, 11, 9, 11, 2, 9, 2, 1, -1, -1, -1, -1, }, + { 1, 2, 10, 8, 4, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 3, 4, 7, 3, 0, 4, 1, 2, 10, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 2, 10, 9, 0, 2, 8, 4, 7, -1, -1, -1, -1, -1, -1, -1, }, + { 2, 10, 9, 2, 9, 7, 2, 7, 3, 7, 9, 4, -1, -1, -1, -1, }, + { 3, 10, 1, 3, 11, 10, 7, 8, 4, -1, -1, -1, -1, -1, -1, -1, }, + { 1, 11, 10, 1, 4, 11, 1, 0, 4, 7, 11, 4, -1, -1, -1, -1, }, + { 4, 7, 8, 9, 0, 11, 9, 11, 10, 11, 0, 3, -1, -1, -1, -1, }, + { 4, 7, 11, 4, 11, 9, 9, 11, 10, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 5, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 5, 4, 0, 8, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 5, 4, 1, 5, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 8, 5, 4, 8, 3, 5, 3, 1, 5, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 5, 4, 2, 3, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 11, 2, 0, 8, 11, 4, 9, 5, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 5, 4, 0, 1, 5, 2, 3, 11, -1, -1, -1, -1, -1, -1, -1, }, + { 2, 1, 5, 2, 5, 8, 2, 8, 11, 4, 8, 5, -1, -1, -1, -1, }, + { 1, 2, 10, 9, 5, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 3, 0, 8, 1, 2, 10, 4, 9, 5, -1, -1, -1, -1, -1, -1, -1, }, + { 5, 2, 10, 5, 4, 2, 4, 0, 2, -1, -1, -1, -1, -1, -1, -1, }, + { 2, 10, 5, 3, 2, 5, 3, 5, 4, 3, 4, 8, -1, -1, -1, -1, }, + { 10, 3, 11, 10, 1, 3, 9, 5, 4, -1, -1, -1, -1, -1, -1, -1, }, + { 4, 9, 5, 0, 8, 1, 8, 10, 1, 8, 11, 10, -1, -1, -1, -1, }, + { 5, 4, 0, 5, 0, 11, 5, 11, 10, 11, 0, 3, -1, -1, -1, -1, }, + { 5, 4, 8, 5, 8, 10, 10, 8, 11, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 7, 8, 5, 7, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 3, 0, 9, 5, 3, 5, 7, 3, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 7, 8, 0, 1, 7, 1, 5, 7, -1, -1, -1, -1, -1, -1, -1, }, + { 1, 5, 3, 3, 5, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 7, 9, 5, 7, 8, 9, 3, 11, 2, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 5, 7, 9, 7, 2, 9, 2, 0, 2, 7, 11, -1, -1, -1, -1, }, + { 2, 3, 11, 0, 1, 8, 1, 7, 8, 1, 5, 7, -1, -1, -1, -1, }, + { 11, 2, 1, 11, 1, 7, 7, 1, 5, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 7, 8, 9, 5, 7, 10, 1, 2, -1, -1, -1, -1, -1, -1, -1, }, + { 10, 1, 2, 9, 5, 0, 5, 3, 0, 5, 7, 3, -1, -1, -1, -1, }, + { 8, 0, 2, 8, 2, 5, 8, 5, 7, 10, 5, 2, -1, -1, -1, -1, }, + { 2, 10, 5, 2, 5, 3, 3, 5, 7, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 5, 8, 8, 5, 7, 10, 1, 3, 10, 3, 11, -1, -1, -1, -1, }, + { 5, 7, 0, 5, 0, 9, 7, 11, 0, 1, 0, 10, 11, 10, 0, -1, }, + { 11, 10, 0, 11, 0, 3, 10, 5, 0, 8, 0, 7, 5, 7, 0, -1, }, + { 11, 10, 5, 7, 11, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 7, 6, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 3, 0, 8, 11, 7, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 1, 9, 11, 7, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 8, 1, 9, 8, 3, 1, 11, 7, 6, -1, -1, -1, -1, -1, -1, -1, }, + { 7, 2, 3, 6, 2, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 7, 0, 8, 7, 6, 0, 6, 2, 0, -1, -1, -1, -1, -1, -1, -1, }, + { 2, 7, 6, 2, 3, 7, 0, 1, 9, -1, -1, -1, -1, -1, -1, -1, }, + { 1, 6, 2, 1, 8, 6, 1, 9, 8, 8, 7, 6, -1, -1, -1, -1, }, + { 10, 1, 2, 6, 11, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 1, 2, 10, 3, 0, 8, 6, 11, 7, -1, -1, -1, -1, -1, -1, -1, }, + { 2, 9, 0, 2, 10, 9, 6, 11, 7, -1, -1, -1, -1, -1, -1, -1, }, + { 6, 11, 7, 2, 10, 3, 10, 8, 3, 10, 9, 8, -1, -1, -1, -1, }, + { 10, 7, 6, 10, 1, 7, 1, 3, 7, -1, -1, -1, -1, -1, -1, -1, }, + { 10, 7, 6, 1, 7, 10, 1, 8, 7, 1, 0, 8, -1, -1, -1, -1, }, + { 0, 3, 7, 0, 7, 10, 0, 10, 9, 6, 10, 7, -1, -1, -1, -1, }, + { 7, 6, 10, 7, 10, 8, 8, 10, 9, -1, -1, -1, -1, -1, -1, -1, }, + { 6, 8, 4, 11, 8, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 3, 6, 11, 3, 0, 6, 0, 4, 6, -1, -1, -1, -1, -1, -1, -1, }, + { 8, 6, 11, 8, 4, 6, 9, 0, 1, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 4, 6, 9, 6, 3, 9, 3, 1, 11, 3, 6, -1, -1, -1, -1, }, + { 8, 2, 3, 8, 4, 2, 4, 6, 2, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 4, 2, 4, 6, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 1, 9, 0, 2, 3, 4, 2, 4, 6, 4, 3, 8, -1, -1, -1, -1, }, + { 1, 9, 4, 1, 4, 2, 2, 4, 6, -1, -1, -1, -1, -1, -1, -1, }, + { 6, 8, 4, 6, 11, 8, 2, 10, 1, -1, -1, -1, -1, -1, -1, -1, }, + { 1, 2, 10, 3, 0, 11, 0, 6, 11, 0, 4, 6, -1, -1, -1, -1, }, + { 4, 11, 8, 4, 6, 11, 0, 2, 9, 2, 10, 9, -1, -1, -1, -1, }, + { 10, 9, 3, 10, 3, 2, 9, 4, 3, 11, 3, 6, 4, 6, 3, -1, }, + { 8, 1, 3, 8, 6, 1, 8, 4, 6, 6, 10, 1, -1, -1, -1, -1, }, + { 10, 1, 0, 10, 0, 6, 6, 0, 4, -1, -1, -1, -1, -1, -1, -1, }, + { 4, 6, 3, 4, 3, 8, 6, 10, 3, 0, 3, 9, 10, 9, 3, -1, }, + { 10, 9, 4, 6, 10, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 4, 9, 5, 7, 6, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 8, 3, 4, 9, 5, 11, 7, 6, -1, -1, -1, -1, -1, -1, -1, }, + { 5, 0, 1, 5, 4, 0, 7, 6, 11, -1, -1, -1, -1, -1, -1, -1, }, + { 11, 7, 6, 8, 3, 4, 3, 5, 4, 3, 1, 5, -1, -1, -1, -1, }, + { 7, 2, 3, 7, 6, 2, 5, 4, 9, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 5, 4, 0, 8, 6, 0, 6, 2, 6, 8, 7, -1, -1, -1, -1, }, + { 3, 6, 2, 3, 7, 6, 1, 5, 0, 5, 4, 0, -1, -1, -1, -1, }, + { 6, 2, 8, 6, 8, 7, 2, 1, 8, 4, 8, 5, 1, 5, 8, -1, }, + { 9, 5, 4, 10, 1, 2, 7, 6, 11, -1, -1, -1, -1, -1, -1, -1, }, + { 6, 11, 7, 1, 2, 10, 0, 8, 3, 4, 9, 5, -1, -1, -1, -1, }, + { 7, 6, 11, 5, 4, 10, 4, 2, 10, 4, 0, 2, -1, -1, -1, -1, }, + { 3, 4, 8, 3, 5, 4, 3, 2, 5, 10, 5, 2, 11, 7, 6, -1, }, + { 9, 5, 4, 10, 1, 6, 1, 7, 6, 1, 3, 7, -1, -1, -1, -1, }, + { 1, 6, 10, 1, 7, 6, 1, 0, 7, 8, 7, 0, 9, 5, 4, -1, }, + { 4, 0, 10, 4, 10, 5, 0, 3, 10, 6, 10, 7, 3, 7, 10, -1, }, + { 7, 6, 10, 7, 10, 8, 5, 4, 10, 4, 8, 10, -1, -1, -1, -1, }, + { 6, 9, 5, 6, 11, 9, 11, 8, 9, -1, -1, -1, -1, -1, -1, -1, }, + { 3, 6, 11, 0, 6, 3, 0, 5, 6, 0, 9, 5, -1, -1, -1, -1, }, + { 0, 11, 8, 0, 5, 11, 0, 1, 5, 5, 6, 11, -1, -1, -1, -1, }, + { 6, 11, 3, 6, 3, 5, 5, 3, 1, -1, -1, -1, -1, -1, -1, -1, }, + { 5, 8, 9, 5, 2, 8, 5, 6, 2, 3, 8, 2, -1, -1, -1, -1, }, + { 9, 5, 6, 9, 6, 0, 0, 6, 2, -1, -1, -1, -1, -1, -1, -1, }, + { 1, 5, 8, 1, 8, 0, 5, 6, 8, 3, 8, 2, 6, 2, 8, -1, }, + { 1, 5, 6, 2, 1, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 1, 2, 10, 9, 5, 11, 9, 11, 8, 11, 5, 6, -1, -1, -1, -1, }, + { 0, 11, 3, 0, 6, 11, 0, 9, 6, 5, 6, 9, 1, 2, 10, -1, }, + { 11, 8, 5, 11, 5, 6, 8, 0, 5, 10, 5, 2, 0, 2, 5, -1, }, + { 6, 11, 3, 6, 3, 5, 2, 10, 3, 10, 5, 3, -1, -1, -1, -1, }, + { 1, 3, 6, 1, 6, 10, 3, 8, 6, 5, 6, 9, 8, 9, 6, -1, }, + { 10, 1, 0, 10, 0, 6, 9, 5, 0, 5, 6, 0, -1, -1, -1, -1, }, + { 0, 3, 8, 5, 6, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 10, 5, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 10, 6, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 8, 3, 5, 10, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 0, 1, 5, 10, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 1, 8, 3, 1, 9, 8, 5, 10, 6, -1, -1, -1, -1, -1, -1, -1, }, + { 2, 3, 11, 10, 6, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 11, 0, 8, 11, 2, 0, 10, 6, 5, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 1, 9, 2, 3, 11, 5, 10, 6, -1, -1, -1, -1, -1, -1, -1, }, + { 5, 10, 6, 1, 9, 2, 9, 11, 2, 9, 8, 11, -1, -1, -1, -1, }, + { 1, 6, 5, 2, 6, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 1, 6, 5, 1, 2, 6, 3, 0, 8, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 6, 5, 9, 0, 6, 0, 2, 6, -1, -1, -1, -1, -1, -1, -1, }, + { 5, 9, 8, 5, 8, 2, 5, 2, 6, 3, 2, 8, -1, -1, -1, -1, }, + { 6, 3, 11, 6, 5, 3, 5, 1, 3, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 8, 11, 0, 11, 5, 0, 5, 1, 5, 11, 6, -1, -1, -1, -1, }, + { 3, 11, 6, 0, 3, 6, 0, 6, 5, 0, 5, 9, -1, -1, -1, -1, }, + { 6, 5, 9, 6, 9, 11, 11, 9, 8, -1, -1, -1, -1, -1, -1, -1, }, + { 5, 10, 6, 4, 7, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 4, 3, 0, 4, 7, 3, 6, 5, 10, -1, -1, -1, -1, -1, -1, -1, }, + { 1, 9, 0, 5, 10, 6, 8, 4, 7, -1, -1, -1, -1, -1, -1, -1, }, + { 10, 6, 5, 1, 9, 7, 1, 7, 3, 7, 9, 4, -1, -1, -1, -1, }, + { 3, 11, 2, 7, 8, 4, 10, 6, 5, -1, -1, -1, -1, -1, -1, -1, }, + { 5, 10, 6, 4, 7, 2, 4, 2, 0, 2, 7, 11, -1, -1, -1, -1, }, + { 0, 1, 9, 4, 7, 8, 2, 3, 11, 5, 10, 6, -1, -1, -1, -1, }, + { 9, 2, 1, 9, 11, 2, 9, 4, 11, 7, 11, 4, 5, 10, 6, -1, }, + { 6, 1, 2, 6, 5, 1, 4, 7, 8, -1, -1, -1, -1, -1, -1, -1, }, + { 1, 2, 5, 5, 2, 6, 3, 0, 4, 3, 4, 7, -1, -1, -1, -1, }, + { 8, 4, 7, 9, 0, 5, 0, 6, 5, 0, 2, 6, -1, -1, -1, -1, }, + { 7, 3, 9, 7, 9, 4, 3, 2, 9, 5, 9, 6, 2, 6, 9, -1, }, + { 8, 4, 7, 3, 11, 5, 3, 5, 1, 5, 11, 6, -1, -1, -1, -1, }, + { 5, 1, 11, 5, 11, 6, 1, 0, 11, 7, 11, 4, 0, 4, 11, -1, }, + { 0, 5, 9, 0, 6, 5, 0, 3, 6, 11, 6, 3, 8, 4, 7, -1, }, + { 6, 5, 9, 6, 9, 11, 4, 7, 9, 7, 11, 9, -1, -1, -1, -1, }, + { 10, 4, 9, 6, 4, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 4, 10, 6, 4, 9, 10, 0, 8, 3, -1, -1, -1, -1, -1, -1, -1, }, + { 10, 0, 1, 10, 6, 0, 6, 4, 0, -1, -1, -1, -1, -1, -1, -1, }, + { 8, 3, 1, 8, 1, 6, 8, 6, 4, 6, 1, 10, -1, -1, -1, -1, }, + { 10, 4, 9, 10, 6, 4, 11, 2, 3, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 8, 2, 2, 8, 11, 4, 9, 10, 4, 10, 6, -1, -1, -1, -1, }, + { 3, 11, 2, 0, 1, 6, 0, 6, 4, 6, 1, 10, -1, -1, -1, -1, }, + { 6, 4, 1, 6, 1, 10, 4, 8, 1, 2, 1, 11, 8, 11, 1, -1, }, + { 1, 4, 9, 1, 2, 4, 2, 6, 4, -1, -1, -1, -1, -1, -1, -1, }, + { 3, 0, 8, 1, 2, 9, 2, 4, 9, 2, 6, 4, -1, -1, -1, -1, }, + { 0, 2, 4, 4, 2, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 8, 3, 2, 8, 2, 4, 4, 2, 6, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 6, 4, 9, 3, 6, 9, 1, 3, 11, 6, 3, -1, -1, -1, -1, }, + { 8, 11, 1, 8, 1, 0, 11, 6, 1, 9, 1, 4, 6, 4, 1, -1, }, + { 3, 11, 6, 3, 6, 0, 0, 6, 4, -1, -1, -1, -1, -1, -1, -1, }, + { 6, 4, 8, 11, 6, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 7, 10, 6, 7, 8, 10, 8, 9, 10, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 7, 3, 0, 10, 7, 0, 9, 10, 6, 7, 10, -1, -1, -1, -1, }, + { 10, 6, 7, 1, 10, 7, 1, 7, 8, 1, 8, 0, -1, -1, -1, -1, }, + { 10, 6, 7, 10, 7, 1, 1, 7, 3, -1, -1, -1, -1, -1, -1, -1, }, + { 2, 3, 11, 10, 6, 8, 10, 8, 9, 8, 6, 7, -1, -1, -1, -1, }, + { 2, 0, 7, 2, 7, 11, 0, 9, 7, 6, 7, 10, 9, 10, 7, -1, }, + { 1, 8, 0, 1, 7, 8, 1, 10, 7, 6, 7, 10, 2, 3, 11, -1, }, + { 11, 2, 1, 11, 1, 7, 10, 6, 1, 6, 7, 1, -1, -1, -1, -1, }, + { 1, 2, 6, 1, 6, 8, 1, 8, 9, 8, 6, 7, -1, -1, -1, -1, }, + { 2, 6, 9, 2, 9, 1, 6, 7, 9, 0, 9, 3, 7, 3, 9, -1, }, + { 7, 8, 0, 7, 0, 6, 6, 0, 2, -1, -1, -1, -1, -1, -1, -1, }, + { 7, 3, 2, 6, 7, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 8, 9, 6, 8, 6, 7, 9, 1, 6, 11, 6, 3, 1, 3, 6, -1, }, + { 0, 9, 1, 11, 6, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 7, 8, 0, 7, 0, 6, 3, 11, 0, 11, 6, 0, -1, -1, -1, -1, }, + { 7, 11, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 11, 5, 10, 7, 5, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 11, 5, 10, 11, 7, 5, 8, 3, 0, -1, -1, -1, -1, -1, -1, -1, }, + { 5, 11, 7, 5, 10, 11, 1, 9, 0, -1, -1, -1, -1, -1, -1, -1, }, + { 10, 7, 5, 10, 11, 7, 9, 8, 1, 8, 3, 1, -1, -1, -1, -1, }, + { 2, 5, 10, 2, 3, 5, 3, 7, 5, -1, -1, -1, -1, -1, -1, -1, }, + { 8, 2, 0, 8, 5, 2, 8, 7, 5, 10, 2, 5, -1, -1, -1, -1, }, + { 9, 0, 1, 5, 10, 3, 5, 3, 7, 3, 10, 2, -1, -1, -1, -1, }, + { 9, 8, 2, 9, 2, 1, 8, 7, 2, 10, 2, 5, 7, 5, 2, -1, }, + { 11, 1, 2, 11, 7, 1, 7, 5, 1, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 8, 3, 1, 2, 7, 1, 7, 5, 7, 2, 11, -1, -1, -1, -1, }, + { 9, 7, 5, 9, 2, 7, 9, 0, 2, 2, 11, 7, -1, -1, -1, -1, }, + { 7, 5, 2, 7, 2, 11, 5, 9, 2, 3, 2, 8, 9, 8, 2, -1, }, + { 1, 3, 5, 3, 7, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 8, 7, 0, 7, 1, 1, 7, 5, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 0, 3, 9, 3, 5, 5, 3, 7, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 8, 7, 5, 9, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 5, 8, 4, 5, 10, 8, 10, 11, 8, -1, -1, -1, -1, -1, -1, -1, }, + { 5, 0, 4, 5, 11, 0, 5, 10, 11, 11, 3, 0, -1, -1, -1, -1, }, + { 0, 1, 9, 8, 4, 10, 8, 10, 11, 10, 4, 5, -1, -1, -1, -1, }, + { 10, 11, 4, 10, 4, 5, 11, 3, 4, 9, 4, 1, 3, 1, 4, -1, }, + { 2, 5, 10, 3, 5, 2, 3, 4, 5, 3, 8, 4, -1, -1, -1, -1, }, + { 5, 10, 2, 5, 2, 4, 4, 2, 0, -1, -1, -1, -1, -1, -1, -1, }, + { 3, 10, 2, 3, 5, 10, 3, 8, 5, 4, 5, 8, 0, 1, 9, -1, }, + { 5, 10, 2, 5, 2, 4, 1, 9, 2, 9, 4, 2, -1, -1, -1, -1, }, + { 2, 5, 1, 2, 8, 5, 2, 11, 8, 4, 5, 8, -1, -1, -1, -1, }, + { 0, 4, 11, 0, 11, 3, 4, 5, 11, 2, 11, 1, 5, 1, 11, -1, }, + { 0, 2, 5, 0, 5, 9, 2, 11, 5, 4, 5, 8, 11, 8, 5, -1, }, + { 9, 4, 5, 2, 11, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 8, 4, 5, 8, 5, 3, 3, 5, 1, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 4, 5, 1, 0, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 8, 4, 5, 8, 5, 3, 9, 0, 5, 0, 3, 5, -1, -1, -1, -1, }, + { 9, 4, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 4, 11, 7, 4, 9, 11, 9, 10, 11, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 8, 3, 4, 9, 7, 9, 11, 7, 9, 10, 11, -1, -1, -1, -1, }, + { 1, 10, 11, 1, 11, 4, 1, 4, 0, 7, 4, 11, -1, -1, -1, -1, }, + { 3, 1, 4, 3, 4, 8, 1, 10, 4, 7, 4, 11, 10, 11, 4, -1, }, + { 2, 9, 10, 2, 7, 9, 2, 3, 7, 7, 4, 9, -1, -1, -1, -1, }, + { 9, 10, 7, 9, 7, 4, 10, 2, 7, 8, 7, 0, 2, 0, 7, -1, }, + { 3, 7, 10, 3, 10, 2, 7, 4, 10, 1, 10, 0, 4, 0, 10, -1, }, + { 1, 10, 2, 8, 7, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 4, 11, 7, 9, 11, 4, 9, 2, 11, 9, 1, 2, -1, -1, -1, -1, }, + { 9, 7, 4, 9, 11, 7, 9, 1, 11, 2, 11, 1, 0, 8, 3, -1, }, + { 11, 7, 4, 11, 4, 2, 2, 4, 0, -1, -1, -1, -1, -1, -1, -1, }, + { 11, 7, 4, 11, 4, 2, 8, 3, 4, 3, 2, 4, -1, -1, -1, -1, }, + { 4, 9, 1, 4, 1, 7, 7, 1, 3, -1, -1, -1, -1, -1, -1, -1, }, + { 4, 9, 1, 4, 1, 7, 0, 8, 1, 8, 7, 1, -1, -1, -1, -1, }, + { 4, 0, 3, 7, 4, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 4, 8, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 10, 8, 10, 11, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 3, 0, 9, 3, 9, 11, 11, 9, 10, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 1, 10, 0, 10, 8, 8, 10, 11, -1, -1, -1, -1, -1, -1, -1, }, + { 3, 1, 10, 11, 3, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 2, 3, 8, 2, 8, 10, 10, 8, 9, -1, -1, -1, -1, -1, -1, -1, }, + { 9, 10, 2, 0, 9, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 2, 3, 8, 2, 8, 10, 0, 1, 8, 1, 10, 8, -1, -1, -1, -1, }, + { 1, 10, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 1, 2, 11, 1, 11, 9, 9, 11, 8, -1, -1, -1, -1, -1, -1, -1, }, + { 3, 0, 9, 3, 9, 11, 1, 2, 9, 2, 11, 9, -1, -1, -1, -1, }, + { 0, 2, 11, 8, 0, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 3, 2, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 1, 3, 8, 9, 1, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 9, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { 0, 3, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, + { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, } + }; } #endif diff --git a/library/PolyVoxCore/source/Impl/MarchingCubesTables.cpp b/library/PolyVoxCore/source/Impl/MarchingCubesTables.cpp deleted file mode 100644 index 15769007..00000000 --- a/library/PolyVoxCore/source/Impl/MarchingCubesTables.cpp +++ /dev/null @@ -1,328 +0,0 @@ -/******************************************************************************* -Copyright (c) 2005-2009 David Williams - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -*******************************************************************************/ - -//These tables were based on the article "Polygonising a scalar field". -//They have been optimised to allow a more efficient algorithm via bitwise operations. - -// http://local.wasp.uwa.edu.au/~pbourke/geometry/polygonise/index.html - -#include "PolyVoxCore/Impl/MarchingCubesTables.h" - -namespace PolyVox -{ - const uint16_t edgeTable[256]= - { - 0x000, 0x109, 0x203, 0x30a, 0x80c, 0x905, 0xa0f, 0xb06, - 0x406, 0x50f, 0x605, 0x70c, 0xc0a, 0xd03, 0xe09, 0xf00, - 0x190, 0x099, 0x393, 0x29a, 0x99c, 0x895, 0xb9f, 0xa96, - 0x596, 0x49f, 0x795, 0x69c, 0xd9a, 0xc93, 0xf99, 0xe90, - 0x230, 0x339, 0x033, 0x13a, 0xa3c, 0xb35, 0x83f, 0x936, - 0x636, 0x73f, 0x435, 0x53c, 0xe3a, 0xf33, 0xc39, 0xd30, - 0x3a0, 0x2a9, 0x1a3, 0x0aa, 0xbac, 0xaa5, 0x9af, 0x8a6, - 0x7a6, 0x6af, 0x5a5, 0x4ac, 0xfaa, 0xea3, 0xda9, 0xca0, - 0x8c0, 0x9c9, 0xac3, 0xbca, 0x0cc, 0x1c5, 0x2cf, 0x3c6, - 0xcc6, 0xdcf, 0xec5, 0xfcc, 0x4ca, 0x5c3, 0x6c9, 0x7c0, - 0x950, 0x859, 0xb53, 0xa5a, 0x15c, 0x055, 0x35f, 0x256, - 0xd56, 0xc5f, 0xf55, 0xe5c, 0x55a, 0x453, 0x759, 0x650, - 0xaf0, 0xbf9, 0x8f3, 0x9fa, 0x2fc, 0x3f5, 0x0ff, 0x1f6, - 0xef6, 0xfff, 0xcf5, 0xdfc, 0x6fa, 0x7f3, 0x4f9, 0x5f0, - 0xb60, 0xa69, 0x963, 0x86a, 0x36c, 0x265, 0x16f, 0x066, - 0xf66, 0xe6f, 0xd65, 0xc6c, 0x76a, 0x663, 0x569, 0x460, - 0x460, 0x569, 0x663, 0x76a, 0xc6c, 0xd65, 0xe6f, 0xf66, - 0x066, 0x16f, 0x265, 0x36c, 0x86a, 0x963, 0xa69, 0xb60, - 0x5f0, 0x4f9, 0x7f3, 0x6fa, 0xdfc, 0xcf5, 0xfff, 0xef6, - 0x1f6, 0x0ff, 0x3f5, 0x2fc, 0x9fa, 0x8f3, 0xbf9, 0xaf0, - 0x650, 0x759, 0x453, 0x55a, 0xe5c, 0xf55, 0xc5f, 0xd56, - 0x256, 0x35f, 0x055, 0x15c, 0xa5a, 0xb53, 0x859, 0x950, - 0x7c0, 0x6c9, 0x5c3, 0x4ca, 0xfcc, 0xec5, 0xdcf, 0xcc6, - 0x3c6, 0x2cf, 0x1c5, 0x0cc, 0xbca, 0xac3, 0x9c9, 0x8c0, - 0xca0, 0xda9, 0xea3, 0xfaa, 0x4ac, 0x5a5, 0x6af, 0x7a6, - 0x8a6, 0x9af, 0xaa5, 0xbac, 0x0aa, 0x1a3, 0x2a9, 0x3a0, - 0xd30, 0xc39, 0xf33, 0xe3a, 0x53c, 0x435, 0x73f, 0x636, - 0x936, 0x83f, 0xb35, 0xa3c, 0x13a, 0x033, 0x339, 0x230, - 0xe90, 0xf99, 0xc93, 0xd9a, 0x69c, 0x795, 0x49f, 0x596, - 0xa96, 0xb9f, 0x895, 0x99c, 0x29a, 0x393, 0x099, 0x190, - 0xf00, 0xe09, 0xd03, 0xc0a, 0x70c, 0x605, 0x50f, 0x406, - 0xb06, 0xa0f, 0x905, 0x80c, 0x30a, 0x203, 0x109, 0x000 - }; - - const int8_t triTable[256][16] = - { - {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 8, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 1, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 1, 8, 3, 9, 8, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 3, 11, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 11, 2, 8, 11, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 1, 9, 0, 2, 3, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 1, 11, 2, 1, 9, 11, 9, 8, 11, -1, -1, -1, -1, -1, -1, -1, }, - { 1, 2, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 8, 3, 1, 2, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 2, 10, 0, 2, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 2, 8, 3, 2, 10, 8, 10, 9, 8, -1, -1, -1, -1, -1, -1, -1, }, - { 3, 10, 1, 11, 10, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 10, 1, 0, 8, 10, 8, 11, 10, -1, -1, -1, -1, -1, -1, -1, }, - { 3, 9, 0, 3, 11, 9, 11, 10, 9, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 8, 10, 10, 8, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 4, 7, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 4, 3, 0, 7, 3, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 1, 9, 8, 4, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 4, 1, 9, 4, 7, 1, 7, 3, 1, -1, -1, -1, -1, -1, -1, -1, }, - { 8, 4, 7, 3, 11, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - {11, 4, 7, 11, 2, 4, 2, 0, 4, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 0, 1, 8, 4, 7, 2, 3, 11, -1, -1, -1, -1, -1, -1, -1, }, - { 4, 7, 11, 9, 4, 11, 9, 11, 2, 9, 2, 1, -1, -1, -1, -1, }, - { 1, 2, 10, 8, 4, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 3, 4, 7, 3, 0, 4, 1, 2, 10, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 2, 10, 9, 0, 2, 8, 4, 7, -1, -1, -1, -1, -1, -1, -1, }, - { 2, 10, 9, 2, 9, 7, 2, 7, 3, 7, 9, 4, -1, -1, -1, -1, }, - { 3, 10, 1, 3, 11, 10, 7, 8, 4, -1, -1, -1, -1, -1, -1, -1, }, - { 1, 11, 10, 1, 4, 11, 1, 0, 4, 7, 11, 4, -1, -1, -1, -1, }, - { 4, 7, 8, 9, 0, 11, 9, 11, 10, 11, 0, 3, -1, -1, -1, -1, }, - { 4, 7, 11, 4, 11, 9, 9, 11, 10, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 5, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 5, 4, 0, 8, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 5, 4, 1, 5, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 8, 5, 4, 8, 3, 5, 3, 1, 5, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 5, 4, 2, 3, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 11, 2, 0, 8, 11, 4, 9, 5, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 5, 4, 0, 1, 5, 2, 3, 11, -1, -1, -1, -1, -1, -1, -1, }, - { 2, 1, 5, 2, 5, 8, 2, 8, 11, 4, 8, 5, -1, -1, -1, -1, }, - { 1, 2, 10, 9, 5, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 3, 0, 8, 1, 2, 10, 4, 9, 5, -1, -1, -1, -1, -1, -1, -1, }, - { 5, 2, 10, 5, 4, 2, 4, 0, 2, -1, -1, -1, -1, -1, -1, -1, }, - { 2, 10, 5, 3, 2, 5, 3, 5, 4, 3, 4, 8, -1, -1, -1, -1, }, - {10, 3, 11, 10, 1, 3, 9, 5, 4, -1, -1, -1, -1, -1, -1, -1, }, - { 4, 9, 5, 0, 8, 1, 8, 10, 1, 8, 11, 10, -1, -1, -1, -1, }, - { 5, 4, 0, 5, 0, 11, 5, 11, 10, 11, 0, 3, -1, -1, -1, -1, }, - { 5, 4, 8, 5, 8, 10, 10, 8, 11, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 7, 8, 5, 7, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 3, 0, 9, 5, 3, 5, 7, 3, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 7, 8, 0, 1, 7, 1, 5, 7, -1, -1, -1, -1, -1, -1, -1, }, - { 1, 5, 3, 3, 5, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 7, 9, 5, 7, 8, 9, 3, 11, 2, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 5, 7, 9, 7, 2, 9, 2, 0, 2, 7, 11, -1, -1, -1, -1, }, - { 2, 3, 11, 0, 1, 8, 1, 7, 8, 1, 5, 7, -1, -1, -1, -1, }, - {11, 2, 1, 11, 1, 7, 7, 1, 5, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 7, 8, 9, 5, 7, 10, 1, 2, -1, -1, -1, -1, -1, -1, -1, }, - {10, 1, 2, 9, 5, 0, 5, 3, 0, 5, 7, 3, -1, -1, -1, -1, }, - { 8, 0, 2, 8, 2, 5, 8, 5, 7, 10, 5, 2, -1, -1, -1, -1, }, - { 2, 10, 5, 2, 5, 3, 3, 5, 7, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 5, 8, 8, 5, 7, 10, 1, 3, 10, 3, 11, -1, -1, -1, -1, }, - { 5, 7, 0, 5, 0, 9, 7, 11, 0, 1, 0, 10, 11, 10, 0, -1, }, - {11, 10, 0, 11, 0, 3, 10, 5, 0, 8, 0, 7, 5, 7, 0, -1, }, - {11, 10, 5, 7, 11, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 7, 6, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 3, 0, 8, 11, 7, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 1, 9, 11, 7, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 8, 1, 9, 8, 3, 1, 11, 7, 6, -1, -1, -1, -1, -1, -1, -1, }, - { 7, 2, 3, 6, 2, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 7, 0, 8, 7, 6, 0, 6, 2, 0, -1, -1, -1, -1, -1, -1, -1, }, - { 2, 7, 6, 2, 3, 7, 0, 1, 9, -1, -1, -1, -1, -1, -1, -1, }, - { 1, 6, 2, 1, 8, 6, 1, 9, 8, 8, 7, 6, -1, -1, -1, -1, }, - {10, 1, 2, 6, 11, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 1, 2, 10, 3, 0, 8, 6, 11, 7, -1, -1, -1, -1, -1, -1, -1, }, - { 2, 9, 0, 2, 10, 9, 6, 11, 7, -1, -1, -1, -1, -1, -1, -1, }, - { 6, 11, 7, 2, 10, 3, 10, 8, 3, 10, 9, 8, -1, -1, -1, -1, }, - {10, 7, 6, 10, 1, 7, 1, 3, 7, -1, -1, -1, -1, -1, -1, -1, }, - {10, 7, 6, 1, 7, 10, 1, 8, 7, 1, 0, 8, -1, -1, -1, -1, }, - { 0, 3, 7, 0, 7, 10, 0, 10, 9, 6, 10, 7, -1, -1, -1, -1, }, - { 7, 6, 10, 7, 10, 8, 8, 10, 9, -1, -1, -1, -1, -1, -1, -1, }, - { 6, 8, 4, 11, 8, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 3, 6, 11, 3, 0, 6, 0, 4, 6, -1, -1, -1, -1, -1, -1, -1, }, - { 8, 6, 11, 8, 4, 6, 9, 0, 1, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 4, 6, 9, 6, 3, 9, 3, 1, 11, 3, 6, -1, -1, -1, -1, }, - { 8, 2, 3, 8, 4, 2, 4, 6, 2, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 4, 2, 4, 6, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 1, 9, 0, 2, 3, 4, 2, 4, 6, 4, 3, 8, -1, -1, -1, -1, }, - { 1, 9, 4, 1, 4, 2, 2, 4, 6, -1, -1, -1, -1, -1, -1, -1, }, - { 6, 8, 4, 6, 11, 8, 2, 10, 1, -1, -1, -1, -1, -1, -1, -1, }, - { 1, 2, 10, 3, 0, 11, 0, 6, 11, 0, 4, 6, -1, -1, -1, -1, }, - { 4, 11, 8, 4, 6, 11, 0, 2, 9, 2, 10, 9, -1, -1, -1, -1, }, - {10, 9, 3, 10, 3, 2, 9, 4, 3, 11, 3, 6, 4, 6, 3, -1, }, - { 8, 1, 3, 8, 6, 1, 8, 4, 6, 6, 10, 1, -1, -1, -1, -1, }, - {10, 1, 0, 10, 0, 6, 6, 0, 4, -1, -1, -1, -1, -1, -1, -1, }, - { 4, 6, 3, 4, 3, 8, 6, 10, 3, 0, 3, 9, 10, 9, 3, -1, }, - {10, 9, 4, 6, 10, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 4, 9, 5, 7, 6, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 8, 3, 4, 9, 5, 11, 7, 6, -1, -1, -1, -1, -1, -1, -1, }, - { 5, 0, 1, 5, 4, 0, 7, 6, 11, -1, -1, -1, -1, -1, -1, -1, }, - {11, 7, 6, 8, 3, 4, 3, 5, 4, 3, 1, 5, -1, -1, -1, -1, }, - { 7, 2, 3, 7, 6, 2, 5, 4, 9, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 5, 4, 0, 8, 6, 0, 6, 2, 6, 8, 7, -1, -1, -1, -1, }, - { 3, 6, 2, 3, 7, 6, 1, 5, 0, 5, 4, 0, -1, -1, -1, -1, }, - { 6, 2, 8, 6, 8, 7, 2, 1, 8, 4, 8, 5, 1, 5, 8, -1, }, - { 9, 5, 4, 10, 1, 2, 7, 6, 11, -1, -1, -1, -1, -1, -1, -1, }, - { 6, 11, 7, 1, 2, 10, 0, 8, 3, 4, 9, 5, -1, -1, -1, -1, }, - { 7, 6, 11, 5, 4, 10, 4, 2, 10, 4, 0, 2, -1, -1, -1, -1, }, - { 3, 4, 8, 3, 5, 4, 3, 2, 5, 10, 5, 2, 11, 7, 6, -1, }, - { 9, 5, 4, 10, 1, 6, 1, 7, 6, 1, 3, 7, -1, -1, -1, -1, }, - { 1, 6, 10, 1, 7, 6, 1, 0, 7, 8, 7, 0, 9, 5, 4, -1, }, - { 4, 0, 10, 4, 10, 5, 0, 3, 10, 6, 10, 7, 3, 7, 10, -1, }, - { 7, 6, 10, 7, 10, 8, 5, 4, 10, 4, 8, 10, -1, -1, -1, -1, }, - { 6, 9, 5, 6, 11, 9, 11, 8, 9, -1, -1, -1, -1, -1, -1, -1, }, - { 3, 6, 11, 0, 6, 3, 0, 5, 6, 0, 9, 5, -1, -1, -1, -1, }, - { 0, 11, 8, 0, 5, 11, 0, 1, 5, 5, 6, 11, -1, -1, -1, -1, }, - { 6, 11, 3, 6, 3, 5, 5, 3, 1, -1, -1, -1, -1, -1, -1, -1, }, - { 5, 8, 9, 5, 2, 8, 5, 6, 2, 3, 8, 2, -1, -1, -1, -1, }, - { 9, 5, 6, 9, 6, 0, 0, 6, 2, -1, -1, -1, -1, -1, -1, -1, }, - { 1, 5, 8, 1, 8, 0, 5, 6, 8, 3, 8, 2, 6, 2, 8, -1, }, - { 1, 5, 6, 2, 1, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 1, 2, 10, 9, 5, 11, 9, 11, 8, 11, 5, 6, -1, -1, -1, -1, }, - { 0, 11, 3, 0, 6, 11, 0, 9, 6, 5, 6, 9, 1, 2, 10, -1, }, - {11, 8, 5, 11, 5, 6, 8, 0, 5, 10, 5, 2, 0, 2, 5, -1, }, - { 6, 11, 3, 6, 3, 5, 2, 10, 3, 10, 5, 3, -1, -1, -1, -1, }, - { 1, 3, 6, 1, 6, 10, 3, 8, 6, 5, 6, 9, 8, 9, 6, -1, }, - {10, 1, 0, 10, 0, 6, 9, 5, 0, 5, 6, 0, -1, -1, -1, -1, }, - { 0, 3, 8, 5, 6, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - {10, 5, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - {10, 6, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 8, 3, 5, 10, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 0, 1, 5, 10, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 1, 8, 3, 1, 9, 8, 5, 10, 6, -1, -1, -1, -1, -1, -1, -1, }, - { 2, 3, 11, 10, 6, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - {11, 0, 8, 11, 2, 0, 10, 6, 5, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 1, 9, 2, 3, 11, 5, 10, 6, -1, -1, -1, -1, -1, -1, -1, }, - { 5, 10, 6, 1, 9, 2, 9, 11, 2, 9, 8, 11, -1, -1, -1, -1, }, - { 1, 6, 5, 2, 6, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 1, 6, 5, 1, 2, 6, 3, 0, 8, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 6, 5, 9, 0, 6, 0, 2, 6, -1, -1, -1, -1, -1, -1, -1, }, - { 5, 9, 8, 5, 8, 2, 5, 2, 6, 3, 2, 8, -1, -1, -1, -1, }, - { 6, 3, 11, 6, 5, 3, 5, 1, 3, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 8, 11, 0, 11, 5, 0, 5, 1, 5, 11, 6, -1, -1, -1, -1, }, - { 3, 11, 6, 0, 3, 6, 0, 6, 5, 0, 5, 9, -1, -1, -1, -1, }, - { 6, 5, 9, 6, 9, 11, 11, 9, 8, -1, -1, -1, -1, -1, -1, -1, }, - { 5, 10, 6, 4, 7, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 4, 3, 0, 4, 7, 3, 6, 5, 10, -1, -1, -1, -1, -1, -1, -1, }, - { 1, 9, 0, 5, 10, 6, 8, 4, 7, -1, -1, -1, -1, -1, -1, -1, }, - {10, 6, 5, 1, 9, 7, 1, 7, 3, 7, 9, 4, -1, -1, -1, -1, }, - { 3, 11, 2, 7, 8, 4, 10, 6, 5, -1, -1, -1, -1, -1, -1, -1, }, - { 5, 10, 6, 4, 7, 2, 4, 2, 0, 2, 7, 11, -1, -1, -1, -1, }, - { 0, 1, 9, 4, 7, 8, 2, 3, 11, 5, 10, 6, -1, -1, -1, -1, }, - { 9, 2, 1, 9, 11, 2, 9, 4, 11, 7, 11, 4, 5, 10, 6, -1, }, - { 6, 1, 2, 6, 5, 1, 4, 7, 8, -1, -1, -1, -1, -1, -1, -1, }, - { 1, 2, 5, 5, 2, 6, 3, 0, 4, 3, 4, 7, -1, -1, -1, -1, }, - { 8, 4, 7, 9, 0, 5, 0, 6, 5, 0, 2, 6, -1, -1, -1, -1, }, - { 7, 3, 9, 7, 9, 4, 3, 2, 9, 5, 9, 6, 2, 6, 9, -1, }, - { 8, 4, 7, 3, 11, 5, 3, 5, 1, 5, 11, 6, -1, -1, -1, -1, }, - { 5, 1, 11, 5, 11, 6, 1, 0, 11, 7, 11, 4, 0, 4, 11, -1, }, - { 0, 5, 9, 0, 6, 5, 0, 3, 6, 11, 6, 3, 8, 4, 7, -1, }, - { 6, 5, 9, 6, 9, 11, 4, 7, 9, 7, 11, 9, -1, -1, -1, -1, }, - {10, 4, 9, 6, 4, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 4, 10, 6, 4, 9, 10, 0, 8, 3, -1, -1, -1, -1, -1, -1, -1, }, - {10, 0, 1, 10, 6, 0, 6, 4, 0, -1, -1, -1, -1, -1, -1, -1, }, - { 8, 3, 1, 8, 1, 6, 8, 6, 4, 6, 1, 10, -1, -1, -1, -1, }, - {10, 4, 9, 10, 6, 4, 11, 2, 3, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 8, 2, 2, 8, 11, 4, 9, 10, 4, 10, 6, -1, -1, -1, -1, }, - { 3, 11, 2, 0, 1, 6, 0, 6, 4, 6, 1, 10, -1, -1, -1, -1, }, - { 6, 4, 1, 6, 1, 10, 4, 8, 1, 2, 1, 11, 8, 11, 1, -1, }, - { 1, 4, 9, 1, 2, 4, 2, 6, 4, -1, -1, -1, -1, -1, -1, -1, }, - { 3, 0, 8, 1, 2, 9, 2, 4, 9, 2, 6, 4, -1, -1, -1, -1, }, - { 0, 2, 4, 4, 2, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 8, 3, 2, 8, 2, 4, 4, 2, 6, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 6, 4, 9, 3, 6, 9, 1, 3, 11, 6, 3, -1, -1, -1, -1, }, - { 8, 11, 1, 8, 1, 0, 11, 6, 1, 9, 1, 4, 6, 4, 1, -1, }, - { 3, 11, 6, 3, 6, 0, 0, 6, 4, -1, -1, -1, -1, -1, -1, -1, }, - { 6, 4, 8, 11, 6, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 7, 10, 6, 7, 8, 10, 8, 9, 10, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 7, 3, 0, 10, 7, 0, 9, 10, 6, 7, 10, -1, -1, -1, -1, }, - {10, 6, 7, 1, 10, 7, 1, 7, 8, 1, 8, 0, -1, -1, -1, -1, }, - {10, 6, 7, 10, 7, 1, 1, 7, 3, -1, -1, -1, -1, -1, -1, -1, }, - { 2, 3, 11, 10, 6, 8, 10, 8, 9, 8, 6, 7, -1, -1, -1, -1, }, - { 2, 0, 7, 2, 7, 11, 0, 9, 7, 6, 7, 10, 9, 10, 7, -1, }, - { 1, 8, 0, 1, 7, 8, 1, 10, 7, 6, 7, 10, 2, 3, 11, -1, }, - {11, 2, 1, 11, 1, 7, 10, 6, 1, 6, 7, 1, -1, -1, -1, -1, }, - { 1, 2, 6, 1, 6, 8, 1, 8, 9, 8, 6, 7, -1, -1, -1, -1, }, - { 2, 6, 9, 2, 9, 1, 6, 7, 9, 0, 9, 3, 7, 3, 9, -1, }, - { 7, 8, 0, 7, 0, 6, 6, 0, 2, -1, -1, -1, -1, -1, -1, -1, }, - { 7, 3, 2, 6, 7, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 8, 9, 6, 8, 6, 7, 9, 1, 6, 11, 6, 3, 1, 3, 6, -1, }, - { 0, 9, 1, 11, 6, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 7, 8, 0, 7, 0, 6, 3, 11, 0, 11, 6, 0, -1, -1, -1, -1, }, - { 7, 11, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - {11, 5, 10, 7, 5, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - {11, 5, 10, 11, 7, 5, 8, 3, 0, -1, -1, -1, -1, -1, -1, -1, }, - { 5, 11, 7, 5, 10, 11, 1, 9, 0, -1, -1, -1, -1, -1, -1, -1, }, - {10, 7, 5, 10, 11, 7, 9, 8, 1, 8, 3, 1, -1, -1, -1, -1, }, - { 2, 5, 10, 2, 3, 5, 3, 7, 5, -1, -1, -1, -1, -1, -1, -1, }, - { 8, 2, 0, 8, 5, 2, 8, 7, 5, 10, 2, 5, -1, -1, -1, -1, }, - { 9, 0, 1, 5, 10, 3, 5, 3, 7, 3, 10, 2, -1, -1, -1, -1, }, - { 9, 8, 2, 9, 2, 1, 8, 7, 2, 10, 2, 5, 7, 5, 2, -1, }, - {11, 1, 2, 11, 7, 1, 7, 5, 1, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 8, 3, 1, 2, 7, 1, 7, 5, 7, 2, 11, -1, -1, -1, -1, }, - { 9, 7, 5, 9, 2, 7, 9, 0, 2, 2, 11, 7, -1, -1, -1, -1, }, - { 7, 5, 2, 7, 2, 11, 5, 9, 2, 3, 2, 8, 9, 8, 2, -1, }, - { 1, 3, 5, 3, 7, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 8, 7, 0, 7, 1, 1, 7, 5, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 0, 3, 9, 3, 5, 5, 3, 7, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 8, 7, 5, 9, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 5, 8, 4, 5, 10, 8, 10, 11, 8, -1, -1, -1, -1, -1, -1, -1, }, - { 5, 0, 4, 5, 11, 0, 5, 10, 11, 11, 3, 0, -1, -1, -1, -1, }, - { 0, 1, 9, 8, 4, 10, 8, 10, 11, 10, 4, 5, -1, -1, -1, -1, }, - {10, 11, 4, 10, 4, 5, 11, 3, 4, 9, 4, 1, 3, 1, 4, -1, }, - { 2, 5, 10, 3, 5, 2, 3, 4, 5, 3, 8, 4, -1, -1, -1, -1, }, - { 5, 10, 2, 5, 2, 4, 4, 2, 0, -1, -1, -1, -1, -1, -1, -1, }, - { 3, 10, 2, 3, 5, 10, 3, 8, 5, 4, 5, 8, 0, 1, 9, -1, }, - { 5, 10, 2, 5, 2, 4, 1, 9, 2, 9, 4, 2, -1, -1, -1, -1, }, - { 2, 5, 1, 2, 8, 5, 2, 11, 8, 4, 5, 8, -1, -1, -1, -1, }, - { 0, 4, 11, 0, 11, 3, 4, 5, 11, 2, 11, 1, 5, 1, 11, -1, }, - { 0, 2, 5, 0, 5, 9, 2, 11, 5, 4, 5, 8, 11, 8, 5, -1, }, - { 9, 4, 5, 2, 11, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 8, 4, 5, 8, 5, 3, 3, 5, 1, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 4, 5, 1, 0, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 8, 4, 5, 8, 5, 3, 9, 0, 5, 0, 3, 5, -1, -1, -1, -1, }, - { 9, 4, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 4, 11, 7, 4, 9, 11, 9, 10, 11, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 8, 3, 4, 9, 7, 9, 11, 7, 9, 10, 11, -1, -1, -1, -1, }, - { 1, 10, 11, 1, 11, 4, 1, 4, 0, 7, 4, 11, -1, -1, -1, -1, }, - { 3, 1, 4, 3, 4, 8, 1, 10, 4, 7, 4, 11, 10, 11, 4, -1, }, - { 2, 9, 10, 2, 7, 9, 2, 3, 7, 7, 4, 9, -1, -1, -1, -1, }, - { 9, 10, 7, 9, 7, 4, 10, 2, 7, 8, 7, 0, 2, 0, 7, -1, }, - { 3, 7, 10, 3, 10, 2, 7, 4, 10, 1, 10, 0, 4, 0, 10, -1, }, - { 1, 10, 2, 8, 7, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 4, 11, 7, 9, 11, 4, 9, 2, 11, 9, 1, 2, -1, -1, -1, -1, }, - { 9, 7, 4, 9, 11, 7, 9, 1, 11, 2, 11, 1, 0, 8, 3, -1, }, - {11, 7, 4, 11, 4, 2, 2, 4, 0, -1, -1, -1, -1, -1, -1, -1, }, - {11, 7, 4, 11, 4, 2, 8, 3, 4, 3, 2, 4, -1, -1, -1, -1, }, - { 4, 9, 1, 4, 1, 7, 7, 1, 3, -1, -1, -1, -1, -1, -1, -1, }, - { 4, 9, 1, 4, 1, 7, 0, 8, 1, 8, 7, 1, -1, -1, -1, -1, }, - { 4, 0, 3, 7, 4, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 4, 8, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 10, 8, 10, 11, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 3, 0, 9, 3, 9, 11, 11, 9, 10, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 1, 10, 0, 10, 8, 8, 10, 11, -1, -1, -1, -1, -1, -1, -1, }, - { 3, 1, 10, 11, 3, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 2, 3, 8, 2, 8, 10, 10, 8, 9, -1, -1, -1, -1, -1, -1, -1, }, - { 9, 10, 2, 0, 9, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 2, 3, 8, 2, 8, 10, 0, 1, 8, 1, 10, 8, -1, -1, -1, -1, }, - { 1, 10, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 1, 2, 11, 1, 11, 9, 9, 11, 8, -1, -1, -1, -1, -1, -1, -1, }, - { 3, 0, 9, 3, 9, 11, 1, 2, 9, 2, 11, 9, -1, -1, -1, -1, }, - { 0, 2, 11, 8, 0, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 3, 2, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 1, 3, 8, 9, 1, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 9, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - { 0, 3, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, - {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, } - }; -} From 8cff2bb2da97d0225a25847379e55b570a15c2cd Mon Sep 17 00:00:00 2001 From: David Williams Date: Fri, 6 Feb 2015 16:43:29 +0100 Subject: [PATCH 04/19] Moved random vectors to header files. --- library/PolyVoxCore/CMakeLists.txt | 4 +- .../PolyVoxCore/Impl/RandomUnitVectors.h | 1028 +++++++++++++++- .../include/PolyVoxCore/Impl/RandomVectors.h | 1028 +++++++++++++++- .../source/Impl/RandomUnitVectors.cpp | 1055 ----------------- .../PolyVoxCore/source/Impl/RandomVectors.cpp | 1055 ----------------- 5 files changed, 2056 insertions(+), 2114 deletions(-) delete mode 100644 library/PolyVoxCore/source/Impl/RandomUnitVectors.cpp delete mode 100644 library/PolyVoxCore/source/Impl/RandomVectors.cpp diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index ed717e07..2e2cb8b0 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -85,8 +85,8 @@ SET(IMPL_SRC_FILES source/Impl/ErrorHandling.cpp source/Impl/Logging.cpp #source/Impl/MarchingCubesTables.cpp - source/Impl/RandomUnitVectors.cpp - source/Impl/RandomVectors.cpp + #source/Impl/RandomUnitVectors.cpp + #source/Impl/RandomVectors.cpp source/Impl/Timer.cpp source/Impl/Utility.cpp ) diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/RandomUnitVectors.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/RandomUnitVectors.h index 69d2af1e..aac04c05 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Impl/RandomUnitVectors.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/RandomUnitVectors.h @@ -30,7 +30,1033 @@ freely, subject to the following restrictions: namespace PolyVox { - extern POLYVOX_API const Vector3DFloat randomUnitVectors[]; + const Vector3DFloat randomUnitVectors[1024] = + { + Vector3DFloat(+0.339922f, +0.827727f, -0.446454f), + Vector3DFloat(+0.084104f, -0.552666f, -0.829148f), + Vector3DFloat(+0.272549f, -0.946890f, +0.170637f), + Vector3DFloat(-0.366941f, -0.785500f, -0.498341f), + Vector3DFloat(-0.566493f, -0.533056f, +0.628440f), + Vector3DFloat(+0.964857f, -0.261032f, -0.030203f), + Vector3DFloat(+0.692249f, -0.251370f, +0.676465f), + Vector3DFloat(-0.962508f, -0.173232f, -0.208734f), + Vector3DFloat(-0.659700f, +0.712315f, +0.239589f), + Vector3DFloat(+0.818392f, -0.574522f, +0.012631f), + Vector3DFloat(+0.560367f, -0.792890f, -0.239405f), + Vector3DFloat(+0.906429f, -0.307885f, +0.289127f), + Vector3DFloat(-0.159051f, +0.461737f, +0.872641f), + Vector3DFloat(-0.231332f, +0.080769f, +0.969516f), + Vector3DFloat(-0.053423f, +0.774833f, +0.629904f), + Vector3DFloat(+0.824248f, -0.144982f, +0.547353f), + Vector3DFloat(+0.174020f, -0.439121f, -0.881413f), + Vector3DFloat(+0.467553f, +0.882007f, -0.058800f), + Vector3DFloat(+0.538442f, -0.808622f, +0.237089f), + Vector3DFloat(+0.502236f, +0.150786f, -0.851483f), + Vector3DFloat(+0.735645f, +0.569407f, -0.366882f), + Vector3DFloat(-0.855825f, -0.328077f, -0.399912f), + Vector3DFloat(-0.474060f, -0.211393f, +0.854740f), + Vector3DFloat(+0.828518f, -0.114561f, +0.548119f), + Vector3DFloat(+0.740223f, -0.663929f, +0.106149f), + Vector3DFloat(-0.604006f, -0.756687f, +0.250204f), + Vector3DFloat(+0.382515f, -0.373773f, -0.844971f), + Vector3DFloat(-0.819034f, -0.162715f, -0.550188f), + Vector3DFloat(-0.982375f, +0.169525f, -0.078743f), + Vector3DFloat(+0.367097f, +0.380576f, +0.848765f), + Vector3DFloat(+0.569529f, +0.516287f, +0.639597f), + Vector3DFloat(-0.853575f, -0.243752f, +0.460429f), + Vector3DFloat(+0.678039f, -0.729861f, -0.086982f), + Vector3DFloat(-0.869225f, +0.393408f, +0.299462f), + Vector3DFloat(-0.916254f, -0.295218f, +0.270784f), + Vector3DFloat(-0.070601f, +0.873182f, +0.482253f), + Vector3DFloat(-0.863217f, +0.189580f, +0.467885f), + Vector3DFloat(-0.691774f, -0.687382f, -0.221257f), + Vector3DFloat(-0.229393f, -0.552390f, +0.801402f), + Vector3DFloat(+0.463007f, -0.161958f, -0.871432f), + Vector3DFloat(-0.952260f, +0.214379f, +0.217352f), + Vector3DFloat(+0.052543f, -0.983907f, +0.170781f), + Vector3DFloat(+0.286530f, +0.546131f, -0.787173f), + Vector3DFloat(+0.975618f, -0.202665f, +0.084242f), + Vector3DFloat(-0.946903f, +0.193782f, -0.256561f), + Vector3DFloat(+0.602392f, +0.563710f, +0.565115f), + Vector3DFloat(-0.419515f, -0.334134f, -0.844015f), + Vector3DFloat(+0.032529f, -0.018906f, -0.999292f), + Vector3DFloat(+0.683276f, +0.293783f, -0.668450f), + Vector3DFloat(+0.194348f, +0.974682f, +0.110565f), + Vector3DFloat(-0.140892f, +0.831281f, +0.537700f), + Vector3DFloat(+0.685721f, -0.335248f, -0.646062f), + Vector3DFloat(+0.308294f, +0.062479f, -0.949237f), + Vector3DFloat(-0.619897f, +0.133633f, -0.773220f), + Vector3DFloat(+0.568018f, -0.694982f, +0.440858f), + Vector3DFloat(+0.014460f, +0.810882f, -0.585031f), + Vector3DFloat(-0.939900f, +0.051870f, +0.337488f), + Vector3DFloat(+0.886477f, -0.450612f, -0.105395f), + Vector3DFloat(-0.787830f, +0.158037f, -0.595271f), + Vector3DFloat(-0.318153f, -0.830670f, -0.456910f), + Vector3DFloat(-0.106830f, -0.755766f, -0.646069f), + Vector3DFloat(-0.077610f, -0.893295f, -0.442720f), + Vector3DFloat(+0.321718f, -0.338373f, +0.884309f), + Vector3DFloat(+0.405993f, -0.037181f, +0.913119f), + Vector3DFloat(+0.635434f, -0.612340f, +0.470387f), + Vector3DFloat(-0.440661f, +0.527619f, -0.726248f), + Vector3DFloat(+0.682630f, +0.730693f, +0.010181f), + Vector3DFloat(+0.364300f, -0.398796f, -0.841574f), + Vector3DFloat(+0.023390f, -0.827974f, +0.560279f), + Vector3DFloat(-0.647533f, -0.750712f, +0.130894f), + Vector3DFloat(+0.618352f, +0.694153f, +0.368499f), + Vector3DFloat(+0.087485f, -0.552555f, +0.828872f), + Vector3DFloat(-0.317011f, -0.740865f, -0.592134f), + Vector3DFloat(+0.992075f, +0.089501f, +0.088190f), + Vector3DFloat(+0.660945f, -0.628212f, -0.410490f), + Vector3DFloat(-0.376167f, +0.394528f, -0.838359f), + Vector3DFloat(+0.761817f, -0.647395f, -0.022690f), + Vector3DFloat(+0.839361f, -0.432911f, -0.328727f), + Vector3DFloat(-0.411275f, +0.046377f, -0.910331f), + Vector3DFloat(+0.078506f, -0.797408f, +0.598312f), + Vector3DFloat(-0.381022f, +0.922073f, +0.067844f), + Vector3DFloat(-0.837489f, -0.501853f, +0.216232f), + Vector3DFloat(-0.993133f, +0.055873f, -0.102786f), + Vector3DFloat(+0.927419f, -0.354639f, -0.118844f), + Vector3DFloat(+0.159676f, +0.614049f, -0.772947f), + Vector3DFloat(-0.187074f, +0.846574f, +0.498312f), + Vector3DFloat(+0.516069f, +0.728369f, -0.450724f), + Vector3DFloat(-0.960108f, -0.233106f, -0.154447f), + Vector3DFloat(-0.987760f, -0.112007f, +0.108557f), + Vector3DFloat(+0.049202f, +0.998738f, -0.010071f), + Vector3DFloat(-0.821445f, +0.254709f, +0.510247f), + Vector3DFloat(+0.252350f, -0.204056f, +0.945876f), + Vector3DFloat(-0.398037f, +0.781383f, -0.480633f), + Vector3DFloat(+0.527785f, +0.747611f, -0.403137f), + Vector3DFloat(-0.998566f, +0.043248f, +0.031542f), + Vector3DFloat(+0.548139f, +0.684886f, +0.480078f), + Vector3DFloat(-0.566315f, -0.745438f, +0.351581f), + Vector3DFloat(-0.848496f, -0.030994f, +0.528294f), + Vector3DFloat(-0.070703f, +0.825305f, -0.560244f), + Vector3DFloat(+0.624014f, -0.043543f, +0.780199f), + Vector3DFloat(+0.964602f, -0.189230f, -0.183670f), + Vector3DFloat(+0.637905f, -0.539396f, +0.549663f), + Vector3DFloat(+0.114321f, +0.904904f, -0.409974f), + Vector3DFloat(-0.021617f, +0.186501f, +0.982217f), + Vector3DFloat(+0.469141f, -0.747866f, +0.469685f), + Vector3DFloat(+0.132117f, +0.385378f, +0.913252f), + Vector3DFloat(-0.252634f, -0.349595f, +0.902197f), + Vector3DFloat(-0.145421f, +0.945344f, +0.291851f), + Vector3DFloat(-0.600604f, +0.448416f, -0.661965f), + Vector3DFloat(+0.381683f, -0.700133f, -0.603433f), + Vector3DFloat(+0.569938f, -0.030470f, +0.821122f), + Vector3DFloat(+0.112037f, +0.915575f, +0.386225f), + Vector3DFloat(+0.059716f, -0.821586f, -0.566949f), + Vector3DFloat(-0.158273f, -0.639328f, -0.752468f), + Vector3DFloat(+0.001205f, -0.990747f, -0.135715f), + Vector3DFloat(-0.100969f, -0.176804f, -0.979054f), + Vector3DFloat(+0.169578f, -0.733794f, -0.657868f), + Vector3DFloat(+0.474056f, +0.669558f, -0.571807f), + Vector3DFloat(+0.014190f, -0.179546f, -0.983647f), + Vector3DFloat(-0.506680f, +0.784137f, -0.358337f), + Vector3DFloat(+0.402466f, +0.736544f, -0.543621f), + Vector3DFloat(-0.740589f, +0.430129f, +0.516252f), + Vector3DFloat(-0.731489f, -0.411418f, +0.543745f), + Vector3DFloat(-0.372220f, +0.822132f, -0.430756f), + Vector3DFloat(-0.403935f, +0.195178f, +0.893724f), + Vector3DFloat(+0.893255f, -0.191946f, +0.406512f), + Vector3DFloat(+0.257182f, +0.933321f, +0.250537f), + Vector3DFloat(-0.946047f, -0.252800f, +0.202699f), + Vector3DFloat(+0.287823f, -0.484935f, +0.825830f), + Vector3DFloat(+0.880378f, +0.321649f, +0.348535f), + Vector3DFloat(-0.820150f, +0.481236f, +0.309460f), + Vector3DFloat(-0.888465f, +0.169680f, -0.426425f), + Vector3DFloat(+0.761535f, -0.481027f, +0.434371f), + Vector3DFloat(+0.581314f, +0.037144f, -0.812831f), + Vector3DFloat(-0.014257f, -0.470925f, +0.882058f), + Vector3DFloat(+0.327440f, +0.265095f, -0.906922f), + Vector3DFloat(+0.445945f, +0.877176f, +0.178034f), + Vector3DFloat(+0.724926f, -0.523194f, -0.448052f), + Vector3DFloat(-0.649973f, +0.748818f, -0.129641f), + Vector3DFloat(-0.862141f, -0.181190f, -0.473163f), + Vector3DFloat(+0.546248f, -0.486978f, -0.681517f), + Vector3DFloat(-0.466403f, -0.132595f, +0.874578f), + Vector3DFloat(-0.726486f, +0.640533f, -0.248868f), + Vector3DFloat(-0.717238f, -0.164892f, +0.677038f), + Vector3DFloat(-0.173482f, -0.912751f, -0.369852f), + Vector3DFloat(+0.151425f, +0.097703f, +0.983628f), + Vector3DFloat(-0.367962f, +0.286588f, -0.884574f), + Vector3DFloat(-0.269776f, -0.681349f, +0.680430f), + Vector3DFloat(+0.587256f, +0.243525f, +0.771898f), + Vector3DFloat(+0.052027f, +0.391610f, -0.918659f), + Vector3DFloat(+0.991548f, -0.106357f, +0.074308f), + Vector3DFloat(+0.659039f, +0.457360f, -0.597067f), + Vector3DFloat(-0.626734f, -0.682082f, -0.376787f), + Vector3DFloat(-0.353101f, +0.033567f, -0.934983f), + Vector3DFloat(+0.621237f, -0.289495f, +0.728188f), + Vector3DFloat(+0.490845f, -0.189807f, +0.850320f), + Vector3DFloat(-0.699031f, -0.710681f, -0.079302f), + Vector3DFloat(-0.050094f, +0.880791f, +0.470847f), + Vector3DFloat(+0.070288f, -0.086374f, +0.993780f), + Vector3DFloat(+0.853154f, +0.022317f, +0.521181f), + Vector3DFloat(+0.230886f, +0.693269f, -0.682693f), + Vector3DFloat(-0.466130f, +0.883868f, -0.038727f), + Vector3DFloat(-0.551610f, +0.824661f, +0.125144f), + Vector3DFloat(-0.137494f, +0.409326f, -0.901968f), + Vector3DFloat(-0.890857f, -0.180159f, +0.417034f), + Vector3DFloat(+0.553659f, -0.392300f, +0.734549f), + Vector3DFloat(+0.406329f, -0.048366f, +0.912446f), + Vector3DFloat(-0.270581f, +0.233748f, -0.933888f), + Vector3DFloat(-0.197245f, +0.810087f, -0.552136f), + Vector3DFloat(+0.295429f, +0.704757f, +0.645011f), + Vector3DFloat(+0.717722f, -0.581869f, -0.382496f), + Vector3DFloat(+0.626543f, -0.539930f, +0.562067f), + Vector3DFloat(+0.971598f, -0.144608f, +0.187311f), + Vector3DFloat(-0.697722f, -0.464932f, -0.544998f), + Vector3DFloat(+0.457003f, +0.780926f, +0.425797f), + Vector3DFloat(+0.183694f, +0.717668f, -0.671720f), + Vector3DFloat(+0.251615f, -0.738280f, -0.625805f), + Vector3DFloat(+0.545768f, +0.806104f, +0.228766f), + Vector3DFloat(-0.928760f, -0.348049f, +0.127545f), + Vector3DFloat(+0.137432f, -0.972652f, -0.187242f), + Vector3DFloat(-0.804669f, -0.253834f, +0.536727f), + Vector3DFloat(-0.931569f, -0.252185f, -0.261882f), + Vector3DFloat(-0.604266f, -0.710349f, +0.360924f), + Vector3DFloat(-0.687860f, -0.535154f, -0.490367f), + Vector3DFloat(+0.017091f, +0.824354f, -0.565817f), + Vector3DFloat(+0.978598f, +0.134960f, +0.155346f), + Vector3DFloat(-0.802635f, +0.545353f, -0.241595f), + Vector3DFloat(+0.155235f, +0.909842f, +0.384824f), + Vector3DFloat(+0.499090f, -0.206100f, -0.841684f), + Vector3DFloat(-0.474793f, -0.216500f, +0.853053f), + Vector3DFloat(-0.317506f, -0.762610f, -0.563575f), + Vector3DFloat(-0.914433f, +0.049911f, -0.401649f), + Vector3DFloat(+0.209168f, +0.632836f, -0.745498f), + Vector3DFloat(+0.571789f, +0.197009f, -0.796395f), + Vector3DFloat(-0.364670f, +0.917590f, -0.158254f), + Vector3DFloat(-0.966271f, +0.140594f, -0.215761f), + Vector3DFloat(-0.915867f, +0.394413f, +0.075008f), + Vector3DFloat(+0.035516f, +0.991982f, -0.121285f), + Vector3DFloat(+0.334756f, -0.834260f, +0.438120f), + Vector3DFloat(+0.471469f, +0.810497f, -0.347579f), + Vector3DFloat(-0.630204f, -0.370799f, -0.682166f), + Vector3DFloat(+0.752076f, -0.232512f, +0.616701f), + Vector3DFloat(+0.780218f, -0.524134f, +0.341385f), + Vector3DFloat(-0.717151f, -0.558684f, -0.416614f), + Vector3DFloat(+0.026975f, +0.354843f, +0.934537f), + Vector3DFloat(+0.660713f, -0.205604f, +0.721931f), + Vector3DFloat(+0.569071f, -0.717916f, +0.400942f), + Vector3DFloat(+0.345670f, +0.917475f, -0.196853f), + Vector3DFloat(+0.109370f, +0.150700f, -0.982511f), + Vector3DFloat(-0.075296f, +0.867593f, -0.491541f), + Vector3DFloat(+0.427583f, +0.181258f, -0.885617f), + Vector3DFloat(-0.423011f, -0.536708f, +0.730073f), + Vector3DFloat(+0.410061f, +0.902819f, +0.129491f), + Vector3DFloat(+0.783330f, +0.352044f, -0.512307f), + Vector3DFloat(+0.019660f, +0.294402f, +0.955480f), + Vector3DFloat(+0.370284f, +0.795152f, -0.480232f), + Vector3DFloat(+0.620337f, +0.569302f, -0.539516f), + Vector3DFloat(-0.947343f, -0.008934f, +0.320097f), + Vector3DFloat(-0.093679f, +0.931693f, -0.350960f), + Vector3DFloat(-0.555730f, +0.665103f, +0.498802f), + Vector3DFloat(+0.319960f, +0.176651f, -0.930817f), + Vector3DFloat(-0.679840f, +0.281903f, +0.677014f), + Vector3DFloat(-0.954067f, +0.193782f, +0.228484f), + Vector3DFloat(+0.592922f, -0.708226f, +0.383222f), + Vector3DFloat(-0.759157f, -0.391265f, +0.520184f), + Vector3DFloat(-0.256083f, +0.304044f, +0.917594f), + Vector3DFloat(-0.462124f, +0.481197f, +0.744910f), + Vector3DFloat(-0.679480f, +0.733098f, +0.029563f), + Vector3DFloat(+0.025552f, -0.585890f, -0.809987f), + Vector3DFloat(-0.060045f, +0.002791f, +0.998192f), + Vector3DFloat(-0.507954f, +0.858736f, +0.067494f), + Vector3DFloat(-0.060525f, +0.636414f, -0.768969f), + Vector3DFloat(-0.874884f, +0.448472f, -0.182895f), + Vector3DFloat(+0.643562f, +0.762645f, -0.064807f), + Vector3DFloat(-0.516967f, -0.154231f, +0.841996f), + Vector3DFloat(+0.448249f, -0.717116f, -0.533683f), + Vector3DFloat(+0.536270f, -0.786853f, +0.305411f), + Vector3DFloat(+0.000761f, +0.527854f, -0.849335f), + Vector3DFloat(+0.723561f, -0.634332f, +0.272181f), + Vector3DFloat(+0.112740f, -0.371782f, -0.921449f), + Vector3DFloat(+0.966055f, +0.051903f, +0.253070f), + Vector3DFloat(-0.600327f, +0.248981f, -0.760011f), + Vector3DFloat(+0.091875f, +0.041693f, -0.994897f), + Vector3DFloat(-0.302152f, +0.607269f, +0.734798f), + Vector3DFloat(+0.287662f, -0.651858f, -0.701663f), + Vector3DFloat(-0.004536f, +0.679631f, +0.733540f), + Vector3DFloat(+0.526143f, +0.799583f, -0.289551f), + Vector3DFloat(-0.603927f, +0.789648f, -0.108294f), + Vector3DFloat(-0.033126f, +0.944024f, -0.328210f), + Vector3DFloat(-0.167102f, -0.851884f, -0.496358f), + Vector3DFloat(+0.288185f, -0.113731f, +0.950797f), + Vector3DFloat(+0.578194f, -0.436702f, -0.689190f), + Vector3DFloat(+0.217496f, +0.313876f, +0.924217f), + Vector3DFloat(-0.915961f, -0.158736f, -0.368535f), + Vector3DFloat(-0.498651f, +0.155245f, +0.852787f), + Vector3DFloat(-0.248762f, +0.679310f, -0.690403f), + Vector3DFloat(-0.582908f, +0.077123f, +0.808870f), + Vector3DFloat(+0.686950f, +0.229251f, -0.689597f), + Vector3DFloat(-0.647296f, +0.760051f, +0.057711f), + Vector3DFloat(-0.485938f, -0.092580f, +0.869076f), + Vector3DFloat(+0.418369f, +0.089460f, -0.903861f), + Vector3DFloat(-0.047269f, +0.350493f, -0.935372f), + Vector3DFloat(-0.242049f, -0.214469f, +0.946264f), + Vector3DFloat(-0.804456f, +0.566448f, +0.178852f), + Vector3DFloat(+0.097365f, -0.900938f, +0.422885f), + Vector3DFloat(+0.956649f, +0.290563f, +0.019905f), + Vector3DFloat(-0.783547f, +0.574387f, -0.236925f), + Vector3DFloat(-0.308724f, -0.086733f, -0.947189f), + Vector3DFloat(-0.035715f, +0.856029f, -0.515692f), + Vector3DFloat(+0.920461f, +0.190617f, +0.341199f), + Vector3DFloat(+0.637306f, +0.769628f, -0.038913f), + Vector3DFloat(-0.040111f, +0.877976f, +0.477021f), + Vector3DFloat(+0.110588f, +0.251198f, +0.961598f), + Vector3DFloat(-0.391595f, +0.858960f, +0.329911f), + Vector3DFloat(+0.159040f, +0.801465f, -0.576507f), + Vector3DFloat(-0.420361f, +0.896705f, +0.138623f), + Vector3DFloat(-0.706685f, -0.506701f, -0.493812f), + Vector3DFloat(+0.589701f, +0.807018f, -0.031213f), + Vector3DFloat(+0.613812f, +0.504595f, -0.607140f), + Vector3DFloat(+0.453930f, +0.802963f, +0.386261f), + Vector3DFloat(+0.034816f, +0.204525f, +0.978242f), + Vector3DFloat(+0.557178f, -0.795610f, +0.237816f), + Vector3DFloat(+0.694672f, -0.364363f, +0.620218f), + Vector3DFloat(+0.703004f, +0.571702f, +0.423015f), + Vector3DFloat(-0.821828f, -0.569379f, +0.020152f), + Vector3DFloat(+0.999573f, +0.011862f, +0.026716f), + Vector3DFloat(+0.045244f, +0.476148f, +0.878201f), + Vector3DFloat(-0.879083f, +0.458490f, +0.130387f), + Vector3DFloat(-0.548204f, +0.534573f, -0.643198f), + Vector3DFloat(+0.371419f, +0.536568f, +0.757722f), + Vector3DFloat(-0.121365f, +0.656202f, -0.744761f), + Vector3DFloat(-0.594210f, +0.803019f, -0.045540f), + Vector3DFloat(+0.249812f, +0.564218f, -0.786926f), + Vector3DFloat(+0.807295f, +0.588715f, -0.041117f), + Vector3DFloat(-0.333582f, +0.911830f, +0.239350f), + Vector3DFloat(+0.437116f, -0.527554f, -0.728434f), + Vector3DFloat(+0.061956f, +0.967757f, +0.244147f), + Vector3DFloat(+0.511582f, -0.822519f, -0.248487f), + Vector3DFloat(-0.341118f, -0.068048f, -0.937554f), + Vector3DFloat(+0.387840f, +0.793197f, +0.469487f), + Vector3DFloat(+0.682570f, +0.445391f, -0.579418f), + Vector3DFloat(+0.769534f, -0.445299f, -0.457740f), + Vector3DFloat(-0.883027f, -0.468901f, -0.019884f), + Vector3DFloat(-0.595228f, +0.589924f, +0.545613f), + Vector3DFloat(+0.123593f, +0.850082f, +0.511943f), + Vector3DFloat(+0.428617f, -0.326588f, -0.842394f), + Vector3DFloat(-0.838837f, +0.492096f, +0.232796f), + Vector3DFloat(-0.912950f, -0.283450f, -0.293562f), + Vector3DFloat(-0.701007f, +0.660260f, +0.269527f), + Vector3DFloat(-0.726761f, -0.673596f, -0.134488f), + Vector3DFloat(+0.969362f, -0.234200f, +0.074084f), + Vector3DFloat(-0.249448f, -0.056271f, +0.966752f), + Vector3DFloat(+0.996651f, -0.018843f, +0.079570f), + Vector3DFloat(+0.807648f, +0.476489f, +0.347367f), + Vector3DFloat(-0.749837f, -0.398796f, -0.527926f), + Vector3DFloat(+0.739222f, +0.268296f, +0.617712f), + Vector3DFloat(+0.770822f, -0.517357f, -0.371720f), + Vector3DFloat(-0.799675f, +0.207189f, +0.563554f), + Vector3DFloat(+0.858095f, +0.081493f, +0.506983f), + Vector3DFloat(+0.677579f, -0.727246f, +0.109543f), + Vector3DFloat(-0.745912f, -0.097643f, +0.658848f), + Vector3DFloat(+0.923446f, -0.321145f, +0.210033f), + Vector3DFloat(+0.633275f, +0.749248f, -0.193880f), + Vector3DFloat(+0.445950f, +0.115095f, +0.887627f), + Vector3DFloat(-0.813021f, +0.255444f, -0.523207f), + Vector3DFloat(-0.872976f, -0.483345f, -0.065502f), + Vector3DFloat(+0.587776f, +0.807323f, -0.052440f), + Vector3DFloat(-0.324123f, +0.518088f, -0.791536f), + Vector3DFloat(+0.041866f, +0.935359f, -0.351214f), + Vector3DFloat(-0.745819f, -0.037221f, -0.665108f), + Vector3DFloat(-0.625395f, -0.780290f, -0.005274f), + Vector3DFloat(-0.949212f, -0.125200f, -0.288653f), + Vector3DFloat(+0.746352f, +0.513825f, -0.423016f), + Vector3DFloat(+0.165203f, -0.819308f, -0.549038f), + Vector3DFloat(+0.749447f, -0.199908f, +0.631162f), + Vector3DFloat(-0.935221f, +0.313398f, +0.164751f), + Vector3DFloat(+0.574888f, +0.577243f, -0.579908f), + Vector3DFloat(+0.213935f, -0.439668f, +0.872309f), + Vector3DFloat(-0.067281f, -0.429365f, -0.900621f), + Vector3DFloat(-0.675176f, -0.265100f, -0.688374f), + Vector3DFloat(-0.940780f, -0.187993f, +0.282119f), + Vector3DFloat(+0.608412f, -0.674603f, -0.418026f), + Vector3DFloat(+0.226805f, -0.971072f, -0.074690f), + Vector3DFloat(-0.922002f, -0.058313f, -0.382768f), + Vector3DFloat(-0.889078f, -0.285307f, +0.357968f), + Vector3DFloat(-0.463386f, -0.780956f, +0.418785f), + Vector3DFloat(+0.480335f, -0.863968f, +0.151120f), + Vector3DFloat(-0.467641f, -0.601770f, -0.647444f), + Vector3DFloat(+0.752364f, -0.628982f, +0.195781f), + Vector3DFloat(+0.068107f, -0.990481f, -0.119616f), + Vector3DFloat(+0.225170f, -0.147543f, +0.963083f), + Vector3DFloat(+0.225228f, +0.971322f, +0.076195f), + Vector3DFloat(-0.991397f, -0.118660f, +0.055239f), + Vector3DFloat(-0.160493f, -0.746967f, +0.645200f), + Vector3DFloat(-0.458821f, -0.208468f, +0.863727f), + Vector3DFloat(+0.333033f, +0.516134f, +0.789110f), + Vector3DFloat(+0.732654f, +0.260905f, -0.628607f), + Vector3DFloat(-0.669918f, -0.656301f, -0.347102f), + Vector3DFloat(-0.786699f, +0.543142f, -0.293431f), + Vector3DFloat(+0.347036f, +0.004466f, +0.937841f), + Vector3DFloat(-0.484482f, -0.771461f, +0.412463f), + Vector3DFloat(+0.103332f, +0.547687f, -0.830278f), + Vector3DFloat(+0.119923f, -0.930107f, -0.347159f), + Vector3DFloat(+0.005754f, +0.994568f, +0.103930f), + Vector3DFloat(-0.033282f, +0.896829f, +0.441124f), + Vector3DFloat(+0.457958f, +0.771949f, +0.440874f), + Vector3DFloat(-0.519990f, +0.369290f, -0.770218f), + Vector3DFloat(-0.171662f, -0.061337f, -0.983245f), + Vector3DFloat(+0.250848f, +0.937167f, -0.242472f), + Vector3DFloat(-0.527961f, -0.608927f, +0.592001f), + Vector3DFloat(+0.524343f, -0.097826f, +0.845869f), + Vector3DFloat(-0.900974f, +0.373399f, +0.220951f), + Vector3DFloat(+0.287497f, +0.561963f, +0.775592f), + Vector3DFloat(+0.540008f, +0.803719f, -0.249855f), + Vector3DFloat(+0.566511f, +0.497948f, -0.656592f), + Vector3DFloat(+0.337228f, +0.656232f, -0.675009f), + Vector3DFloat(+0.978888f, -0.153522f, -0.134940f), + Vector3DFloat(+0.720676f, +0.649026f, +0.243702f), + Vector3DFloat(+0.530737f, +0.228155f, -0.816250f), + Vector3DFloat(+0.429492f, +0.091242f, -0.898449f), + Vector3DFloat(-0.572942f, +0.085360f, +0.815139f), + Vector3DFloat(+0.918652f, -0.255422f, +0.301395f), + Vector3DFloat(+0.947882f, -0.087598f, +0.306343f), + Vector3DFloat(+0.108362f, +0.969752f, -0.218719f), + Vector3DFloat(-0.471217f, +0.713578f, +0.518421f), + Vector3DFloat(+0.750274f, -0.244288f, -0.614339f), + Vector3DFloat(+0.560909f, -0.563116f, -0.606862f), + Vector3DFloat(+0.863412f, -0.431809f, +0.260886f), + Vector3DFloat(+0.316636f, +0.937246f, -0.145983f), + Vector3DFloat(-0.292652f, +0.171648f, +0.940687f), + Vector3DFloat(-0.636577f, +0.687143f, -0.350149f), + Vector3DFloat(+0.876483f, +0.262488f, +0.403581f), + Vector3DFloat(-0.477533f, +0.501607f, +0.721355f), + Vector3DFloat(+0.620654f, +0.186584f, +0.761561f), + Vector3DFloat(+0.085796f, +0.736783f, +0.670664f), + Vector3DFloat(-0.444489f, -0.220480f, -0.868227f), + Vector3DFloat(-0.380013f, +0.496385f, +0.780508f), + Vector3DFloat(+0.076912f, -0.385017f, -0.919699f), + Vector3DFloat(+0.148937f, -0.407401f, -0.901023f), + Vector3DFloat(+0.790103f, +0.361770f, -0.494833f), + Vector3DFloat(+0.206634f, +0.909197f, +0.361474f), + Vector3DFloat(+0.171861f, -0.895971f, -0.409512f), + Vector3DFloat(-0.961243f, +0.146552f, -0.233527f), + Vector3DFloat(-0.142180f, +0.815553f, +0.560944f), + Vector3DFloat(-0.423930f, -0.030949f, +0.905166f), + Vector3DFloat(+0.618879f, -0.685650f, +0.383241f), + Vector3DFloat(-0.209245f, +0.545013f, +0.811898f), + Vector3DFloat(+0.377987f, +0.747944f, -0.545624f), + Vector3DFloat(-0.791300f, +0.607509f, -0.069108f), + Vector3DFloat(+0.754199f, -0.113604f, -0.646744f), + Vector3DFloat(-0.583229f, -0.063801f, +0.809798f), + Vector3DFloat(-0.469901f, +0.015164f, +0.882589f), + Vector3DFloat(-0.978270f, +0.003442f, -0.207306f), + Vector3DFloat(+0.655500f, +0.726545f, +0.206039f), + Vector3DFloat(+0.967185f, -0.245972f, +0.063652f), + Vector3DFloat(-0.442760f, +0.675317f, +0.589840f), + Vector3DFloat(+0.403392f, +0.270425f, +0.874154f), + Vector3DFloat(+0.902052f, +0.135317f, +0.409868f), + Vector3DFloat(-0.210257f, -0.926257f, -0.312794f), + Vector3DFloat(-0.933559f, -0.225815f, -0.278344f), + Vector3DFloat(-0.635320f, +0.772243f, -0.003054f), + Vector3DFloat(-0.554821f, +0.812428f, -0.179259f), + Vector3DFloat(-0.844807f, +0.091109f, -0.527258f), + Vector3DFloat(-0.748601f, +0.549263f, -0.371358f), + Vector3DFloat(-0.081435f, +0.491490f, -0.867067f), + Vector3DFloat(+0.005014f, -0.658765f, +0.752332f), + Vector3DFloat(-0.384916f, +0.588836f, -0.710712f), + Vector3DFloat(-0.563287f, -0.436926f, -0.701287f), + Vector3DFloat(+0.075923f, -0.889985f, +0.449624f), + Vector3DFloat(+0.460179f, +0.240506f, -0.854630f), + Vector3DFloat(+0.133134f, +0.863013f, +0.487323f), + Vector3DFloat(-0.451891f, -0.691915f, +0.563071f), + Vector3DFloat(+0.482576f, +0.491924f, -0.724659f), + Vector3DFloat(-0.772395f, +0.503554f, +0.387091f), + Vector3DFloat(-0.861070f, -0.363456f, -0.355610f), + Vector3DFloat(-0.219092f, -0.539591f, +0.812921f), + Vector3DFloat(-0.232021f, +0.937887f, +0.257940f), + Vector3DFloat(+0.864410f, +0.411132f, +0.289425f), + Vector3DFloat(-0.657914f, +0.356283f, +0.663485f), + Vector3DFloat(-0.695536f, -0.354660f, -0.624856f), + Vector3DFloat(-0.984126f, +0.139830f, -0.109283f), + Vector3DFloat(-0.739931f, -0.568047f, +0.360312f), + Vector3DFloat(-0.422765f, +0.793857f, -0.437105f), + Vector3DFloat(+0.695244f, +0.499122f, +0.517216f), + Vector3DFloat(+0.620847f, +0.772096f, +0.135708f), + Vector3DFloat(+0.640543f, +0.693625f, -0.329529f), + Vector3DFloat(-0.716203f, +0.695845f, -0.053417f), + Vector3DFloat(+0.688286f, -0.614140f, +0.386127f), + Vector3DFloat(+0.990001f, -0.012803f, -0.140479f), + Vector3DFloat(-0.842904f, +0.537664f, +0.020753f), + Vector3DFloat(+0.008333f, +0.285713f, +0.958279f), + Vector3DFloat(-0.276086f, -0.823605f, +0.495431f), + Vector3DFloat(+0.795835f, -0.446944f, +0.408518f), + Vector3DFloat(-0.068520f, +0.989143f, -0.130001f), + Vector3DFloat(-0.995477f, -0.013318f, -0.094068f), + Vector3DFloat(-0.013256f, -0.205680f, +0.978530f), + Vector3DFloat(+0.286330f, +0.478558f, +0.830058f), + Vector3DFloat(-0.312670f, -0.000134f, +0.949862f), + Vector3DFloat(-0.992102f, -0.018784f, -0.124017f), + Vector3DFloat(-0.218201f, +0.471729f, +0.854318f), + Vector3DFloat(-0.885932f, -0.441603f, +0.141812f), + Vector3DFloat(+0.410418f, -0.903853f, +0.120862f), + Vector3DFloat(-0.046755f, -0.618559f, +0.784346f), + Vector3DFloat(+0.561077f, +0.827730f, +0.007490f), + Vector3DFloat(-0.264927f, +0.963738f, +0.031968f), + Vector3DFloat(+0.360743f, +0.887368f, -0.287127f), + Vector3DFloat(+0.829757f, -0.531319f, -0.170889f), + Vector3DFloat(-0.716516f, -0.646065f, +0.263068f), + Vector3DFloat(+0.557460f, +0.677923f, -0.479227f), + Vector3DFloat(-0.709849f, +0.694781f, -0.115733f), + Vector3DFloat(+0.853291f, -0.488531f, -0.182299f), + Vector3DFloat(+0.455284f, -0.849392f, -0.266925f), + Vector3DFloat(+0.417165f, +0.856319f, -0.304453f), + Vector3DFloat(+0.871881f, +0.388090f, +0.298681f), + Vector3DFloat(-0.103988f, +0.510844f, -0.853361f), + Vector3DFloat(+0.351047f, +0.889847f, -0.291441f), + Vector3DFloat(+0.389540f, -0.053379f, -0.919462f), + Vector3DFloat(-0.581684f, +0.075521f, +0.809901f), + Vector3DFloat(-0.422965f, -0.141455f, +0.895037f), + Vector3DFloat(+0.213377f, +0.454586f, -0.864767f), + Vector3DFloat(+0.159390f, +0.466820f, +0.869870f), + Vector3DFloat(+0.385902f, -0.013831f, +0.922436f), + Vector3DFloat(-0.360291f, -0.335817f, -0.870297f), + Vector3DFloat(-0.420892f, +0.570921f, -0.704910f), + Vector3DFloat(+0.046113f, -0.619140f, -0.783925f), + Vector3DFloat(+0.454440f, +0.871791f, -0.182935f), + Vector3DFloat(+0.523305f, -0.762818f, +0.379816f), + Vector3DFloat(-0.639517f, -0.634506f, -0.434073f), + Vector3DFloat(+0.286115f, -0.720485f, +0.631695f), + Vector3DFloat(+0.391046f, -0.912504f, -0.120079f), + Vector3DFloat(+0.562545f, +0.825619f, +0.043556f), + Vector3DFloat(+0.976939f, +0.145670f, -0.156113f), + Vector3DFloat(-0.197444f, -0.653530f, -0.730695f), + Vector3DFloat(-0.727176f, +0.159246f, +0.667724f), + Vector3DFloat(+0.977135f, +0.039408f, +0.208935f), + Vector3DFloat(+0.487883f, -0.668376f, -0.561466f), + Vector3DFloat(+0.081173f, -0.454129f, -0.887231f), + Vector3DFloat(+0.007776f, -0.558369f, -0.829556f), + Vector3DFloat(+0.392559f, -0.216208f, +0.893952f), + Vector3DFloat(+0.552351f, -0.797994f, -0.241067f), + Vector3DFloat(-0.812645f, +0.582758f, -0.000884f), + Vector3DFloat(+0.723477f, +0.425448f, +0.543668f), + Vector3DFloat(-0.290387f, -0.824836f, +0.485099f), + Vector3DFloat(-0.648037f, +0.731057f, +0.213549f), + Vector3DFloat(-0.112077f, +0.911214f, +0.396394f), + Vector3DFloat(-0.257374f, +0.878627f, +0.402212f), + Vector3DFloat(-0.871679f, -0.449228f, -0.195884f), + Vector3DFloat(-0.832643f, +0.503619f, -0.230377f), + Vector3DFloat(-0.750683f, +0.454826f, -0.479174f), + Vector3DFloat(+0.668945f, -0.737419f, +0.093412f), + Vector3DFloat(+0.232689f, -0.239415f, -0.942622f), + Vector3DFloat(+0.932416f, +0.058455f, -0.356629f), + Vector3DFloat(-0.266008f, -0.899388f, +0.346900f), + Vector3DFloat(+0.574940f, -0.817948f, -0.020127f), + Vector3DFloat(-0.332832f, +0.728233f, +0.599083f), + Vector3DFloat(+0.252574f, -0.202957f, +0.946052f), + Vector3DFloat(+0.614750f, -0.787545f, +0.043079f), + Vector3DFloat(+0.502885f, +0.757385f, -0.416503f), + Vector3DFloat(-0.829003f, +0.454711f, -0.325562f), + Vector3DFloat(-0.568805f, +0.542102f, +0.618536f), + Vector3DFloat(-0.024095f, -0.673837f, -0.738487f), + Vector3DFloat(+0.138735f, -0.428584f, -0.892787f), + Vector3DFloat(-0.535936f, -0.016858f, +0.844090f), + Vector3DFloat(-0.040976f, +0.588714f, +0.807302f), + Vector3DFloat(-0.691862f, -0.721945f, +0.011050f), + Vector3DFloat(+0.862563f, -0.438786f, -0.251897f), + Vector3DFloat(+0.278186f, +0.894754f, +0.349326f), + Vector3DFloat(-0.377682f, -0.908327f, +0.179719f), + Vector3DFloat(-0.632125f, -0.611940f, +0.475339f), + Vector3DFloat(-0.575327f, -0.789967f, -0.212015f), + Vector3DFloat(+0.112909f, -0.993543f, -0.011156f), + Vector3DFloat(+0.593082f, -0.037683f, -0.804260f), + Vector3DFloat(-0.067094f, -0.620832f, +0.781067f), + Vector3DFloat(-0.152754f, +0.253291f, -0.955254f), + Vector3DFloat(-0.325782f, +0.882758f, -0.338533f), + Vector3DFloat(+0.359581f, -0.906944f, +0.219441f), + Vector3DFloat(-0.436527f, +0.597887f, +0.672291f), + Vector3DFloat(-0.475060f, +0.315753f, +0.821351f), + Vector3DFloat(-0.504146f, +0.392763f, -0.769138f), + Vector3DFloat(+0.732747f, -0.275063f, -0.622432f), + Vector3DFloat(-0.222604f, +0.239178f, +0.945115f), + Vector3DFloat(+0.929953f, +0.212024f, +0.300389f), + Vector3DFloat(+0.212224f, -0.914623f, -0.344129f), + Vector3DFloat(+0.744091f, -0.069074f, +0.664498f), + Vector3DFloat(+0.378632f, +0.925135f, -0.027624f), + Vector3DFloat(-0.657970f, +0.042972f, +0.751817f), + Vector3DFloat(-0.475295f, -0.858227f, -0.193754f), + Vector3DFloat(-0.002138f, -0.163379f, -0.986561f), + Vector3DFloat(+0.762016f, +0.464503f, -0.451186f), + Vector3DFloat(+0.110962f, +0.350977f, +0.929786f), + Vector3DFloat(+0.359220f, -0.409270f, +0.838725f), + Vector3DFloat(+0.067679f, -0.492517f, -0.867667f), + Vector3DFloat(-0.765643f, -0.627245f, -0.142671f), + Vector3DFloat(-0.736364f, -0.613024f, -0.286304f), + Vector3DFloat(-0.404067f, -0.396451f, +0.824352f), + Vector3DFloat(-0.908793f, +0.158289f, +0.386057f), + Vector3DFloat(-0.582767f, +0.467557f, +0.664660f), + Vector3DFloat(+0.437506f, -0.078200f, -0.895809f), + Vector3DFloat(+0.079580f, -0.165593f, -0.982978f), + Vector3DFloat(-0.152308f, +0.193183f, +0.969269f), + Vector3DFloat(+0.537776f, -0.029450f, -0.842573f), + Vector3DFloat(+0.242145f, -0.450593f, +0.859262f), + Vector3DFloat(-0.731540f, -0.287459f, +0.618237f), + Vector3DFloat(-0.822775f, +0.200303f, +0.531903f), + Vector3DFloat(+0.814744f, -0.396544f, +0.423019f), + Vector3DFloat(+0.981241f, +0.108708f, -0.159215f), + Vector3DFloat(+0.435099f, -0.134466f, -0.890285f), + Vector3DFloat(-0.863642f, -0.333093f, +0.378379f), + Vector3DFloat(+0.975214f, -0.007932f, +0.221121f), + Vector3DFloat(+0.562312f, +0.756514f, -0.333904f), + Vector3DFloat(-0.860757f, -0.321366f, -0.394743f), + Vector3DFloat(+0.202468f, +0.651174f, +0.731423f), + Vector3DFloat(+0.070835f, -0.997485f, -0.002525f), + Vector3DFloat(-0.282142f, -0.646099f, +0.709191f), + Vector3DFloat(+0.734636f, +0.546486f, -0.402073f), + Vector3DFloat(-0.792802f, +0.359455f, -0.492196f), + Vector3DFloat(+0.064556f, -0.768826f, +0.636192f), + Vector3DFloat(-0.387159f, -0.539262f, +0.747867f), + Vector3DFloat(-0.321231f, +0.945995f, +0.043642f), + Vector3DFloat(-0.051543f, -0.358058f, +0.932276f), + Vector3DFloat(+0.463676f, -0.211202f, +0.860464f), + Vector3DFloat(-0.985546f, -0.040806f, -0.164421f), + Vector3DFloat(-0.956965f, +0.289910f, -0.013071f), + Vector3DFloat(-0.575614f, -0.401429f, -0.712406f), + Vector3DFloat(+0.005411f, +0.912319f, +0.409443f), + Vector3DFloat(-0.147120f, +0.145609f, +0.978342f), + Vector3DFloat(+0.381181f, -0.303247f, +0.873351f), + Vector3DFloat(+0.646964f, -0.669990f, -0.364076f), + Vector3DFloat(+0.335662f, -0.334853f, +0.880457f), + Vector3DFloat(+0.812790f, -0.515621f, -0.271122f), + Vector3DFloat(+0.406265f, +0.443117f, -0.799122f), + Vector3DFloat(+0.818068f, +0.142779f, +0.557117f), + Vector3DFloat(-0.202146f, +0.482979f, +0.851979f), + Vector3DFloat(-0.359491f, -0.834883f, +0.416817f), + Vector3DFloat(+0.897243f, +0.373837f, -0.234949f), + Vector3DFloat(+0.734938f, -0.377211f, -0.563541f), + Vector3DFloat(+0.938936f, +0.089082f, +0.332362f), + Vector3DFloat(+0.847286f, +0.101367f, -0.521375f), + Vector3DFloat(+0.976962f, +0.212808f, -0.016060f), + Vector3DFloat(-0.484037f, -0.785288f, -0.386045f), + Vector3DFloat(+0.412432f, -0.846393f, -0.336925f), + Vector3DFloat(-0.290605f, -0.951829f, +0.097828f), + Vector3DFloat(+0.522856f, +0.099925f, -0.846544f), + Vector3DFloat(-0.268624f, -0.592962f, +0.759103f), + Vector3DFloat(+0.532873f, -0.247493f, +0.809193f), + Vector3DFloat(-0.313247f, +0.857502f, -0.408126f), + Vector3DFloat(-0.279136f, +0.481391f, +0.830870f), + Vector3DFloat(-0.648063f, -0.437447f, -0.623422f), + Vector3DFloat(+0.693159f, -0.411042f, +0.592094f), + Vector3DFloat(-0.361556f, -0.008347f, -0.932313f), + Vector3DFloat(-0.706752f, -0.017905f, +0.707235f), + Vector3DFloat(+0.277671f, +0.588210f, +0.759544f), + Vector3DFloat(+0.706147f, +0.436673f, -0.557380f), + Vector3DFloat(+0.329465f, -0.938612f, -0.102275f), + Vector3DFloat(+0.941491f, +0.304731f, -0.143996f), + Vector3DFloat(-0.530440f, -0.419970f, -0.736382f), + Vector3DFloat(-0.933059f, +0.333768f, -0.134161f), + Vector3DFloat(-0.799598f, -0.383384f, -0.462234f), + Vector3DFloat(+0.589799f, +0.017619f, -0.807358f), + Vector3DFloat(-0.157486f, -0.147213f, +0.976487f), + Vector3DFloat(+0.144612f, -0.765441f, +0.627046f), + Vector3DFloat(-0.224062f, +0.971686f, +0.074988f), + Vector3DFloat(-0.525446f, +0.743496f, +0.413666f), + Vector3DFloat(+0.913834f, -0.396502f, +0.087711f), + Vector3DFloat(+0.551810f, +0.713484f, -0.431793f), + Vector3DFloat(-0.988855f, +0.027355f, +0.146346f), + Vector3DFloat(+0.129678f, -0.922163f, +0.364417f), + Vector3DFloat(-0.443546f, +0.337851f, +0.830135f), + Vector3DFloat(-0.076099f, -0.128182f, -0.988827f), + Vector3DFloat(-0.930714f, -0.363326f, +0.042022f), + Vector3DFloat(-0.062724f, +0.597013f, -0.799776f), + Vector3DFloat(+0.674612f, -0.080125f, +0.733811f), + Vector3DFloat(-0.732149f, -0.106968f, -0.672693f), + Vector3DFloat(-0.477404f, -0.735544f, +0.480688f), + Vector3DFloat(+0.720306f, +0.691043f, +0.060162f), + Vector3DFloat(-0.480694f, -0.691928f, -0.538673f), + Vector3DFloat(+0.284364f, -0.490827f, +0.823545f), + Vector3DFloat(-0.467068f, -0.635840f, +0.614455f), + Vector3DFloat(+0.259424f, +0.728928f, +0.633532f), + Vector3DFloat(-0.829024f, +0.499711f, +0.251015f), + Vector3DFloat(+0.918101f, +0.199840f, +0.342278f), + Vector3DFloat(-0.132256f, +0.844697f, -0.518648f), + Vector3DFloat(-0.880945f, +0.470246f, +0.052958f), + Vector3DFloat(-0.907893f, +0.418701f, -0.020494f), + Vector3DFloat(-0.898489f, +0.435552f, -0.054882f), + Vector3DFloat(-0.181486f, -0.981241f, -0.065032f), + Vector3DFloat(+0.612484f, -0.390415f, -0.687342f), + Vector3DFloat(-0.674745f, +0.504350f, +0.538841f), + Vector3DFloat(-0.489037f, -0.427926f, +0.760080f), + Vector3DFloat(-0.629283f, +0.776741f, +0.026012f), + Vector3DFloat(-0.327015f, +0.559793f, +0.761375f), + Vector3DFloat(+0.143982f, -0.052568f, +0.988183f), + Vector3DFloat(+0.963642f, +0.246339f, -0.103498f), + Vector3DFloat(+0.083550f, +0.206217f, +0.974933f), + Vector3DFloat(+0.985008f, +0.097629f, -0.142221f), + Vector3DFloat(+0.386516f, -0.544556f, +0.744355f), + Vector3DFloat(-0.390134f, -0.377051f, +0.840017f), + Vector3DFloat(+0.188428f, -0.872526f, -0.450770f), + Vector3DFloat(-0.249415f, +0.963139f, +0.100774f), + Vector3DFloat(-0.246900f, -0.688081f, +0.682338f), + Vector3DFloat(-0.815515f, -0.341331f, -0.467363f), + Vector3DFloat(-0.828295f, -0.545972f, +0.125866f), + Vector3DFloat(-0.251196f, +0.860882f, +0.442473f), + Vector3DFloat(+0.787130f, -0.124629f, -0.604065f), + Vector3DFloat(-0.546825f, -0.350565f, +0.760320f), + Vector3DFloat(+0.910761f, +0.326941f, +0.252237f), + Vector3DFloat(-0.822947f, -0.029868f, +0.567332f), + Vector3DFloat(-0.119863f, -0.101264f, +0.987612f), + Vector3DFloat(+0.338978f, +0.251339f, +0.906600f), + Vector3DFloat(-0.168116f, +0.130641f, +0.977072f), + Vector3DFloat(+0.630274f, -0.051172f, +0.774685f), + Vector3DFloat(+0.509020f, +0.860289f, -0.028316f), + Vector3DFloat(-0.741184f, +0.614383f, -0.270518f), + Vector3DFloat(+0.783367f, +0.216068f, -0.582796f), + Vector3DFloat(-0.917044f, -0.239253f, -0.319042f), + Vector3DFloat(+0.326503f, +0.605534f, +0.725758f), + Vector3DFloat(-0.858028f, +0.033090f, +0.512536f), + Vector3DFloat(+0.920390f, +0.341687f, +0.190084f), + Vector3DFloat(+0.184870f, +0.206034f, -0.960923f), + Vector3DFloat(-0.320575f, -0.873361f, -0.366704f), + Vector3DFloat(-0.908564f, +0.179683f, -0.377129f), + Vector3DFloat(-0.995162f, +0.060094f, -0.077721f), + Vector3DFloat(-0.970805f, +0.057864f, +0.232786f), + Vector3DFloat(-0.438989f, -0.719230f, -0.538514f), + Vector3DFloat(-0.305764f, +0.586163f, +0.750281f), + Vector3DFloat(+0.813263f, +0.070638f, +0.577593f), + Vector3DFloat(-0.856072f, +0.356367f, -0.374356f), + Vector3DFloat(-0.291393f, -0.496711f, -0.817538f), + Vector3DFloat(-0.465919f, +0.423021f, +0.777157f), + Vector3DFloat(-0.197288f, +0.747479f, +0.634312f), + Vector3DFloat(+0.459532f, -0.294706f, +0.837842f), + Vector3DFloat(-0.669432f, -0.715572f, -0.199543f), + Vector3DFloat(+0.651361f, +0.729418f, -0.208995f), + Vector3DFloat(+0.899675f, -0.409092f, +0.152409f), + Vector3DFloat(-0.909013f, +0.374561f, +0.182756f), + Vector3DFloat(+0.584390f, +0.675714f, -0.449332f), + Vector3DFloat(-0.679644f, +0.693287f, -0.239658f), + Vector3DFloat(-0.447022f, -0.041260f, +0.893571f), + Vector3DFloat(-0.116547f, +0.050542f, -0.991898f), + Vector3DFloat(+0.395893f, +0.741111f, -0.542239f), + Vector3DFloat(+0.350204f, -0.445076f, -0.824175f), + Vector3DFloat(-0.172775f, +0.743090f, -0.646503f), + Vector3DFloat(+0.990144f, +0.139743f, -0.009361f), + Vector3DFloat(+0.519086f, +0.780496f, -0.348389f), + Vector3DFloat(-0.437746f, -0.398253f, +0.806085f), + Vector3DFloat(-0.008119f, +0.986280f, -0.164880f), + Vector3DFloat(+0.597715f, -0.604411f, -0.526711f), + Vector3DFloat(-0.097509f, +0.175580f, -0.979624f), + Vector3DFloat(+0.660655f, -0.124974f, +0.740214f), + Vector3DFloat(-0.206022f, +0.283440f, -0.936599f), + Vector3DFloat(-0.702342f, +0.672455f, -0.233496f), + Vector3DFloat(+0.306125f, -0.350950f, -0.884942f), + Vector3DFloat(+0.572172f, -0.424424f, -0.701772f), + Vector3DFloat(-0.218533f, -0.939401f, -0.264138f), + Vector3DFloat(+0.409469f, -0.491877f, -0.768370f), + Vector3DFloat(-0.651781f, -0.191800f, +0.733754f), + Vector3DFloat(+0.900352f, -0.242264f, -0.361490f), + Vector3DFloat(+0.809489f, +0.255902f, -0.528434f), + Vector3DFloat(+0.615724f, -0.777952f, +0.125199f), + Vector3DFloat(-0.337892f, -0.510143f, -0.790938f), + Vector3DFloat(-0.326182f, -0.695879f, +0.639811f), + Vector3DFloat(-0.877877f, -0.220692f, +0.425002f), + Vector3DFloat(+0.837897f, -0.278492f, -0.469436f), + Vector3DFloat(-0.802587f, -0.151114f, +0.577077f), + Vector3DFloat(+0.409855f, +0.796889f, -0.443832f), + Vector3DFloat(-0.374483f, +0.669830f, -0.641164f), + Vector3DFloat(-0.745860f, +0.343937f, -0.570438f), + Vector3DFloat(-0.202905f, +0.156353f, +0.966635f), + Vector3DFloat(+0.556026f, +0.322254f, -0.766151f), + Vector3DFloat(+0.776714f, +0.240272f, -0.582224f), + Vector3DFloat(-0.125301f, +0.638214f, -0.759594f), + Vector3DFloat(+0.399976f, +0.226329f, -0.888141f), + Vector3DFloat(-0.704797f, +0.579196f, -0.409625f), + Vector3DFloat(-0.007629f, +0.072037f, +0.997373f), + Vector3DFloat(-0.284284f, +0.861559f, +0.420592f), + Vector3DFloat(+0.775941f, +0.385137f, -0.499586f), + Vector3DFloat(-0.234994f, +0.400120f, +0.885823f), + Vector3DFloat(+0.575813f, +0.632406f, +0.518172f), + Vector3DFloat(+0.076477f, +0.592931f, -0.801613f), + Vector3DFloat(+0.603536f, -0.788719f, -0.116900f), + Vector3DFloat(-0.301173f, -0.779883f, -0.548705f), + Vector3DFloat(-0.315064f, -0.948217f, +0.040230f), + Vector3DFloat(+0.332902f, +0.851413f, -0.405304f), + Vector3DFloat(-0.403429f, +0.778318f, +0.481110f), + Vector3DFloat(-0.213870f, +0.976545f, +0.024873f), + Vector3DFloat(-0.753760f, -0.519440f, +0.402528f), + Vector3DFloat(-0.293424f, +0.935690f, -0.195925f), + Vector3DFloat(-0.370354f, +0.922391f, -0.109697f), + Vector3DFloat(+0.278418f, +0.666623f, +0.691445f), + Vector3DFloat(-0.284329f, +0.930765f, +0.229857f), + Vector3DFloat(+0.860824f, -0.367097f, -0.352452f), + Vector3DFloat(+0.541854f, -0.702580f, -0.461275f), + Vector3DFloat(+0.912176f, +0.185368f, -0.365478f), + Vector3DFloat(+0.168057f, +0.931969f, -0.321232f), + Vector3DFloat(-0.267320f, +0.845122f, +0.462934f), + Vector3DFloat(-0.201487f, +0.198600f, +0.959146f), + Vector3DFloat(-0.839945f, -0.276826f, -0.466754f), + Vector3DFloat(-0.740956f, -0.484640f, +0.464874f), + Vector3DFloat(-0.383491f, +0.705487f, -0.596006f), + Vector3DFloat(-0.954405f, -0.026765f, -0.297313f), + Vector3DFloat(+0.468574f, +0.859438f, +0.204460f), + Vector3DFloat(-0.940360f, +0.331786f, +0.075105f), + Vector3DFloat(-0.852277f, +0.454172f, -0.259522f), + Vector3DFloat(-0.759647f, +0.519837f, -0.390776f), + Vector3DFloat(+0.111525f, -0.475265f, -0.872746f), + Vector3DFloat(-0.452079f, -0.035104f, +0.891287f), + Vector3DFloat(+0.390392f, -0.669936f, -0.631490f), + Vector3DFloat(-0.292073f, +0.321693f, -0.900670f), + Vector3DFloat(+0.104005f, +0.994338f, +0.021788f), + Vector3DFloat(+0.960865f, +0.271665f, +0.054189f), + Vector3DFloat(-0.723235f, +0.690428f, +0.015487f), + Vector3DFloat(+0.179328f, -0.278614f, +0.943513f), + Vector3DFloat(+0.673808f, +0.589682f, +0.445263f), + Vector3DFloat(+0.731197f, +0.497511f, +0.466726f), + Vector3DFloat(+0.153734f, -0.134017f, +0.978982f), + Vector3DFloat(+0.456781f, -0.221267f, -0.861622f), + Vector3DFloat(+0.688864f, +0.648593f, +0.323719f), + Vector3DFloat(-0.036351f, +0.715024f, -0.698155f), + Vector3DFloat(+0.979208f, -0.118292f, +0.164797f), + Vector3DFloat(-0.543655f, -0.797469f, -0.261692f), + Vector3DFloat(+0.474224f, -0.342549f, -0.811031f), + Vector3DFloat(+0.455954f, +0.830262f, +0.320580f), + Vector3DFloat(+0.050584f, -0.993831f, -0.098696f), + Vector3DFloat(-0.061916f, +0.662832f, +0.746204f), + Vector3DFloat(+0.153491f, -0.981695f, +0.112766f), + Vector3DFloat(-0.303003f, +0.664435f, +0.683165f), + Vector3DFloat(+0.490302f, +0.248088f, -0.835497f), + Vector3DFloat(-0.909045f, +0.282351f, -0.306455f), + Vector3DFloat(+0.412988f, -0.552647f, +0.723894f), + Vector3DFloat(-0.254003f, -0.874419f, +0.413370f), + Vector3DFloat(-0.254922f, +0.922643f, -0.289387f), + Vector3DFloat(+0.788379f, -0.515671f, +0.335474f), + Vector3DFloat(+0.704882f, -0.446475f, -0.551182f), + Vector3DFloat(+0.446454f, +0.893141f, -0.054572f), + Vector3DFloat(-0.139484f, +0.078095f, -0.987140f), + Vector3DFloat(+0.196257f, -0.117325f, -0.973508f), + Vector3DFloat(-0.887951f, -0.452728f, +0.081119f), + Vector3DFloat(+0.482286f, +0.838290f, -0.254304f), + Vector3DFloat(-0.085400f, +0.836828f, +0.540764f), + Vector3DFloat(-0.033243f, -0.288034f, +0.957043f), + Vector3DFloat(+0.262770f, -0.771585f, +0.579318f), + Vector3DFloat(-0.911785f, -0.235533f, +0.336411f), + Vector3DFloat(+0.927275f, +0.367451f, -0.071696f), + Vector3DFloat(+0.771172f, -0.229858f, +0.593683f), + Vector3DFloat(-0.375316f, -0.068341f, -0.924374f), + Vector3DFloat(-0.735343f, +0.284450f, -0.615109f), + Vector3DFloat(-0.985363f, +0.154529f, +0.071973f), + Vector3DFloat(-0.544949f, +0.792232f, -0.274589f), + Vector3DFloat(-0.565066f, -0.783807f, -0.257579f), + Vector3DFloat(-0.188990f, +0.764476f, -0.616328f), + Vector3DFloat(+0.011964f, -0.681395f, +0.731818f), + Vector3DFloat(+0.647082f, +0.652894f, -0.393719f), + Vector3DFloat(-0.883463f, +0.088810f, -0.460006f), + Vector3DFloat(-0.443140f, -0.048579f, -0.895135f), + Vector3DFloat(+0.925708f, +0.333853f, -0.177785f), + Vector3DFloat(-0.057825f, -0.850139f, +0.523373f), + Vector3DFloat(+0.376782f, +0.740216f, +0.556881f), + Vector3DFloat(-0.711665f, -0.184658f, -0.677816f), + Vector3DFloat(+0.410214f, -0.115790f, -0.904609f), + Vector3DFloat(+0.382722f, +0.646393f, -0.660076f), + Vector3DFloat(-0.300767f, -0.354337f, +0.885429f), + Vector3DFloat(+0.568398f, +0.272778f, +0.776219f), + Vector3DFloat(-0.157935f, +0.980750f, +0.114830f), + Vector3DFloat(+0.359219f, +0.495150f, -0.791068f), + Vector3DFloat(-0.349238f, +0.056262f, -0.935344f), + Vector3DFloat(-0.633800f, +0.743629f, +0.212869f), + Vector3DFloat(+0.097107f, -0.993326f, -0.062246f), + Vector3DFloat(+0.372454f, -0.806078f, -0.459908f), + Vector3DFloat(-0.263428f, +0.934015f, +0.241290f), + Vector3DFloat(-0.943443f, +0.122444f, +0.308095f), + Vector3DFloat(+0.408781f, +0.502375f, -0.761917f), + Vector3DFloat(+0.697179f, -0.332546f, -0.635102f), + Vector3DFloat(-0.491802f, +0.870583f, -0.014715f), + Vector3DFloat(+0.737536f, -0.656902f, +0.156592f), + Vector3DFloat(+0.827336f, -0.246097f, +0.504928f), + Vector3DFloat(-0.446202f, +0.667651f, +0.595941f), + Vector3DFloat(-0.964936f, -0.243630f, +0.097691f), + Vector3DFloat(+0.897134f, -0.435766f, -0.072518f), + Vector3DFloat(-0.669699f, -0.151247f, -0.727068f), + Vector3DFloat(-0.016765f, -0.955618f, +0.294130f), + Vector3DFloat(-0.230630f, +0.832879f, -0.503112f), + Vector3DFloat(+0.899464f, +0.318825f, -0.298856f), + Vector3DFloat(+0.058885f, -0.789911f, +0.610388f), + Vector3DFloat(+0.659402f, +0.666930f, +0.346977f), + Vector3DFloat(+0.284813f, -0.414001f, -0.864572f), + Vector3DFloat(+0.484149f, -0.789140f, -0.377964f), + Vector3DFloat(+0.738956f, +0.298547f, -0.603998f), + Vector3DFloat(+0.136326f, +0.352541f, -0.925813f), + Vector3DFloat(+0.868090f, +0.478579f, +0.131841f), + Vector3DFloat(+0.446372f, -0.633533f, -0.631972f), + Vector3DFloat(-0.464744f, -0.873724f, +0.143596f), + Vector3DFloat(-0.157889f, +0.556623f, -0.815624f), + Vector3DFloat(-0.916952f, -0.270205f, +0.293579f), + Vector3DFloat(-0.968515f, +0.157169f, -0.193071f), + Vector3DFloat(-0.428526f, -0.889206f, +0.160242f), + Vector3DFloat(+0.396152f, +0.173085f, +0.901724f), + Vector3DFloat(+0.966792f, +0.160015f, -0.199271f), + Vector3DFloat(-0.912490f, -0.111826f, +0.393519f), + Vector3DFloat(+0.866392f, -0.192509f, -0.460765f), + Vector3DFloat(+0.480992f, +0.492893f, -0.725054f), + Vector3DFloat(-0.355535f, +0.884194f, +0.302977f), + Vector3DFloat(+0.980976f, -0.055915f, +0.185905f), + Vector3DFloat(-0.740688f, +0.154276f, -0.653896f), + Vector3DFloat(+0.193789f, -0.135151f, -0.971689f), + Vector3DFloat(-0.301940f, -0.417607f, -0.856993f), + Vector3DFloat(-0.519232f, +0.773966f, -0.362455f), + Vector3DFloat(+0.938672f, -0.020909f, -0.344177f), + Vector3DFloat(+0.637853f, -0.449939f, +0.625058f), + Vector3DFloat(+0.544105f, -0.664601f, -0.512109f), + Vector3DFloat(-0.170728f, -0.774921f, +0.608563f), + Vector3DFloat(+0.669668f, +0.441721f, -0.597016f), + Vector3DFloat(-0.311388f, -0.044999f, -0.949217f), + Vector3DFloat(+0.146744f, +0.375501f, +0.915131f), + Vector3DFloat(-0.703678f, -0.557559f, -0.440414f), + Vector3DFloat(-0.470187f, +0.695298f, +0.543585f), + Vector3DFloat(-0.254132f, -0.184139f, +0.949479f), + Vector3DFloat(-0.900622f, +0.005714f, +0.434565f), + Vector3DFloat(-0.014656f, +0.303063f, -0.952858f), + Vector3DFloat(-0.865696f, -0.264074f, +0.425247f), + Vector3DFloat(+0.481061f, +0.842497f, +0.242445f), + Vector3DFloat(-0.450784f, +0.137271f, +0.882015f), + Vector3DFloat(+0.091619f, +0.964503f, +0.247669f), + Vector3DFloat(-0.135659f, -0.122365f, +0.983170f), + Vector3DFloat(-0.322292f, +0.502269f, +0.802405f), + Vector3DFloat(+0.157842f, +0.435303f, +0.886339f), + Vector3DFloat(+0.158697f, -0.622087f, -0.766696f), + Vector3DFloat(+0.427134f, -0.647168f, -0.631451f), + Vector3DFloat(-0.101271f, +0.917326f, +0.385042f), + Vector3DFloat(-0.351641f, -0.653340f, -0.670445f), + Vector3DFloat(-0.903498f, -0.392917f, +0.171195f), + Vector3DFloat(+0.227012f, -0.849095f, -0.476974f), + Vector3DFloat(-0.094069f, -0.890637f, +0.444878f), + Vector3DFloat(+0.803352f, -0.594284f, -0.038110f), + Vector3DFloat(-0.094739f, -0.865030f, -0.492695f), + Vector3DFloat(+0.264702f, -0.854667f, +0.446629f), + Vector3DFloat(-0.897678f, +0.277821f, -0.342037f), + Vector3DFloat(-0.327036f, +0.939653f, +0.100497f), + Vector3DFloat(-0.826248f, -0.337885f, -0.450719f), + Vector3DFloat(+0.066622f, -0.956883f, +0.282730f), + Vector3DFloat(-0.746913f, -0.121996f, +0.653635f), + Vector3DFloat(-0.671734f, +0.736418f, +0.080385f), + Vector3DFloat(+0.693715f, +0.576755f, -0.431408f), + Vector3DFloat(-0.788320f, -0.082995f, -0.609642f), + Vector3DFloat(-0.456573f, +0.863290f, -0.215108f), + Vector3DFloat(-0.622201f, +0.453957f, +0.637800f), + Vector3DFloat(+0.723922f, +0.655748f, +0.214319f), + Vector3DFloat(+0.882913f, -0.420816f, -0.208276f), + Vector3DFloat(-0.926551f, +0.212056f, -0.310703f), + Vector3DFloat(+0.388695f, -0.691965f, +0.608358f), + Vector3DFloat(+0.728427f, +0.198534f, -0.655728f), + Vector3DFloat(+0.319262f, +0.105299f, +0.941798f), + Vector3DFloat(-0.333911f, +0.881805f, +0.333050f), + Vector3DFloat(+0.245338f, -0.611922f, -0.751904f), + Vector3DFloat(+0.220061f, -0.101481f, -0.970193f), + Vector3DFloat(+0.930032f, -0.311841f, +0.194412f), + Vector3DFloat(+0.048087f, -0.993913f, +0.099115f), + Vector3DFloat(-0.275537f, +0.705669f, +0.652772f), + Vector3DFloat(+0.383019f, -0.163631f, -0.909132f), + Vector3DFloat(-0.135900f, -0.988939f, +0.059414f), + Vector3DFloat(-0.662199f, +0.747009f, +0.058896f), + Vector3DFloat(-0.124689f, +0.015288f, +0.992078f), + Vector3DFloat(+0.489432f, -0.555663f, -0.672082f), + Vector3DFloat(-0.780927f, -0.255976f, +0.569763f), + Vector3DFloat(+0.694171f, +0.278571f, -0.663720f), + Vector3DFloat(-0.604581f, -0.463542f, -0.647774f), + Vector3DFloat(-0.676259f, -0.684602f, -0.272018f), + Vector3DFloat(+0.494855f, -0.701192f, -0.513272f), + Vector3DFloat(+0.565633f, +0.823079f, +0.050993f), + Vector3DFloat(+0.050237f, -0.998492f, +0.022122f), + Vector3DFloat(-0.386389f, -0.893963f, -0.227011f), + Vector3DFloat(+0.888703f, -0.437519f, -0.137056f), + Vector3DFloat(-0.914197f, +0.390980f, +0.106670f), + Vector3DFloat(+0.778906f, -0.627140f, -0.001437f), + Vector3DFloat(-0.603014f, +0.672265f, -0.429458f), + Vector3DFloat(+0.501042f, -0.665212f, +0.553579f), + Vector3DFloat(-0.995164f, +0.092308f, -0.033577f), + Vector3DFloat(-0.998104f, +0.018497f, +0.058712f), + Vector3DFloat(+0.929569f, +0.123842f, -0.347225f), + Vector3DFloat(+0.235077f, -0.609238f, +0.757343f), + Vector3DFloat(-0.452902f, -0.887545f, +0.084525f), + Vector3DFloat(-0.137550f, -0.488131f, -0.861863f), + Vector3DFloat(+0.660545f, -0.371465f, +0.652453f), + Vector3DFloat(+0.747313f, -0.657236f, +0.097799f), + Vector3DFloat(-0.543312f, -0.315699f, -0.777911f), + Vector3DFloat(+0.189959f, -0.346861f, +0.918478f), + Vector3DFloat(+0.323571f, +0.300781f, +0.897125f), + Vector3DFloat(-0.482606f, +0.875832f, -0.003165f), + Vector3DFloat(-0.936502f, +0.291824f, -0.194430f), + Vector3DFloat(-0.503609f, -0.390560f, +0.770610f), + Vector3DFloat(-0.540142f, +0.002774f, -0.841569f), + Vector3DFloat(-0.085055f, -0.996376f, -0.000148f), + Vector3DFloat(-0.615309f, +0.059981f, -0.786000f), + Vector3DFloat(+0.718191f, +0.505958f, -0.477711f), + Vector3DFloat(-0.167397f, +0.844465f, -0.508780f), + Vector3DFloat(+0.636446f, -0.344036f, -0.690345f), + Vector3DFloat(+0.663267f, +0.700418f, -0.263613f), + Vector3DFloat(+0.602334f, +0.435514f, +0.668970f), + Vector3DFloat(-0.275820f, -0.393792f, +0.876842f), + Vector3DFloat(+0.437736f, -0.747931f, +0.498986f), + Vector3DFloat(+0.882319f, +0.417138f, +0.217965f), + Vector3DFloat(-0.851108f, -0.482384f, -0.207174f), + Vector3DFloat(+0.320590f, +0.898664f, +0.299375f), + Vector3DFloat(-0.621201f, -0.614972f, +0.485714f), + Vector3DFloat(+0.911173f, +0.041873f, +0.409892f), + Vector3DFloat(+0.729444f, +0.142692f, -0.668992f), + Vector3DFloat(+0.666307f, -0.735324f, +0.123831f), + Vector3DFloat(+0.463591f, +0.847227f, -0.259402f), + Vector3DFloat(+0.894296f, +0.059634f, +0.443484f), + Vector3DFloat(-0.736335f, -0.674274f, +0.056256f), + Vector3DFloat(+0.469502f, -0.733536f, +0.491420f), + Vector3DFloat(-0.391723f, -0.837099f, +0.381861f), + Vector3DFloat(-0.437372f, -0.437618f, -0.785618f), + Vector3DFloat(-0.203384f, -0.343038f, -0.917039f), + Vector3DFloat(-0.945306f, +0.221497f, +0.239450f), + Vector3DFloat(+0.773091f, +0.496793f, +0.394369f), + Vector3DFloat(-0.710103f, +0.093103f, +0.697915f), + Vector3DFloat(-0.456786f, +0.151779f, +0.876533f), + Vector3DFloat(+0.373153f, +0.587166f, -0.718326f), + Vector3DFloat(-0.559785f, -0.793881f, +0.237473f), + Vector3DFloat(-0.884665f, +0.422952f, +0.196163f), + Vector3DFloat(-0.468879f, +0.300549f, -0.830556f), + Vector3DFloat(+0.958105f, +0.285330f, -0.024919f), + Vector3DFloat(+0.825326f, -0.423197f, -0.373819f), + Vector3DFloat(-0.034122f, +0.999414f, +0.002781f), + Vector3DFloat(-0.904795f, -0.041789f, -0.423792f), + Vector3DFloat(-0.799927f, +0.541477f, -0.258687f), + Vector3DFloat(+0.995132f, +0.000543f, -0.098546f), + Vector3DFloat(+0.843984f, -0.507103f, -0.174749f), + Vector3DFloat(-0.640934f, +0.618163f, +0.455058f), + Vector3DFloat(+0.543397f, +0.492878f, +0.679553f), + Vector3DFloat(+0.408980f, -0.467105f, +0.783932f), + Vector3DFloat(+0.219682f, +0.823953f, +0.522343f), + Vector3DFloat(+0.845523f, +0.410442f, -0.341509f), + Vector3DFloat(-0.997099f, +0.057254f, -0.050159f), + Vector3DFloat(+0.535588f, +0.112415f, +0.836964f), + Vector3DFloat(+0.139015f, +0.182777f, +0.973277f), + Vector3DFloat(+0.681261f, +0.731126f, -0.036585f), + Vector3DFloat(-0.161589f, +0.986188f, -0.036352f), + Vector3DFloat(-0.294098f, +0.640063f, +0.709806f), + Vector3DFloat(+0.213370f, -0.880985f, -0.422301f), + Vector3DFloat(-0.903331f, +0.383376f, +0.192395f), + Vector3DFloat(+0.020283f, +0.989297f, -0.144498f), + Vector3DFloat(+0.550858f, -0.603955f, +0.576016f), + Vector3DFloat(-0.297499f, -0.396883f, -0.868319f), + Vector3DFloat(-0.125581f, +0.971238f, +0.202303f), + Vector3DFloat(+0.994606f, -0.096856f, +0.037125f), + Vector3DFloat(+0.959844f, -0.254636f, -0.117729f), + Vector3DFloat(-0.332961f, +0.808031f, +0.486028f), + Vector3DFloat(+0.118411f, -0.818829f, +0.561692f), + Vector3DFloat(-0.329010f, +0.932571f, +0.148536f), + Vector3DFloat(+0.386616f, -0.386923f, -0.837149f), + Vector3DFloat(+0.501223f, -0.201907f, -0.841433f), + Vector3DFloat(+0.555119f, -0.793008f, -0.250959f), + Vector3DFloat(-0.512485f, +0.850268f, -0.120011f), + Vector3DFloat(+0.573352f, +0.737293f, +0.357306f), + Vector3DFloat(+0.315311f, -0.182192f, +0.931335f), + Vector3DFloat(+0.156167f, -0.963694f, -0.216579f), + Vector3DFloat(-0.285174f, -0.542273f, +0.790326f), + Vector3DFloat(-0.277593f, +0.668866f, +0.689609f), + Vector3DFloat(+0.319798f, -0.921924f, +0.218599f), + Vector3DFloat(-0.727455f, -0.686116f, -0.007338f), + Vector3DFloat(+0.219712f, -0.952663f, +0.210141f), + Vector3DFloat(+0.491792f, +0.552463f, -0.672997f), + Vector3DFloat(-0.526640f, +0.820445f, +0.222533f) + }; } #endif //__PolyVox_RandomUnitVectors_H__ diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/RandomVectors.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/RandomVectors.h index a4d2d4bd..a18d5e1f 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Impl/RandomVectors.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/RandomVectors.h @@ -30,7 +30,1033 @@ freely, subject to the following restrictions: namespace PolyVox { - extern POLYVOX_API const Vector3DFloat randomVectors[]; + const Vector3DFloat randomVectors[1024] = + { + Vector3DFloat(+0.348918f, -0.385662f, +0.650197f), + Vector3DFloat(-0.259255f, +0.791559f, +0.920957f), + Vector3DFloat(+0.940733f, -0.101535f, +0.250160f), + Vector3DFloat(-0.308939f, +0.367656f, +0.877987f), + Vector3DFloat(+0.112949f, -0.047090f, -0.730277f), + Vector3DFloat(-0.605579f, +0.039705f, +0.310160f), + Vector3DFloat(+0.086459f, +0.376446f, -0.496078f), + Vector3DFloat(+0.565661f, -0.261574f, -0.924986f), + Vector3DFloat(-0.285745f, -0.792047f, -0.582568f), + Vector3DFloat(+0.943175f, +0.226844f, +0.823481f), + Vector3DFloat(+0.599414f, +0.846797f, -0.438215f), + Vector3DFloat(-0.502731f, -0.907407f, +0.170751f), + Vector3DFloat(+0.136204f, -0.735527f, -0.066622f), + Vector3DFloat(-0.618763f, +0.825617f, -0.325053f), + Vector3DFloat(+0.942076f, +0.608325f, -0.532517f), + Vector3DFloat(-0.466414f, -0.248756f, -0.189856f), + Vector3DFloat(+0.618213f, +0.879513f, +0.120090f), + Vector3DFloat(-0.918393f, +0.876522f, +0.265114f), + Vector3DFloat(+0.345195f, +0.670705f, -0.914243f), + Vector3DFloat(-0.600757f, -0.417646f, -0.736747f), + Vector3DFloat(-0.271828f, +0.215674f, +0.890622f), + Vector3DFloat(+0.100986f, +0.821955f, +0.429975f), + Vector3DFloat(+0.811823f, -0.506943f, +0.635853f), + Vector3DFloat(+0.647084f, +0.297403f, -0.714774f), + Vector3DFloat(+0.531907f, -0.917417f, +0.795770f), + Vector3DFloat(-0.151585f, +0.250038f, +0.959105f), + Vector3DFloat(+0.311747f, -0.850948f, +0.946348f), + Vector3DFloat(+0.641407f, -0.747978f, +0.464583f), + Vector3DFloat(+0.297769f, -0.427839f, +0.867489f), + Vector3DFloat(+0.305032f, +0.985900f, +0.071261f), + Vector3DFloat(+0.105930f, -0.895016f, +0.871700f), + Vector3DFloat(+0.060335f, -0.312235f, +0.247475f), + Vector3DFloat(+0.174718f, +0.776055f, -0.783563f), + Vector3DFloat(-0.018342f, -0.031343f, +0.533982f), + Vector3DFloat(+0.136753f, -0.201575f, -0.694998f), + Vector3DFloat(+0.606006f, +0.353069f, -0.174841f), + Vector3DFloat(-0.720573f, +0.272805f, -0.679189f), + Vector3DFloat(+0.802484f, -0.649281f, -0.884274f), + Vector3DFloat(-0.577807f, -0.794610f, +0.227332f), + Vector3DFloat(-0.391644f, +0.440474f, -0.927854f), + Vector3DFloat(+0.631825f, +0.072115f, +0.943785f), + Vector3DFloat(-0.898312f, +0.257363f, -0.942930f), + Vector3DFloat(-0.608264f, +0.583667f, +0.228126f), + Vector3DFloat(-0.788202f, +0.777764f, +0.722953f), + Vector3DFloat(-0.624622f, -0.296976f, -0.382122f), + Vector3DFloat(+0.921323f, -0.356365f, -0.750542f), + Vector3DFloat(-0.899106f, +0.578234f, +0.937132f), + Vector3DFloat(+0.830744f, -0.789422f, -0.026154f), + Vector3DFloat(+0.720634f, +0.135166f, -0.366985f), + Vector3DFloat(+0.796930f, +0.687124f, +0.807855f), + Vector3DFloat(+0.262001f, -0.120945f, -0.196631f), + Vector3DFloat(+0.562426f, -0.886166f, +0.699149f), + Vector3DFloat(+0.047945f, -0.781793f, +0.465987f), + Vector3DFloat(+0.219275f, +0.152440f, +0.726127f), + Vector3DFloat(-0.970641f, -0.384136f, -0.340739f), + Vector3DFloat(+0.244606f, +0.969848f, +0.466903f), + Vector3DFloat(+0.608753f, +0.329936f, -0.411542f), + Vector3DFloat(+0.959593f, -0.833186f, -0.698721f), + Vector3DFloat(+0.475692f, -0.320658f, +0.507675f), + Vector3DFloat(-0.155431f, -0.050447f, -0.455855f), + Vector3DFloat(-0.738456f, +0.917173f, -0.407758f), + Vector3DFloat(-0.555284f, +0.842891f, -0.984619f), + Vector3DFloat(+0.696951f, +0.155553f, -0.031526f), + Vector3DFloat(-0.131565f, -0.563707f, +0.076815f), + Vector3DFloat(-0.319376f, +0.620106f, +0.567614f), + Vector3DFloat(-0.628163f, -0.813959f, -0.438581f), + Vector3DFloat(+0.484115f, +0.060640f, -0.176183f), + Vector3DFloat(-0.523240f, -0.572314f, +0.633778f), + Vector3DFloat(-0.524949f, -0.334574f, -0.326701f), + Vector3DFloat(+0.747673f, +0.725944f, +0.701651f), + Vector3DFloat(-0.500961f, +0.564867f, -0.902341f), + Vector3DFloat(+0.995422f, -0.245949f, +0.301065f), + Vector3DFloat(+0.655080f, -0.783380f, +0.835871f), + Vector3DFloat(+0.541795f, -0.693472f, -0.355083f), + Vector3DFloat(+0.891110f, +0.891171f, -0.891903f), + Vector3DFloat(+0.507675f, -0.949034f, -0.485214f), + Vector3DFloat(-0.116123f, +0.368999f, +0.514756f), + Vector3DFloat(-0.859432f, -0.525071f, +0.632008f), + Vector3DFloat(-0.707205f, +0.077914f, +0.930540f), + Vector3DFloat(-0.783380f, -0.577074f, -0.180212f), + Vector3DFloat(-0.047884f, -0.523789f, +0.471664f), + Vector3DFloat(-0.210791f, +0.904904f, -0.585864f), + Vector3DFloat(+0.132664f, +0.792230f, +0.707266f), + Vector3DFloat(-0.735710f, -0.263710f, -0.258827f), + Vector3DFloat(+0.912290f, +0.497421f, -0.518845f), + Vector3DFloat(-0.790521f, -0.707144f, +0.314982f), + Vector3DFloat(-0.799249f, +0.381207f, -0.756462f), + Vector3DFloat(+0.694998f, -0.521836f, +0.957213f), + Vector3DFloat(+0.310709f, +0.049837f, +0.920652f), + Vector3DFloat(+0.581530f, +0.164647f, +0.560900f), + Vector3DFloat(+0.406903f, -0.650563f, -0.674551f), + Vector3DFloat(-0.749016f, +0.119663f, -0.040193f), + Vector3DFloat(+0.955260f, -0.142552f, +0.175756f), + Vector3DFloat(-0.925108f, -0.970824f, -0.430952f), + Vector3DFloat(+0.666372f, +0.449507f, -0.801813f), + Vector3DFloat(-0.311991f, -0.079928f, -0.608142f), + Vector3DFloat(-0.344829f, +0.280862f, +0.800775f), + Vector3DFloat(-0.880123f, +0.318217f, -0.120212f), + Vector3DFloat(-0.146519f, +0.573412f, -0.358013f), + Vector3DFloat(+0.297220f, -0.889523f, +0.246620f), + Vector3DFloat(-0.628834f, -0.383404f, -0.630360f), + Vector3DFloat(-0.397382f, +0.547533f, -0.579150f), + Vector3DFloat(+0.758049f, +0.631947f, -0.916807f), + Vector3DFloat(-0.678030f, -0.606433f, -0.881527f), + Vector3DFloat(+0.213233f, +0.854060f, -0.043428f), + Vector3DFloat(+0.175085f, +0.139500f, -0.208472f), + Vector3DFloat(+0.983520f, -0.389386f, +0.178076f), + Vector3DFloat(+0.956603f, +0.696951f, -0.307657f), + Vector3DFloat(-0.276345f, +0.576220f, +0.182104f), + Vector3DFloat(+0.864742f, -0.657582f, +0.253639f), + Vector3DFloat(-0.275735f, -0.012177f, +0.306619f), + Vector3DFloat(-0.385235f, -0.881649f, +0.658071f), + Vector3DFloat(-0.117466f, -0.306681f, -0.235755f), + Vector3DFloat(+0.173254f, +0.685720f, +0.116733f), + Vector3DFloat(-0.641041f, +0.704642f, -0.585864f), + Vector3DFloat(+0.154820f, +0.999939f, -0.761345f), + Vector3DFloat(-0.726310f, +0.695181f, -0.490036f), + Vector3DFloat(-0.149510f, -0.593188f, -0.794122f), + Vector3DFloat(+0.798212f, +0.872555f, -0.361980f), + Vector3DFloat(+0.749687f, -0.931944f, +0.519211f), + Vector3DFloat(-0.151952f, -0.889096f, -0.313822f), + Vector3DFloat(-0.467879f, +0.289651f, -0.901242f), + Vector3DFloat(+0.522752f, +0.406781f, +0.157079f), + Vector3DFloat(+0.088534f, -0.421735f, -0.236122f), + Vector3DFloat(+0.722221f, -0.136692f, -0.292825f), + Vector3DFloat(-0.572436f, +0.349162f, +0.819697f), + Vector3DFloat(+0.252113f, +0.773614f, -0.299051f), + Vector3DFloat(-0.401410f, +0.400250f, -0.091037f), + Vector3DFloat(+0.449507f, +0.205115f, +0.075533f), + Vector3DFloat(+0.246803f, -0.197851f, -0.322123f), + Vector3DFloat(-0.822077f, +0.037263f, +0.157445f), + Vector3DFloat(+0.373455f, +0.983154f, -0.580920f), + Vector3DFloat(+0.201758f, -0.075289f, +0.514878f), + Vector3DFloat(+0.552477f, +0.760430f, +0.938963f), + Vector3DFloat(-0.297525f, -0.603504f, -0.285318f), + Vector3DFloat(-0.504257f, +0.135899f, +0.694021f), + Vector3DFloat(-0.701895f, +0.509140f, -0.768914f), + Vector3DFloat(+0.725639f, +0.083834f, -0.985961f), + Vector3DFloat(+0.617847f, -0.604114f, +0.976440f), + Vector3DFloat(-0.557115f, +0.562853f, +0.214087f), + Vector3DFloat(-0.480819f, -0.048738f, -0.759392f), + Vector3DFloat(-0.268105f, -0.168493f, -0.141881f), + Vector3DFloat(+0.664357f, -0.999207f, +0.486740f), + Vector3DFloat(-0.739128f, +0.089328f, +0.611194f), + Vector3DFloat(-0.355876f, +0.889523f, +0.701895f), + Vector3DFloat(-0.123692f, -0.252358f, -0.739250f), + Vector3DFloat(+0.405438f, -0.276772f, -0.896786f), + Vector3DFloat(-0.803644f, +0.517563f, -0.146886f), + Vector3DFloat(+0.647511f, +0.766289f, -0.811518f), + Vector3DFloat(-0.266457f, -0.779534f, +0.720634f), + Vector3DFloat(-0.643849f, -0.014130f, -0.345134f), + Vector3DFloat(-0.527390f, +0.047700f, -0.271340f), + Vector3DFloat(+0.993957f, -0.305643f, +0.841731f), + Vector3DFloat(+0.441816f, -0.849117f, -0.411664f), + Vector3DFloat(+0.303323f, -0.088473f, -0.677602f), + Vector3DFloat(+0.897824f, +0.203833f, +0.821039f), + Vector3DFloat(+0.468123f, +0.717338f, +0.338542f), + Vector3DFloat(-0.452986f, -0.830622f, -0.832942f), + Vector3DFloat(-0.245582f, -0.273171f, -0.820612f), + Vector3DFloat(-0.007660f, -0.799371f, +0.156896f), + Vector3DFloat(-0.022919f, +0.152013f, +0.614246f), + Vector3DFloat(-0.414045f, +0.637440f, -0.542711f), + Vector3DFloat(+0.453108f, -0.034516f, +0.330607f), + Vector3DFloat(+0.324015f, +0.689505f, +0.719108f), + Vector3DFloat(-0.236854f, +0.700491f, +0.276406f), + Vector3DFloat(-0.405316f, +0.871944f, +0.233863f), + Vector3DFloat(+0.898373f, +0.660756f, -0.914609f), + Vector3DFloat(+0.737114f, -0.179601f, -0.990539f), + Vector3DFloat(-0.536241f, -0.980712f, -0.352702f), + Vector3DFloat(+0.730094f, -0.970214f, -0.857967f), + Vector3DFloat(-0.194800f, -0.286782f, +0.604236f), + Vector3DFloat(+0.163366f, -0.441755f, -0.149022f), + Vector3DFloat(+0.457564f, +0.433149f, -0.626698f), + Vector3DFloat(+0.192846f, -0.909848f, +0.501572f), + Vector3DFloat(+0.444563f, -0.377789f, -0.545213f), + Vector3DFloat(-0.296670f, -0.809259f, +0.614246f), + Vector3DFloat(-0.068209f, +0.480148f, +0.537828f), + Vector3DFloat(+0.638173f, +0.371685f, -0.495956f), + Vector3DFloat(+0.798822f, +0.767510f, +0.516282f), + Vector3DFloat(-0.336161f, -0.035615f, +0.058687f), + Vector3DFloat(-0.888852f, -0.022370f, +0.215552f), + Vector3DFloat(-0.737541f, -0.977783f, -0.506638f), + Vector3DFloat(+0.471969f, +0.429670f, +0.668508f), + Vector3DFloat(+0.240394f, -0.212500f, -0.026215f), + Vector3DFloat(-0.916379f, -0.706229f, -0.593799f), + Vector3DFloat(-0.246681f, +0.919736f, -0.984741f), + Vector3DFloat(+0.291055f, -0.263771f, +0.703726f), + Vector3DFloat(-0.468245f, -0.062777f, +0.808527f), + Vector3DFloat(+0.661245f, +0.514817f, -0.715995f), + Vector3DFloat(-0.709830f, -0.580920f, +0.323710f), + Vector3DFloat(-0.463912f, -0.279092f, -0.101291f), + Vector3DFloat(-0.426252f, -0.292520f, -0.523057f), + Vector3DFloat(-0.285928f, -0.806574f, +0.701468f), + Vector3DFloat(-0.216468f, +0.385968f, +0.031953f), + Vector3DFloat(+0.737053f, +0.683767f, +0.684561f), + Vector3DFloat(+0.080172f, -0.063753f, +0.526902f), + Vector3DFloat(+0.414228f, +0.367351f, +0.884335f), + Vector3DFloat(-0.460677f, -0.048189f, -0.403851f), + Vector3DFloat(+0.973998f, +0.039399f, -0.148839f), + Vector3DFloat(+0.578539f, -0.651173f, +0.859432f), + Vector3DFloat(-0.172948f, +0.534593f, +0.255531f), + Vector3DFloat(+0.537584f, -0.570116f, +0.317606f), + Vector3DFloat(-0.380535f, +0.841548f, -0.274880f), + Vector3DFloat(+0.627247f, +0.655507f, -0.813532f), + Vector3DFloat(+0.288186f, +0.273171f, -0.674123f), + Vector3DFloat(-0.489303f, +0.828913f, +0.552599f), + Vector3DFloat(-0.541002f, +0.170019f, -0.242836f), + Vector3DFloat(+0.802972f, +0.340190f, +0.414716f), + Vector3DFloat(-0.997253f, -0.806635f, +0.588122f), + Vector3DFloat(+0.011017f, -0.599109f, -0.183325f), + Vector3DFloat(-0.871578f, -0.430708f, -0.042634f), + Vector3DFloat(+0.144627f, -0.921751f, +0.142003f), + Vector3DFloat(-0.695059f, -0.091037f, -0.647694f), + Vector3DFloat(-0.346477f, +0.663381f, -0.528977f), + Vector3DFloat(-0.194739f, +0.724967f, +0.615894f), + Vector3DFloat(+0.741874f, +0.720695f, -0.544847f), + Vector3DFloat(-0.984863f, +0.715445f, +0.461287f), + Vector3DFloat(-0.277871f, +0.329936f, +0.678091f), + Vector3DFloat(+0.090854f, +0.565905f, -0.254250f), + Vector3DFloat(-0.844050f, +0.781915f, -0.783929f), + Vector3DFloat(+0.332377f, -0.336528f, +0.820673f), + Vector3DFloat(-0.673391f, +0.589953f, -0.685598f), + Vector3DFloat(+0.022370f, +0.979980f, +0.686453f), + Vector3DFloat(-0.640065f, +0.369488f, +0.022919f), + Vector3DFloat(+0.699088f, -0.286355f, +0.684378f), + Vector3DFloat(-0.702139f, -0.827754f, +0.528367f), + Vector3DFloat(+0.150365f, -0.669851f, -0.695486f), + Vector3DFloat(+0.885617f, +0.492416f, -0.964599f), + Vector3DFloat(-0.923643f, -0.338847f, -0.369060f), + Vector3DFloat(+0.009064f, +0.632435f, +0.628956f), + Vector3DFloat(+0.620411f, +0.959777f, -0.769890f), + Vector3DFloat(+0.865413f, +0.685659f, -0.149327f), + Vector3DFloat(-0.933042f, +0.517258f, +0.168493f), + Vector3DFloat(+0.309732f, +0.299417f, +0.995361f), + Vector3DFloat(+0.196814f, -0.128025f, +0.565233f), + Vector3DFloat(-0.343669f, +0.889157f, +0.616688f), + Vector3DFloat(-0.676870f, +0.035432f, +0.906430f), + Vector3DFloat(-0.238868f, +0.320475f, -0.307596f), + Vector3DFloat(+0.164159f, +0.774468f, +0.502792f), + Vector3DFloat(+0.733146f, +0.517563f, +0.572741f), + Vector3DFloat(+0.676931f, -0.930235f, +0.231056f), + Vector3DFloat(-0.640370f, +0.241127f, -0.518479f), + Vector3DFloat(-0.953795f, +0.673086f, -0.706656f), + Vector3DFloat(+0.538621f, -0.340495f, +0.202124f), + Vector3DFloat(+0.431501f, +0.452315f, +0.422651f), + Vector3DFloat(+0.935606f, -0.442793f, -0.087191f), + Vector3DFloat(-0.921873f, -0.794733f, -0.003388f), + Vector3DFloat(+0.978576f, +0.342814f, -0.813898f), + Vector3DFloat(-0.750969f, +0.077853f, -0.849117f), + Vector3DFloat(+0.416120f, +0.678030f, +0.187475f), + Vector3DFloat(+0.370342f, -0.101901f, -0.544053f), + Vector3DFloat(+0.248512f, +0.803766f, -0.654042f), + Vector3DFloat(-0.925230f, +0.883480f, +0.287698f), + Vector3DFloat(-0.861873f, -0.263771f, +0.476730f), + Vector3DFloat(-0.298868f, -0.459517f, +0.932798f), + Vector3DFloat(+0.680532f, +0.697928f, +0.761162f), + Vector3DFloat(-0.466964f, -0.590625f, +0.972716f), + Vector3DFloat(+0.400067f, -0.316507f, +0.385418f), + Vector3DFloat(-0.123814f, -0.144444f, -0.161290f), + Vector3DFloat(-0.703726f, +0.189489f, +0.250099f), + Vector3DFloat(-0.766533f, -0.369854f, +0.871395f), + Vector3DFloat(-0.561205f, -0.891415f, +0.247658f), + Vector3DFloat(+0.590991f, +0.661489f, -0.996887f), + Vector3DFloat(-0.244667f, +0.857723f, +0.402692f), + Vector3DFloat(-0.574572f, -0.257790f, +0.561449f), + Vector3DFloat(+0.020600f, -0.784173f, -0.057711f), + Vector3DFloat(+0.735954f, +0.708487f, +0.913022f), + Vector3DFloat(-0.615101f, -0.643666f, +0.350017f), + Vector3DFloat(+0.436933f, +0.596423f, +0.985412f), + Vector3DFloat(-0.167577f, +0.400555f, +0.914670f), + Vector3DFloat(-0.920896f, -0.621570f, -0.637074f), + Vector3DFloat(-0.020356f, -0.234657f, +0.460860f), + Vector3DFloat(+0.336650f, -0.537767f, +0.907712f), + Vector3DFloat(-0.138768f, +0.860653f, +0.093661f), + Vector3DFloat(-0.733512f, -0.564196f, -0.046724f), + Vector3DFloat(+0.058260f, -0.429060f, +0.150792f), + Vector3DFloat(+0.255837f, -0.187780f, +0.312601f), + Vector3DFloat(-0.050081f, +0.680105f, -0.609485f), + Vector3DFloat(+0.075411f, +0.016511f, -0.127293f), + Vector3DFloat(-0.735710f, -0.787957f, +0.992248f), + Vector3DFloat(-0.191931f, +0.812311f, +0.681692f), + Vector3DFloat(-0.284402f, -0.177160f, -0.533128f), + Vector3DFloat(+0.859432f, +0.042940f, +0.404096f), + Vector3DFloat(+0.599841f, +0.131260f, +0.313028f), + Vector3DFloat(-0.955809f, -0.792474f, +0.086947f), + Vector3DFloat(-0.980712f, -0.525498f, -0.539598f), + Vector3DFloat(-0.877377f, -0.748222f, +0.590320f), + Vector3DFloat(-0.822443f, -0.733634f, -0.529588f), + Vector3DFloat(+0.379620f, -0.710013f, +0.038484f), + Vector3DFloat(-0.826472f, -0.831050f, -0.645436f), + Vector3DFloat(+0.160131f, -0.977050f, -0.502609f), + Vector3DFloat(-0.818964f, +0.921567f, -0.011261f), + Vector3DFloat(+0.932005f, -0.364727f, +0.023103f), + Vector3DFloat(-0.923826f, -0.862300f, +0.680410f), + Vector3DFloat(-0.298379f, +0.196936f, -0.486618f), + Vector3DFloat(-0.281411f, -0.045747f, -0.252602f), + Vector3DFloat(+0.706534f, +0.296976f, +0.672292f), + Vector3DFloat(-0.543077f, +0.319376f, +0.238075f), + Vector3DFloat(-0.501938f, +0.067293f, +0.119602f), + Vector3DFloat(-0.740287f, -0.783197f, +0.407514f), + Vector3DFloat(-0.933470f, -0.855098f, -0.503952f), + Vector3DFloat(-0.574877f, -0.533067f, +0.525437f), + Vector3DFloat(+0.785394f, -0.262612f, +0.571642f), + Vector3DFloat(-0.659108f, -0.811396f, +0.264138f), + Vector3DFloat(+0.926695f, -0.963622f, +0.121372f), + Vector3DFloat(+0.505661f, -0.209815f, -0.439131f), + Vector3DFloat(-0.433882f, +0.026887f, +0.928953f), + Vector3DFloat(-0.771599f, +0.737785f, -0.288003f), + Vector3DFloat(-0.894406f, +0.505905f, +0.971068f), + Vector3DFloat(+0.350383f, +0.570421f, -0.211646f), + Vector3DFloat(+0.644093f, -0.882748f, -0.131382f), + Vector3DFloat(+0.225745f, +0.948973f, -0.488327f), + Vector3DFloat(+0.277810f, -0.337748f, +0.322672f), + Vector3DFloat(-0.686514f, +0.185766f, +0.752129f), + Vector3DFloat(+0.350566f, +0.122959f, +0.722526f), + Vector3DFloat(-0.687002f, +0.955260f, -0.955687f), + Vector3DFloat(+0.958983f, -0.019074f, -0.317118f), + Vector3DFloat(+0.076937f, -0.015839f, -0.772027f), + Vector3DFloat(+0.899777f, -0.224647f, +0.174230f), + Vector3DFloat(+0.805719f, -0.288797f, +0.742119f), + Vector3DFloat(+0.964904f, -0.322794f, +0.416486f), + Vector3DFloat(-0.485641f, -0.559130f, -0.500168f), + Vector3DFloat(+0.310282f, +0.408185f, -0.946471f), + Vector3DFloat(-0.279031f, +0.645131f, -0.118259f), + Vector3DFloat(+0.780694f, -0.650136f, -0.433943f), + Vector3DFloat(+0.981262f, +0.039521f, -0.532395f), + Vector3DFloat(+0.830866f, +0.430769f, -0.333293f), + Vector3DFloat(-0.462081f, -0.872799f, -0.070711f), + Vector3DFloat(+0.276894f, -0.418683f, -0.198767f), + Vector3DFloat(+0.217750f, +0.312662f, -0.725211f), + Vector3DFloat(-0.193091f, -0.522752f, -0.901486f), + Vector3DFloat(+0.040071f, -0.307291f, +0.622669f), + Vector3DFloat(-0.788446f, -0.817438f, -0.566027f), + Vector3DFloat(-0.947508f, -0.519822f, +0.143468f), + Vector3DFloat(-0.072970f, -0.580920f, +0.925230f), + Vector3DFloat(-0.072359f, +0.954772f, +0.980163f), + Vector3DFloat(+0.954344f, -0.229774f, -0.562059f), + Vector3DFloat(+0.095004f, +0.123020f, +0.103366f), + Vector3DFloat(+0.784478f, -0.571764f, +0.774529f), + Vector3DFloat(-0.113498f, -0.852229f, +0.422468f), + Vector3DFloat(-0.128941f, -0.637196f, -0.590869f), + Vector3DFloat(+0.603259f, -0.670766f, +0.303201f), + Vector3DFloat(+0.693960f, +0.278542f, +0.171422f), + Vector3DFloat(+0.801813f, +0.236671f, +0.195227f), + Vector3DFloat(-0.193823f, +0.684072f, -0.594714f), + Vector3DFloat(+0.715201f, +0.750725f, +0.591479f), + Vector3DFloat(+0.698782f, +0.073214f, +0.106052f), + Vector3DFloat(+0.803522f, -0.470809f, +0.279763f), + Vector3DFloat(+0.099704f, +0.861385f, -0.397687f), + Vector3DFloat(+0.230506f, -0.993286f, +0.054292f), + Vector3DFloat(-0.292398f, +0.585376f, +0.762139f), + Vector3DFloat(-0.168004f, +0.731132f, -0.020051f), + Vector3DFloat(+0.577441f, +0.205359f, +0.703848f), + Vector3DFloat(-0.869076f, +0.873653f, -0.802301f), + Vector3DFloat(+0.697256f, +0.399335f, +0.842708f), + Vector3DFloat(-0.590258f, -0.620777f, -0.628040f), + Vector3DFloat(-0.048982f, +0.759697f, -0.957335f), + Vector3DFloat(+0.026582f, +0.696402f, -0.537645f), + Vector3DFloat(+0.919431f, +0.040254f, +0.931394f), + Vector3DFloat(+0.308512f, +0.591052f, -0.194739f), + Vector3DFloat(-0.934202f, +0.307718f, -0.688894f), + Vector3DFloat(-0.285318f, +0.460860f, +0.757012f), + Vector3DFloat(+0.048799f, -0.720389f, +0.325968f), + Vector3DFloat(-0.202246f, +0.068697f, +0.641407f), + Vector3DFloat(-0.566088f, +0.523301f, +0.857295f), + Vector3DFloat(+0.040193f, -0.036836f, +0.699881f), + Vector3DFloat(-0.789422f, -0.195959f, -0.217505f), + Vector3DFloat(-0.836665f, +0.293741f, +0.418867f), + Vector3DFloat(+0.489486f, +0.954344f, +0.486007f), + Vector3DFloat(-0.755913f, -0.485153f, +0.253822f), + Vector3DFloat(+0.823420f, -0.565722f, -0.393353f), + Vector3DFloat(-0.817560f, +0.851436f, -0.368755f), + Vector3DFloat(+0.004791f, -0.474899f, -0.299417f), + Vector3DFloat(-0.012726f, +0.620289f, -0.555773f), + Vector3DFloat(+0.197058f, -0.916318f, -0.469466f), + Vector3DFloat(+0.243812f, +0.820734f, -0.694021f), + Vector3DFloat(-0.896359f, -0.753716f, -0.676321f), + Vector3DFloat(-0.761589f, -0.936033f, -0.154149f), + Vector3DFloat(+0.821528f, +0.641224f, -0.188025f), + Vector3DFloat(+0.799432f, +0.168981f, +0.571520f), + Vector3DFloat(+0.309793f, -0.181005f, -0.565416f), + Vector3DFloat(+0.211890f, -0.153539f, -0.473312f), + Vector3DFloat(+0.284097f, +0.968444f, -0.005829f), + Vector3DFloat(+0.835994f, +0.087374f, -0.599780f), + Vector3DFloat(+0.068270f, -0.178930f, -0.439741f), + Vector3DFloat(-0.455611f, +0.404218f, -0.862911f), + Vector3DFloat(+0.754143f, +0.197058f, +0.762749f), + Vector3DFloat(+0.053499f, -0.794549f, -0.285257f), + Vector3DFloat(+0.176916f, +0.163121f, -0.941954f), + Vector3DFloat(-0.102817f, -0.446944f, +0.830195f), + Vector3DFloat(+0.970824f, -0.484848f, -0.661977f), + Vector3DFloat(-0.561998f, -0.377544f, -0.955321f), + Vector3DFloat(-0.434980f, +0.501022f, +0.627186f), + Vector3DFloat(-0.828120f, +0.591540f, +0.701895f), + Vector3DFloat(-0.327555f, +0.628346f, -0.159581f), + Vector3DFloat(-0.082980f, -0.308084f, -0.077731f), + Vector3DFloat(+0.858150f, -0.706473f, +0.886532f), + Vector3DFloat(+0.526475f, +0.001373f, +0.438276f), + Vector3DFloat(-0.594958f, +0.084994f, -0.935057f), + Vector3DFloat(+0.783746f, -0.501877f, -0.797052f), + Vector3DFloat(-0.835566f, -0.808405f, +0.956359f), + Vector3DFloat(+0.380169f, +0.184118f, +0.857540f), + Vector3DFloat(+0.647206f, +0.652089f, -0.895383f), + Vector3DFloat(-0.421369f, -0.038667f, +0.500046f), + Vector3DFloat(-0.478133f, +0.447432f, +0.981750f), + Vector3DFloat(+0.593921f, -0.330485f, -0.966674f), + Vector3DFloat(-0.811823f, +0.928892f, -0.741935f), + Vector3DFloat(+0.115879f, -0.490707f, -0.080355f), + Vector3DFloat(+0.443159f, +0.030061f, -0.465560f), + Vector3DFloat(+0.013703f, -0.765435f, -0.311502f), + Vector3DFloat(+0.698782f, -0.612903f, +0.660207f), + Vector3DFloat(+0.341227f, -0.746940f, +0.284341f), + Vector3DFloat(-0.005036f, -0.863460f, -0.168432f), + Vector3DFloat(-0.434370f, -0.629933f, +0.545152f), + Vector3DFloat(-0.570544f, +0.023591f, +0.072970f), + Vector3DFloat(+0.709830f, +0.603626f, +0.031831f), + Vector3DFloat(-0.148961f, +0.783807f, -0.292154f), + Vector3DFloat(+0.088107f, -0.467818f, +0.319498f), + Vector3DFloat(+0.976623f, -0.185339f, +0.274087f), + Vector3DFloat(+0.770867f, +0.267861f, -0.022004f), + Vector3DFloat(-0.245338f, +0.171056f, -0.720389f), + Vector3DFloat(-0.909299f, +0.616993f, -0.950926f), + Vector3DFloat(+0.050935f, -0.842341f, -0.519944f), + Vector3DFloat(+0.646779f, +0.560839f, +0.129673f), + Vector3DFloat(-0.171361f, -0.501328f, -0.762749f), + Vector3DFloat(-0.374065f, -0.905209f, -0.561144f), + Vector3DFloat(-0.811029f, -0.510483f, -0.757073f), + Vector3DFloat(-0.905332f, -0.027924f, -0.263649f), + Vector3DFloat(-0.828730f, -0.067721f, -0.295206f), + Vector3DFloat(-0.538133f, +0.242714f, +0.914914f), + Vector3DFloat(-0.657949f, -0.732658f, -0.743584f), + Vector3DFloat(+0.837214f, -0.077181f, +0.767449f), + Vector3DFloat(+0.174047f, +0.397687f, +0.602405f), + Vector3DFloat(-0.256996f, +0.911435f, -0.927915f), + Vector3DFloat(+0.282754f, +0.500900f, +0.510178f), + Vector3DFloat(+0.849971f, +0.652821f, +0.002838f), + Vector3DFloat(-1.000000f, -0.103305f, -0.548814f), + Vector3DFloat(-0.673208f, -0.734489f, +0.204749f), + Vector3DFloat(-0.235511f, -0.977477f, -0.771538f), + Vector3DFloat(+0.294412f, +0.173009f, -0.075533f), + Vector3DFloat(-0.339946f, -0.970946f, -0.443525f), + Vector3DFloat(-0.016144f, -0.066134f, -0.394635f), + Vector3DFloat(-0.627003f, +0.683401f, -0.967101f), + Vector3DFloat(-0.217994f, -0.777642f, -0.404584f), + Vector3DFloat(+0.123447f, -0.590747f, +0.507614f), + Vector3DFloat(+0.648610f, +0.006806f, -0.677969f), + Vector3DFloat(+0.006561f, +0.662648f, -0.236305f), + Vector3DFloat(+0.658132f, +0.166173f, -0.283975f), + Vector3DFloat(-0.098178f, +0.665273f, -0.068636f), + Vector3DFloat(-0.091891f, +0.319620f, +0.058870f), + Vector3DFloat(+0.922666f, +0.077731f, +0.399701f), + Vector3DFloat(-0.007050f, +0.772942f, -0.957945f), + Vector3DFloat(-0.456832f, -0.293313f, +0.437300f), + Vector3DFloat(+0.917173f, -0.542100f, +0.909665f), + Vector3DFloat(-0.711722f, -0.917356f, +0.513169f), + Vector3DFloat(-0.032624f, +0.808100f, +0.354472f), + Vector3DFloat(-0.526597f, -0.049409f, +0.691702f), + Vector3DFloat(-0.073946f, +0.923521f, -0.389813f), + Vector3DFloat(+0.172216f, +0.642140f, -0.302896f), + Vector3DFloat(-0.660024f, +0.381329f, -0.833064f), + Vector3DFloat(+0.622791f, -0.809076f, +0.557787f), + Vector3DFloat(+0.609790f, +0.897702f, +0.998352f), + Vector3DFloat(-0.084384f, +0.169042f, -0.596667f), + Vector3DFloat(-0.315470f, -0.014618f, -0.640187f), + Vector3DFloat(+0.275552f, -0.199438f, -0.759941f), + Vector3DFloat(-0.615223f, -0.960021f, +0.367901f), + Vector3DFloat(+0.819514f, -0.787225f, +0.627308f), + Vector3DFloat(+0.083834f, -0.836299f, +0.926450f), + Vector3DFloat(-0.420637f, -0.047273f, +0.370281f), + Vector3DFloat(-0.097629f, -0.240577f, -0.594836f), + Vector3DFloat(+0.085604f, +0.385601f, -0.121189f), + Vector3DFloat(+0.968444f, -0.255104f, +0.021027f), + Vector3DFloat(+0.152440f, -0.450484f, +0.971496f), + Vector3DFloat(-0.095737f, +0.395672f, -0.605213f), + Vector3DFloat(+0.949278f, -0.284951f, +0.875118f), + Vector3DFloat(+0.787286f, +0.580248f, +0.494613f), + Vector3DFloat(+0.225990f, -0.455123f, +0.239540f), + Vector3DFloat(+0.630238f, -0.251747f, -0.617725f), + Vector3DFloat(+0.940733f, -0.390484f, +0.394024f), + Vector3DFloat(+0.197851f, -0.276345f, -0.893368f), + Vector3DFloat(-0.240883f, +0.349651f, -0.922178f), + Vector3DFloat(-0.037080f, -0.609119f, -0.018342f), + Vector3DFloat(-0.787042f, +0.624500f, -0.274880f), + Vector3DFloat(-0.536485f, +0.989746f, -0.400128f), + Vector3DFloat(+0.963988f, +0.006012f, +0.323649f), + Vector3DFloat(-0.501022f, -0.791864f, +0.514817f), + Vector3DFloat(-0.126316f, -0.782769f, +0.155553f), + Vector3DFloat(-0.254921f, +0.828547f, -0.173925f), + Vector3DFloat(-0.321512f, -0.180822f, +0.603198f), + Vector3DFloat(+0.733757f, -0.407514f, +0.170385f), + Vector3DFloat(-0.741691f, -0.322611f, -0.070956f), + Vector3DFloat(-0.025300f, +0.454329f, -0.889767f), + Vector3DFloat(+0.024751f, +0.133518f, -0.246498f), + Vector3DFloat(+0.545701f, -0.260842f, +0.869747f), + Vector3DFloat(+0.082247f, -0.579638f, -0.885495f), + Vector3DFloat(-0.000885f, -0.834346f, +0.040254f), + Vector3DFloat(-0.211097f, -0.059297f, +0.747856f), + Vector3DFloat(-0.829646f, +0.475753f, +0.527451f), + Vector3DFloat(+0.409162f, -0.167882f, -0.177099f), + Vector3DFloat(-0.319865f, -0.205664f, -0.130222f), + Vector3DFloat(+0.962523f, -0.992615f, +0.062655f), + Vector3DFloat(+0.849361f, -0.935301f, +0.394024f), + Vector3DFloat(+0.373699f, -0.148350f, +0.208594f), + Vector3DFloat(+0.639332f, +0.220557f, -0.277444f), + Vector3DFloat(+0.880734f, +0.209937f, -0.576708f), + Vector3DFloat(+0.342814f, +0.416364f, -0.832453f), + Vector3DFloat(+0.594958f, +0.479843f, -0.306070f), + Vector3DFloat(+0.335002f, -0.107334f, +0.784173f), + Vector3DFloat(+0.395917f, +0.763604f, +0.866756f), + Vector3DFloat(-0.507553f, +0.148717f, -0.436750f), + Vector3DFloat(-0.780450f, -0.599048f, -0.146031f), + Vector3DFloat(-0.841304f, -0.712577f, -0.329997f), + Vector3DFloat(+0.524033f, +0.033845f, +0.057100f), + Vector3DFloat(-0.976562f, -0.066866f, +0.026887f), + Vector3DFloat(-0.469405f, -0.094394f, +0.398175f), + Vector3DFloat(+0.238685f, -0.750237f, +0.156713f), + Vector3DFloat(+0.000702f, +0.617298f, -0.206397f), + Vector3DFloat(-0.228553f, +0.562548f, -0.719840f), + Vector3DFloat(-0.939451f, -0.698782f, +0.688162f), + Vector3DFloat(+0.637623f, +0.149022f, -0.536058f), + Vector3DFloat(-0.814386f, +0.379315f, +0.647145f), + Vector3DFloat(+0.523179f, -0.820368f, +0.386517f), + Vector3DFloat(+0.146092f, +0.999146f, +0.227332f), + Vector3DFloat(-0.366924f, -0.211707f, +0.274697f), + Vector3DFloat(+0.751640f, +0.136509f, +0.662648f), + Vector3DFloat(+0.657888f, +0.102695f, +0.022736f), + Vector3DFloat(+0.861019f, -0.535813f, +0.561449f), + Vector3DFloat(+0.766839f, +0.006317f, +0.681204f), + Vector3DFloat(+0.596301f, +0.671255f, -0.933470f), + Vector3DFloat(+0.776910f, -0.313211f, -0.353923f), + Vector3DFloat(+0.266213f, +0.215796f, +0.026093f), + Vector3DFloat(-0.648732f, +0.907407f, -0.755425f), + Vector3DFloat(-0.585498f, -0.234535f, -0.085421f), + Vector3DFloat(-0.490890f, +0.657582f, +0.242897f), + Vector3DFloat(+0.913450f, +0.066622f, -0.220252f), + Vector3DFloat(+0.121067f, +0.658193f, -0.645314f), + Vector3DFloat(+0.367779f, +0.941588f, +0.618702f), + Vector3DFloat(-0.320231f, +0.354900f, -0.653005f), + Vector3DFloat(+0.540147f, -0.212317f, +0.559374f), + Vector3DFloat(+0.715812f, -0.211951f, +0.078646f), + Vector3DFloat(-0.711051f, +0.598132f, -0.708914f), + Vector3DFloat(+0.029756f, +0.324809f, +0.014924f), + Vector3DFloat(-0.106418f, +0.386090f, +0.596301f), + Vector3DFloat(-0.317179f, -0.068880f, -0.315165f), + Vector3DFloat(+0.860164f, -0.772881f, -0.158788f), + Vector3DFloat(-0.326640f, -0.304239f, +0.445906f), + Vector3DFloat(+0.621265f, -0.815729f, +0.129429f), + Vector3DFloat(+0.687063f, -0.052767f, -0.969481f), + Vector3DFloat(-0.800043f, -0.598621f, +0.764702f), + Vector3DFloat(-0.518052f, -0.221534f, -0.066256f), + Vector3DFloat(+0.164953f, +0.886898f, +0.954100f), + Vector3DFloat(-0.384808f, -0.641102f, -1.000000f), + Vector3DFloat(+0.299051f, +0.218360f, +0.561205f), + Vector3DFloat(-0.419050f, +0.324992f, -0.161779f), + Vector3DFloat(-0.403241f, -0.176305f, +0.442976f), + Vector3DFloat(+0.262001f, +0.042817f, -0.818842f), + Vector3DFloat(+0.740410f, +0.888852f, -0.281716f), + Vector3DFloat(-0.853084f, +0.886227f, -0.736442f), + Vector3DFloat(-0.666616f, +0.555956f, +0.477950f), + Vector3DFloat(-0.714164f, +0.112156f, -0.032197f), + Vector3DFloat(+0.142674f, -0.842341f, +0.199744f), + Vector3DFloat(-0.305948f, -0.295999f, +0.131504f), + Vector3DFloat(+0.667470f, -0.966674f, +0.728629f), + Vector3DFloat(+0.122166f, +0.928281f, -0.725028f), + Vector3DFloat(-0.236854f, -0.756096f, +0.374798f), + Vector3DFloat(+0.035432f, -0.423505f, -0.663747f), + Vector3DFloat(+0.051973f, -0.510910f, +0.716849f), + Vector3DFloat(+0.540208f, -0.821711f, +0.055757f), + Vector3DFloat(+0.699149f, +0.988098f, +0.326579f), + Vector3DFloat(+0.108188f, -0.867367f, +0.668996f), + Vector3DFloat(+0.077181f, -0.738884f, +0.103671f), + Vector3DFloat(-0.467391f, +0.957335f, -0.194494f), + Vector3DFloat(+0.123386f, +0.893674f, -0.523118f), + Vector3DFloat(-0.151036f, +0.955809f, +0.199622f), + Vector3DFloat(+0.075411f, +0.726493f, -0.363994f), + Vector3DFloat(+0.224647f, -0.208960f, +0.242531f), + Vector3DFloat(+0.993591f, +0.751213f, -0.535203f), + Vector3DFloat(+0.308512f, +0.990905f, -0.197241f), + Vector3DFloat(+0.292886f, +0.536180f, +0.191748f), + Vector3DFloat(+0.489853f, -0.461531f, +0.351665f), + Vector3DFloat(-0.329447f, +0.531602f, +0.216834f), + Vector3DFloat(-0.809320f, +0.675649f, +0.516037f), + Vector3DFloat(+0.565172f, -0.661184f, +0.359111f), + Vector3DFloat(-0.039460f, +0.110080f, +0.978698f), + Vector3DFloat(+0.885372f, -0.763787f, +0.145726f), + Vector3DFloat(+0.006195f, +0.231117f, +0.417585f), + Vector3DFloat(-0.566027f, +0.179846f, -0.010407f), + Vector3DFloat(-0.879391f, +0.940123f, +0.163305f), + Vector3DFloat(+0.490646f, +0.391949f, +0.415998f), + Vector3DFloat(-0.973815f, +0.550096f, +0.710868f), + Vector3DFloat(+0.643544f, +0.763543f, +0.160375f), + Vector3DFloat(-0.832759f, +0.150792f, -0.602466f), + Vector3DFloat(-0.564745f, -0.121982f, +0.213172f), + Vector3DFloat(-0.775750f, +0.120640f, +0.703970f), + Vector3DFloat(+0.952208f, -0.233375f, +0.984619f), + Vector3DFloat(+0.330241f, +0.344707f, -0.002472f), + Vector3DFloat(-0.601489f, +0.772454f, +0.954527f), + Vector3DFloat(-0.605335f, +0.422590f, -0.629261f), + Vector3DFloat(+0.199011f, +0.389996f, -0.293069f), + Vector3DFloat(-0.664479f, +0.964110f, -0.223731f), + Vector3DFloat(-0.477340f, +0.905515f, +0.378521f), + Vector3DFloat(-0.366741f, +0.233497f, +0.181860f), + Vector3DFloat(-0.438826f, -0.664724f, +0.521653f), + Vector3DFloat(-0.298990f, +0.153844f, -0.795587f), + Vector3DFloat(+0.679983f, -0.192114f, +0.451033f), + Vector3DFloat(-0.630360f, +0.283303f, +0.892270f), + Vector3DFloat(+0.940489f, +0.396222f, +0.550890f), + Vector3DFloat(-0.448653f, +0.065889f, -0.753105f), + Vector3DFloat(+0.712821f, +0.740410f, +0.025178f), + Vector3DFloat(-0.862606f, +0.692923f, +0.973937f), + Vector3DFloat(-0.583789f, +0.849544f, -0.579455f), + Vector3DFloat(+0.640675f, +0.542711f, +0.062960f), + Vector3DFloat(-0.916196f, +0.493881f, +0.192602f), + Vector3DFloat(+0.270119f, +0.636525f, +0.380108f), + Vector3DFloat(-0.297952f, -0.165502f, +0.871578f), + Vector3DFloat(-0.731132f, -0.883175f, +0.756951f), + Vector3DFloat(+0.373760f, +0.645436f, -0.736503f), + Vector3DFloat(-0.289407f, +0.663259f, +0.329142f), + Vector3DFloat(+0.544115f, +0.908933f, -0.156713f), + Vector3DFloat(+0.780816f, +0.264870f, -0.632984f), + Vector3DFloat(-0.935667f, +0.959899f, -0.686148f), + Vector3DFloat(+0.121250f, -0.882687f, -0.204260f), + Vector3DFloat(-0.002106f, -0.032807f, -0.532334f), + Vector3DFloat(+0.334208f, -0.147862f, -0.719474f), + Vector3DFloat(-0.956114f, +0.622791f, -0.764702f), + Vector3DFloat(+0.482162f, -0.907651f, +0.396100f), + Vector3DFloat(-0.477645f, +0.710196f, -0.589221f), + Vector3DFloat(-0.374676f, -0.293008f, -0.738578f), + Vector3DFloat(+0.273232f, -0.007050f, +0.227454f), + Vector3DFloat(-0.634449f, -0.640675f, -0.644276f), + Vector3DFloat(-0.173315f, +0.852840f, -0.000580f), + Vector3DFloat(+0.258766f, +0.261086f, -0.720450f), + Vector3DFloat(+0.048921f, +0.562609f, +0.668569f), + Vector3DFloat(+0.072970f, -0.296182f, -0.753594f), + Vector3DFloat(+0.409528f, -0.742302f, -0.429365f), + Vector3DFloat(-0.551012f, +0.193579f, -0.672414f), + Vector3DFloat(-0.698111f, -0.188940f, +0.302896f), + Vector3DFloat(-0.176366f, +0.111606f, +0.180273f), + Vector3DFloat(-0.273537f, -0.817988f, -0.519028f), + Vector3DFloat(+0.742546f, -0.983154f, -0.585864f), + Vector3DFloat(-0.631031f, +0.641469f, +0.681936f), + Vector3DFloat(+0.181127f, +0.238929f, -0.851680f), + Vector3DFloat(-0.075655f, -0.175085f, +0.213904f), + Vector3DFloat(-0.554369f, -0.458724f, -0.080172f), + Vector3DFloat(-0.326273f, +0.086398f, -0.203162f), + Vector3DFloat(+0.905332f, +0.605762f, +0.191443f), + Vector3DFloat(-0.920835f, -0.636525f, -0.977844f), + Vector3DFloat(-0.552110f, +0.156102f, +0.504135f), + Vector3DFloat(-0.243934f, +0.970763f, -0.160070f), + Vector3DFloat(+0.418195f, -0.050996f, +0.090060f), + Vector3DFloat(+0.875729f, -0.335307f, +0.542589f), + Vector3DFloat(-0.873226f, -0.135777f, +0.750908f), + Vector3DFloat(+0.086032f, -0.780999f, +0.032624f), + Vector3DFloat(-0.929746f, +0.173376f, -0.738212f), + Vector3DFloat(+0.665639f, -0.140172f, +0.821223f), + Vector3DFloat(-0.977416f, +0.008698f, +0.739372f), + Vector3DFloat(-0.899045f, +0.494980f, -0.542833f), + Vector3DFloat(+0.395062f, -0.662465f, +0.553148f), + Vector3DFloat(-0.157689f, +0.970824f, +0.186377f), + Vector3DFloat(+0.969970f, -0.372051f, +0.728263f), + Vector3DFloat(+0.902463f, +0.860225f, -0.170141f), + Vector3DFloat(+0.539415f, +0.112949f, -0.387066f), + Vector3DFloat(-0.530259f, +0.773553f, -0.593554f), + Vector3DFloat(-0.626392f, +0.377483f, +0.141209f), + Vector3DFloat(-0.949278f, -0.859554f, -0.846858f), + Vector3DFloat(-0.942442f, +0.152562f, -0.463973f), + Vector3DFloat(-0.897763f, -0.911557f, +0.570482f), + Vector3DFloat(+0.317179f, -0.045076f, -0.960204f), + Vector3DFloat(+0.895077f, -0.314066f, +0.184240f), + Vector3DFloat(-0.744621f, -0.192602f, -0.536485f), + Vector3DFloat(-0.266274f, +0.682974f, -0.871090f), + Vector3DFloat(-0.809748f, -0.032258f, +0.273232f), + Vector3DFloat(-0.124363f, -0.786309f, +0.657216f), + Vector3DFloat(-0.726981f, -0.371563f, -0.172521f), + Vector3DFloat(+0.812860f, -0.024384f, +0.532212f), + Vector3DFloat(+0.523545f, -0.821589f, -0.509934f), + Vector3DFloat(+0.236671f, +0.420148f, -0.802911f), + Vector3DFloat(+0.093783f, -0.909177f, -0.071932f), + Vector3DFloat(+0.262429f, +0.728141f, -0.095798f), + Vector3DFloat(+0.717826f, +0.067171f, -0.797784f), + Vector3DFloat(-0.413678f, +0.049593f, -0.137364f), + Vector3DFloat(-0.334391f, +0.978515f, +0.529893f), + Vector3DFloat(-0.559862f, +0.913511f, +0.188513f), + Vector3DFloat(-0.644642f, -0.352214f, +0.085849f), + Vector3DFloat(-0.257302f, +0.108371f, -0.744804f), + Vector3DFloat(-0.676015f, +0.866207f, -0.834712f), + Vector3DFloat(-0.021882f, -0.053072f, -0.795160f), + Vector3DFloat(-0.219214f, +0.475448f, -0.291055f), + Vector3DFloat(-0.698721f, -0.089816f, -0.867977f), + Vector3DFloat(-0.297403f, +0.136876f, +0.832881f), + Vector3DFloat(+0.438887f, +0.468001f, -0.946959f), + Vector3DFloat(+0.638905f, +0.782952f, -0.127903f), + Vector3DFloat(+0.363811f, -0.358745f, +0.460494f), + Vector3DFloat(+0.320109f, -0.028047f, -0.223365f), + Vector3DFloat(-0.274758f, -0.139256f, +0.302469f), + Vector3DFloat(-0.943297f, -0.316263f, +0.749382f), + Vector3DFloat(+0.863704f, -0.867183f, -0.148473f), + Vector3DFloat(+0.030122f, +0.751030f, -0.963439f), + Vector3DFloat(-0.818232f, -0.299966f, +0.403485f), + Vector3DFloat(-0.841548f, +0.378826f, -0.981689f), + Vector3DFloat(+0.927671f, +0.527696f, +0.309549f), + Vector3DFloat(+0.521897f, +0.299844f, -0.545579f), + Vector3DFloat(+0.324992f, +0.310648f, +0.759880f), + Vector3DFloat(+0.599170f, -0.695303f, +0.165380f), + Vector3DFloat(+0.708914f, +0.528916f, -0.764336f), + Vector3DFloat(+0.059297f, -0.576586f, +0.825312f), + Vector3DFloat(+0.139805f, +0.627247f, -0.101657f), + Vector3DFloat(+0.805414f, +0.160619f, +0.154210f), + Vector3DFloat(+0.131443f, +0.918393f, -0.376629f), + Vector3DFloat(-0.354289f, +0.161534f, +0.880612f), + Vector3DFloat(+0.880184f, +0.543138f, -0.826594f), + Vector3DFloat(-0.388714f, +0.751946f, +0.645680f), + Vector3DFloat(-0.018586f, -0.968078f, -0.617969f), + Vector3DFloat(+0.802057f, -0.795648f, +0.790704f), + Vector3DFloat(+0.311075f, -0.065828f, +0.444746f), + Vector3DFloat(-0.024201f, -0.412152f, +0.955382f), + Vector3DFloat(+0.783868f, +0.879452f, +0.727409f), + Vector3DFloat(-0.854427f, -0.093844f, +0.874935f), + Vector3DFloat(-0.670522f, -0.453780f, +0.165014f), + Vector3DFloat(-0.530381f, +0.169836f, +0.937071f), + Vector3DFloat(+0.902158f, +0.596423f, +0.575976f), + Vector3DFloat(+0.957152f, -0.666372f, -0.794610f), + Vector3DFloat(+0.901425f, -0.066378f, -0.684988f), + Vector3DFloat(+0.219581f, -0.090426f, -0.020356f), + Vector3DFloat(+0.297342f, +0.915708f, -0.119419f), + Vector3DFloat(+0.923887f, -0.212622f, +0.793695f), + Vector3DFloat(-0.747124f, -0.364666f, -0.375591f), + Vector3DFloat(-0.003021f, -0.386944f, +0.304849f), + Vector3DFloat(-0.614368f, +0.345805f, +0.845210f), + Vector3DFloat(+0.245827f, -0.766961f, +0.046358f), + Vector3DFloat(-0.746818f, +0.777642f, -0.485580f), + Vector3DFloat(+0.138524f, +0.468673f, -0.247108f), + Vector3DFloat(-0.569628f, -0.256020f, -0.044465f), + Vector3DFloat(-0.707572f, +0.080599f, +0.177892f), + Vector3DFloat(+0.925657f, -0.710807f, +0.201453f), + Vector3DFloat(+0.986267f, +0.476547f, +0.244362f), + Vector3DFloat(-0.092746f, -0.028718f, -0.235450f), + Vector3DFloat(-0.001740f, +0.748466f, +0.268288f), + Vector3DFloat(-0.974181f, -0.081942f, -0.602161f), + Vector3DFloat(+0.534898f, -0.743217f, -0.895077f), + Vector3DFloat(-0.720573f, -0.683096f, -0.631825f), + Vector3DFloat(+0.183569f, -0.549913f, -0.348125f), + Vector3DFloat(+0.623341f, -0.764275f, -0.951964f), + Vector3DFloat(+0.973693f, -0.825251f, -0.558580f), + Vector3DFloat(+0.620350f, +0.380169f, +0.510849f), + Vector3DFloat(+0.989074f, +0.641774f, +0.327128f), + Vector3DFloat(+0.624805f, +0.817988f, +0.537339f), + Vector3DFloat(+0.809870f, -0.280984f, +0.755486f), + Vector3DFloat(+0.521531f, -0.903928f, -0.742851f), + Vector3DFloat(-0.389325f, -0.433699f, -0.928343f), + Vector3DFloat(+0.176366f, -0.211768f, -0.189428f), + Vector3DFloat(-0.737602f, -0.928159f, -0.016449f), + Vector3DFloat(+0.723380f, -0.405866f, +0.167211f), + Vector3DFloat(+0.523301f, -0.666372f, -0.046480f), + Vector3DFloat(-0.118259f, +0.912290f, -0.160985f), + Vector3DFloat(+0.611927f, -0.191748f, +0.149998f), + Vector3DFloat(+0.905881f, -0.424482f, +0.913816f), + Vector3DFloat(-0.620411f, -0.027131f, +0.923276f), + Vector3DFloat(+0.774957f, -0.569140f, +0.871944f), + Vector3DFloat(-0.804193f, +0.661061f, +0.820795f), + Vector3DFloat(+0.077059f, -0.102023f, +0.278054f), + Vector3DFloat(+0.772637f, -0.104831f, -0.823847f), + Vector3DFloat(+0.983947f, +0.818659f, -0.089267f), + Vector3DFloat(+0.735221f, -0.709586f, -0.454268f), + Vector3DFloat(+0.996643f, -0.944945f, -0.538316f), + Vector3DFloat(+0.049165f, -0.796014f, +0.971374f), + Vector3DFloat(-0.976623f, +0.655263f, -0.156163f), + Vector3DFloat(+0.681143f, -0.005585f, +0.476547f), + Vector3DFloat(-0.928159f, +0.237648f, -0.346538f), + Vector3DFloat(+0.361003f, -0.709586f, +0.595325f), + Vector3DFloat(-0.345927f, +0.798700f, -0.321390f), + Vector3DFloat(-0.731803f, -0.701346f, -0.652272f), + Vector3DFloat(+0.164708f, -0.335795f, -0.213599f), + Vector3DFloat(-0.857601f, +0.151463f, +0.157689f), + Vector3DFloat(-0.754692f, -0.954283f, +0.308939f), + Vector3DFloat(-0.037446f, -0.637562f, -0.991150f), + Vector3DFloat(+0.744987f, -0.130894f, -0.575610f), + Vector3DFloat(-0.799249f, -0.131687f, +0.906247f), + Vector3DFloat(+0.580004f, +0.468734f, -0.745232f), + Vector3DFloat(+0.991882f, +0.138401f, +0.694693f), + Vector3DFloat(+0.830195f, +0.634877f, +0.715140f), + Vector3DFloat(+0.607532f, -0.317972f, -0.250710f), + Vector3DFloat(+0.037629f, -0.384320f, +0.812922f), + Vector3DFloat(+0.645009f, +0.224036f, -0.778924f), + Vector3DFloat(-0.852779f, -0.743522f, +0.346843f), + Vector3DFloat(+0.578478f, -0.894955f, -0.327616f), + Vector3DFloat(-0.905759f, -0.239296f, -0.945799f), + Vector3DFloat(+0.028352f, -0.658254f, -0.705313f), + Vector3DFloat(+0.954405f, +0.825434f, -0.553575f), + Vector3DFloat(-0.471480f, +0.504440f, -0.262856f), + Vector3DFloat(-0.924131f, +0.393353f, +0.106967f), + Vector3DFloat(-0.032685f, +0.385846f, -0.877255f), + Vector3DFloat(-0.039094f, +0.220557f, +0.356731f), + Vector3DFloat(+0.490890f, -0.403790f, -0.650624f), + Vector3DFloat(-0.896115f, -0.866817f, -0.837825f), + Vector3DFloat(-0.260842f, -0.027558f, +0.511582f), + Vector3DFloat(+0.782037f, +0.493759f, +0.229835f), + Vector3DFloat(+0.086337f, -0.713431f, +0.484664f), + Vector3DFloat(+0.168615f, -0.742058f, +0.639637f), + Vector3DFloat(+0.325968f, -0.567919f, -0.359294f), + Vector3DFloat(-0.633717f, -0.662709f, +0.374615f), + Vector3DFloat(+0.230995f, -0.701041f, +0.557970f), + Vector3DFloat(-0.729911f, -0.967650f, +0.951170f), + Vector3DFloat(-0.126011f, -0.819819f, -0.299539f), + Vector3DFloat(-0.166540f, +0.321024f, -0.704398f), + Vector3DFloat(+0.769890f, -0.977111f, -0.374187f), + Vector3DFloat(+0.562120f, +0.025300f, +0.299234f), + Vector3DFloat(+0.048189f, +0.404462f, -0.420026f), + Vector3DFloat(-0.840632f, +0.586291f, +0.360515f), + Vector3DFloat(+0.223792f, +0.024140f, +0.607593f), + Vector3DFloat(-0.562120f, +0.602771f, +0.948302f), + Vector3DFloat(+0.968627f, -0.994263f, -0.206030f), + Vector3DFloat(+0.146886f, -0.315287f, +0.034455f), + Vector3DFloat(+0.836848f, -0.348613f, +0.213904f), + Vector3DFloat(+0.494980f, -0.216041f, +0.405927f), + Vector3DFloat(-0.584338f, -0.268715f, -0.165258f), + Vector3DFloat(+0.118686f, -0.751091f, -0.381817f), + Vector3DFloat(-0.887753f, +0.178686f, -0.730216f), + Vector3DFloat(-0.684194f, -0.351543f, +0.952330f), + Vector3DFloat(-0.006256f, -0.564562f, +0.137974f), + Vector3DFloat(-0.229408f, +0.182470f, +0.427168f), + Vector3DFloat(+0.024445f, +0.920713f, +0.119724f), + Vector3DFloat(-0.996948f, -0.518784f, -0.045991f), + Vector3DFloat(-0.062166f, -0.592090f, +0.849117f), + Vector3DFloat(-0.377422f, -0.942808f, -0.649770f), + Vector3DFloat(+0.093478f, -0.242470f, -0.198096f), + Vector3DFloat(-0.594348f, -0.156102f, +0.401105f), + Vector3DFloat(-0.746574f, -0.294351f, +0.577685f), + Vector3DFloat(+0.504929f, +0.405194f, +0.724296f), + Vector3DFloat(-0.489059f, -0.492294f, +0.680288f), + Vector3DFloat(-0.025971f, -0.241127f, +0.103977f), + Vector3DFloat(+0.875301f, -0.574206f, -0.671804f), + Vector3DFloat(-0.483444f, +0.592029f, -0.537339f), + Vector3DFloat(+0.504257f, -0.413984f, -0.779839f), + Vector3DFloat(+0.182043f, -0.805292f, +0.988403f), + Vector3DFloat(+0.533372f, -0.142064f, +0.793512f), + Vector3DFloat(-0.105380f, -0.039338f, -0.624317f), + Vector3DFloat(+0.125950f, +0.384259f, +0.596973f), + Vector3DFloat(+0.452071f, +0.039216f, +0.924802f), + Vector3DFloat(-0.986694f, +0.452498f, +0.199194f), + Vector3DFloat(+0.230323f, +0.931516f, -0.380596f), + Vector3DFloat(+0.657277f, +0.811945f, -0.176733f), + Vector3DFloat(-0.477767f, -0.251137f, -0.468734f), + Vector3DFloat(+0.499252f, +0.543260f, +0.886898f), + Vector3DFloat(-0.528855f, +0.747124f, -0.789300f), + Vector3DFloat(-0.188330f, +0.434675f, -0.915891f), + Vector3DFloat(-0.807733f, +0.861080f, +0.386029f), + Vector3DFloat(-0.314615f, +0.761223f, -0.177953f), + Vector3DFloat(-0.855098f, +0.549486f, +0.547227f), + Vector3DFloat(-0.072970f, +0.647816f, -0.034089f), + Vector3DFloat(+0.385784f, +0.557482f, -0.912534f), + Vector3DFloat(-0.654530f, -0.923032f, -0.783624f), + Vector3DFloat(-0.755425f, -0.523789f, -0.132725f), + Vector3DFloat(+0.333781f, +0.322733f, +0.267678f), + Vector3DFloat(-0.533982f, -0.534471f, -0.399884f), + Vector3DFloat(-0.953673f, -0.589465f, +0.450423f), + Vector3DFloat(-0.789911f, -0.535936f, -0.409833f), + Vector3DFloat(+0.085726f, +0.363079f, +0.082003f), + Vector3DFloat(+0.744194f, -0.114292f, +0.322245f), + Vector3DFloat(+0.693472f, -0.256447f, -0.516160f), + Vector3DFloat(+0.446028f, -0.553026f, +0.471908f), + Vector3DFloat(-0.757561f, +0.608997f, +0.833064f), + Vector3DFloat(+0.115024f, +0.632191f, +0.314493f), + Vector3DFloat(-0.403851f, -0.325663f, -0.057161f), + Vector3DFloat(-0.188696f, +0.636097f, +0.514756f), + Vector3DFloat(-0.110813f, -0.473861f, -0.041597f), + Vector3DFloat(-0.239540f, +0.673940f, -0.874325f), + Vector3DFloat(+0.739982f, +0.350932f, -0.930418f), + Vector3DFloat(+0.519639f, -0.430952f, +0.569262f), + Vector3DFloat(-0.916807f, +0.117832f, +0.924070f), + Vector3DFloat(+0.856136f, +0.764763f, +0.653798f), + Vector3DFloat(+0.953185f, +0.721061f, +0.723441f), + Vector3DFloat(-0.113010f, +0.617176f, -0.436140f), + Vector3DFloat(+0.912839f, +0.496811f, -0.742058f), + Vector3DFloat(+0.219275f, -0.751701f, +0.479965f), + Vector3DFloat(+0.655690f, -0.964538f, +0.619312f), + Vector3DFloat(+0.364971f, +0.635975f, -0.697989f), + Vector3DFloat(-0.142247f, +0.554918f, +0.291238f), + Vector3DFloat(-0.163732f, -0.772820f, -0.887997f), + Vector3DFloat(-0.122593f, -0.456404f, -0.006989f), + Vector3DFloat(-0.704154f, -0.551378f, -0.237770f), + Vector3DFloat(+0.637501f, -0.831843f, -0.706534f), + Vector3DFloat(-0.794061f, -0.717887f, +0.576464f), + Vector3DFloat(+0.233558f, -0.683218f, +0.879147f), + Vector3DFloat(-0.170934f, +0.848811f, +0.840510f), + Vector3DFloat(+0.735282f, -0.625965f, -0.309732f), + Vector3DFloat(-0.562975f, +0.929746f, +0.794794f), + Vector3DFloat(-0.455611f, -0.860836f, -0.810114f), + Vector3DFloat(+0.433882f, -0.190222f, -0.529405f), + Vector3DFloat(+0.785638f, -0.040864f, +0.050569f), + Vector3DFloat(-0.963134f, -0.993713f, -0.817011f), + Vector3DFloat(+0.787347f, -0.598071f, +0.782220f), + Vector3DFloat(-0.551378f, +0.589526f, +0.061983f), + Vector3DFloat(-0.987243f, +0.894589f, -0.469649f), + Vector3DFloat(+0.329264f, +0.164464f, -0.088656f), + Vector3DFloat(+0.068270f, +0.938841f, +0.700858f), + Vector3DFloat(+0.101535f, -0.583850f, -0.809503f), + Vector3DFloat(+0.906980f, -0.943724f, +0.461592f), + Vector3DFloat(+0.438520f, -0.329264f, +0.261086f), + Vector3DFloat(-0.700003f, -0.259316f, +0.784356f), + Vector3DFloat(+0.442305f, +0.444502f, +0.481185f), + Vector3DFloat(+0.326701f, -0.331523f, -0.227393f), + Vector3DFloat(-0.222327f, -0.308390f, +0.517136f), + Vector3DFloat(+0.275369f, -0.513169f, -0.177892f), + Vector3DFloat(-0.378887f, +0.668203f, +0.619312f), + Vector3DFloat(-0.785455f, -0.093661f, -0.071322f), + Vector3DFloat(-0.022309f, -0.744987f, +0.832820f), + Vector3DFloat(-0.177892f, +0.829707f, -0.550218f), + Vector3DFloat(+0.952879f, +0.477767f, +0.428999f), + Vector3DFloat(+0.113376f, +0.097568f, -0.921201f), + Vector3DFloat(+0.195898f, -0.924619f, -0.494613f), + Vector3DFloat(+0.727592f, -0.628956f, -0.029756f), + Vector3DFloat(-0.796197f, -0.450484f, -0.045686f), + Vector3DFloat(+0.670888f, +0.958068f, -0.902402f), + Vector3DFloat(-0.259194f, -0.570666f, +0.098422f), + Vector3DFloat(+0.120273f, -0.732475f, -0.712272f), + Vector3DFloat(+0.539109f, +0.754753f, -0.517075f), + Vector3DFloat(+0.320170f, +0.300821f, -0.790643f), + Vector3DFloat(-0.049287f, +0.269814f, -0.149998f), + Vector3DFloat(-0.004120f, +0.402081f, -0.856807f), + Vector3DFloat(+0.566881f, -0.224464f, -0.552049f), + Vector3DFloat(+0.323405f, -0.345317f, -0.119114f), + Vector3DFloat(-0.736198f, -0.234352f, +0.803278f), + Vector3DFloat(-0.424421f, +0.059358f, -0.162389f), + Vector3DFloat(+0.918516f, -0.884640f, -0.853511f), + Vector3DFloat(-0.633717f, +0.231239f, +0.672170f), + Vector3DFloat(+0.417096f, +0.454878f, +0.097201f), + Vector3DFloat(+0.183630f, -0.957030f, -0.368938f), + Vector3DFloat(-0.199133f, +0.191687f, -0.787774f), + Vector3DFloat(-0.109104f, +0.676077f, +0.731193f), + Vector3DFloat(-0.288186f, -0.801691f, +0.855037f), + Vector3DFloat(+0.332133f, -0.828730f, +0.005402f), + Vector3DFloat(+0.959166f, +0.197790f, -0.221107f), + Vector3DFloat(-0.646046f, +0.043428f, -0.379254f), + Vector3DFloat(-0.717338f, +0.122105f, +0.107883f), + Vector3DFloat(-0.299783f, +0.089389f, +0.977172f), + Vector3DFloat(+0.486862f, -0.577990f, -0.726615f), + Vector3DFloat(-0.400922f, +0.430769f, -0.834956f), + Vector3DFloat(+0.308756f, +0.735221f, -0.809076f), + Vector3DFloat(-0.304605f, +0.335551f, -0.350627f), + Vector3DFloat(-0.078219f, -0.288491f, -0.225318f), + Vector3DFloat(+0.529099f, +0.710562f, +0.002960f), + Vector3DFloat(+0.102695f, +0.410932f, -0.950072f), + Vector3DFloat(-0.715751f, +0.598621f, +0.188879f), + Vector3DFloat(-0.936460f, -0.232398f, -0.123203f), + Vector3DFloat(-0.733146f, -0.201819f, -0.463851f), + Vector3DFloat(-0.982971f, -0.581347f, -0.104953f), + Vector3DFloat(-0.219459f, +0.104648f, +0.416425f), + Vector3DFloat(+0.952391f, -0.038789f, +0.993530f), + Vector3DFloat(+0.992370f, +0.891537f, +0.959227f), + Vector3DFloat(+0.104221f, -0.305704f, -0.359722f), + Vector3DFloat(-0.722770f, +0.069735f, -0.801447f), + Vector3DFloat(+0.444563f, +0.354961f, +0.041414f), + Vector3DFloat(+0.642018f, -0.878903f, +0.058809f), + Vector3DFloat(-0.532579f, -0.463668f, +0.565233f), + Vector3DFloat(+0.411176f, -0.843379f, -0.172704f), + Vector3DFloat(+0.823908f, +0.619922f, +0.439863f), + Vector3DFloat(-0.340007f, +0.048189f, -0.529160f), + Vector3DFloat(+0.241310f, -0.585070f, +0.637135f), + Vector3DFloat(+0.146886f, +0.873226f, -0.425153f), + Vector3DFloat(-0.114658f, -0.465621f, +0.364483f), + Vector3DFloat(+0.987121f, -0.552599f, -0.918821f), + Vector3DFloat(+0.138401f, -0.917722f, +0.930479f), + Vector3DFloat(-0.732536f, -0.150731f, +0.613269f), + Vector3DFloat(-0.071139f, +0.752373f, +0.192541f), + Vector3DFloat(+0.475143f, -0.187353f, +0.258950f), + Vector3DFloat(-0.500412f, -0.829157f, -0.418073f), + Vector3DFloat(+0.260414f, +0.930479f, +0.483016f), + Vector3DFloat(-0.899106f, +0.528550f, +0.076510f), + Vector3DFloat(-0.084384f, +0.022614f, +0.609180f), + Vector3DFloat(-0.213843f, -0.532334f, -0.282022f), + Vector3DFloat(-0.715323f, +0.025117f, -0.698477f), + Vector3DFloat(+0.521348f, +0.088656f, -0.415265f), + Vector3DFloat(-0.131809f, -0.395672f, +0.932432f), + Vector3DFloat(-0.549364f, -0.948363f, -0.207862f), + Vector3DFloat(+0.908322f, +0.643605f, -0.103732f), + Vector3DFloat(+0.632496f, +0.330973f, +0.345622f), + Vector3DFloat(-0.522141f, +0.031892f, -0.920713f), + Vector3DFloat(-0.875912f, +0.481918f, -0.229408f), + Vector3DFloat(-0.698172f, -0.934202f, +0.051668f), + Vector3DFloat(-0.791070f, -0.452193f, -0.366680f), + Vector3DFloat(-0.531907f, +0.497299f, +0.386517f), + Vector3DFloat(-0.942808f, -0.775811f, -0.397320f), + Vector3DFloat(+0.577563f, +0.075289f, -0.943297f), + Vector3DFloat(+0.464827f, -0.145848f, -0.167638f), + Vector3DFloat(-0.503220f, +0.592273f, -0.617359f), + Vector3DFloat(+0.752739f, +0.503464f, -0.586230f), + Vector3DFloat(-0.040315f, +0.197180f, -0.259072f), + Vector3DFloat(-0.304422f, -0.989380f, -0.281289f), + Vector3DFloat(+0.063387f, -0.662954f, +0.451338f), + Vector3DFloat(-0.272744f, +0.768914f, -0.141270f), + Vector3DFloat(+0.475021f, +0.378033f, +0.186010f), + Vector3DFloat(+0.893613f, -0.671560f, +0.494491f), + Vector3DFloat(+0.154027f, +0.994873f, +0.138096f), + Vector3DFloat(-0.661061f, -0.039094f, +0.072787f), + Vector3DFloat(+0.849666f, -0.956298f, +0.300699f), + Vector3DFloat(-0.227027f, +0.343913f, +0.514512f), + Vector3DFloat(+0.812738f, -0.891659f, +0.790277f), + Vector3DFloat(+0.619251f, -0.234779f, -0.342448f), + Vector3DFloat(-0.698904f, -0.525620f, -0.553331f), + Vector3DFloat(-0.357524f, +0.950194f, -0.358623f), + Vector3DFloat(-0.174352f, -0.802911f, +0.215552f), + Vector3DFloat(+0.046175f, +0.043794f, +0.139927f), + Vector3DFloat(+0.911924f, +0.433149f, +0.302286f), + Vector3DFloat(+0.563463f, -0.326823f, -0.832759f), + Vector3DFloat(-0.293741f, -0.448103f, -0.951781f), + Vector3DFloat(+0.196448f, +0.627979f, +0.340800f), + Vector3DFloat(-0.727042f, -0.013886f, -0.847346f), + Vector3DFloat(-0.769707f, +0.780084f, +0.239174f), + Vector3DFloat(+0.168493f, +0.564806f, +0.509690f), + Vector3DFloat(-0.786126f, +0.663564f, -0.908261f), + Vector3DFloat(+0.084017f, -0.548631f, -0.207312f), + Vector3DFloat(+0.011567f, +0.906552f, +0.726188f), + Vector3DFloat(-0.723746f, +0.031648f, +0.250587f), + Vector3DFloat(+0.031892f, +0.693045f, -0.263283f), + Vector3DFloat(-0.601856f, -0.585742f, -0.769280f), + Vector3DFloat(+0.588122f, -0.108127f, -0.535020f), + Vector3DFloat(+0.455672f, +0.864498f, +0.963378f), + Vector3DFloat(-0.712882f, -0.335490f, -0.143712f), + Vector3DFloat(+0.199194f, +0.747002f, +0.380840f), + Vector3DFloat(+0.626820f, +0.508042f, -0.177465f), + Vector3DFloat(-0.441816f, +0.652150f, -0.549058f), + Vector3DFloat(+0.862667f, +0.053377f, +0.652333f), + Vector3DFloat(-0.002289f, +0.568834f, -0.069185f) + }; } #endif //__PolyVox_RandomVectors_H__ diff --git a/library/PolyVoxCore/source/Impl/RandomUnitVectors.cpp b/library/PolyVoxCore/source/Impl/RandomUnitVectors.cpp deleted file mode 100644 index f1d3aabf..00000000 --- a/library/PolyVoxCore/source/Impl/RandomUnitVectors.cpp +++ /dev/null @@ -1,1055 +0,0 @@ -/******************************************************************************* -Copyright (c) 2005-2009 David Williams - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -*******************************************************************************/ - -#include "PolyVoxCore/Impl/RandomUnitVectors.h" - -namespace PolyVox -{ - extern const Vector3DFloat randomUnitVectors[1024] = - { - Vector3DFloat(+0.339922f, +0.827727f, -0.446454f), - Vector3DFloat(+0.084104f, -0.552666f, -0.829148f), - Vector3DFloat(+0.272549f, -0.946890f, +0.170637f), - Vector3DFloat(-0.366941f, -0.785500f, -0.498341f), - Vector3DFloat(-0.566493f, -0.533056f, +0.628440f), - Vector3DFloat(+0.964857f, -0.261032f, -0.030203f), - Vector3DFloat(+0.692249f, -0.251370f, +0.676465f), - Vector3DFloat(-0.962508f, -0.173232f, -0.208734f), - Vector3DFloat(-0.659700f, +0.712315f, +0.239589f), - Vector3DFloat(+0.818392f, -0.574522f, +0.012631f), - Vector3DFloat(+0.560367f, -0.792890f, -0.239405f), - Vector3DFloat(+0.906429f, -0.307885f, +0.289127f), - Vector3DFloat(-0.159051f, +0.461737f, +0.872641f), - Vector3DFloat(-0.231332f, +0.080769f, +0.969516f), - Vector3DFloat(-0.053423f, +0.774833f, +0.629904f), - Vector3DFloat(+0.824248f, -0.144982f, +0.547353f), - Vector3DFloat(+0.174020f, -0.439121f, -0.881413f), - Vector3DFloat(+0.467553f, +0.882007f, -0.058800f), - Vector3DFloat(+0.538442f, -0.808622f, +0.237089f), - Vector3DFloat(+0.502236f, +0.150786f, -0.851483f), - Vector3DFloat(+0.735645f, +0.569407f, -0.366882f), - Vector3DFloat(-0.855825f, -0.328077f, -0.399912f), - Vector3DFloat(-0.474060f, -0.211393f, +0.854740f), - Vector3DFloat(+0.828518f, -0.114561f, +0.548119f), - Vector3DFloat(+0.740223f, -0.663929f, +0.106149f), - Vector3DFloat(-0.604006f, -0.756687f, +0.250204f), - Vector3DFloat(+0.382515f, -0.373773f, -0.844971f), - Vector3DFloat(-0.819034f, -0.162715f, -0.550188f), - Vector3DFloat(-0.982375f, +0.169525f, -0.078743f), - Vector3DFloat(+0.367097f, +0.380576f, +0.848765f), - Vector3DFloat(+0.569529f, +0.516287f, +0.639597f), - Vector3DFloat(-0.853575f, -0.243752f, +0.460429f), - Vector3DFloat(+0.678039f, -0.729861f, -0.086982f), - Vector3DFloat(-0.869225f, +0.393408f, +0.299462f), - Vector3DFloat(-0.916254f, -0.295218f, +0.270784f), - Vector3DFloat(-0.070601f, +0.873182f, +0.482253f), - Vector3DFloat(-0.863217f, +0.189580f, +0.467885f), - Vector3DFloat(-0.691774f, -0.687382f, -0.221257f), - Vector3DFloat(-0.229393f, -0.552390f, +0.801402f), - Vector3DFloat(+0.463007f, -0.161958f, -0.871432f), - Vector3DFloat(-0.952260f, +0.214379f, +0.217352f), - Vector3DFloat(+0.052543f, -0.983907f, +0.170781f), - Vector3DFloat(+0.286530f, +0.546131f, -0.787173f), - Vector3DFloat(+0.975618f, -0.202665f, +0.084242f), - Vector3DFloat(-0.946903f, +0.193782f, -0.256561f), - Vector3DFloat(+0.602392f, +0.563710f, +0.565115f), - Vector3DFloat(-0.419515f, -0.334134f, -0.844015f), - Vector3DFloat(+0.032529f, -0.018906f, -0.999292f), - Vector3DFloat(+0.683276f, +0.293783f, -0.668450f), - Vector3DFloat(+0.194348f, +0.974682f, +0.110565f), - Vector3DFloat(-0.140892f, +0.831281f, +0.537700f), - Vector3DFloat(+0.685721f, -0.335248f, -0.646062f), - Vector3DFloat(+0.308294f, +0.062479f, -0.949237f), - Vector3DFloat(-0.619897f, +0.133633f, -0.773220f), - Vector3DFloat(+0.568018f, -0.694982f, +0.440858f), - Vector3DFloat(+0.014460f, +0.810882f, -0.585031f), - Vector3DFloat(-0.939900f, +0.051870f, +0.337488f), - Vector3DFloat(+0.886477f, -0.450612f, -0.105395f), - Vector3DFloat(-0.787830f, +0.158037f, -0.595271f), - Vector3DFloat(-0.318153f, -0.830670f, -0.456910f), - Vector3DFloat(-0.106830f, -0.755766f, -0.646069f), - Vector3DFloat(-0.077610f, -0.893295f, -0.442720f), - Vector3DFloat(+0.321718f, -0.338373f, +0.884309f), - Vector3DFloat(+0.405993f, -0.037181f, +0.913119f), - Vector3DFloat(+0.635434f, -0.612340f, +0.470387f), - Vector3DFloat(-0.440661f, +0.527619f, -0.726248f), - Vector3DFloat(+0.682630f, +0.730693f, +0.010181f), - Vector3DFloat(+0.364300f, -0.398796f, -0.841574f), - Vector3DFloat(+0.023390f, -0.827974f, +0.560279f), - Vector3DFloat(-0.647533f, -0.750712f, +0.130894f), - Vector3DFloat(+0.618352f, +0.694153f, +0.368499f), - Vector3DFloat(+0.087485f, -0.552555f, +0.828872f), - Vector3DFloat(-0.317011f, -0.740865f, -0.592134f), - Vector3DFloat(+0.992075f, +0.089501f, +0.088190f), - Vector3DFloat(+0.660945f, -0.628212f, -0.410490f), - Vector3DFloat(-0.376167f, +0.394528f, -0.838359f), - Vector3DFloat(+0.761817f, -0.647395f, -0.022690f), - Vector3DFloat(+0.839361f, -0.432911f, -0.328727f), - Vector3DFloat(-0.411275f, +0.046377f, -0.910331f), - Vector3DFloat(+0.078506f, -0.797408f, +0.598312f), - Vector3DFloat(-0.381022f, +0.922073f, +0.067844f), - Vector3DFloat(-0.837489f, -0.501853f, +0.216232f), - Vector3DFloat(-0.993133f, +0.055873f, -0.102786f), - Vector3DFloat(+0.927419f, -0.354639f, -0.118844f), - Vector3DFloat(+0.159676f, +0.614049f, -0.772947f), - Vector3DFloat(-0.187074f, +0.846574f, +0.498312f), - Vector3DFloat(+0.516069f, +0.728369f, -0.450724f), - Vector3DFloat(-0.960108f, -0.233106f, -0.154447f), - Vector3DFloat(-0.987760f, -0.112007f, +0.108557f), - Vector3DFloat(+0.049202f, +0.998738f, -0.010071f), - Vector3DFloat(-0.821445f, +0.254709f, +0.510247f), - Vector3DFloat(+0.252350f, -0.204056f, +0.945876f), - Vector3DFloat(-0.398037f, +0.781383f, -0.480633f), - Vector3DFloat(+0.527785f, +0.747611f, -0.403137f), - Vector3DFloat(-0.998566f, +0.043248f, +0.031542f), - Vector3DFloat(+0.548139f, +0.684886f, +0.480078f), - Vector3DFloat(-0.566315f, -0.745438f, +0.351581f), - Vector3DFloat(-0.848496f, -0.030994f, +0.528294f), - Vector3DFloat(-0.070703f, +0.825305f, -0.560244f), - Vector3DFloat(+0.624014f, -0.043543f, +0.780199f), - Vector3DFloat(+0.964602f, -0.189230f, -0.183670f), - Vector3DFloat(+0.637905f, -0.539396f, +0.549663f), - Vector3DFloat(+0.114321f, +0.904904f, -0.409974f), - Vector3DFloat(-0.021617f, +0.186501f, +0.982217f), - Vector3DFloat(+0.469141f, -0.747866f, +0.469685f), - Vector3DFloat(+0.132117f, +0.385378f, +0.913252f), - Vector3DFloat(-0.252634f, -0.349595f, +0.902197f), - Vector3DFloat(-0.145421f, +0.945344f, +0.291851f), - Vector3DFloat(-0.600604f, +0.448416f, -0.661965f), - Vector3DFloat(+0.381683f, -0.700133f, -0.603433f), - Vector3DFloat(+0.569938f, -0.030470f, +0.821122f), - Vector3DFloat(+0.112037f, +0.915575f, +0.386225f), - Vector3DFloat(+0.059716f, -0.821586f, -0.566949f), - Vector3DFloat(-0.158273f, -0.639328f, -0.752468f), - Vector3DFloat(+0.001205f, -0.990747f, -0.135715f), - Vector3DFloat(-0.100969f, -0.176804f, -0.979054f), - Vector3DFloat(+0.169578f, -0.733794f, -0.657868f), - Vector3DFloat(+0.474056f, +0.669558f, -0.571807f), - Vector3DFloat(+0.014190f, -0.179546f, -0.983647f), - Vector3DFloat(-0.506680f, +0.784137f, -0.358337f), - Vector3DFloat(+0.402466f, +0.736544f, -0.543621f), - Vector3DFloat(-0.740589f, +0.430129f, +0.516252f), - Vector3DFloat(-0.731489f, -0.411418f, +0.543745f), - Vector3DFloat(-0.372220f, +0.822132f, -0.430756f), - Vector3DFloat(-0.403935f, +0.195178f, +0.893724f), - Vector3DFloat(+0.893255f, -0.191946f, +0.406512f), - Vector3DFloat(+0.257182f, +0.933321f, +0.250537f), - Vector3DFloat(-0.946047f, -0.252800f, +0.202699f), - Vector3DFloat(+0.287823f, -0.484935f, +0.825830f), - Vector3DFloat(+0.880378f, +0.321649f, +0.348535f), - Vector3DFloat(-0.820150f, +0.481236f, +0.309460f), - Vector3DFloat(-0.888465f, +0.169680f, -0.426425f), - Vector3DFloat(+0.761535f, -0.481027f, +0.434371f), - Vector3DFloat(+0.581314f, +0.037144f, -0.812831f), - Vector3DFloat(-0.014257f, -0.470925f, +0.882058f), - Vector3DFloat(+0.327440f, +0.265095f, -0.906922f), - Vector3DFloat(+0.445945f, +0.877176f, +0.178034f), - Vector3DFloat(+0.724926f, -0.523194f, -0.448052f), - Vector3DFloat(-0.649973f, +0.748818f, -0.129641f), - Vector3DFloat(-0.862141f, -0.181190f, -0.473163f), - Vector3DFloat(+0.546248f, -0.486978f, -0.681517f), - Vector3DFloat(-0.466403f, -0.132595f, +0.874578f), - Vector3DFloat(-0.726486f, +0.640533f, -0.248868f), - Vector3DFloat(-0.717238f, -0.164892f, +0.677038f), - Vector3DFloat(-0.173482f, -0.912751f, -0.369852f), - Vector3DFloat(+0.151425f, +0.097703f, +0.983628f), - Vector3DFloat(-0.367962f, +0.286588f, -0.884574f), - Vector3DFloat(-0.269776f, -0.681349f, +0.680430f), - Vector3DFloat(+0.587256f, +0.243525f, +0.771898f), - Vector3DFloat(+0.052027f, +0.391610f, -0.918659f), - Vector3DFloat(+0.991548f, -0.106357f, +0.074308f), - Vector3DFloat(+0.659039f, +0.457360f, -0.597067f), - Vector3DFloat(-0.626734f, -0.682082f, -0.376787f), - Vector3DFloat(-0.353101f, +0.033567f, -0.934983f), - Vector3DFloat(+0.621237f, -0.289495f, +0.728188f), - Vector3DFloat(+0.490845f, -0.189807f, +0.850320f), - Vector3DFloat(-0.699031f, -0.710681f, -0.079302f), - Vector3DFloat(-0.050094f, +0.880791f, +0.470847f), - Vector3DFloat(+0.070288f, -0.086374f, +0.993780f), - Vector3DFloat(+0.853154f, +0.022317f, +0.521181f), - Vector3DFloat(+0.230886f, +0.693269f, -0.682693f), - Vector3DFloat(-0.466130f, +0.883868f, -0.038727f), - Vector3DFloat(-0.551610f, +0.824661f, +0.125144f), - Vector3DFloat(-0.137494f, +0.409326f, -0.901968f), - Vector3DFloat(-0.890857f, -0.180159f, +0.417034f), - Vector3DFloat(+0.553659f, -0.392300f, +0.734549f), - Vector3DFloat(+0.406329f, -0.048366f, +0.912446f), - Vector3DFloat(-0.270581f, +0.233748f, -0.933888f), - Vector3DFloat(-0.197245f, +0.810087f, -0.552136f), - Vector3DFloat(+0.295429f, +0.704757f, +0.645011f), - Vector3DFloat(+0.717722f, -0.581869f, -0.382496f), - Vector3DFloat(+0.626543f, -0.539930f, +0.562067f), - Vector3DFloat(+0.971598f, -0.144608f, +0.187311f), - Vector3DFloat(-0.697722f, -0.464932f, -0.544998f), - Vector3DFloat(+0.457003f, +0.780926f, +0.425797f), - Vector3DFloat(+0.183694f, +0.717668f, -0.671720f), - Vector3DFloat(+0.251615f, -0.738280f, -0.625805f), - Vector3DFloat(+0.545768f, +0.806104f, +0.228766f), - Vector3DFloat(-0.928760f, -0.348049f, +0.127545f), - Vector3DFloat(+0.137432f, -0.972652f, -0.187242f), - Vector3DFloat(-0.804669f, -0.253834f, +0.536727f), - Vector3DFloat(-0.931569f, -0.252185f, -0.261882f), - Vector3DFloat(-0.604266f, -0.710349f, +0.360924f), - Vector3DFloat(-0.687860f, -0.535154f, -0.490367f), - Vector3DFloat(+0.017091f, +0.824354f, -0.565817f), - Vector3DFloat(+0.978598f, +0.134960f, +0.155346f), - Vector3DFloat(-0.802635f, +0.545353f, -0.241595f), - Vector3DFloat(+0.155235f, +0.909842f, +0.384824f), - Vector3DFloat(+0.499090f, -0.206100f, -0.841684f), - Vector3DFloat(-0.474793f, -0.216500f, +0.853053f), - Vector3DFloat(-0.317506f, -0.762610f, -0.563575f), - Vector3DFloat(-0.914433f, +0.049911f, -0.401649f), - Vector3DFloat(+0.209168f, +0.632836f, -0.745498f), - Vector3DFloat(+0.571789f, +0.197009f, -0.796395f), - Vector3DFloat(-0.364670f, +0.917590f, -0.158254f), - Vector3DFloat(-0.966271f, +0.140594f, -0.215761f), - Vector3DFloat(-0.915867f, +0.394413f, +0.075008f), - Vector3DFloat(+0.035516f, +0.991982f, -0.121285f), - Vector3DFloat(+0.334756f, -0.834260f, +0.438120f), - Vector3DFloat(+0.471469f, +0.810497f, -0.347579f), - Vector3DFloat(-0.630204f, -0.370799f, -0.682166f), - Vector3DFloat(+0.752076f, -0.232512f, +0.616701f), - Vector3DFloat(+0.780218f, -0.524134f, +0.341385f), - Vector3DFloat(-0.717151f, -0.558684f, -0.416614f), - Vector3DFloat(+0.026975f, +0.354843f, +0.934537f), - Vector3DFloat(+0.660713f, -0.205604f, +0.721931f), - Vector3DFloat(+0.569071f, -0.717916f, +0.400942f), - Vector3DFloat(+0.345670f, +0.917475f, -0.196853f), - Vector3DFloat(+0.109370f, +0.150700f, -0.982511f), - Vector3DFloat(-0.075296f, +0.867593f, -0.491541f), - Vector3DFloat(+0.427583f, +0.181258f, -0.885617f), - Vector3DFloat(-0.423011f, -0.536708f, +0.730073f), - Vector3DFloat(+0.410061f, +0.902819f, +0.129491f), - Vector3DFloat(+0.783330f, +0.352044f, -0.512307f), - Vector3DFloat(+0.019660f, +0.294402f, +0.955480f), - Vector3DFloat(+0.370284f, +0.795152f, -0.480232f), - Vector3DFloat(+0.620337f, +0.569302f, -0.539516f), - Vector3DFloat(-0.947343f, -0.008934f, +0.320097f), - Vector3DFloat(-0.093679f, +0.931693f, -0.350960f), - Vector3DFloat(-0.555730f, +0.665103f, +0.498802f), - Vector3DFloat(+0.319960f, +0.176651f, -0.930817f), - Vector3DFloat(-0.679840f, +0.281903f, +0.677014f), - Vector3DFloat(-0.954067f, +0.193782f, +0.228484f), - Vector3DFloat(+0.592922f, -0.708226f, +0.383222f), - Vector3DFloat(-0.759157f, -0.391265f, +0.520184f), - Vector3DFloat(-0.256083f, +0.304044f, +0.917594f), - Vector3DFloat(-0.462124f, +0.481197f, +0.744910f), - Vector3DFloat(-0.679480f, +0.733098f, +0.029563f), - Vector3DFloat(+0.025552f, -0.585890f, -0.809987f), - Vector3DFloat(-0.060045f, +0.002791f, +0.998192f), - Vector3DFloat(-0.507954f, +0.858736f, +0.067494f), - Vector3DFloat(-0.060525f, +0.636414f, -0.768969f), - Vector3DFloat(-0.874884f, +0.448472f, -0.182895f), - Vector3DFloat(+0.643562f, +0.762645f, -0.064807f), - Vector3DFloat(-0.516967f, -0.154231f, +0.841996f), - Vector3DFloat(+0.448249f, -0.717116f, -0.533683f), - Vector3DFloat(+0.536270f, -0.786853f, +0.305411f), - Vector3DFloat(+0.000761f, +0.527854f, -0.849335f), - Vector3DFloat(+0.723561f, -0.634332f, +0.272181f), - Vector3DFloat(+0.112740f, -0.371782f, -0.921449f), - Vector3DFloat(+0.966055f, +0.051903f, +0.253070f), - Vector3DFloat(-0.600327f, +0.248981f, -0.760011f), - Vector3DFloat(+0.091875f, +0.041693f, -0.994897f), - Vector3DFloat(-0.302152f, +0.607269f, +0.734798f), - Vector3DFloat(+0.287662f, -0.651858f, -0.701663f), - Vector3DFloat(-0.004536f, +0.679631f, +0.733540f), - Vector3DFloat(+0.526143f, +0.799583f, -0.289551f), - Vector3DFloat(-0.603927f, +0.789648f, -0.108294f), - Vector3DFloat(-0.033126f, +0.944024f, -0.328210f), - Vector3DFloat(-0.167102f, -0.851884f, -0.496358f), - Vector3DFloat(+0.288185f, -0.113731f, +0.950797f), - Vector3DFloat(+0.578194f, -0.436702f, -0.689190f), - Vector3DFloat(+0.217496f, +0.313876f, +0.924217f), - Vector3DFloat(-0.915961f, -0.158736f, -0.368535f), - Vector3DFloat(-0.498651f, +0.155245f, +0.852787f), - Vector3DFloat(-0.248762f, +0.679310f, -0.690403f), - Vector3DFloat(-0.582908f, +0.077123f, +0.808870f), - Vector3DFloat(+0.686950f, +0.229251f, -0.689597f), - Vector3DFloat(-0.647296f, +0.760051f, +0.057711f), - Vector3DFloat(-0.485938f, -0.092580f, +0.869076f), - Vector3DFloat(+0.418369f, +0.089460f, -0.903861f), - Vector3DFloat(-0.047269f, +0.350493f, -0.935372f), - Vector3DFloat(-0.242049f, -0.214469f, +0.946264f), - Vector3DFloat(-0.804456f, +0.566448f, +0.178852f), - Vector3DFloat(+0.097365f, -0.900938f, +0.422885f), - Vector3DFloat(+0.956649f, +0.290563f, +0.019905f), - Vector3DFloat(-0.783547f, +0.574387f, -0.236925f), - Vector3DFloat(-0.308724f, -0.086733f, -0.947189f), - Vector3DFloat(-0.035715f, +0.856029f, -0.515692f), - Vector3DFloat(+0.920461f, +0.190617f, +0.341199f), - Vector3DFloat(+0.637306f, +0.769628f, -0.038913f), - Vector3DFloat(-0.040111f, +0.877976f, +0.477021f), - Vector3DFloat(+0.110588f, +0.251198f, +0.961598f), - Vector3DFloat(-0.391595f, +0.858960f, +0.329911f), - Vector3DFloat(+0.159040f, +0.801465f, -0.576507f), - Vector3DFloat(-0.420361f, +0.896705f, +0.138623f), - Vector3DFloat(-0.706685f, -0.506701f, -0.493812f), - Vector3DFloat(+0.589701f, +0.807018f, -0.031213f), - Vector3DFloat(+0.613812f, +0.504595f, -0.607140f), - Vector3DFloat(+0.453930f, +0.802963f, +0.386261f), - Vector3DFloat(+0.034816f, +0.204525f, +0.978242f), - Vector3DFloat(+0.557178f, -0.795610f, +0.237816f), - Vector3DFloat(+0.694672f, -0.364363f, +0.620218f), - Vector3DFloat(+0.703004f, +0.571702f, +0.423015f), - Vector3DFloat(-0.821828f, -0.569379f, +0.020152f), - Vector3DFloat(+0.999573f, +0.011862f, +0.026716f), - Vector3DFloat(+0.045244f, +0.476148f, +0.878201f), - Vector3DFloat(-0.879083f, +0.458490f, +0.130387f), - Vector3DFloat(-0.548204f, +0.534573f, -0.643198f), - Vector3DFloat(+0.371419f, +0.536568f, +0.757722f), - Vector3DFloat(-0.121365f, +0.656202f, -0.744761f), - Vector3DFloat(-0.594210f, +0.803019f, -0.045540f), - Vector3DFloat(+0.249812f, +0.564218f, -0.786926f), - Vector3DFloat(+0.807295f, +0.588715f, -0.041117f), - Vector3DFloat(-0.333582f, +0.911830f, +0.239350f), - Vector3DFloat(+0.437116f, -0.527554f, -0.728434f), - Vector3DFloat(+0.061956f, +0.967757f, +0.244147f), - Vector3DFloat(+0.511582f, -0.822519f, -0.248487f), - Vector3DFloat(-0.341118f, -0.068048f, -0.937554f), - Vector3DFloat(+0.387840f, +0.793197f, +0.469487f), - Vector3DFloat(+0.682570f, +0.445391f, -0.579418f), - Vector3DFloat(+0.769534f, -0.445299f, -0.457740f), - Vector3DFloat(-0.883027f, -0.468901f, -0.019884f), - Vector3DFloat(-0.595228f, +0.589924f, +0.545613f), - Vector3DFloat(+0.123593f, +0.850082f, +0.511943f), - Vector3DFloat(+0.428617f, -0.326588f, -0.842394f), - Vector3DFloat(-0.838837f, +0.492096f, +0.232796f), - Vector3DFloat(-0.912950f, -0.283450f, -0.293562f), - Vector3DFloat(-0.701007f, +0.660260f, +0.269527f), - Vector3DFloat(-0.726761f, -0.673596f, -0.134488f), - Vector3DFloat(+0.969362f, -0.234200f, +0.074084f), - Vector3DFloat(-0.249448f, -0.056271f, +0.966752f), - Vector3DFloat(+0.996651f, -0.018843f, +0.079570f), - Vector3DFloat(+0.807648f, +0.476489f, +0.347367f), - Vector3DFloat(-0.749837f, -0.398796f, -0.527926f), - Vector3DFloat(+0.739222f, +0.268296f, +0.617712f), - Vector3DFloat(+0.770822f, -0.517357f, -0.371720f), - Vector3DFloat(-0.799675f, +0.207189f, +0.563554f), - Vector3DFloat(+0.858095f, +0.081493f, +0.506983f), - Vector3DFloat(+0.677579f, -0.727246f, +0.109543f), - Vector3DFloat(-0.745912f, -0.097643f, +0.658848f), - Vector3DFloat(+0.923446f, -0.321145f, +0.210033f), - Vector3DFloat(+0.633275f, +0.749248f, -0.193880f), - Vector3DFloat(+0.445950f, +0.115095f, +0.887627f), - Vector3DFloat(-0.813021f, +0.255444f, -0.523207f), - Vector3DFloat(-0.872976f, -0.483345f, -0.065502f), - Vector3DFloat(+0.587776f, +0.807323f, -0.052440f), - Vector3DFloat(-0.324123f, +0.518088f, -0.791536f), - Vector3DFloat(+0.041866f, +0.935359f, -0.351214f), - Vector3DFloat(-0.745819f, -0.037221f, -0.665108f), - Vector3DFloat(-0.625395f, -0.780290f, -0.005274f), - Vector3DFloat(-0.949212f, -0.125200f, -0.288653f), - Vector3DFloat(+0.746352f, +0.513825f, -0.423016f), - Vector3DFloat(+0.165203f, -0.819308f, -0.549038f), - Vector3DFloat(+0.749447f, -0.199908f, +0.631162f), - Vector3DFloat(-0.935221f, +0.313398f, +0.164751f), - Vector3DFloat(+0.574888f, +0.577243f, -0.579908f), - Vector3DFloat(+0.213935f, -0.439668f, +0.872309f), - Vector3DFloat(-0.067281f, -0.429365f, -0.900621f), - Vector3DFloat(-0.675176f, -0.265100f, -0.688374f), - Vector3DFloat(-0.940780f, -0.187993f, +0.282119f), - Vector3DFloat(+0.608412f, -0.674603f, -0.418026f), - Vector3DFloat(+0.226805f, -0.971072f, -0.074690f), - Vector3DFloat(-0.922002f, -0.058313f, -0.382768f), - Vector3DFloat(-0.889078f, -0.285307f, +0.357968f), - Vector3DFloat(-0.463386f, -0.780956f, +0.418785f), - Vector3DFloat(+0.480335f, -0.863968f, +0.151120f), - Vector3DFloat(-0.467641f, -0.601770f, -0.647444f), - Vector3DFloat(+0.752364f, -0.628982f, +0.195781f), - Vector3DFloat(+0.068107f, -0.990481f, -0.119616f), - Vector3DFloat(+0.225170f, -0.147543f, +0.963083f), - Vector3DFloat(+0.225228f, +0.971322f, +0.076195f), - Vector3DFloat(-0.991397f, -0.118660f, +0.055239f), - Vector3DFloat(-0.160493f, -0.746967f, +0.645200f), - Vector3DFloat(-0.458821f, -0.208468f, +0.863727f), - Vector3DFloat(+0.333033f, +0.516134f, +0.789110f), - Vector3DFloat(+0.732654f, +0.260905f, -0.628607f), - Vector3DFloat(-0.669918f, -0.656301f, -0.347102f), - Vector3DFloat(-0.786699f, +0.543142f, -0.293431f), - Vector3DFloat(+0.347036f, +0.004466f, +0.937841f), - Vector3DFloat(-0.484482f, -0.771461f, +0.412463f), - Vector3DFloat(+0.103332f, +0.547687f, -0.830278f), - Vector3DFloat(+0.119923f, -0.930107f, -0.347159f), - Vector3DFloat(+0.005754f, +0.994568f, +0.103930f), - Vector3DFloat(-0.033282f, +0.896829f, +0.441124f), - Vector3DFloat(+0.457958f, +0.771949f, +0.440874f), - Vector3DFloat(-0.519990f, +0.369290f, -0.770218f), - Vector3DFloat(-0.171662f, -0.061337f, -0.983245f), - Vector3DFloat(+0.250848f, +0.937167f, -0.242472f), - Vector3DFloat(-0.527961f, -0.608927f, +0.592001f), - Vector3DFloat(+0.524343f, -0.097826f, +0.845869f), - Vector3DFloat(-0.900974f, +0.373399f, +0.220951f), - Vector3DFloat(+0.287497f, +0.561963f, +0.775592f), - Vector3DFloat(+0.540008f, +0.803719f, -0.249855f), - Vector3DFloat(+0.566511f, +0.497948f, -0.656592f), - Vector3DFloat(+0.337228f, +0.656232f, -0.675009f), - Vector3DFloat(+0.978888f, -0.153522f, -0.134940f), - Vector3DFloat(+0.720676f, +0.649026f, +0.243702f), - Vector3DFloat(+0.530737f, +0.228155f, -0.816250f), - Vector3DFloat(+0.429492f, +0.091242f, -0.898449f), - Vector3DFloat(-0.572942f, +0.085360f, +0.815139f), - Vector3DFloat(+0.918652f, -0.255422f, +0.301395f), - Vector3DFloat(+0.947882f, -0.087598f, +0.306343f), - Vector3DFloat(+0.108362f, +0.969752f, -0.218719f), - Vector3DFloat(-0.471217f, +0.713578f, +0.518421f), - Vector3DFloat(+0.750274f, -0.244288f, -0.614339f), - Vector3DFloat(+0.560909f, -0.563116f, -0.606862f), - Vector3DFloat(+0.863412f, -0.431809f, +0.260886f), - Vector3DFloat(+0.316636f, +0.937246f, -0.145983f), - Vector3DFloat(-0.292652f, +0.171648f, +0.940687f), - Vector3DFloat(-0.636577f, +0.687143f, -0.350149f), - Vector3DFloat(+0.876483f, +0.262488f, +0.403581f), - Vector3DFloat(-0.477533f, +0.501607f, +0.721355f), - Vector3DFloat(+0.620654f, +0.186584f, +0.761561f), - Vector3DFloat(+0.085796f, +0.736783f, +0.670664f), - Vector3DFloat(-0.444489f, -0.220480f, -0.868227f), - Vector3DFloat(-0.380013f, +0.496385f, +0.780508f), - Vector3DFloat(+0.076912f, -0.385017f, -0.919699f), - Vector3DFloat(+0.148937f, -0.407401f, -0.901023f), - Vector3DFloat(+0.790103f, +0.361770f, -0.494833f), - Vector3DFloat(+0.206634f, +0.909197f, +0.361474f), - Vector3DFloat(+0.171861f, -0.895971f, -0.409512f), - Vector3DFloat(-0.961243f, +0.146552f, -0.233527f), - Vector3DFloat(-0.142180f, +0.815553f, +0.560944f), - Vector3DFloat(-0.423930f, -0.030949f, +0.905166f), - Vector3DFloat(+0.618879f, -0.685650f, +0.383241f), - Vector3DFloat(-0.209245f, +0.545013f, +0.811898f), - Vector3DFloat(+0.377987f, +0.747944f, -0.545624f), - Vector3DFloat(-0.791300f, +0.607509f, -0.069108f), - Vector3DFloat(+0.754199f, -0.113604f, -0.646744f), - Vector3DFloat(-0.583229f, -0.063801f, +0.809798f), - Vector3DFloat(-0.469901f, +0.015164f, +0.882589f), - Vector3DFloat(-0.978270f, +0.003442f, -0.207306f), - Vector3DFloat(+0.655500f, +0.726545f, +0.206039f), - Vector3DFloat(+0.967185f, -0.245972f, +0.063652f), - Vector3DFloat(-0.442760f, +0.675317f, +0.589840f), - Vector3DFloat(+0.403392f, +0.270425f, +0.874154f), - Vector3DFloat(+0.902052f, +0.135317f, +0.409868f), - Vector3DFloat(-0.210257f, -0.926257f, -0.312794f), - Vector3DFloat(-0.933559f, -0.225815f, -0.278344f), - Vector3DFloat(-0.635320f, +0.772243f, -0.003054f), - Vector3DFloat(-0.554821f, +0.812428f, -0.179259f), - Vector3DFloat(-0.844807f, +0.091109f, -0.527258f), - Vector3DFloat(-0.748601f, +0.549263f, -0.371358f), - Vector3DFloat(-0.081435f, +0.491490f, -0.867067f), - Vector3DFloat(+0.005014f, -0.658765f, +0.752332f), - Vector3DFloat(-0.384916f, +0.588836f, -0.710712f), - Vector3DFloat(-0.563287f, -0.436926f, -0.701287f), - Vector3DFloat(+0.075923f, -0.889985f, +0.449624f), - Vector3DFloat(+0.460179f, +0.240506f, -0.854630f), - Vector3DFloat(+0.133134f, +0.863013f, +0.487323f), - Vector3DFloat(-0.451891f, -0.691915f, +0.563071f), - Vector3DFloat(+0.482576f, +0.491924f, -0.724659f), - Vector3DFloat(-0.772395f, +0.503554f, +0.387091f), - Vector3DFloat(-0.861070f, -0.363456f, -0.355610f), - Vector3DFloat(-0.219092f, -0.539591f, +0.812921f), - Vector3DFloat(-0.232021f, +0.937887f, +0.257940f), - Vector3DFloat(+0.864410f, +0.411132f, +0.289425f), - Vector3DFloat(-0.657914f, +0.356283f, +0.663485f), - Vector3DFloat(-0.695536f, -0.354660f, -0.624856f), - Vector3DFloat(-0.984126f, +0.139830f, -0.109283f), - Vector3DFloat(-0.739931f, -0.568047f, +0.360312f), - Vector3DFloat(-0.422765f, +0.793857f, -0.437105f), - Vector3DFloat(+0.695244f, +0.499122f, +0.517216f), - Vector3DFloat(+0.620847f, +0.772096f, +0.135708f), - Vector3DFloat(+0.640543f, +0.693625f, -0.329529f), - Vector3DFloat(-0.716203f, +0.695845f, -0.053417f), - Vector3DFloat(+0.688286f, -0.614140f, +0.386127f), - Vector3DFloat(+0.990001f, -0.012803f, -0.140479f), - Vector3DFloat(-0.842904f, +0.537664f, +0.020753f), - Vector3DFloat(+0.008333f, +0.285713f, +0.958279f), - Vector3DFloat(-0.276086f, -0.823605f, +0.495431f), - Vector3DFloat(+0.795835f, -0.446944f, +0.408518f), - Vector3DFloat(-0.068520f, +0.989143f, -0.130001f), - Vector3DFloat(-0.995477f, -0.013318f, -0.094068f), - Vector3DFloat(-0.013256f, -0.205680f, +0.978530f), - Vector3DFloat(+0.286330f, +0.478558f, +0.830058f), - Vector3DFloat(-0.312670f, -0.000134f, +0.949862f), - Vector3DFloat(-0.992102f, -0.018784f, -0.124017f), - Vector3DFloat(-0.218201f, +0.471729f, +0.854318f), - Vector3DFloat(-0.885932f, -0.441603f, +0.141812f), - Vector3DFloat(+0.410418f, -0.903853f, +0.120862f), - Vector3DFloat(-0.046755f, -0.618559f, +0.784346f), - Vector3DFloat(+0.561077f, +0.827730f, +0.007490f), - Vector3DFloat(-0.264927f, +0.963738f, +0.031968f), - Vector3DFloat(+0.360743f, +0.887368f, -0.287127f), - Vector3DFloat(+0.829757f, -0.531319f, -0.170889f), - Vector3DFloat(-0.716516f, -0.646065f, +0.263068f), - Vector3DFloat(+0.557460f, +0.677923f, -0.479227f), - Vector3DFloat(-0.709849f, +0.694781f, -0.115733f), - Vector3DFloat(+0.853291f, -0.488531f, -0.182299f), - Vector3DFloat(+0.455284f, -0.849392f, -0.266925f), - Vector3DFloat(+0.417165f, +0.856319f, -0.304453f), - Vector3DFloat(+0.871881f, +0.388090f, +0.298681f), - Vector3DFloat(-0.103988f, +0.510844f, -0.853361f), - Vector3DFloat(+0.351047f, +0.889847f, -0.291441f), - Vector3DFloat(+0.389540f, -0.053379f, -0.919462f), - Vector3DFloat(-0.581684f, +0.075521f, +0.809901f), - Vector3DFloat(-0.422965f, -0.141455f, +0.895037f), - Vector3DFloat(+0.213377f, +0.454586f, -0.864767f), - Vector3DFloat(+0.159390f, +0.466820f, +0.869870f), - Vector3DFloat(+0.385902f, -0.013831f, +0.922436f), - Vector3DFloat(-0.360291f, -0.335817f, -0.870297f), - Vector3DFloat(-0.420892f, +0.570921f, -0.704910f), - Vector3DFloat(+0.046113f, -0.619140f, -0.783925f), - Vector3DFloat(+0.454440f, +0.871791f, -0.182935f), - Vector3DFloat(+0.523305f, -0.762818f, +0.379816f), - Vector3DFloat(-0.639517f, -0.634506f, -0.434073f), - Vector3DFloat(+0.286115f, -0.720485f, +0.631695f), - Vector3DFloat(+0.391046f, -0.912504f, -0.120079f), - Vector3DFloat(+0.562545f, +0.825619f, +0.043556f), - Vector3DFloat(+0.976939f, +0.145670f, -0.156113f), - Vector3DFloat(-0.197444f, -0.653530f, -0.730695f), - Vector3DFloat(-0.727176f, +0.159246f, +0.667724f), - Vector3DFloat(+0.977135f, +0.039408f, +0.208935f), - Vector3DFloat(+0.487883f, -0.668376f, -0.561466f), - Vector3DFloat(+0.081173f, -0.454129f, -0.887231f), - Vector3DFloat(+0.007776f, -0.558369f, -0.829556f), - Vector3DFloat(+0.392559f, -0.216208f, +0.893952f), - Vector3DFloat(+0.552351f, -0.797994f, -0.241067f), - Vector3DFloat(-0.812645f, +0.582758f, -0.000884f), - Vector3DFloat(+0.723477f, +0.425448f, +0.543668f), - Vector3DFloat(-0.290387f, -0.824836f, +0.485099f), - Vector3DFloat(-0.648037f, +0.731057f, +0.213549f), - Vector3DFloat(-0.112077f, +0.911214f, +0.396394f), - Vector3DFloat(-0.257374f, +0.878627f, +0.402212f), - Vector3DFloat(-0.871679f, -0.449228f, -0.195884f), - Vector3DFloat(-0.832643f, +0.503619f, -0.230377f), - Vector3DFloat(-0.750683f, +0.454826f, -0.479174f), - Vector3DFloat(+0.668945f, -0.737419f, +0.093412f), - Vector3DFloat(+0.232689f, -0.239415f, -0.942622f), - Vector3DFloat(+0.932416f, +0.058455f, -0.356629f), - Vector3DFloat(-0.266008f, -0.899388f, +0.346900f), - Vector3DFloat(+0.574940f, -0.817948f, -0.020127f), - Vector3DFloat(-0.332832f, +0.728233f, +0.599083f), - Vector3DFloat(+0.252574f, -0.202957f, +0.946052f), - Vector3DFloat(+0.614750f, -0.787545f, +0.043079f), - Vector3DFloat(+0.502885f, +0.757385f, -0.416503f), - Vector3DFloat(-0.829003f, +0.454711f, -0.325562f), - Vector3DFloat(-0.568805f, +0.542102f, +0.618536f), - Vector3DFloat(-0.024095f, -0.673837f, -0.738487f), - Vector3DFloat(+0.138735f, -0.428584f, -0.892787f), - Vector3DFloat(-0.535936f, -0.016858f, +0.844090f), - Vector3DFloat(-0.040976f, +0.588714f, +0.807302f), - Vector3DFloat(-0.691862f, -0.721945f, +0.011050f), - Vector3DFloat(+0.862563f, -0.438786f, -0.251897f), - Vector3DFloat(+0.278186f, +0.894754f, +0.349326f), - Vector3DFloat(-0.377682f, -0.908327f, +0.179719f), - Vector3DFloat(-0.632125f, -0.611940f, +0.475339f), - Vector3DFloat(-0.575327f, -0.789967f, -0.212015f), - Vector3DFloat(+0.112909f, -0.993543f, -0.011156f), - Vector3DFloat(+0.593082f, -0.037683f, -0.804260f), - Vector3DFloat(-0.067094f, -0.620832f, +0.781067f), - Vector3DFloat(-0.152754f, +0.253291f, -0.955254f), - Vector3DFloat(-0.325782f, +0.882758f, -0.338533f), - Vector3DFloat(+0.359581f, -0.906944f, +0.219441f), - Vector3DFloat(-0.436527f, +0.597887f, +0.672291f), - Vector3DFloat(-0.475060f, +0.315753f, +0.821351f), - Vector3DFloat(-0.504146f, +0.392763f, -0.769138f), - Vector3DFloat(+0.732747f, -0.275063f, -0.622432f), - Vector3DFloat(-0.222604f, +0.239178f, +0.945115f), - Vector3DFloat(+0.929953f, +0.212024f, +0.300389f), - Vector3DFloat(+0.212224f, -0.914623f, -0.344129f), - Vector3DFloat(+0.744091f, -0.069074f, +0.664498f), - Vector3DFloat(+0.378632f, +0.925135f, -0.027624f), - Vector3DFloat(-0.657970f, +0.042972f, +0.751817f), - Vector3DFloat(-0.475295f, -0.858227f, -0.193754f), - Vector3DFloat(-0.002138f, -0.163379f, -0.986561f), - Vector3DFloat(+0.762016f, +0.464503f, -0.451186f), - Vector3DFloat(+0.110962f, +0.350977f, +0.929786f), - Vector3DFloat(+0.359220f, -0.409270f, +0.838725f), - Vector3DFloat(+0.067679f, -0.492517f, -0.867667f), - Vector3DFloat(-0.765643f, -0.627245f, -0.142671f), - Vector3DFloat(-0.736364f, -0.613024f, -0.286304f), - Vector3DFloat(-0.404067f, -0.396451f, +0.824352f), - Vector3DFloat(-0.908793f, +0.158289f, +0.386057f), - Vector3DFloat(-0.582767f, +0.467557f, +0.664660f), - Vector3DFloat(+0.437506f, -0.078200f, -0.895809f), - Vector3DFloat(+0.079580f, -0.165593f, -0.982978f), - Vector3DFloat(-0.152308f, +0.193183f, +0.969269f), - Vector3DFloat(+0.537776f, -0.029450f, -0.842573f), - Vector3DFloat(+0.242145f, -0.450593f, +0.859262f), - Vector3DFloat(-0.731540f, -0.287459f, +0.618237f), - Vector3DFloat(-0.822775f, +0.200303f, +0.531903f), - Vector3DFloat(+0.814744f, -0.396544f, +0.423019f), - Vector3DFloat(+0.981241f, +0.108708f, -0.159215f), - Vector3DFloat(+0.435099f, -0.134466f, -0.890285f), - Vector3DFloat(-0.863642f, -0.333093f, +0.378379f), - Vector3DFloat(+0.975214f, -0.007932f, +0.221121f), - Vector3DFloat(+0.562312f, +0.756514f, -0.333904f), - Vector3DFloat(-0.860757f, -0.321366f, -0.394743f), - Vector3DFloat(+0.202468f, +0.651174f, +0.731423f), - Vector3DFloat(+0.070835f, -0.997485f, -0.002525f), - Vector3DFloat(-0.282142f, -0.646099f, +0.709191f), - Vector3DFloat(+0.734636f, +0.546486f, -0.402073f), - Vector3DFloat(-0.792802f, +0.359455f, -0.492196f), - Vector3DFloat(+0.064556f, -0.768826f, +0.636192f), - Vector3DFloat(-0.387159f, -0.539262f, +0.747867f), - Vector3DFloat(-0.321231f, +0.945995f, +0.043642f), - Vector3DFloat(-0.051543f, -0.358058f, +0.932276f), - Vector3DFloat(+0.463676f, -0.211202f, +0.860464f), - Vector3DFloat(-0.985546f, -0.040806f, -0.164421f), - Vector3DFloat(-0.956965f, +0.289910f, -0.013071f), - Vector3DFloat(-0.575614f, -0.401429f, -0.712406f), - Vector3DFloat(+0.005411f, +0.912319f, +0.409443f), - Vector3DFloat(-0.147120f, +0.145609f, +0.978342f), - Vector3DFloat(+0.381181f, -0.303247f, +0.873351f), - Vector3DFloat(+0.646964f, -0.669990f, -0.364076f), - Vector3DFloat(+0.335662f, -0.334853f, +0.880457f), - Vector3DFloat(+0.812790f, -0.515621f, -0.271122f), - Vector3DFloat(+0.406265f, +0.443117f, -0.799122f), - Vector3DFloat(+0.818068f, +0.142779f, +0.557117f), - Vector3DFloat(-0.202146f, +0.482979f, +0.851979f), - Vector3DFloat(-0.359491f, -0.834883f, +0.416817f), - Vector3DFloat(+0.897243f, +0.373837f, -0.234949f), - Vector3DFloat(+0.734938f, -0.377211f, -0.563541f), - Vector3DFloat(+0.938936f, +0.089082f, +0.332362f), - Vector3DFloat(+0.847286f, +0.101367f, -0.521375f), - Vector3DFloat(+0.976962f, +0.212808f, -0.016060f), - Vector3DFloat(-0.484037f, -0.785288f, -0.386045f), - Vector3DFloat(+0.412432f, -0.846393f, -0.336925f), - Vector3DFloat(-0.290605f, -0.951829f, +0.097828f), - Vector3DFloat(+0.522856f, +0.099925f, -0.846544f), - Vector3DFloat(-0.268624f, -0.592962f, +0.759103f), - Vector3DFloat(+0.532873f, -0.247493f, +0.809193f), - Vector3DFloat(-0.313247f, +0.857502f, -0.408126f), - Vector3DFloat(-0.279136f, +0.481391f, +0.830870f), - Vector3DFloat(-0.648063f, -0.437447f, -0.623422f), - Vector3DFloat(+0.693159f, -0.411042f, +0.592094f), - Vector3DFloat(-0.361556f, -0.008347f, -0.932313f), - Vector3DFloat(-0.706752f, -0.017905f, +0.707235f), - Vector3DFloat(+0.277671f, +0.588210f, +0.759544f), - Vector3DFloat(+0.706147f, +0.436673f, -0.557380f), - Vector3DFloat(+0.329465f, -0.938612f, -0.102275f), - Vector3DFloat(+0.941491f, +0.304731f, -0.143996f), - Vector3DFloat(-0.530440f, -0.419970f, -0.736382f), - Vector3DFloat(-0.933059f, +0.333768f, -0.134161f), - Vector3DFloat(-0.799598f, -0.383384f, -0.462234f), - Vector3DFloat(+0.589799f, +0.017619f, -0.807358f), - Vector3DFloat(-0.157486f, -0.147213f, +0.976487f), - Vector3DFloat(+0.144612f, -0.765441f, +0.627046f), - Vector3DFloat(-0.224062f, +0.971686f, +0.074988f), - Vector3DFloat(-0.525446f, +0.743496f, +0.413666f), - Vector3DFloat(+0.913834f, -0.396502f, +0.087711f), - Vector3DFloat(+0.551810f, +0.713484f, -0.431793f), - Vector3DFloat(-0.988855f, +0.027355f, +0.146346f), - Vector3DFloat(+0.129678f, -0.922163f, +0.364417f), - Vector3DFloat(-0.443546f, +0.337851f, +0.830135f), - Vector3DFloat(-0.076099f, -0.128182f, -0.988827f), - Vector3DFloat(-0.930714f, -0.363326f, +0.042022f), - Vector3DFloat(-0.062724f, +0.597013f, -0.799776f), - Vector3DFloat(+0.674612f, -0.080125f, +0.733811f), - Vector3DFloat(-0.732149f, -0.106968f, -0.672693f), - Vector3DFloat(-0.477404f, -0.735544f, +0.480688f), - Vector3DFloat(+0.720306f, +0.691043f, +0.060162f), - Vector3DFloat(-0.480694f, -0.691928f, -0.538673f), - Vector3DFloat(+0.284364f, -0.490827f, +0.823545f), - Vector3DFloat(-0.467068f, -0.635840f, +0.614455f), - Vector3DFloat(+0.259424f, +0.728928f, +0.633532f), - Vector3DFloat(-0.829024f, +0.499711f, +0.251015f), - Vector3DFloat(+0.918101f, +0.199840f, +0.342278f), - Vector3DFloat(-0.132256f, +0.844697f, -0.518648f), - Vector3DFloat(-0.880945f, +0.470246f, +0.052958f), - Vector3DFloat(-0.907893f, +0.418701f, -0.020494f), - Vector3DFloat(-0.898489f, +0.435552f, -0.054882f), - Vector3DFloat(-0.181486f, -0.981241f, -0.065032f), - Vector3DFloat(+0.612484f, -0.390415f, -0.687342f), - Vector3DFloat(-0.674745f, +0.504350f, +0.538841f), - Vector3DFloat(-0.489037f, -0.427926f, +0.760080f), - Vector3DFloat(-0.629283f, +0.776741f, +0.026012f), - Vector3DFloat(-0.327015f, +0.559793f, +0.761375f), - Vector3DFloat(+0.143982f, -0.052568f, +0.988183f), - Vector3DFloat(+0.963642f, +0.246339f, -0.103498f), - Vector3DFloat(+0.083550f, +0.206217f, +0.974933f), - Vector3DFloat(+0.985008f, +0.097629f, -0.142221f), - Vector3DFloat(+0.386516f, -0.544556f, +0.744355f), - Vector3DFloat(-0.390134f, -0.377051f, +0.840017f), - Vector3DFloat(+0.188428f, -0.872526f, -0.450770f), - Vector3DFloat(-0.249415f, +0.963139f, +0.100774f), - Vector3DFloat(-0.246900f, -0.688081f, +0.682338f), - Vector3DFloat(-0.815515f, -0.341331f, -0.467363f), - Vector3DFloat(-0.828295f, -0.545972f, +0.125866f), - Vector3DFloat(-0.251196f, +0.860882f, +0.442473f), - Vector3DFloat(+0.787130f, -0.124629f, -0.604065f), - Vector3DFloat(-0.546825f, -0.350565f, +0.760320f), - Vector3DFloat(+0.910761f, +0.326941f, +0.252237f), - Vector3DFloat(-0.822947f, -0.029868f, +0.567332f), - Vector3DFloat(-0.119863f, -0.101264f, +0.987612f), - Vector3DFloat(+0.338978f, +0.251339f, +0.906600f), - Vector3DFloat(-0.168116f, +0.130641f, +0.977072f), - Vector3DFloat(+0.630274f, -0.051172f, +0.774685f), - Vector3DFloat(+0.509020f, +0.860289f, -0.028316f), - Vector3DFloat(-0.741184f, +0.614383f, -0.270518f), - Vector3DFloat(+0.783367f, +0.216068f, -0.582796f), - Vector3DFloat(-0.917044f, -0.239253f, -0.319042f), - Vector3DFloat(+0.326503f, +0.605534f, +0.725758f), - Vector3DFloat(-0.858028f, +0.033090f, +0.512536f), - Vector3DFloat(+0.920390f, +0.341687f, +0.190084f), - Vector3DFloat(+0.184870f, +0.206034f, -0.960923f), - Vector3DFloat(-0.320575f, -0.873361f, -0.366704f), - Vector3DFloat(-0.908564f, +0.179683f, -0.377129f), - Vector3DFloat(-0.995162f, +0.060094f, -0.077721f), - Vector3DFloat(-0.970805f, +0.057864f, +0.232786f), - Vector3DFloat(-0.438989f, -0.719230f, -0.538514f), - Vector3DFloat(-0.305764f, +0.586163f, +0.750281f), - Vector3DFloat(+0.813263f, +0.070638f, +0.577593f), - Vector3DFloat(-0.856072f, +0.356367f, -0.374356f), - Vector3DFloat(-0.291393f, -0.496711f, -0.817538f), - Vector3DFloat(-0.465919f, +0.423021f, +0.777157f), - Vector3DFloat(-0.197288f, +0.747479f, +0.634312f), - Vector3DFloat(+0.459532f, -0.294706f, +0.837842f), - Vector3DFloat(-0.669432f, -0.715572f, -0.199543f), - Vector3DFloat(+0.651361f, +0.729418f, -0.208995f), - Vector3DFloat(+0.899675f, -0.409092f, +0.152409f), - Vector3DFloat(-0.909013f, +0.374561f, +0.182756f), - Vector3DFloat(+0.584390f, +0.675714f, -0.449332f), - Vector3DFloat(-0.679644f, +0.693287f, -0.239658f), - Vector3DFloat(-0.447022f, -0.041260f, +0.893571f), - Vector3DFloat(-0.116547f, +0.050542f, -0.991898f), - Vector3DFloat(+0.395893f, +0.741111f, -0.542239f), - Vector3DFloat(+0.350204f, -0.445076f, -0.824175f), - Vector3DFloat(-0.172775f, +0.743090f, -0.646503f), - Vector3DFloat(+0.990144f, +0.139743f, -0.009361f), - Vector3DFloat(+0.519086f, +0.780496f, -0.348389f), - Vector3DFloat(-0.437746f, -0.398253f, +0.806085f), - Vector3DFloat(-0.008119f, +0.986280f, -0.164880f), - Vector3DFloat(+0.597715f, -0.604411f, -0.526711f), - Vector3DFloat(-0.097509f, +0.175580f, -0.979624f), - Vector3DFloat(+0.660655f, -0.124974f, +0.740214f), - Vector3DFloat(-0.206022f, +0.283440f, -0.936599f), - Vector3DFloat(-0.702342f, +0.672455f, -0.233496f), - Vector3DFloat(+0.306125f, -0.350950f, -0.884942f), - Vector3DFloat(+0.572172f, -0.424424f, -0.701772f), - Vector3DFloat(-0.218533f, -0.939401f, -0.264138f), - Vector3DFloat(+0.409469f, -0.491877f, -0.768370f), - Vector3DFloat(-0.651781f, -0.191800f, +0.733754f), - Vector3DFloat(+0.900352f, -0.242264f, -0.361490f), - Vector3DFloat(+0.809489f, +0.255902f, -0.528434f), - Vector3DFloat(+0.615724f, -0.777952f, +0.125199f), - Vector3DFloat(-0.337892f, -0.510143f, -0.790938f), - Vector3DFloat(-0.326182f, -0.695879f, +0.639811f), - Vector3DFloat(-0.877877f, -0.220692f, +0.425002f), - Vector3DFloat(+0.837897f, -0.278492f, -0.469436f), - Vector3DFloat(-0.802587f, -0.151114f, +0.577077f), - Vector3DFloat(+0.409855f, +0.796889f, -0.443832f), - Vector3DFloat(-0.374483f, +0.669830f, -0.641164f), - Vector3DFloat(-0.745860f, +0.343937f, -0.570438f), - Vector3DFloat(-0.202905f, +0.156353f, +0.966635f), - Vector3DFloat(+0.556026f, +0.322254f, -0.766151f), - Vector3DFloat(+0.776714f, +0.240272f, -0.582224f), - Vector3DFloat(-0.125301f, +0.638214f, -0.759594f), - Vector3DFloat(+0.399976f, +0.226329f, -0.888141f), - Vector3DFloat(-0.704797f, +0.579196f, -0.409625f), - Vector3DFloat(-0.007629f, +0.072037f, +0.997373f), - Vector3DFloat(-0.284284f, +0.861559f, +0.420592f), - Vector3DFloat(+0.775941f, +0.385137f, -0.499586f), - Vector3DFloat(-0.234994f, +0.400120f, +0.885823f), - Vector3DFloat(+0.575813f, +0.632406f, +0.518172f), - Vector3DFloat(+0.076477f, +0.592931f, -0.801613f), - Vector3DFloat(+0.603536f, -0.788719f, -0.116900f), - Vector3DFloat(-0.301173f, -0.779883f, -0.548705f), - Vector3DFloat(-0.315064f, -0.948217f, +0.040230f), - Vector3DFloat(+0.332902f, +0.851413f, -0.405304f), - Vector3DFloat(-0.403429f, +0.778318f, +0.481110f), - Vector3DFloat(-0.213870f, +0.976545f, +0.024873f), - Vector3DFloat(-0.753760f, -0.519440f, +0.402528f), - Vector3DFloat(-0.293424f, +0.935690f, -0.195925f), - Vector3DFloat(-0.370354f, +0.922391f, -0.109697f), - Vector3DFloat(+0.278418f, +0.666623f, +0.691445f), - Vector3DFloat(-0.284329f, +0.930765f, +0.229857f), - Vector3DFloat(+0.860824f, -0.367097f, -0.352452f), - Vector3DFloat(+0.541854f, -0.702580f, -0.461275f), - Vector3DFloat(+0.912176f, +0.185368f, -0.365478f), - Vector3DFloat(+0.168057f, +0.931969f, -0.321232f), - Vector3DFloat(-0.267320f, +0.845122f, +0.462934f), - Vector3DFloat(-0.201487f, +0.198600f, +0.959146f), - Vector3DFloat(-0.839945f, -0.276826f, -0.466754f), - Vector3DFloat(-0.740956f, -0.484640f, +0.464874f), - Vector3DFloat(-0.383491f, +0.705487f, -0.596006f), - Vector3DFloat(-0.954405f, -0.026765f, -0.297313f), - Vector3DFloat(+0.468574f, +0.859438f, +0.204460f), - Vector3DFloat(-0.940360f, +0.331786f, +0.075105f), - Vector3DFloat(-0.852277f, +0.454172f, -0.259522f), - Vector3DFloat(-0.759647f, +0.519837f, -0.390776f), - Vector3DFloat(+0.111525f, -0.475265f, -0.872746f), - Vector3DFloat(-0.452079f, -0.035104f, +0.891287f), - Vector3DFloat(+0.390392f, -0.669936f, -0.631490f), - Vector3DFloat(-0.292073f, +0.321693f, -0.900670f), - Vector3DFloat(+0.104005f, +0.994338f, +0.021788f), - Vector3DFloat(+0.960865f, +0.271665f, +0.054189f), - Vector3DFloat(-0.723235f, +0.690428f, +0.015487f), - Vector3DFloat(+0.179328f, -0.278614f, +0.943513f), - Vector3DFloat(+0.673808f, +0.589682f, +0.445263f), - Vector3DFloat(+0.731197f, +0.497511f, +0.466726f), - Vector3DFloat(+0.153734f, -0.134017f, +0.978982f), - Vector3DFloat(+0.456781f, -0.221267f, -0.861622f), - Vector3DFloat(+0.688864f, +0.648593f, +0.323719f), - Vector3DFloat(-0.036351f, +0.715024f, -0.698155f), - Vector3DFloat(+0.979208f, -0.118292f, +0.164797f), - Vector3DFloat(-0.543655f, -0.797469f, -0.261692f), - Vector3DFloat(+0.474224f, -0.342549f, -0.811031f), - Vector3DFloat(+0.455954f, +0.830262f, +0.320580f), - Vector3DFloat(+0.050584f, -0.993831f, -0.098696f), - Vector3DFloat(-0.061916f, +0.662832f, +0.746204f), - Vector3DFloat(+0.153491f, -0.981695f, +0.112766f), - Vector3DFloat(-0.303003f, +0.664435f, +0.683165f), - Vector3DFloat(+0.490302f, +0.248088f, -0.835497f), - Vector3DFloat(-0.909045f, +0.282351f, -0.306455f), - Vector3DFloat(+0.412988f, -0.552647f, +0.723894f), - Vector3DFloat(-0.254003f, -0.874419f, +0.413370f), - Vector3DFloat(-0.254922f, +0.922643f, -0.289387f), - Vector3DFloat(+0.788379f, -0.515671f, +0.335474f), - Vector3DFloat(+0.704882f, -0.446475f, -0.551182f), - Vector3DFloat(+0.446454f, +0.893141f, -0.054572f), - Vector3DFloat(-0.139484f, +0.078095f, -0.987140f), - Vector3DFloat(+0.196257f, -0.117325f, -0.973508f), - Vector3DFloat(-0.887951f, -0.452728f, +0.081119f), - Vector3DFloat(+0.482286f, +0.838290f, -0.254304f), - Vector3DFloat(-0.085400f, +0.836828f, +0.540764f), - Vector3DFloat(-0.033243f, -0.288034f, +0.957043f), - Vector3DFloat(+0.262770f, -0.771585f, +0.579318f), - Vector3DFloat(-0.911785f, -0.235533f, +0.336411f), - Vector3DFloat(+0.927275f, +0.367451f, -0.071696f), - Vector3DFloat(+0.771172f, -0.229858f, +0.593683f), - Vector3DFloat(-0.375316f, -0.068341f, -0.924374f), - Vector3DFloat(-0.735343f, +0.284450f, -0.615109f), - Vector3DFloat(-0.985363f, +0.154529f, +0.071973f), - Vector3DFloat(-0.544949f, +0.792232f, -0.274589f), - Vector3DFloat(-0.565066f, -0.783807f, -0.257579f), - Vector3DFloat(-0.188990f, +0.764476f, -0.616328f), - Vector3DFloat(+0.011964f, -0.681395f, +0.731818f), - Vector3DFloat(+0.647082f, +0.652894f, -0.393719f), - Vector3DFloat(-0.883463f, +0.088810f, -0.460006f), - Vector3DFloat(-0.443140f, -0.048579f, -0.895135f), - Vector3DFloat(+0.925708f, +0.333853f, -0.177785f), - Vector3DFloat(-0.057825f, -0.850139f, +0.523373f), - Vector3DFloat(+0.376782f, +0.740216f, +0.556881f), - Vector3DFloat(-0.711665f, -0.184658f, -0.677816f), - Vector3DFloat(+0.410214f, -0.115790f, -0.904609f), - Vector3DFloat(+0.382722f, +0.646393f, -0.660076f), - Vector3DFloat(-0.300767f, -0.354337f, +0.885429f), - Vector3DFloat(+0.568398f, +0.272778f, +0.776219f), - Vector3DFloat(-0.157935f, +0.980750f, +0.114830f), - Vector3DFloat(+0.359219f, +0.495150f, -0.791068f), - Vector3DFloat(-0.349238f, +0.056262f, -0.935344f), - Vector3DFloat(-0.633800f, +0.743629f, +0.212869f), - Vector3DFloat(+0.097107f, -0.993326f, -0.062246f), - Vector3DFloat(+0.372454f, -0.806078f, -0.459908f), - Vector3DFloat(-0.263428f, +0.934015f, +0.241290f), - Vector3DFloat(-0.943443f, +0.122444f, +0.308095f), - Vector3DFloat(+0.408781f, +0.502375f, -0.761917f), - Vector3DFloat(+0.697179f, -0.332546f, -0.635102f), - Vector3DFloat(-0.491802f, +0.870583f, -0.014715f), - Vector3DFloat(+0.737536f, -0.656902f, +0.156592f), - Vector3DFloat(+0.827336f, -0.246097f, +0.504928f), - Vector3DFloat(-0.446202f, +0.667651f, +0.595941f), - Vector3DFloat(-0.964936f, -0.243630f, +0.097691f), - Vector3DFloat(+0.897134f, -0.435766f, -0.072518f), - Vector3DFloat(-0.669699f, -0.151247f, -0.727068f), - Vector3DFloat(-0.016765f, -0.955618f, +0.294130f), - Vector3DFloat(-0.230630f, +0.832879f, -0.503112f), - Vector3DFloat(+0.899464f, +0.318825f, -0.298856f), - Vector3DFloat(+0.058885f, -0.789911f, +0.610388f), - Vector3DFloat(+0.659402f, +0.666930f, +0.346977f), - Vector3DFloat(+0.284813f, -0.414001f, -0.864572f), - Vector3DFloat(+0.484149f, -0.789140f, -0.377964f), - Vector3DFloat(+0.738956f, +0.298547f, -0.603998f), - Vector3DFloat(+0.136326f, +0.352541f, -0.925813f), - Vector3DFloat(+0.868090f, +0.478579f, +0.131841f), - Vector3DFloat(+0.446372f, -0.633533f, -0.631972f), - Vector3DFloat(-0.464744f, -0.873724f, +0.143596f), - Vector3DFloat(-0.157889f, +0.556623f, -0.815624f), - Vector3DFloat(-0.916952f, -0.270205f, +0.293579f), - Vector3DFloat(-0.968515f, +0.157169f, -0.193071f), - Vector3DFloat(-0.428526f, -0.889206f, +0.160242f), - Vector3DFloat(+0.396152f, +0.173085f, +0.901724f), - Vector3DFloat(+0.966792f, +0.160015f, -0.199271f), - Vector3DFloat(-0.912490f, -0.111826f, +0.393519f), - Vector3DFloat(+0.866392f, -0.192509f, -0.460765f), - Vector3DFloat(+0.480992f, +0.492893f, -0.725054f), - Vector3DFloat(-0.355535f, +0.884194f, +0.302977f), - Vector3DFloat(+0.980976f, -0.055915f, +0.185905f), - Vector3DFloat(-0.740688f, +0.154276f, -0.653896f), - Vector3DFloat(+0.193789f, -0.135151f, -0.971689f), - Vector3DFloat(-0.301940f, -0.417607f, -0.856993f), - Vector3DFloat(-0.519232f, +0.773966f, -0.362455f), - Vector3DFloat(+0.938672f, -0.020909f, -0.344177f), - Vector3DFloat(+0.637853f, -0.449939f, +0.625058f), - Vector3DFloat(+0.544105f, -0.664601f, -0.512109f), - Vector3DFloat(-0.170728f, -0.774921f, +0.608563f), - Vector3DFloat(+0.669668f, +0.441721f, -0.597016f), - Vector3DFloat(-0.311388f, -0.044999f, -0.949217f), - Vector3DFloat(+0.146744f, +0.375501f, +0.915131f), - Vector3DFloat(-0.703678f, -0.557559f, -0.440414f), - Vector3DFloat(-0.470187f, +0.695298f, +0.543585f), - Vector3DFloat(-0.254132f, -0.184139f, +0.949479f), - Vector3DFloat(-0.900622f, +0.005714f, +0.434565f), - Vector3DFloat(-0.014656f, +0.303063f, -0.952858f), - Vector3DFloat(-0.865696f, -0.264074f, +0.425247f), - Vector3DFloat(+0.481061f, +0.842497f, +0.242445f), - Vector3DFloat(-0.450784f, +0.137271f, +0.882015f), - Vector3DFloat(+0.091619f, +0.964503f, +0.247669f), - Vector3DFloat(-0.135659f, -0.122365f, +0.983170f), - Vector3DFloat(-0.322292f, +0.502269f, +0.802405f), - Vector3DFloat(+0.157842f, +0.435303f, +0.886339f), - Vector3DFloat(+0.158697f, -0.622087f, -0.766696f), - Vector3DFloat(+0.427134f, -0.647168f, -0.631451f), - Vector3DFloat(-0.101271f, +0.917326f, +0.385042f), - Vector3DFloat(-0.351641f, -0.653340f, -0.670445f), - Vector3DFloat(-0.903498f, -0.392917f, +0.171195f), - Vector3DFloat(+0.227012f, -0.849095f, -0.476974f), - Vector3DFloat(-0.094069f, -0.890637f, +0.444878f), - Vector3DFloat(+0.803352f, -0.594284f, -0.038110f), - Vector3DFloat(-0.094739f, -0.865030f, -0.492695f), - Vector3DFloat(+0.264702f, -0.854667f, +0.446629f), - Vector3DFloat(-0.897678f, +0.277821f, -0.342037f), - Vector3DFloat(-0.327036f, +0.939653f, +0.100497f), - Vector3DFloat(-0.826248f, -0.337885f, -0.450719f), - Vector3DFloat(+0.066622f, -0.956883f, +0.282730f), - Vector3DFloat(-0.746913f, -0.121996f, +0.653635f), - Vector3DFloat(-0.671734f, +0.736418f, +0.080385f), - Vector3DFloat(+0.693715f, +0.576755f, -0.431408f), - Vector3DFloat(-0.788320f, -0.082995f, -0.609642f), - Vector3DFloat(-0.456573f, +0.863290f, -0.215108f), - Vector3DFloat(-0.622201f, +0.453957f, +0.637800f), - Vector3DFloat(+0.723922f, +0.655748f, +0.214319f), - Vector3DFloat(+0.882913f, -0.420816f, -0.208276f), - Vector3DFloat(-0.926551f, +0.212056f, -0.310703f), - Vector3DFloat(+0.388695f, -0.691965f, +0.608358f), - Vector3DFloat(+0.728427f, +0.198534f, -0.655728f), - Vector3DFloat(+0.319262f, +0.105299f, +0.941798f), - Vector3DFloat(-0.333911f, +0.881805f, +0.333050f), - Vector3DFloat(+0.245338f, -0.611922f, -0.751904f), - Vector3DFloat(+0.220061f, -0.101481f, -0.970193f), - Vector3DFloat(+0.930032f, -0.311841f, +0.194412f), - Vector3DFloat(+0.048087f, -0.993913f, +0.099115f), - Vector3DFloat(-0.275537f, +0.705669f, +0.652772f), - Vector3DFloat(+0.383019f, -0.163631f, -0.909132f), - Vector3DFloat(-0.135900f, -0.988939f, +0.059414f), - Vector3DFloat(-0.662199f, +0.747009f, +0.058896f), - Vector3DFloat(-0.124689f, +0.015288f, +0.992078f), - Vector3DFloat(+0.489432f, -0.555663f, -0.672082f), - Vector3DFloat(-0.780927f, -0.255976f, +0.569763f), - Vector3DFloat(+0.694171f, +0.278571f, -0.663720f), - Vector3DFloat(-0.604581f, -0.463542f, -0.647774f), - Vector3DFloat(-0.676259f, -0.684602f, -0.272018f), - Vector3DFloat(+0.494855f, -0.701192f, -0.513272f), - Vector3DFloat(+0.565633f, +0.823079f, +0.050993f), - Vector3DFloat(+0.050237f, -0.998492f, +0.022122f), - Vector3DFloat(-0.386389f, -0.893963f, -0.227011f), - Vector3DFloat(+0.888703f, -0.437519f, -0.137056f), - Vector3DFloat(-0.914197f, +0.390980f, +0.106670f), - Vector3DFloat(+0.778906f, -0.627140f, -0.001437f), - Vector3DFloat(-0.603014f, +0.672265f, -0.429458f), - Vector3DFloat(+0.501042f, -0.665212f, +0.553579f), - Vector3DFloat(-0.995164f, +0.092308f, -0.033577f), - Vector3DFloat(-0.998104f, +0.018497f, +0.058712f), - Vector3DFloat(+0.929569f, +0.123842f, -0.347225f), - Vector3DFloat(+0.235077f, -0.609238f, +0.757343f), - Vector3DFloat(-0.452902f, -0.887545f, +0.084525f), - Vector3DFloat(-0.137550f, -0.488131f, -0.861863f), - Vector3DFloat(+0.660545f, -0.371465f, +0.652453f), - Vector3DFloat(+0.747313f, -0.657236f, +0.097799f), - Vector3DFloat(-0.543312f, -0.315699f, -0.777911f), - Vector3DFloat(+0.189959f, -0.346861f, +0.918478f), - Vector3DFloat(+0.323571f, +0.300781f, +0.897125f), - Vector3DFloat(-0.482606f, +0.875832f, -0.003165f), - Vector3DFloat(-0.936502f, +0.291824f, -0.194430f), - Vector3DFloat(-0.503609f, -0.390560f, +0.770610f), - Vector3DFloat(-0.540142f, +0.002774f, -0.841569f), - Vector3DFloat(-0.085055f, -0.996376f, -0.000148f), - Vector3DFloat(-0.615309f, +0.059981f, -0.786000f), - Vector3DFloat(+0.718191f, +0.505958f, -0.477711f), - Vector3DFloat(-0.167397f, +0.844465f, -0.508780f), - Vector3DFloat(+0.636446f, -0.344036f, -0.690345f), - Vector3DFloat(+0.663267f, +0.700418f, -0.263613f), - Vector3DFloat(+0.602334f, +0.435514f, +0.668970f), - Vector3DFloat(-0.275820f, -0.393792f, +0.876842f), - Vector3DFloat(+0.437736f, -0.747931f, +0.498986f), - Vector3DFloat(+0.882319f, +0.417138f, +0.217965f), - Vector3DFloat(-0.851108f, -0.482384f, -0.207174f), - Vector3DFloat(+0.320590f, +0.898664f, +0.299375f), - Vector3DFloat(-0.621201f, -0.614972f, +0.485714f), - Vector3DFloat(+0.911173f, +0.041873f, +0.409892f), - Vector3DFloat(+0.729444f, +0.142692f, -0.668992f), - Vector3DFloat(+0.666307f, -0.735324f, +0.123831f), - Vector3DFloat(+0.463591f, +0.847227f, -0.259402f), - Vector3DFloat(+0.894296f, +0.059634f, +0.443484f), - Vector3DFloat(-0.736335f, -0.674274f, +0.056256f), - Vector3DFloat(+0.469502f, -0.733536f, +0.491420f), - Vector3DFloat(-0.391723f, -0.837099f, +0.381861f), - Vector3DFloat(-0.437372f, -0.437618f, -0.785618f), - Vector3DFloat(-0.203384f, -0.343038f, -0.917039f), - Vector3DFloat(-0.945306f, +0.221497f, +0.239450f), - Vector3DFloat(+0.773091f, +0.496793f, +0.394369f), - Vector3DFloat(-0.710103f, +0.093103f, +0.697915f), - Vector3DFloat(-0.456786f, +0.151779f, +0.876533f), - Vector3DFloat(+0.373153f, +0.587166f, -0.718326f), - Vector3DFloat(-0.559785f, -0.793881f, +0.237473f), - Vector3DFloat(-0.884665f, +0.422952f, +0.196163f), - Vector3DFloat(-0.468879f, +0.300549f, -0.830556f), - Vector3DFloat(+0.958105f, +0.285330f, -0.024919f), - Vector3DFloat(+0.825326f, -0.423197f, -0.373819f), - Vector3DFloat(-0.034122f, +0.999414f, +0.002781f), - Vector3DFloat(-0.904795f, -0.041789f, -0.423792f), - Vector3DFloat(-0.799927f, +0.541477f, -0.258687f), - Vector3DFloat(+0.995132f, +0.000543f, -0.098546f), - Vector3DFloat(+0.843984f, -0.507103f, -0.174749f), - Vector3DFloat(-0.640934f, +0.618163f, +0.455058f), - Vector3DFloat(+0.543397f, +0.492878f, +0.679553f), - Vector3DFloat(+0.408980f, -0.467105f, +0.783932f), - Vector3DFloat(+0.219682f, +0.823953f, +0.522343f), - Vector3DFloat(+0.845523f, +0.410442f, -0.341509f), - Vector3DFloat(-0.997099f, +0.057254f, -0.050159f), - Vector3DFloat(+0.535588f, +0.112415f, +0.836964f), - Vector3DFloat(+0.139015f, +0.182777f, +0.973277f), - Vector3DFloat(+0.681261f, +0.731126f, -0.036585f), - Vector3DFloat(-0.161589f, +0.986188f, -0.036352f), - Vector3DFloat(-0.294098f, +0.640063f, +0.709806f), - Vector3DFloat(+0.213370f, -0.880985f, -0.422301f), - Vector3DFloat(-0.903331f, +0.383376f, +0.192395f), - Vector3DFloat(+0.020283f, +0.989297f, -0.144498f), - Vector3DFloat(+0.550858f, -0.603955f, +0.576016f), - Vector3DFloat(-0.297499f, -0.396883f, -0.868319f), - Vector3DFloat(-0.125581f, +0.971238f, +0.202303f), - Vector3DFloat(+0.994606f, -0.096856f, +0.037125f), - Vector3DFloat(+0.959844f, -0.254636f, -0.117729f), - Vector3DFloat(-0.332961f, +0.808031f, +0.486028f), - Vector3DFloat(+0.118411f, -0.818829f, +0.561692f), - Vector3DFloat(-0.329010f, +0.932571f, +0.148536f), - Vector3DFloat(+0.386616f, -0.386923f, -0.837149f), - Vector3DFloat(+0.501223f, -0.201907f, -0.841433f), - Vector3DFloat(+0.555119f, -0.793008f, -0.250959f), - Vector3DFloat(-0.512485f, +0.850268f, -0.120011f), - Vector3DFloat(+0.573352f, +0.737293f, +0.357306f), - Vector3DFloat(+0.315311f, -0.182192f, +0.931335f), - Vector3DFloat(+0.156167f, -0.963694f, -0.216579f), - Vector3DFloat(-0.285174f, -0.542273f, +0.790326f), - Vector3DFloat(-0.277593f, +0.668866f, +0.689609f), - Vector3DFloat(+0.319798f, -0.921924f, +0.218599f), - Vector3DFloat(-0.727455f, -0.686116f, -0.007338f), - Vector3DFloat(+0.219712f, -0.952663f, +0.210141f), - Vector3DFloat(+0.491792f, +0.552463f, -0.672997f), - Vector3DFloat(-0.526640f, +0.820445f, +0.222533f) - }; -} diff --git a/library/PolyVoxCore/source/Impl/RandomVectors.cpp b/library/PolyVoxCore/source/Impl/RandomVectors.cpp deleted file mode 100644 index b6f141da..00000000 --- a/library/PolyVoxCore/source/Impl/RandomVectors.cpp +++ /dev/null @@ -1,1055 +0,0 @@ -/******************************************************************************* -Copyright (c) 2005-2009 David Williams - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -*******************************************************************************/ - -#include "PolyVoxCore/Impl/RandomVectors.h" - -namespace PolyVox -{ - extern const Vector3DFloat randomVectors[1024] = - { - Vector3DFloat(+0.348918f, -0.385662f, +0.650197f), - Vector3DFloat(-0.259255f, +0.791559f, +0.920957f), - Vector3DFloat(+0.940733f, -0.101535f, +0.250160f), - Vector3DFloat(-0.308939f, +0.367656f, +0.877987f), - Vector3DFloat(+0.112949f, -0.047090f, -0.730277f), - Vector3DFloat(-0.605579f, +0.039705f, +0.310160f), - Vector3DFloat(+0.086459f, +0.376446f, -0.496078f), - Vector3DFloat(+0.565661f, -0.261574f, -0.924986f), - Vector3DFloat(-0.285745f, -0.792047f, -0.582568f), - Vector3DFloat(+0.943175f, +0.226844f, +0.823481f), - Vector3DFloat(+0.599414f, +0.846797f, -0.438215f), - Vector3DFloat(-0.502731f, -0.907407f, +0.170751f), - Vector3DFloat(+0.136204f, -0.735527f, -0.066622f), - Vector3DFloat(-0.618763f, +0.825617f, -0.325053f), - Vector3DFloat(+0.942076f, +0.608325f, -0.532517f), - Vector3DFloat(-0.466414f, -0.248756f, -0.189856f), - Vector3DFloat(+0.618213f, +0.879513f, +0.120090f), - Vector3DFloat(-0.918393f, +0.876522f, +0.265114f), - Vector3DFloat(+0.345195f, +0.670705f, -0.914243f), - Vector3DFloat(-0.600757f, -0.417646f, -0.736747f), - Vector3DFloat(-0.271828f, +0.215674f, +0.890622f), - Vector3DFloat(+0.100986f, +0.821955f, +0.429975f), - Vector3DFloat(+0.811823f, -0.506943f, +0.635853f), - Vector3DFloat(+0.647084f, +0.297403f, -0.714774f), - Vector3DFloat(+0.531907f, -0.917417f, +0.795770f), - Vector3DFloat(-0.151585f, +0.250038f, +0.959105f), - Vector3DFloat(+0.311747f, -0.850948f, +0.946348f), - Vector3DFloat(+0.641407f, -0.747978f, +0.464583f), - Vector3DFloat(+0.297769f, -0.427839f, +0.867489f), - Vector3DFloat(+0.305032f, +0.985900f, +0.071261f), - Vector3DFloat(+0.105930f, -0.895016f, +0.871700f), - Vector3DFloat(+0.060335f, -0.312235f, +0.247475f), - Vector3DFloat(+0.174718f, +0.776055f, -0.783563f), - Vector3DFloat(-0.018342f, -0.031343f, +0.533982f), - Vector3DFloat(+0.136753f, -0.201575f, -0.694998f), - Vector3DFloat(+0.606006f, +0.353069f, -0.174841f), - Vector3DFloat(-0.720573f, +0.272805f, -0.679189f), - Vector3DFloat(+0.802484f, -0.649281f, -0.884274f), - Vector3DFloat(-0.577807f, -0.794610f, +0.227332f), - Vector3DFloat(-0.391644f, +0.440474f, -0.927854f), - Vector3DFloat(+0.631825f, +0.072115f, +0.943785f), - Vector3DFloat(-0.898312f, +0.257363f, -0.942930f), - Vector3DFloat(-0.608264f, +0.583667f, +0.228126f), - Vector3DFloat(-0.788202f, +0.777764f, +0.722953f), - Vector3DFloat(-0.624622f, -0.296976f, -0.382122f), - Vector3DFloat(+0.921323f, -0.356365f, -0.750542f), - Vector3DFloat(-0.899106f, +0.578234f, +0.937132f), - Vector3DFloat(+0.830744f, -0.789422f, -0.026154f), - Vector3DFloat(+0.720634f, +0.135166f, -0.366985f), - Vector3DFloat(+0.796930f, +0.687124f, +0.807855f), - Vector3DFloat(+0.262001f, -0.120945f, -0.196631f), - Vector3DFloat(+0.562426f, -0.886166f, +0.699149f), - Vector3DFloat(+0.047945f, -0.781793f, +0.465987f), - Vector3DFloat(+0.219275f, +0.152440f, +0.726127f), - Vector3DFloat(-0.970641f, -0.384136f, -0.340739f), - Vector3DFloat(+0.244606f, +0.969848f, +0.466903f), - Vector3DFloat(+0.608753f, +0.329936f, -0.411542f), - Vector3DFloat(+0.959593f, -0.833186f, -0.698721f), - Vector3DFloat(+0.475692f, -0.320658f, +0.507675f), - Vector3DFloat(-0.155431f, -0.050447f, -0.455855f), - Vector3DFloat(-0.738456f, +0.917173f, -0.407758f), - Vector3DFloat(-0.555284f, +0.842891f, -0.984619f), - Vector3DFloat(+0.696951f, +0.155553f, -0.031526f), - Vector3DFloat(-0.131565f, -0.563707f, +0.076815f), - Vector3DFloat(-0.319376f, +0.620106f, +0.567614f), - Vector3DFloat(-0.628163f, -0.813959f, -0.438581f), - Vector3DFloat(+0.484115f, +0.060640f, -0.176183f), - Vector3DFloat(-0.523240f, -0.572314f, +0.633778f), - Vector3DFloat(-0.524949f, -0.334574f, -0.326701f), - Vector3DFloat(+0.747673f, +0.725944f, +0.701651f), - Vector3DFloat(-0.500961f, +0.564867f, -0.902341f), - Vector3DFloat(+0.995422f, -0.245949f, +0.301065f), - Vector3DFloat(+0.655080f, -0.783380f, +0.835871f), - Vector3DFloat(+0.541795f, -0.693472f, -0.355083f), - Vector3DFloat(+0.891110f, +0.891171f, -0.891903f), - Vector3DFloat(+0.507675f, -0.949034f, -0.485214f), - Vector3DFloat(-0.116123f, +0.368999f, +0.514756f), - Vector3DFloat(-0.859432f, -0.525071f, +0.632008f), - Vector3DFloat(-0.707205f, +0.077914f, +0.930540f), - Vector3DFloat(-0.783380f, -0.577074f, -0.180212f), - Vector3DFloat(-0.047884f, -0.523789f, +0.471664f), - Vector3DFloat(-0.210791f, +0.904904f, -0.585864f), - Vector3DFloat(+0.132664f, +0.792230f, +0.707266f), - Vector3DFloat(-0.735710f, -0.263710f, -0.258827f), - Vector3DFloat(+0.912290f, +0.497421f, -0.518845f), - Vector3DFloat(-0.790521f, -0.707144f, +0.314982f), - Vector3DFloat(-0.799249f, +0.381207f, -0.756462f), - Vector3DFloat(+0.694998f, -0.521836f, +0.957213f), - Vector3DFloat(+0.310709f, +0.049837f, +0.920652f), - Vector3DFloat(+0.581530f, +0.164647f, +0.560900f), - Vector3DFloat(+0.406903f, -0.650563f, -0.674551f), - Vector3DFloat(-0.749016f, +0.119663f, -0.040193f), - Vector3DFloat(+0.955260f, -0.142552f, +0.175756f), - Vector3DFloat(-0.925108f, -0.970824f, -0.430952f), - Vector3DFloat(+0.666372f, +0.449507f, -0.801813f), - Vector3DFloat(-0.311991f, -0.079928f, -0.608142f), - Vector3DFloat(-0.344829f, +0.280862f, +0.800775f), - Vector3DFloat(-0.880123f, +0.318217f, -0.120212f), - Vector3DFloat(-0.146519f, +0.573412f, -0.358013f), - Vector3DFloat(+0.297220f, -0.889523f, +0.246620f), - Vector3DFloat(-0.628834f, -0.383404f, -0.630360f), - Vector3DFloat(-0.397382f, +0.547533f, -0.579150f), - Vector3DFloat(+0.758049f, +0.631947f, -0.916807f), - Vector3DFloat(-0.678030f, -0.606433f, -0.881527f), - Vector3DFloat(+0.213233f, +0.854060f, -0.043428f), - Vector3DFloat(+0.175085f, +0.139500f, -0.208472f), - Vector3DFloat(+0.983520f, -0.389386f, +0.178076f), - Vector3DFloat(+0.956603f, +0.696951f, -0.307657f), - Vector3DFloat(-0.276345f, +0.576220f, +0.182104f), - Vector3DFloat(+0.864742f, -0.657582f, +0.253639f), - Vector3DFloat(-0.275735f, -0.012177f, +0.306619f), - Vector3DFloat(-0.385235f, -0.881649f, +0.658071f), - Vector3DFloat(-0.117466f, -0.306681f, -0.235755f), - Vector3DFloat(+0.173254f, +0.685720f, +0.116733f), - Vector3DFloat(-0.641041f, +0.704642f, -0.585864f), - Vector3DFloat(+0.154820f, +0.999939f, -0.761345f), - Vector3DFloat(-0.726310f, +0.695181f, -0.490036f), - Vector3DFloat(-0.149510f, -0.593188f, -0.794122f), - Vector3DFloat(+0.798212f, +0.872555f, -0.361980f), - Vector3DFloat(+0.749687f, -0.931944f, +0.519211f), - Vector3DFloat(-0.151952f, -0.889096f, -0.313822f), - Vector3DFloat(-0.467879f, +0.289651f, -0.901242f), - Vector3DFloat(+0.522752f, +0.406781f, +0.157079f), - Vector3DFloat(+0.088534f, -0.421735f, -0.236122f), - Vector3DFloat(+0.722221f, -0.136692f, -0.292825f), - Vector3DFloat(-0.572436f, +0.349162f, +0.819697f), - Vector3DFloat(+0.252113f, +0.773614f, -0.299051f), - Vector3DFloat(-0.401410f, +0.400250f, -0.091037f), - Vector3DFloat(+0.449507f, +0.205115f, +0.075533f), - Vector3DFloat(+0.246803f, -0.197851f, -0.322123f), - Vector3DFloat(-0.822077f, +0.037263f, +0.157445f), - Vector3DFloat(+0.373455f, +0.983154f, -0.580920f), - Vector3DFloat(+0.201758f, -0.075289f, +0.514878f), - Vector3DFloat(+0.552477f, +0.760430f, +0.938963f), - Vector3DFloat(-0.297525f, -0.603504f, -0.285318f), - Vector3DFloat(-0.504257f, +0.135899f, +0.694021f), - Vector3DFloat(-0.701895f, +0.509140f, -0.768914f), - Vector3DFloat(+0.725639f, +0.083834f, -0.985961f), - Vector3DFloat(+0.617847f, -0.604114f, +0.976440f), - Vector3DFloat(-0.557115f, +0.562853f, +0.214087f), - Vector3DFloat(-0.480819f, -0.048738f, -0.759392f), - Vector3DFloat(-0.268105f, -0.168493f, -0.141881f), - Vector3DFloat(+0.664357f, -0.999207f, +0.486740f), - Vector3DFloat(-0.739128f, +0.089328f, +0.611194f), - Vector3DFloat(-0.355876f, +0.889523f, +0.701895f), - Vector3DFloat(-0.123692f, -0.252358f, -0.739250f), - Vector3DFloat(+0.405438f, -0.276772f, -0.896786f), - Vector3DFloat(-0.803644f, +0.517563f, -0.146886f), - Vector3DFloat(+0.647511f, +0.766289f, -0.811518f), - Vector3DFloat(-0.266457f, -0.779534f, +0.720634f), - Vector3DFloat(-0.643849f, -0.014130f, -0.345134f), - Vector3DFloat(-0.527390f, +0.047700f, -0.271340f), - Vector3DFloat(+0.993957f, -0.305643f, +0.841731f), - Vector3DFloat(+0.441816f, -0.849117f, -0.411664f), - Vector3DFloat(+0.303323f, -0.088473f, -0.677602f), - Vector3DFloat(+0.897824f, +0.203833f, +0.821039f), - Vector3DFloat(+0.468123f, +0.717338f, +0.338542f), - Vector3DFloat(-0.452986f, -0.830622f, -0.832942f), - Vector3DFloat(-0.245582f, -0.273171f, -0.820612f), - Vector3DFloat(-0.007660f, -0.799371f, +0.156896f), - Vector3DFloat(-0.022919f, +0.152013f, +0.614246f), - Vector3DFloat(-0.414045f, +0.637440f, -0.542711f), - Vector3DFloat(+0.453108f, -0.034516f, +0.330607f), - Vector3DFloat(+0.324015f, +0.689505f, +0.719108f), - Vector3DFloat(-0.236854f, +0.700491f, +0.276406f), - Vector3DFloat(-0.405316f, +0.871944f, +0.233863f), - Vector3DFloat(+0.898373f, +0.660756f, -0.914609f), - Vector3DFloat(+0.737114f, -0.179601f, -0.990539f), - Vector3DFloat(-0.536241f, -0.980712f, -0.352702f), - Vector3DFloat(+0.730094f, -0.970214f, -0.857967f), - Vector3DFloat(-0.194800f, -0.286782f, +0.604236f), - Vector3DFloat(+0.163366f, -0.441755f, -0.149022f), - Vector3DFloat(+0.457564f, +0.433149f, -0.626698f), - Vector3DFloat(+0.192846f, -0.909848f, +0.501572f), - Vector3DFloat(+0.444563f, -0.377789f, -0.545213f), - Vector3DFloat(-0.296670f, -0.809259f, +0.614246f), - Vector3DFloat(-0.068209f, +0.480148f, +0.537828f), - Vector3DFloat(+0.638173f, +0.371685f, -0.495956f), - Vector3DFloat(+0.798822f, +0.767510f, +0.516282f), - Vector3DFloat(-0.336161f, -0.035615f, +0.058687f), - Vector3DFloat(-0.888852f, -0.022370f, +0.215552f), - Vector3DFloat(-0.737541f, -0.977783f, -0.506638f), - Vector3DFloat(+0.471969f, +0.429670f, +0.668508f), - Vector3DFloat(+0.240394f, -0.212500f, -0.026215f), - Vector3DFloat(-0.916379f, -0.706229f, -0.593799f), - Vector3DFloat(-0.246681f, +0.919736f, -0.984741f), - Vector3DFloat(+0.291055f, -0.263771f, +0.703726f), - Vector3DFloat(-0.468245f, -0.062777f, +0.808527f), - Vector3DFloat(+0.661245f, +0.514817f, -0.715995f), - Vector3DFloat(-0.709830f, -0.580920f, +0.323710f), - Vector3DFloat(-0.463912f, -0.279092f, -0.101291f), - Vector3DFloat(-0.426252f, -0.292520f, -0.523057f), - Vector3DFloat(-0.285928f, -0.806574f, +0.701468f), - Vector3DFloat(-0.216468f, +0.385968f, +0.031953f), - Vector3DFloat(+0.737053f, +0.683767f, +0.684561f), - Vector3DFloat(+0.080172f, -0.063753f, +0.526902f), - Vector3DFloat(+0.414228f, +0.367351f, +0.884335f), - Vector3DFloat(-0.460677f, -0.048189f, -0.403851f), - Vector3DFloat(+0.973998f, +0.039399f, -0.148839f), - Vector3DFloat(+0.578539f, -0.651173f, +0.859432f), - Vector3DFloat(-0.172948f, +0.534593f, +0.255531f), - Vector3DFloat(+0.537584f, -0.570116f, +0.317606f), - Vector3DFloat(-0.380535f, +0.841548f, -0.274880f), - Vector3DFloat(+0.627247f, +0.655507f, -0.813532f), - Vector3DFloat(+0.288186f, +0.273171f, -0.674123f), - Vector3DFloat(-0.489303f, +0.828913f, +0.552599f), - Vector3DFloat(-0.541002f, +0.170019f, -0.242836f), - Vector3DFloat(+0.802972f, +0.340190f, +0.414716f), - Vector3DFloat(-0.997253f, -0.806635f, +0.588122f), - Vector3DFloat(+0.011017f, -0.599109f, -0.183325f), - Vector3DFloat(-0.871578f, -0.430708f, -0.042634f), - Vector3DFloat(+0.144627f, -0.921751f, +0.142003f), - Vector3DFloat(-0.695059f, -0.091037f, -0.647694f), - Vector3DFloat(-0.346477f, +0.663381f, -0.528977f), - Vector3DFloat(-0.194739f, +0.724967f, +0.615894f), - Vector3DFloat(+0.741874f, +0.720695f, -0.544847f), - Vector3DFloat(-0.984863f, +0.715445f, +0.461287f), - Vector3DFloat(-0.277871f, +0.329936f, +0.678091f), - Vector3DFloat(+0.090854f, +0.565905f, -0.254250f), - Vector3DFloat(-0.844050f, +0.781915f, -0.783929f), - Vector3DFloat(+0.332377f, -0.336528f, +0.820673f), - Vector3DFloat(-0.673391f, +0.589953f, -0.685598f), - Vector3DFloat(+0.022370f, +0.979980f, +0.686453f), - Vector3DFloat(-0.640065f, +0.369488f, +0.022919f), - Vector3DFloat(+0.699088f, -0.286355f, +0.684378f), - Vector3DFloat(-0.702139f, -0.827754f, +0.528367f), - Vector3DFloat(+0.150365f, -0.669851f, -0.695486f), - Vector3DFloat(+0.885617f, +0.492416f, -0.964599f), - Vector3DFloat(-0.923643f, -0.338847f, -0.369060f), - Vector3DFloat(+0.009064f, +0.632435f, +0.628956f), - Vector3DFloat(+0.620411f, +0.959777f, -0.769890f), - Vector3DFloat(+0.865413f, +0.685659f, -0.149327f), - Vector3DFloat(-0.933042f, +0.517258f, +0.168493f), - Vector3DFloat(+0.309732f, +0.299417f, +0.995361f), - Vector3DFloat(+0.196814f, -0.128025f, +0.565233f), - Vector3DFloat(-0.343669f, +0.889157f, +0.616688f), - Vector3DFloat(-0.676870f, +0.035432f, +0.906430f), - Vector3DFloat(-0.238868f, +0.320475f, -0.307596f), - Vector3DFloat(+0.164159f, +0.774468f, +0.502792f), - Vector3DFloat(+0.733146f, +0.517563f, +0.572741f), - Vector3DFloat(+0.676931f, -0.930235f, +0.231056f), - Vector3DFloat(-0.640370f, +0.241127f, -0.518479f), - Vector3DFloat(-0.953795f, +0.673086f, -0.706656f), - Vector3DFloat(+0.538621f, -0.340495f, +0.202124f), - Vector3DFloat(+0.431501f, +0.452315f, +0.422651f), - Vector3DFloat(+0.935606f, -0.442793f, -0.087191f), - Vector3DFloat(-0.921873f, -0.794733f, -0.003388f), - Vector3DFloat(+0.978576f, +0.342814f, -0.813898f), - Vector3DFloat(-0.750969f, +0.077853f, -0.849117f), - Vector3DFloat(+0.416120f, +0.678030f, +0.187475f), - Vector3DFloat(+0.370342f, -0.101901f, -0.544053f), - Vector3DFloat(+0.248512f, +0.803766f, -0.654042f), - Vector3DFloat(-0.925230f, +0.883480f, +0.287698f), - Vector3DFloat(-0.861873f, -0.263771f, +0.476730f), - Vector3DFloat(-0.298868f, -0.459517f, +0.932798f), - Vector3DFloat(+0.680532f, +0.697928f, +0.761162f), - Vector3DFloat(-0.466964f, -0.590625f, +0.972716f), - Vector3DFloat(+0.400067f, -0.316507f, +0.385418f), - Vector3DFloat(-0.123814f, -0.144444f, -0.161290f), - Vector3DFloat(-0.703726f, +0.189489f, +0.250099f), - Vector3DFloat(-0.766533f, -0.369854f, +0.871395f), - Vector3DFloat(-0.561205f, -0.891415f, +0.247658f), - Vector3DFloat(+0.590991f, +0.661489f, -0.996887f), - Vector3DFloat(-0.244667f, +0.857723f, +0.402692f), - Vector3DFloat(-0.574572f, -0.257790f, +0.561449f), - Vector3DFloat(+0.020600f, -0.784173f, -0.057711f), - Vector3DFloat(+0.735954f, +0.708487f, +0.913022f), - Vector3DFloat(-0.615101f, -0.643666f, +0.350017f), - Vector3DFloat(+0.436933f, +0.596423f, +0.985412f), - Vector3DFloat(-0.167577f, +0.400555f, +0.914670f), - Vector3DFloat(-0.920896f, -0.621570f, -0.637074f), - Vector3DFloat(-0.020356f, -0.234657f, +0.460860f), - Vector3DFloat(+0.336650f, -0.537767f, +0.907712f), - Vector3DFloat(-0.138768f, +0.860653f, +0.093661f), - Vector3DFloat(-0.733512f, -0.564196f, -0.046724f), - Vector3DFloat(+0.058260f, -0.429060f, +0.150792f), - Vector3DFloat(+0.255837f, -0.187780f, +0.312601f), - Vector3DFloat(-0.050081f, +0.680105f, -0.609485f), - Vector3DFloat(+0.075411f, +0.016511f, -0.127293f), - Vector3DFloat(-0.735710f, -0.787957f, +0.992248f), - Vector3DFloat(-0.191931f, +0.812311f, +0.681692f), - Vector3DFloat(-0.284402f, -0.177160f, -0.533128f), - Vector3DFloat(+0.859432f, +0.042940f, +0.404096f), - Vector3DFloat(+0.599841f, +0.131260f, +0.313028f), - Vector3DFloat(-0.955809f, -0.792474f, +0.086947f), - Vector3DFloat(-0.980712f, -0.525498f, -0.539598f), - Vector3DFloat(-0.877377f, -0.748222f, +0.590320f), - Vector3DFloat(-0.822443f, -0.733634f, -0.529588f), - Vector3DFloat(+0.379620f, -0.710013f, +0.038484f), - Vector3DFloat(-0.826472f, -0.831050f, -0.645436f), - Vector3DFloat(+0.160131f, -0.977050f, -0.502609f), - Vector3DFloat(-0.818964f, +0.921567f, -0.011261f), - Vector3DFloat(+0.932005f, -0.364727f, +0.023103f), - Vector3DFloat(-0.923826f, -0.862300f, +0.680410f), - Vector3DFloat(-0.298379f, +0.196936f, -0.486618f), - Vector3DFloat(-0.281411f, -0.045747f, -0.252602f), - Vector3DFloat(+0.706534f, +0.296976f, +0.672292f), - Vector3DFloat(-0.543077f, +0.319376f, +0.238075f), - Vector3DFloat(-0.501938f, +0.067293f, +0.119602f), - Vector3DFloat(-0.740287f, -0.783197f, +0.407514f), - Vector3DFloat(-0.933470f, -0.855098f, -0.503952f), - Vector3DFloat(-0.574877f, -0.533067f, +0.525437f), - Vector3DFloat(+0.785394f, -0.262612f, +0.571642f), - Vector3DFloat(-0.659108f, -0.811396f, +0.264138f), - Vector3DFloat(+0.926695f, -0.963622f, +0.121372f), - Vector3DFloat(+0.505661f, -0.209815f, -0.439131f), - Vector3DFloat(-0.433882f, +0.026887f, +0.928953f), - Vector3DFloat(-0.771599f, +0.737785f, -0.288003f), - Vector3DFloat(-0.894406f, +0.505905f, +0.971068f), - Vector3DFloat(+0.350383f, +0.570421f, -0.211646f), - Vector3DFloat(+0.644093f, -0.882748f, -0.131382f), - Vector3DFloat(+0.225745f, +0.948973f, -0.488327f), - Vector3DFloat(+0.277810f, -0.337748f, +0.322672f), - Vector3DFloat(-0.686514f, +0.185766f, +0.752129f), - Vector3DFloat(+0.350566f, +0.122959f, +0.722526f), - Vector3DFloat(-0.687002f, +0.955260f, -0.955687f), - Vector3DFloat(+0.958983f, -0.019074f, -0.317118f), - Vector3DFloat(+0.076937f, -0.015839f, -0.772027f), - Vector3DFloat(+0.899777f, -0.224647f, +0.174230f), - Vector3DFloat(+0.805719f, -0.288797f, +0.742119f), - Vector3DFloat(+0.964904f, -0.322794f, +0.416486f), - Vector3DFloat(-0.485641f, -0.559130f, -0.500168f), - Vector3DFloat(+0.310282f, +0.408185f, -0.946471f), - Vector3DFloat(-0.279031f, +0.645131f, -0.118259f), - Vector3DFloat(+0.780694f, -0.650136f, -0.433943f), - Vector3DFloat(+0.981262f, +0.039521f, -0.532395f), - Vector3DFloat(+0.830866f, +0.430769f, -0.333293f), - Vector3DFloat(-0.462081f, -0.872799f, -0.070711f), - Vector3DFloat(+0.276894f, -0.418683f, -0.198767f), - Vector3DFloat(+0.217750f, +0.312662f, -0.725211f), - Vector3DFloat(-0.193091f, -0.522752f, -0.901486f), - Vector3DFloat(+0.040071f, -0.307291f, +0.622669f), - Vector3DFloat(-0.788446f, -0.817438f, -0.566027f), - Vector3DFloat(-0.947508f, -0.519822f, +0.143468f), - Vector3DFloat(-0.072970f, -0.580920f, +0.925230f), - Vector3DFloat(-0.072359f, +0.954772f, +0.980163f), - Vector3DFloat(+0.954344f, -0.229774f, -0.562059f), - Vector3DFloat(+0.095004f, +0.123020f, +0.103366f), - Vector3DFloat(+0.784478f, -0.571764f, +0.774529f), - Vector3DFloat(-0.113498f, -0.852229f, +0.422468f), - Vector3DFloat(-0.128941f, -0.637196f, -0.590869f), - Vector3DFloat(+0.603259f, -0.670766f, +0.303201f), - Vector3DFloat(+0.693960f, +0.278542f, +0.171422f), - Vector3DFloat(+0.801813f, +0.236671f, +0.195227f), - Vector3DFloat(-0.193823f, +0.684072f, -0.594714f), - Vector3DFloat(+0.715201f, +0.750725f, +0.591479f), - Vector3DFloat(+0.698782f, +0.073214f, +0.106052f), - Vector3DFloat(+0.803522f, -0.470809f, +0.279763f), - Vector3DFloat(+0.099704f, +0.861385f, -0.397687f), - Vector3DFloat(+0.230506f, -0.993286f, +0.054292f), - Vector3DFloat(-0.292398f, +0.585376f, +0.762139f), - Vector3DFloat(-0.168004f, +0.731132f, -0.020051f), - Vector3DFloat(+0.577441f, +0.205359f, +0.703848f), - Vector3DFloat(-0.869076f, +0.873653f, -0.802301f), - Vector3DFloat(+0.697256f, +0.399335f, +0.842708f), - Vector3DFloat(-0.590258f, -0.620777f, -0.628040f), - Vector3DFloat(-0.048982f, +0.759697f, -0.957335f), - Vector3DFloat(+0.026582f, +0.696402f, -0.537645f), - Vector3DFloat(+0.919431f, +0.040254f, +0.931394f), - Vector3DFloat(+0.308512f, +0.591052f, -0.194739f), - Vector3DFloat(-0.934202f, +0.307718f, -0.688894f), - Vector3DFloat(-0.285318f, +0.460860f, +0.757012f), - Vector3DFloat(+0.048799f, -0.720389f, +0.325968f), - Vector3DFloat(-0.202246f, +0.068697f, +0.641407f), - Vector3DFloat(-0.566088f, +0.523301f, +0.857295f), - Vector3DFloat(+0.040193f, -0.036836f, +0.699881f), - Vector3DFloat(-0.789422f, -0.195959f, -0.217505f), - Vector3DFloat(-0.836665f, +0.293741f, +0.418867f), - Vector3DFloat(+0.489486f, +0.954344f, +0.486007f), - Vector3DFloat(-0.755913f, -0.485153f, +0.253822f), - Vector3DFloat(+0.823420f, -0.565722f, -0.393353f), - Vector3DFloat(-0.817560f, +0.851436f, -0.368755f), - Vector3DFloat(+0.004791f, -0.474899f, -0.299417f), - Vector3DFloat(-0.012726f, +0.620289f, -0.555773f), - Vector3DFloat(+0.197058f, -0.916318f, -0.469466f), - Vector3DFloat(+0.243812f, +0.820734f, -0.694021f), - Vector3DFloat(-0.896359f, -0.753716f, -0.676321f), - Vector3DFloat(-0.761589f, -0.936033f, -0.154149f), - Vector3DFloat(+0.821528f, +0.641224f, -0.188025f), - Vector3DFloat(+0.799432f, +0.168981f, +0.571520f), - Vector3DFloat(+0.309793f, -0.181005f, -0.565416f), - Vector3DFloat(+0.211890f, -0.153539f, -0.473312f), - Vector3DFloat(+0.284097f, +0.968444f, -0.005829f), - Vector3DFloat(+0.835994f, +0.087374f, -0.599780f), - Vector3DFloat(+0.068270f, -0.178930f, -0.439741f), - Vector3DFloat(-0.455611f, +0.404218f, -0.862911f), - Vector3DFloat(+0.754143f, +0.197058f, +0.762749f), - Vector3DFloat(+0.053499f, -0.794549f, -0.285257f), - Vector3DFloat(+0.176916f, +0.163121f, -0.941954f), - Vector3DFloat(-0.102817f, -0.446944f, +0.830195f), - Vector3DFloat(+0.970824f, -0.484848f, -0.661977f), - Vector3DFloat(-0.561998f, -0.377544f, -0.955321f), - Vector3DFloat(-0.434980f, +0.501022f, +0.627186f), - Vector3DFloat(-0.828120f, +0.591540f, +0.701895f), - Vector3DFloat(-0.327555f, +0.628346f, -0.159581f), - Vector3DFloat(-0.082980f, -0.308084f, -0.077731f), - Vector3DFloat(+0.858150f, -0.706473f, +0.886532f), - Vector3DFloat(+0.526475f, +0.001373f, +0.438276f), - Vector3DFloat(-0.594958f, +0.084994f, -0.935057f), - Vector3DFloat(+0.783746f, -0.501877f, -0.797052f), - Vector3DFloat(-0.835566f, -0.808405f, +0.956359f), - Vector3DFloat(+0.380169f, +0.184118f, +0.857540f), - Vector3DFloat(+0.647206f, +0.652089f, -0.895383f), - Vector3DFloat(-0.421369f, -0.038667f, +0.500046f), - Vector3DFloat(-0.478133f, +0.447432f, +0.981750f), - Vector3DFloat(+0.593921f, -0.330485f, -0.966674f), - Vector3DFloat(-0.811823f, +0.928892f, -0.741935f), - Vector3DFloat(+0.115879f, -0.490707f, -0.080355f), - Vector3DFloat(+0.443159f, +0.030061f, -0.465560f), - Vector3DFloat(+0.013703f, -0.765435f, -0.311502f), - Vector3DFloat(+0.698782f, -0.612903f, +0.660207f), - Vector3DFloat(+0.341227f, -0.746940f, +0.284341f), - Vector3DFloat(-0.005036f, -0.863460f, -0.168432f), - Vector3DFloat(-0.434370f, -0.629933f, +0.545152f), - Vector3DFloat(-0.570544f, +0.023591f, +0.072970f), - Vector3DFloat(+0.709830f, +0.603626f, +0.031831f), - Vector3DFloat(-0.148961f, +0.783807f, -0.292154f), - Vector3DFloat(+0.088107f, -0.467818f, +0.319498f), - Vector3DFloat(+0.976623f, -0.185339f, +0.274087f), - Vector3DFloat(+0.770867f, +0.267861f, -0.022004f), - Vector3DFloat(-0.245338f, +0.171056f, -0.720389f), - Vector3DFloat(-0.909299f, +0.616993f, -0.950926f), - Vector3DFloat(+0.050935f, -0.842341f, -0.519944f), - Vector3DFloat(+0.646779f, +0.560839f, +0.129673f), - Vector3DFloat(-0.171361f, -0.501328f, -0.762749f), - Vector3DFloat(-0.374065f, -0.905209f, -0.561144f), - Vector3DFloat(-0.811029f, -0.510483f, -0.757073f), - Vector3DFloat(-0.905332f, -0.027924f, -0.263649f), - Vector3DFloat(-0.828730f, -0.067721f, -0.295206f), - Vector3DFloat(-0.538133f, +0.242714f, +0.914914f), - Vector3DFloat(-0.657949f, -0.732658f, -0.743584f), - Vector3DFloat(+0.837214f, -0.077181f, +0.767449f), - Vector3DFloat(+0.174047f, +0.397687f, +0.602405f), - Vector3DFloat(-0.256996f, +0.911435f, -0.927915f), - Vector3DFloat(+0.282754f, +0.500900f, +0.510178f), - Vector3DFloat(+0.849971f, +0.652821f, +0.002838f), - Vector3DFloat(-1.000000f, -0.103305f, -0.548814f), - Vector3DFloat(-0.673208f, -0.734489f, +0.204749f), - Vector3DFloat(-0.235511f, -0.977477f, -0.771538f), - Vector3DFloat(+0.294412f, +0.173009f, -0.075533f), - Vector3DFloat(-0.339946f, -0.970946f, -0.443525f), - Vector3DFloat(-0.016144f, -0.066134f, -0.394635f), - Vector3DFloat(-0.627003f, +0.683401f, -0.967101f), - Vector3DFloat(-0.217994f, -0.777642f, -0.404584f), - Vector3DFloat(+0.123447f, -0.590747f, +0.507614f), - Vector3DFloat(+0.648610f, +0.006806f, -0.677969f), - Vector3DFloat(+0.006561f, +0.662648f, -0.236305f), - Vector3DFloat(+0.658132f, +0.166173f, -0.283975f), - Vector3DFloat(-0.098178f, +0.665273f, -0.068636f), - Vector3DFloat(-0.091891f, +0.319620f, +0.058870f), - Vector3DFloat(+0.922666f, +0.077731f, +0.399701f), - Vector3DFloat(-0.007050f, +0.772942f, -0.957945f), - Vector3DFloat(-0.456832f, -0.293313f, +0.437300f), - Vector3DFloat(+0.917173f, -0.542100f, +0.909665f), - Vector3DFloat(-0.711722f, -0.917356f, +0.513169f), - Vector3DFloat(-0.032624f, +0.808100f, +0.354472f), - Vector3DFloat(-0.526597f, -0.049409f, +0.691702f), - Vector3DFloat(-0.073946f, +0.923521f, -0.389813f), - Vector3DFloat(+0.172216f, +0.642140f, -0.302896f), - Vector3DFloat(-0.660024f, +0.381329f, -0.833064f), - Vector3DFloat(+0.622791f, -0.809076f, +0.557787f), - Vector3DFloat(+0.609790f, +0.897702f, +0.998352f), - Vector3DFloat(-0.084384f, +0.169042f, -0.596667f), - Vector3DFloat(-0.315470f, -0.014618f, -0.640187f), - Vector3DFloat(+0.275552f, -0.199438f, -0.759941f), - Vector3DFloat(-0.615223f, -0.960021f, +0.367901f), - Vector3DFloat(+0.819514f, -0.787225f, +0.627308f), - Vector3DFloat(+0.083834f, -0.836299f, +0.926450f), - Vector3DFloat(-0.420637f, -0.047273f, +0.370281f), - Vector3DFloat(-0.097629f, -0.240577f, -0.594836f), - Vector3DFloat(+0.085604f, +0.385601f, -0.121189f), - Vector3DFloat(+0.968444f, -0.255104f, +0.021027f), - Vector3DFloat(+0.152440f, -0.450484f, +0.971496f), - Vector3DFloat(-0.095737f, +0.395672f, -0.605213f), - Vector3DFloat(+0.949278f, -0.284951f, +0.875118f), - Vector3DFloat(+0.787286f, +0.580248f, +0.494613f), - Vector3DFloat(+0.225990f, -0.455123f, +0.239540f), - Vector3DFloat(+0.630238f, -0.251747f, -0.617725f), - Vector3DFloat(+0.940733f, -0.390484f, +0.394024f), - Vector3DFloat(+0.197851f, -0.276345f, -0.893368f), - Vector3DFloat(-0.240883f, +0.349651f, -0.922178f), - Vector3DFloat(-0.037080f, -0.609119f, -0.018342f), - Vector3DFloat(-0.787042f, +0.624500f, -0.274880f), - Vector3DFloat(-0.536485f, +0.989746f, -0.400128f), - Vector3DFloat(+0.963988f, +0.006012f, +0.323649f), - Vector3DFloat(-0.501022f, -0.791864f, +0.514817f), - Vector3DFloat(-0.126316f, -0.782769f, +0.155553f), - Vector3DFloat(-0.254921f, +0.828547f, -0.173925f), - Vector3DFloat(-0.321512f, -0.180822f, +0.603198f), - Vector3DFloat(+0.733757f, -0.407514f, +0.170385f), - Vector3DFloat(-0.741691f, -0.322611f, -0.070956f), - Vector3DFloat(-0.025300f, +0.454329f, -0.889767f), - Vector3DFloat(+0.024751f, +0.133518f, -0.246498f), - Vector3DFloat(+0.545701f, -0.260842f, +0.869747f), - Vector3DFloat(+0.082247f, -0.579638f, -0.885495f), - Vector3DFloat(-0.000885f, -0.834346f, +0.040254f), - Vector3DFloat(-0.211097f, -0.059297f, +0.747856f), - Vector3DFloat(-0.829646f, +0.475753f, +0.527451f), - Vector3DFloat(+0.409162f, -0.167882f, -0.177099f), - Vector3DFloat(-0.319865f, -0.205664f, -0.130222f), - Vector3DFloat(+0.962523f, -0.992615f, +0.062655f), - Vector3DFloat(+0.849361f, -0.935301f, +0.394024f), - Vector3DFloat(+0.373699f, -0.148350f, +0.208594f), - Vector3DFloat(+0.639332f, +0.220557f, -0.277444f), - Vector3DFloat(+0.880734f, +0.209937f, -0.576708f), - Vector3DFloat(+0.342814f, +0.416364f, -0.832453f), - Vector3DFloat(+0.594958f, +0.479843f, -0.306070f), - Vector3DFloat(+0.335002f, -0.107334f, +0.784173f), - Vector3DFloat(+0.395917f, +0.763604f, +0.866756f), - Vector3DFloat(-0.507553f, +0.148717f, -0.436750f), - Vector3DFloat(-0.780450f, -0.599048f, -0.146031f), - Vector3DFloat(-0.841304f, -0.712577f, -0.329997f), - Vector3DFloat(+0.524033f, +0.033845f, +0.057100f), - Vector3DFloat(-0.976562f, -0.066866f, +0.026887f), - Vector3DFloat(-0.469405f, -0.094394f, +0.398175f), - Vector3DFloat(+0.238685f, -0.750237f, +0.156713f), - Vector3DFloat(+0.000702f, +0.617298f, -0.206397f), - Vector3DFloat(-0.228553f, +0.562548f, -0.719840f), - Vector3DFloat(-0.939451f, -0.698782f, +0.688162f), - Vector3DFloat(+0.637623f, +0.149022f, -0.536058f), - Vector3DFloat(-0.814386f, +0.379315f, +0.647145f), - Vector3DFloat(+0.523179f, -0.820368f, +0.386517f), - Vector3DFloat(+0.146092f, +0.999146f, +0.227332f), - Vector3DFloat(-0.366924f, -0.211707f, +0.274697f), - Vector3DFloat(+0.751640f, +0.136509f, +0.662648f), - Vector3DFloat(+0.657888f, +0.102695f, +0.022736f), - Vector3DFloat(+0.861019f, -0.535813f, +0.561449f), - Vector3DFloat(+0.766839f, +0.006317f, +0.681204f), - Vector3DFloat(+0.596301f, +0.671255f, -0.933470f), - Vector3DFloat(+0.776910f, -0.313211f, -0.353923f), - Vector3DFloat(+0.266213f, +0.215796f, +0.026093f), - Vector3DFloat(-0.648732f, +0.907407f, -0.755425f), - Vector3DFloat(-0.585498f, -0.234535f, -0.085421f), - Vector3DFloat(-0.490890f, +0.657582f, +0.242897f), - Vector3DFloat(+0.913450f, +0.066622f, -0.220252f), - Vector3DFloat(+0.121067f, +0.658193f, -0.645314f), - Vector3DFloat(+0.367779f, +0.941588f, +0.618702f), - Vector3DFloat(-0.320231f, +0.354900f, -0.653005f), - Vector3DFloat(+0.540147f, -0.212317f, +0.559374f), - Vector3DFloat(+0.715812f, -0.211951f, +0.078646f), - Vector3DFloat(-0.711051f, +0.598132f, -0.708914f), - Vector3DFloat(+0.029756f, +0.324809f, +0.014924f), - Vector3DFloat(-0.106418f, +0.386090f, +0.596301f), - Vector3DFloat(-0.317179f, -0.068880f, -0.315165f), - Vector3DFloat(+0.860164f, -0.772881f, -0.158788f), - Vector3DFloat(-0.326640f, -0.304239f, +0.445906f), - Vector3DFloat(+0.621265f, -0.815729f, +0.129429f), - Vector3DFloat(+0.687063f, -0.052767f, -0.969481f), - Vector3DFloat(-0.800043f, -0.598621f, +0.764702f), - Vector3DFloat(-0.518052f, -0.221534f, -0.066256f), - Vector3DFloat(+0.164953f, +0.886898f, +0.954100f), - Vector3DFloat(-0.384808f, -0.641102f, -1.000000f), - Vector3DFloat(+0.299051f, +0.218360f, +0.561205f), - Vector3DFloat(-0.419050f, +0.324992f, -0.161779f), - Vector3DFloat(-0.403241f, -0.176305f, +0.442976f), - Vector3DFloat(+0.262001f, +0.042817f, -0.818842f), - Vector3DFloat(+0.740410f, +0.888852f, -0.281716f), - Vector3DFloat(-0.853084f, +0.886227f, -0.736442f), - Vector3DFloat(-0.666616f, +0.555956f, +0.477950f), - Vector3DFloat(-0.714164f, +0.112156f, -0.032197f), - Vector3DFloat(+0.142674f, -0.842341f, +0.199744f), - Vector3DFloat(-0.305948f, -0.295999f, +0.131504f), - Vector3DFloat(+0.667470f, -0.966674f, +0.728629f), - Vector3DFloat(+0.122166f, +0.928281f, -0.725028f), - Vector3DFloat(-0.236854f, -0.756096f, +0.374798f), - Vector3DFloat(+0.035432f, -0.423505f, -0.663747f), - Vector3DFloat(+0.051973f, -0.510910f, +0.716849f), - Vector3DFloat(+0.540208f, -0.821711f, +0.055757f), - Vector3DFloat(+0.699149f, +0.988098f, +0.326579f), - Vector3DFloat(+0.108188f, -0.867367f, +0.668996f), - Vector3DFloat(+0.077181f, -0.738884f, +0.103671f), - Vector3DFloat(-0.467391f, +0.957335f, -0.194494f), - Vector3DFloat(+0.123386f, +0.893674f, -0.523118f), - Vector3DFloat(-0.151036f, +0.955809f, +0.199622f), - Vector3DFloat(+0.075411f, +0.726493f, -0.363994f), - Vector3DFloat(+0.224647f, -0.208960f, +0.242531f), - Vector3DFloat(+0.993591f, +0.751213f, -0.535203f), - Vector3DFloat(+0.308512f, +0.990905f, -0.197241f), - Vector3DFloat(+0.292886f, +0.536180f, +0.191748f), - Vector3DFloat(+0.489853f, -0.461531f, +0.351665f), - Vector3DFloat(-0.329447f, +0.531602f, +0.216834f), - Vector3DFloat(-0.809320f, +0.675649f, +0.516037f), - Vector3DFloat(+0.565172f, -0.661184f, +0.359111f), - Vector3DFloat(-0.039460f, +0.110080f, +0.978698f), - Vector3DFloat(+0.885372f, -0.763787f, +0.145726f), - Vector3DFloat(+0.006195f, +0.231117f, +0.417585f), - Vector3DFloat(-0.566027f, +0.179846f, -0.010407f), - Vector3DFloat(-0.879391f, +0.940123f, +0.163305f), - Vector3DFloat(+0.490646f, +0.391949f, +0.415998f), - Vector3DFloat(-0.973815f, +0.550096f, +0.710868f), - Vector3DFloat(+0.643544f, +0.763543f, +0.160375f), - Vector3DFloat(-0.832759f, +0.150792f, -0.602466f), - Vector3DFloat(-0.564745f, -0.121982f, +0.213172f), - Vector3DFloat(-0.775750f, +0.120640f, +0.703970f), - Vector3DFloat(+0.952208f, -0.233375f, +0.984619f), - Vector3DFloat(+0.330241f, +0.344707f, -0.002472f), - Vector3DFloat(-0.601489f, +0.772454f, +0.954527f), - Vector3DFloat(-0.605335f, +0.422590f, -0.629261f), - Vector3DFloat(+0.199011f, +0.389996f, -0.293069f), - Vector3DFloat(-0.664479f, +0.964110f, -0.223731f), - Vector3DFloat(-0.477340f, +0.905515f, +0.378521f), - Vector3DFloat(-0.366741f, +0.233497f, +0.181860f), - Vector3DFloat(-0.438826f, -0.664724f, +0.521653f), - Vector3DFloat(-0.298990f, +0.153844f, -0.795587f), - Vector3DFloat(+0.679983f, -0.192114f, +0.451033f), - Vector3DFloat(-0.630360f, +0.283303f, +0.892270f), - Vector3DFloat(+0.940489f, +0.396222f, +0.550890f), - Vector3DFloat(-0.448653f, +0.065889f, -0.753105f), - Vector3DFloat(+0.712821f, +0.740410f, +0.025178f), - Vector3DFloat(-0.862606f, +0.692923f, +0.973937f), - Vector3DFloat(-0.583789f, +0.849544f, -0.579455f), - Vector3DFloat(+0.640675f, +0.542711f, +0.062960f), - Vector3DFloat(-0.916196f, +0.493881f, +0.192602f), - Vector3DFloat(+0.270119f, +0.636525f, +0.380108f), - Vector3DFloat(-0.297952f, -0.165502f, +0.871578f), - Vector3DFloat(-0.731132f, -0.883175f, +0.756951f), - Vector3DFloat(+0.373760f, +0.645436f, -0.736503f), - Vector3DFloat(-0.289407f, +0.663259f, +0.329142f), - Vector3DFloat(+0.544115f, +0.908933f, -0.156713f), - Vector3DFloat(+0.780816f, +0.264870f, -0.632984f), - Vector3DFloat(-0.935667f, +0.959899f, -0.686148f), - Vector3DFloat(+0.121250f, -0.882687f, -0.204260f), - Vector3DFloat(-0.002106f, -0.032807f, -0.532334f), - Vector3DFloat(+0.334208f, -0.147862f, -0.719474f), - Vector3DFloat(-0.956114f, +0.622791f, -0.764702f), - Vector3DFloat(+0.482162f, -0.907651f, +0.396100f), - Vector3DFloat(-0.477645f, +0.710196f, -0.589221f), - Vector3DFloat(-0.374676f, -0.293008f, -0.738578f), - Vector3DFloat(+0.273232f, -0.007050f, +0.227454f), - Vector3DFloat(-0.634449f, -0.640675f, -0.644276f), - Vector3DFloat(-0.173315f, +0.852840f, -0.000580f), - Vector3DFloat(+0.258766f, +0.261086f, -0.720450f), - Vector3DFloat(+0.048921f, +0.562609f, +0.668569f), - Vector3DFloat(+0.072970f, -0.296182f, -0.753594f), - Vector3DFloat(+0.409528f, -0.742302f, -0.429365f), - Vector3DFloat(-0.551012f, +0.193579f, -0.672414f), - Vector3DFloat(-0.698111f, -0.188940f, +0.302896f), - Vector3DFloat(-0.176366f, +0.111606f, +0.180273f), - Vector3DFloat(-0.273537f, -0.817988f, -0.519028f), - Vector3DFloat(+0.742546f, -0.983154f, -0.585864f), - Vector3DFloat(-0.631031f, +0.641469f, +0.681936f), - Vector3DFloat(+0.181127f, +0.238929f, -0.851680f), - Vector3DFloat(-0.075655f, -0.175085f, +0.213904f), - Vector3DFloat(-0.554369f, -0.458724f, -0.080172f), - Vector3DFloat(-0.326273f, +0.086398f, -0.203162f), - Vector3DFloat(+0.905332f, +0.605762f, +0.191443f), - Vector3DFloat(-0.920835f, -0.636525f, -0.977844f), - Vector3DFloat(-0.552110f, +0.156102f, +0.504135f), - Vector3DFloat(-0.243934f, +0.970763f, -0.160070f), - Vector3DFloat(+0.418195f, -0.050996f, +0.090060f), - Vector3DFloat(+0.875729f, -0.335307f, +0.542589f), - Vector3DFloat(-0.873226f, -0.135777f, +0.750908f), - Vector3DFloat(+0.086032f, -0.780999f, +0.032624f), - Vector3DFloat(-0.929746f, +0.173376f, -0.738212f), - Vector3DFloat(+0.665639f, -0.140172f, +0.821223f), - Vector3DFloat(-0.977416f, +0.008698f, +0.739372f), - Vector3DFloat(-0.899045f, +0.494980f, -0.542833f), - Vector3DFloat(+0.395062f, -0.662465f, +0.553148f), - Vector3DFloat(-0.157689f, +0.970824f, +0.186377f), - Vector3DFloat(+0.969970f, -0.372051f, +0.728263f), - Vector3DFloat(+0.902463f, +0.860225f, -0.170141f), - Vector3DFloat(+0.539415f, +0.112949f, -0.387066f), - Vector3DFloat(-0.530259f, +0.773553f, -0.593554f), - Vector3DFloat(-0.626392f, +0.377483f, +0.141209f), - Vector3DFloat(-0.949278f, -0.859554f, -0.846858f), - Vector3DFloat(-0.942442f, +0.152562f, -0.463973f), - Vector3DFloat(-0.897763f, -0.911557f, +0.570482f), - Vector3DFloat(+0.317179f, -0.045076f, -0.960204f), - Vector3DFloat(+0.895077f, -0.314066f, +0.184240f), - Vector3DFloat(-0.744621f, -0.192602f, -0.536485f), - Vector3DFloat(-0.266274f, +0.682974f, -0.871090f), - Vector3DFloat(-0.809748f, -0.032258f, +0.273232f), - Vector3DFloat(-0.124363f, -0.786309f, +0.657216f), - Vector3DFloat(-0.726981f, -0.371563f, -0.172521f), - Vector3DFloat(+0.812860f, -0.024384f, +0.532212f), - Vector3DFloat(+0.523545f, -0.821589f, -0.509934f), - Vector3DFloat(+0.236671f, +0.420148f, -0.802911f), - Vector3DFloat(+0.093783f, -0.909177f, -0.071932f), - Vector3DFloat(+0.262429f, +0.728141f, -0.095798f), - Vector3DFloat(+0.717826f, +0.067171f, -0.797784f), - Vector3DFloat(-0.413678f, +0.049593f, -0.137364f), - Vector3DFloat(-0.334391f, +0.978515f, +0.529893f), - Vector3DFloat(-0.559862f, +0.913511f, +0.188513f), - Vector3DFloat(-0.644642f, -0.352214f, +0.085849f), - Vector3DFloat(-0.257302f, +0.108371f, -0.744804f), - Vector3DFloat(-0.676015f, +0.866207f, -0.834712f), - Vector3DFloat(-0.021882f, -0.053072f, -0.795160f), - Vector3DFloat(-0.219214f, +0.475448f, -0.291055f), - Vector3DFloat(-0.698721f, -0.089816f, -0.867977f), - Vector3DFloat(-0.297403f, +0.136876f, +0.832881f), - Vector3DFloat(+0.438887f, +0.468001f, -0.946959f), - Vector3DFloat(+0.638905f, +0.782952f, -0.127903f), - Vector3DFloat(+0.363811f, -0.358745f, +0.460494f), - Vector3DFloat(+0.320109f, -0.028047f, -0.223365f), - Vector3DFloat(-0.274758f, -0.139256f, +0.302469f), - Vector3DFloat(-0.943297f, -0.316263f, +0.749382f), - Vector3DFloat(+0.863704f, -0.867183f, -0.148473f), - Vector3DFloat(+0.030122f, +0.751030f, -0.963439f), - Vector3DFloat(-0.818232f, -0.299966f, +0.403485f), - Vector3DFloat(-0.841548f, +0.378826f, -0.981689f), - Vector3DFloat(+0.927671f, +0.527696f, +0.309549f), - Vector3DFloat(+0.521897f, +0.299844f, -0.545579f), - Vector3DFloat(+0.324992f, +0.310648f, +0.759880f), - Vector3DFloat(+0.599170f, -0.695303f, +0.165380f), - Vector3DFloat(+0.708914f, +0.528916f, -0.764336f), - Vector3DFloat(+0.059297f, -0.576586f, +0.825312f), - Vector3DFloat(+0.139805f, +0.627247f, -0.101657f), - Vector3DFloat(+0.805414f, +0.160619f, +0.154210f), - Vector3DFloat(+0.131443f, +0.918393f, -0.376629f), - Vector3DFloat(-0.354289f, +0.161534f, +0.880612f), - Vector3DFloat(+0.880184f, +0.543138f, -0.826594f), - Vector3DFloat(-0.388714f, +0.751946f, +0.645680f), - Vector3DFloat(-0.018586f, -0.968078f, -0.617969f), - Vector3DFloat(+0.802057f, -0.795648f, +0.790704f), - Vector3DFloat(+0.311075f, -0.065828f, +0.444746f), - Vector3DFloat(-0.024201f, -0.412152f, +0.955382f), - Vector3DFloat(+0.783868f, +0.879452f, +0.727409f), - Vector3DFloat(-0.854427f, -0.093844f, +0.874935f), - Vector3DFloat(-0.670522f, -0.453780f, +0.165014f), - Vector3DFloat(-0.530381f, +0.169836f, +0.937071f), - Vector3DFloat(+0.902158f, +0.596423f, +0.575976f), - Vector3DFloat(+0.957152f, -0.666372f, -0.794610f), - Vector3DFloat(+0.901425f, -0.066378f, -0.684988f), - Vector3DFloat(+0.219581f, -0.090426f, -0.020356f), - Vector3DFloat(+0.297342f, +0.915708f, -0.119419f), - Vector3DFloat(+0.923887f, -0.212622f, +0.793695f), - Vector3DFloat(-0.747124f, -0.364666f, -0.375591f), - Vector3DFloat(-0.003021f, -0.386944f, +0.304849f), - Vector3DFloat(-0.614368f, +0.345805f, +0.845210f), - Vector3DFloat(+0.245827f, -0.766961f, +0.046358f), - Vector3DFloat(-0.746818f, +0.777642f, -0.485580f), - Vector3DFloat(+0.138524f, +0.468673f, -0.247108f), - Vector3DFloat(-0.569628f, -0.256020f, -0.044465f), - Vector3DFloat(-0.707572f, +0.080599f, +0.177892f), - Vector3DFloat(+0.925657f, -0.710807f, +0.201453f), - Vector3DFloat(+0.986267f, +0.476547f, +0.244362f), - Vector3DFloat(-0.092746f, -0.028718f, -0.235450f), - Vector3DFloat(-0.001740f, +0.748466f, +0.268288f), - Vector3DFloat(-0.974181f, -0.081942f, -0.602161f), - Vector3DFloat(+0.534898f, -0.743217f, -0.895077f), - Vector3DFloat(-0.720573f, -0.683096f, -0.631825f), - Vector3DFloat(+0.183569f, -0.549913f, -0.348125f), - Vector3DFloat(+0.623341f, -0.764275f, -0.951964f), - Vector3DFloat(+0.973693f, -0.825251f, -0.558580f), - Vector3DFloat(+0.620350f, +0.380169f, +0.510849f), - Vector3DFloat(+0.989074f, +0.641774f, +0.327128f), - Vector3DFloat(+0.624805f, +0.817988f, +0.537339f), - Vector3DFloat(+0.809870f, -0.280984f, +0.755486f), - Vector3DFloat(+0.521531f, -0.903928f, -0.742851f), - Vector3DFloat(-0.389325f, -0.433699f, -0.928343f), - Vector3DFloat(+0.176366f, -0.211768f, -0.189428f), - Vector3DFloat(-0.737602f, -0.928159f, -0.016449f), - Vector3DFloat(+0.723380f, -0.405866f, +0.167211f), - Vector3DFloat(+0.523301f, -0.666372f, -0.046480f), - Vector3DFloat(-0.118259f, +0.912290f, -0.160985f), - Vector3DFloat(+0.611927f, -0.191748f, +0.149998f), - Vector3DFloat(+0.905881f, -0.424482f, +0.913816f), - Vector3DFloat(-0.620411f, -0.027131f, +0.923276f), - Vector3DFloat(+0.774957f, -0.569140f, +0.871944f), - Vector3DFloat(-0.804193f, +0.661061f, +0.820795f), - Vector3DFloat(+0.077059f, -0.102023f, +0.278054f), - Vector3DFloat(+0.772637f, -0.104831f, -0.823847f), - Vector3DFloat(+0.983947f, +0.818659f, -0.089267f), - Vector3DFloat(+0.735221f, -0.709586f, -0.454268f), - Vector3DFloat(+0.996643f, -0.944945f, -0.538316f), - Vector3DFloat(+0.049165f, -0.796014f, +0.971374f), - Vector3DFloat(-0.976623f, +0.655263f, -0.156163f), - Vector3DFloat(+0.681143f, -0.005585f, +0.476547f), - Vector3DFloat(-0.928159f, +0.237648f, -0.346538f), - Vector3DFloat(+0.361003f, -0.709586f, +0.595325f), - Vector3DFloat(-0.345927f, +0.798700f, -0.321390f), - Vector3DFloat(-0.731803f, -0.701346f, -0.652272f), - Vector3DFloat(+0.164708f, -0.335795f, -0.213599f), - Vector3DFloat(-0.857601f, +0.151463f, +0.157689f), - Vector3DFloat(-0.754692f, -0.954283f, +0.308939f), - Vector3DFloat(-0.037446f, -0.637562f, -0.991150f), - Vector3DFloat(+0.744987f, -0.130894f, -0.575610f), - Vector3DFloat(-0.799249f, -0.131687f, +0.906247f), - Vector3DFloat(+0.580004f, +0.468734f, -0.745232f), - Vector3DFloat(+0.991882f, +0.138401f, +0.694693f), - Vector3DFloat(+0.830195f, +0.634877f, +0.715140f), - Vector3DFloat(+0.607532f, -0.317972f, -0.250710f), - Vector3DFloat(+0.037629f, -0.384320f, +0.812922f), - Vector3DFloat(+0.645009f, +0.224036f, -0.778924f), - Vector3DFloat(-0.852779f, -0.743522f, +0.346843f), - Vector3DFloat(+0.578478f, -0.894955f, -0.327616f), - Vector3DFloat(-0.905759f, -0.239296f, -0.945799f), - Vector3DFloat(+0.028352f, -0.658254f, -0.705313f), - Vector3DFloat(+0.954405f, +0.825434f, -0.553575f), - Vector3DFloat(-0.471480f, +0.504440f, -0.262856f), - Vector3DFloat(-0.924131f, +0.393353f, +0.106967f), - Vector3DFloat(-0.032685f, +0.385846f, -0.877255f), - Vector3DFloat(-0.039094f, +0.220557f, +0.356731f), - Vector3DFloat(+0.490890f, -0.403790f, -0.650624f), - Vector3DFloat(-0.896115f, -0.866817f, -0.837825f), - Vector3DFloat(-0.260842f, -0.027558f, +0.511582f), - Vector3DFloat(+0.782037f, +0.493759f, +0.229835f), - Vector3DFloat(+0.086337f, -0.713431f, +0.484664f), - Vector3DFloat(+0.168615f, -0.742058f, +0.639637f), - Vector3DFloat(+0.325968f, -0.567919f, -0.359294f), - Vector3DFloat(-0.633717f, -0.662709f, +0.374615f), - Vector3DFloat(+0.230995f, -0.701041f, +0.557970f), - Vector3DFloat(-0.729911f, -0.967650f, +0.951170f), - Vector3DFloat(-0.126011f, -0.819819f, -0.299539f), - Vector3DFloat(-0.166540f, +0.321024f, -0.704398f), - Vector3DFloat(+0.769890f, -0.977111f, -0.374187f), - Vector3DFloat(+0.562120f, +0.025300f, +0.299234f), - Vector3DFloat(+0.048189f, +0.404462f, -0.420026f), - Vector3DFloat(-0.840632f, +0.586291f, +0.360515f), - Vector3DFloat(+0.223792f, +0.024140f, +0.607593f), - Vector3DFloat(-0.562120f, +0.602771f, +0.948302f), - Vector3DFloat(+0.968627f, -0.994263f, -0.206030f), - Vector3DFloat(+0.146886f, -0.315287f, +0.034455f), - Vector3DFloat(+0.836848f, -0.348613f, +0.213904f), - Vector3DFloat(+0.494980f, -0.216041f, +0.405927f), - Vector3DFloat(-0.584338f, -0.268715f, -0.165258f), - Vector3DFloat(+0.118686f, -0.751091f, -0.381817f), - Vector3DFloat(-0.887753f, +0.178686f, -0.730216f), - Vector3DFloat(-0.684194f, -0.351543f, +0.952330f), - Vector3DFloat(-0.006256f, -0.564562f, +0.137974f), - Vector3DFloat(-0.229408f, +0.182470f, +0.427168f), - Vector3DFloat(+0.024445f, +0.920713f, +0.119724f), - Vector3DFloat(-0.996948f, -0.518784f, -0.045991f), - Vector3DFloat(-0.062166f, -0.592090f, +0.849117f), - Vector3DFloat(-0.377422f, -0.942808f, -0.649770f), - Vector3DFloat(+0.093478f, -0.242470f, -0.198096f), - Vector3DFloat(-0.594348f, -0.156102f, +0.401105f), - Vector3DFloat(-0.746574f, -0.294351f, +0.577685f), - Vector3DFloat(+0.504929f, +0.405194f, +0.724296f), - Vector3DFloat(-0.489059f, -0.492294f, +0.680288f), - Vector3DFloat(-0.025971f, -0.241127f, +0.103977f), - Vector3DFloat(+0.875301f, -0.574206f, -0.671804f), - Vector3DFloat(-0.483444f, +0.592029f, -0.537339f), - Vector3DFloat(+0.504257f, -0.413984f, -0.779839f), - Vector3DFloat(+0.182043f, -0.805292f, +0.988403f), - Vector3DFloat(+0.533372f, -0.142064f, +0.793512f), - Vector3DFloat(-0.105380f, -0.039338f, -0.624317f), - Vector3DFloat(+0.125950f, +0.384259f, +0.596973f), - Vector3DFloat(+0.452071f, +0.039216f, +0.924802f), - Vector3DFloat(-0.986694f, +0.452498f, +0.199194f), - Vector3DFloat(+0.230323f, +0.931516f, -0.380596f), - Vector3DFloat(+0.657277f, +0.811945f, -0.176733f), - Vector3DFloat(-0.477767f, -0.251137f, -0.468734f), - Vector3DFloat(+0.499252f, +0.543260f, +0.886898f), - Vector3DFloat(-0.528855f, +0.747124f, -0.789300f), - Vector3DFloat(-0.188330f, +0.434675f, -0.915891f), - Vector3DFloat(-0.807733f, +0.861080f, +0.386029f), - Vector3DFloat(-0.314615f, +0.761223f, -0.177953f), - Vector3DFloat(-0.855098f, +0.549486f, +0.547227f), - Vector3DFloat(-0.072970f, +0.647816f, -0.034089f), - Vector3DFloat(+0.385784f, +0.557482f, -0.912534f), - Vector3DFloat(-0.654530f, -0.923032f, -0.783624f), - Vector3DFloat(-0.755425f, -0.523789f, -0.132725f), - Vector3DFloat(+0.333781f, +0.322733f, +0.267678f), - Vector3DFloat(-0.533982f, -0.534471f, -0.399884f), - Vector3DFloat(-0.953673f, -0.589465f, +0.450423f), - Vector3DFloat(-0.789911f, -0.535936f, -0.409833f), - Vector3DFloat(+0.085726f, +0.363079f, +0.082003f), - Vector3DFloat(+0.744194f, -0.114292f, +0.322245f), - Vector3DFloat(+0.693472f, -0.256447f, -0.516160f), - Vector3DFloat(+0.446028f, -0.553026f, +0.471908f), - Vector3DFloat(-0.757561f, +0.608997f, +0.833064f), - Vector3DFloat(+0.115024f, +0.632191f, +0.314493f), - Vector3DFloat(-0.403851f, -0.325663f, -0.057161f), - Vector3DFloat(-0.188696f, +0.636097f, +0.514756f), - Vector3DFloat(-0.110813f, -0.473861f, -0.041597f), - Vector3DFloat(-0.239540f, +0.673940f, -0.874325f), - Vector3DFloat(+0.739982f, +0.350932f, -0.930418f), - Vector3DFloat(+0.519639f, -0.430952f, +0.569262f), - Vector3DFloat(-0.916807f, +0.117832f, +0.924070f), - Vector3DFloat(+0.856136f, +0.764763f, +0.653798f), - Vector3DFloat(+0.953185f, +0.721061f, +0.723441f), - Vector3DFloat(-0.113010f, +0.617176f, -0.436140f), - Vector3DFloat(+0.912839f, +0.496811f, -0.742058f), - Vector3DFloat(+0.219275f, -0.751701f, +0.479965f), - Vector3DFloat(+0.655690f, -0.964538f, +0.619312f), - Vector3DFloat(+0.364971f, +0.635975f, -0.697989f), - Vector3DFloat(-0.142247f, +0.554918f, +0.291238f), - Vector3DFloat(-0.163732f, -0.772820f, -0.887997f), - Vector3DFloat(-0.122593f, -0.456404f, -0.006989f), - Vector3DFloat(-0.704154f, -0.551378f, -0.237770f), - Vector3DFloat(+0.637501f, -0.831843f, -0.706534f), - Vector3DFloat(-0.794061f, -0.717887f, +0.576464f), - Vector3DFloat(+0.233558f, -0.683218f, +0.879147f), - Vector3DFloat(-0.170934f, +0.848811f, +0.840510f), - Vector3DFloat(+0.735282f, -0.625965f, -0.309732f), - Vector3DFloat(-0.562975f, +0.929746f, +0.794794f), - Vector3DFloat(-0.455611f, -0.860836f, -0.810114f), - Vector3DFloat(+0.433882f, -0.190222f, -0.529405f), - Vector3DFloat(+0.785638f, -0.040864f, +0.050569f), - Vector3DFloat(-0.963134f, -0.993713f, -0.817011f), - Vector3DFloat(+0.787347f, -0.598071f, +0.782220f), - Vector3DFloat(-0.551378f, +0.589526f, +0.061983f), - Vector3DFloat(-0.987243f, +0.894589f, -0.469649f), - Vector3DFloat(+0.329264f, +0.164464f, -0.088656f), - Vector3DFloat(+0.068270f, +0.938841f, +0.700858f), - Vector3DFloat(+0.101535f, -0.583850f, -0.809503f), - Vector3DFloat(+0.906980f, -0.943724f, +0.461592f), - Vector3DFloat(+0.438520f, -0.329264f, +0.261086f), - Vector3DFloat(-0.700003f, -0.259316f, +0.784356f), - Vector3DFloat(+0.442305f, +0.444502f, +0.481185f), - Vector3DFloat(+0.326701f, -0.331523f, -0.227393f), - Vector3DFloat(-0.222327f, -0.308390f, +0.517136f), - Vector3DFloat(+0.275369f, -0.513169f, -0.177892f), - Vector3DFloat(-0.378887f, +0.668203f, +0.619312f), - Vector3DFloat(-0.785455f, -0.093661f, -0.071322f), - Vector3DFloat(-0.022309f, -0.744987f, +0.832820f), - Vector3DFloat(-0.177892f, +0.829707f, -0.550218f), - Vector3DFloat(+0.952879f, +0.477767f, +0.428999f), - Vector3DFloat(+0.113376f, +0.097568f, -0.921201f), - Vector3DFloat(+0.195898f, -0.924619f, -0.494613f), - Vector3DFloat(+0.727592f, -0.628956f, -0.029756f), - Vector3DFloat(-0.796197f, -0.450484f, -0.045686f), - Vector3DFloat(+0.670888f, +0.958068f, -0.902402f), - Vector3DFloat(-0.259194f, -0.570666f, +0.098422f), - Vector3DFloat(+0.120273f, -0.732475f, -0.712272f), - Vector3DFloat(+0.539109f, +0.754753f, -0.517075f), - Vector3DFloat(+0.320170f, +0.300821f, -0.790643f), - Vector3DFloat(-0.049287f, +0.269814f, -0.149998f), - Vector3DFloat(-0.004120f, +0.402081f, -0.856807f), - Vector3DFloat(+0.566881f, -0.224464f, -0.552049f), - Vector3DFloat(+0.323405f, -0.345317f, -0.119114f), - Vector3DFloat(-0.736198f, -0.234352f, +0.803278f), - Vector3DFloat(-0.424421f, +0.059358f, -0.162389f), - Vector3DFloat(+0.918516f, -0.884640f, -0.853511f), - Vector3DFloat(-0.633717f, +0.231239f, +0.672170f), - Vector3DFloat(+0.417096f, +0.454878f, +0.097201f), - Vector3DFloat(+0.183630f, -0.957030f, -0.368938f), - Vector3DFloat(-0.199133f, +0.191687f, -0.787774f), - Vector3DFloat(-0.109104f, +0.676077f, +0.731193f), - Vector3DFloat(-0.288186f, -0.801691f, +0.855037f), - Vector3DFloat(+0.332133f, -0.828730f, +0.005402f), - Vector3DFloat(+0.959166f, +0.197790f, -0.221107f), - Vector3DFloat(-0.646046f, +0.043428f, -0.379254f), - Vector3DFloat(-0.717338f, +0.122105f, +0.107883f), - Vector3DFloat(-0.299783f, +0.089389f, +0.977172f), - Vector3DFloat(+0.486862f, -0.577990f, -0.726615f), - Vector3DFloat(-0.400922f, +0.430769f, -0.834956f), - Vector3DFloat(+0.308756f, +0.735221f, -0.809076f), - Vector3DFloat(-0.304605f, +0.335551f, -0.350627f), - Vector3DFloat(-0.078219f, -0.288491f, -0.225318f), - Vector3DFloat(+0.529099f, +0.710562f, +0.002960f), - Vector3DFloat(+0.102695f, +0.410932f, -0.950072f), - Vector3DFloat(-0.715751f, +0.598621f, +0.188879f), - Vector3DFloat(-0.936460f, -0.232398f, -0.123203f), - Vector3DFloat(-0.733146f, -0.201819f, -0.463851f), - Vector3DFloat(-0.982971f, -0.581347f, -0.104953f), - Vector3DFloat(-0.219459f, +0.104648f, +0.416425f), - Vector3DFloat(+0.952391f, -0.038789f, +0.993530f), - Vector3DFloat(+0.992370f, +0.891537f, +0.959227f), - Vector3DFloat(+0.104221f, -0.305704f, -0.359722f), - Vector3DFloat(-0.722770f, +0.069735f, -0.801447f), - Vector3DFloat(+0.444563f, +0.354961f, +0.041414f), - Vector3DFloat(+0.642018f, -0.878903f, +0.058809f), - Vector3DFloat(-0.532579f, -0.463668f, +0.565233f), - Vector3DFloat(+0.411176f, -0.843379f, -0.172704f), - Vector3DFloat(+0.823908f, +0.619922f, +0.439863f), - Vector3DFloat(-0.340007f, +0.048189f, -0.529160f), - Vector3DFloat(+0.241310f, -0.585070f, +0.637135f), - Vector3DFloat(+0.146886f, +0.873226f, -0.425153f), - Vector3DFloat(-0.114658f, -0.465621f, +0.364483f), - Vector3DFloat(+0.987121f, -0.552599f, -0.918821f), - Vector3DFloat(+0.138401f, -0.917722f, +0.930479f), - Vector3DFloat(-0.732536f, -0.150731f, +0.613269f), - Vector3DFloat(-0.071139f, +0.752373f, +0.192541f), - Vector3DFloat(+0.475143f, -0.187353f, +0.258950f), - Vector3DFloat(-0.500412f, -0.829157f, -0.418073f), - Vector3DFloat(+0.260414f, +0.930479f, +0.483016f), - Vector3DFloat(-0.899106f, +0.528550f, +0.076510f), - Vector3DFloat(-0.084384f, +0.022614f, +0.609180f), - Vector3DFloat(-0.213843f, -0.532334f, -0.282022f), - Vector3DFloat(-0.715323f, +0.025117f, -0.698477f), - Vector3DFloat(+0.521348f, +0.088656f, -0.415265f), - Vector3DFloat(-0.131809f, -0.395672f, +0.932432f), - Vector3DFloat(-0.549364f, -0.948363f, -0.207862f), - Vector3DFloat(+0.908322f, +0.643605f, -0.103732f), - Vector3DFloat(+0.632496f, +0.330973f, +0.345622f), - Vector3DFloat(-0.522141f, +0.031892f, -0.920713f), - Vector3DFloat(-0.875912f, +0.481918f, -0.229408f), - Vector3DFloat(-0.698172f, -0.934202f, +0.051668f), - Vector3DFloat(-0.791070f, -0.452193f, -0.366680f), - Vector3DFloat(-0.531907f, +0.497299f, +0.386517f), - Vector3DFloat(-0.942808f, -0.775811f, -0.397320f), - Vector3DFloat(+0.577563f, +0.075289f, -0.943297f), - Vector3DFloat(+0.464827f, -0.145848f, -0.167638f), - Vector3DFloat(-0.503220f, +0.592273f, -0.617359f), - Vector3DFloat(+0.752739f, +0.503464f, -0.586230f), - Vector3DFloat(-0.040315f, +0.197180f, -0.259072f), - Vector3DFloat(-0.304422f, -0.989380f, -0.281289f), - Vector3DFloat(+0.063387f, -0.662954f, +0.451338f), - Vector3DFloat(-0.272744f, +0.768914f, -0.141270f), - Vector3DFloat(+0.475021f, +0.378033f, +0.186010f), - Vector3DFloat(+0.893613f, -0.671560f, +0.494491f), - Vector3DFloat(+0.154027f, +0.994873f, +0.138096f), - Vector3DFloat(-0.661061f, -0.039094f, +0.072787f), - Vector3DFloat(+0.849666f, -0.956298f, +0.300699f), - Vector3DFloat(-0.227027f, +0.343913f, +0.514512f), - Vector3DFloat(+0.812738f, -0.891659f, +0.790277f), - Vector3DFloat(+0.619251f, -0.234779f, -0.342448f), - Vector3DFloat(-0.698904f, -0.525620f, -0.553331f), - Vector3DFloat(-0.357524f, +0.950194f, -0.358623f), - Vector3DFloat(-0.174352f, -0.802911f, +0.215552f), - Vector3DFloat(+0.046175f, +0.043794f, +0.139927f), - Vector3DFloat(+0.911924f, +0.433149f, +0.302286f), - Vector3DFloat(+0.563463f, -0.326823f, -0.832759f), - Vector3DFloat(-0.293741f, -0.448103f, -0.951781f), - Vector3DFloat(+0.196448f, +0.627979f, +0.340800f), - Vector3DFloat(-0.727042f, -0.013886f, -0.847346f), - Vector3DFloat(-0.769707f, +0.780084f, +0.239174f), - Vector3DFloat(+0.168493f, +0.564806f, +0.509690f), - Vector3DFloat(-0.786126f, +0.663564f, -0.908261f), - Vector3DFloat(+0.084017f, -0.548631f, -0.207312f), - Vector3DFloat(+0.011567f, +0.906552f, +0.726188f), - Vector3DFloat(-0.723746f, +0.031648f, +0.250587f), - Vector3DFloat(+0.031892f, +0.693045f, -0.263283f), - Vector3DFloat(-0.601856f, -0.585742f, -0.769280f), - Vector3DFloat(+0.588122f, -0.108127f, -0.535020f), - Vector3DFloat(+0.455672f, +0.864498f, +0.963378f), - Vector3DFloat(-0.712882f, -0.335490f, -0.143712f), - Vector3DFloat(+0.199194f, +0.747002f, +0.380840f), - Vector3DFloat(+0.626820f, +0.508042f, -0.177465f), - Vector3DFloat(-0.441816f, +0.652150f, -0.549058f), - Vector3DFloat(+0.862667f, +0.053377f, +0.652333f), - Vector3DFloat(-0.002289f, +0.568834f, -0.069185f) - }; -} From 6e8d9dfb752bcca928f66e46dae33dec8fed9d4a Mon Sep 17 00:00:00 2001 From: David Williams Date: Fri, 6 Feb 2015 16:52:21 +0100 Subject: [PATCH 05/19] Windows now uses standard C++ timer. I assume we weren't using it before because it wasn't present on older versions of Visual Studio? Moved timer code to header. --- library/PolyVoxCore/CMakeLists.txt | 2 +- .../include/PolyVoxCore/Impl/Timer.h | 42 ++++--- library/PolyVoxCore/source/Impl/Timer.cpp | 107 ------------------ 3 files changed, 29 insertions(+), 122 deletions(-) diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index 2e2cb8b0..51ed0841 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -87,7 +87,7 @@ SET(IMPL_SRC_FILES #source/Impl/MarchingCubesTables.cpp #source/Impl/RandomUnitVectors.cpp #source/Impl/RandomVectors.cpp - source/Impl/Timer.cpp + #source/Impl/Timer.cpp source/Impl/Utility.cpp ) diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/Timer.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/Timer.h index d53feb79..9ad25bc6 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Impl/Timer.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/Timer.h @@ -26,33 +26,47 @@ freely, subject to the following restrictions: #include -#ifdef _MSC_VER // Don't worry about the exact version, as long as this is defied. -#include -#else #include -#endif //_MSC_VER namespace PolyVox { class Timer { public: - Timer(bool bAutoStart = true); + Timer(bool bAutoStart = true) + { + if (bAutoStart) + { + start(); + } + } - void start(void); + void start(void) + { + m_start = clock::now(); + } - float elapsedTimeInSeconds(void); - uint32_t elapsedTimeInMilliSeconds(void); - uint32_t elapsedTimeInMicroSeconds(void); + float elapsedTimeInSeconds(void) + { + std::chrono::duration elapsed_seconds = clock::now() - m_start; + return elapsed_seconds.count(); + } + + uint32_t elapsedTimeInMilliSeconds(void) + { + std::chrono::duration elapsed_milliseconds = clock::now() - m_start; + return elapsed_milliseconds.count(); + } + + uint32_t elapsedTimeInMicroSeconds(void) + { + std::chrono::duration elapsed_microseconds = clock::now() - m_start; + return elapsed_microseconds.count(); + } private: -#if defined(_MSC_VER) - double m_fPCFreq; - __int64 m_iStartTime; -#else //_MSC_VER typedef std::chrono::system_clock clock; std::chrono::time_point m_start; -#endif //_MSC_VER }; } diff --git a/library/PolyVoxCore/source/Impl/Timer.cpp b/library/PolyVoxCore/source/Impl/Timer.cpp index a0d3c102..e69de29b 100644 --- a/library/PolyVoxCore/source/Impl/Timer.cpp +++ b/library/PolyVoxCore/source/Impl/Timer.cpp @@ -1,107 +0,0 @@ -/******************************************************************************* -Copyright (c) 2005-20013 David Williams and Matthew Williams - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -*******************************************************************************/ - -#include "PolyVoxCore/Impl/Timer.h" - -#include "PolyVoxCore/Impl/ErrorHandling.h" - -#include - -namespace PolyVox -{ -#if defined(_MSC_VER) - Timer::Timer(bool bAutoStart) - :m_fPCFreq(0.0) - ,m_iStartTime(0) - { - if(bAutoStart) - { - start(); - } - } - - void Timer::start(void) - { - LARGE_INTEGER li; - if(!QueryPerformanceFrequency(&li)) - { - POLYVOX_LOG_WARNING("QueryPerformanceFrequency failed!"); - m_fPCFreq = 1.0f; - } - - m_fPCFreq = double(li.QuadPart); - - QueryPerformanceCounter(&li); - m_iStartTime = li.QuadPart; - } - - float Timer::elapsedTimeInSeconds(void) - { - LARGE_INTEGER li; - QueryPerformanceCounter(&li); - double fDifference = static_cast(li.QuadPart-m_iStartTime); - return static_cast(fDifference / m_fPCFreq); - } - - uint32_t Timer::elapsedTimeInMilliSeconds(void) - { - return static_cast(elapsedTimeInSeconds() * 1000.0f); - } - - uint32_t Timer::elapsedTimeInMicroSeconds(void) - { - return static_cast(elapsedTimeInSeconds() * 1000000.0f); - } -#else //_MSC_VER - Timer::Timer(bool bAutoStart) - { - if(bAutoStart) - { - start(); - } - } - - void Timer::start(void) - { - m_start = clock::now(); - } - - float Timer::elapsedTimeInSeconds(void) - { - std::chrono::duration elapsed_seconds = clock::now() - m_start; - return elapsed_seconds.count(); - } - - uint32_t Timer::elapsedTimeInMilliSeconds(void) - { - std::chrono::duration elapsed_milliseconds = clock::now() - m_start; - return elapsed_milliseconds.count(); - } - - uint32_t Timer::elapsedTimeInMicroSeconds(void) - { - std::chrono::duration elapsed_microseconds = clock::now() - m_start; - return elapsed_microseconds.count(); - } -#endif //_MSC_VER -} From 4325ffabc4cea8bc32bebd76d523c4ec42de9fc7 Mon Sep 17 00:00:00 2001 From: David Williams Date: Fri, 6 Feb 2015 21:08:19 +0100 Subject: [PATCH 06/19] Moved error handling functions/macros to be header-only. --- library/PolyVoxCore/CMakeLists.txt | 2 +- .../include/PolyVoxCore/Impl/ErrorHandling.h | 45 ++++++++++- .../PolyVoxCore/source/Impl/ErrorHandling.cpp | 74 ------------------- library/PolyVoxCore/source/Impl/Timer.cpp | 0 4 files changed, 44 insertions(+), 77 deletions(-) delete mode 100644 library/PolyVoxCore/source/Impl/ErrorHandling.cpp delete mode 100644 library/PolyVoxCore/source/Impl/Timer.cpp diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index 51ed0841..76df58b2 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -82,7 +82,7 @@ SET(CORE_INC_FILES ) SET(IMPL_SRC_FILES - source/Impl/ErrorHandling.cpp + #source/Impl/ErrorHandling.cpp source/Impl/Logging.cpp #source/Impl/MarchingCubesTables.cpp #source/Impl/RandomUnitVectors.cpp diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h index be7515a6..a1049bf7 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h @@ -155,8 +155,49 @@ freely, subject to the following restrictions: { typedef void (*ThrowHandler)(std::exception& e, const char* file, int line); - ThrowHandler getThrowHandler(); - void setThrowHandler(ThrowHandler newHandler); + inline void defaultThrowHandler(std::exception& e, const char* file, int line) + { + std::stringstream ss; \ + ss << "\n"; \ + ss << " PolyVox exception thrown!"; \ + ss << " ========================="; \ + ss << " PolyVox has tried to throw an exception but it was built without support"; \ + ss << " for exceptions. In this scenario PolyVox will call a 'throw handler'"; \ + ss << " and this message is being printed by the default throw handler."; \ + ss << "\n"; \ + ss << " If you don't want to enable exceptions then you should try to determine why"; \ + ss << " this exception was thrown and make sure it doesn't happen again. If it was"; \ + ss << " due to something like an invalid argument to a function then you should be"; \ + ss << " able to fix it quite easily by validating parameters as appropriate. More"; \ + ss << " complex exception scenarios (out of memory, etc) might be harder to fix and"; \ + ss << " you should replace this default handler with something which is more"; \ + ss << " meaningful to your users."; \ + ss << "\n"; \ + ss << " Exception details"; \ + ss << " -----------------"; \ + ss << " Line: " << line; \ + ss << " File: " << file; \ + ss << " Message: " << e.what(); \ + ss << "\n"; \ + PolyVox::Impl::getLoggerInstance()->logFatalMessage(ss.str()); \ + POLYVOX_HALT(); \ + } + + inline ThrowHandler& getThrowHandlerInstance() + { + static ThrowHandler s_fThrowHandler = &defaultThrowHandler; + return s_fThrowHandler; + } + + inline ThrowHandler getThrowHandler() + { + return getThrowHandlerInstance(); + } + + inline void setThrowHandler(ThrowHandler fNewHandler) + { + getThrowHandlerInstance() = fNewHandler; + } } #define POLYVOX_THROW_IF(condition, type, message) \ diff --git a/library/PolyVoxCore/source/Impl/ErrorHandling.cpp b/library/PolyVoxCore/source/Impl/ErrorHandling.cpp deleted file mode 100644 index 98e03fd2..00000000 --- a/library/PolyVoxCore/source/Impl/ErrorHandling.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/******************************************************************************* -Copyright (c) 2005-2009 David Williams - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -*******************************************************************************/ - -#include "PolyVoxCore/Impl/ErrorHandling.h" - -namespace PolyVox -{ - -#ifndef POLYVOX_THROW_ENABLED - void defaultThrowHandler(std::exception& e, const char* file, int line) - { - std::stringstream ss; \ - ss << "\n"; \ - ss << " PolyVox exception thrown!"; \ - ss << " ========================="; \ - ss << " PolyVox has tried to throw an exception but it was built without support"; \ - ss << " for exceptions. In this scenario PolyVox will call a 'throw handler'"; \ - ss << " and this message is being printed by the default throw handler."; \ - ss << "\n"; \ - ss << " If you don't want to enable exceptions then you should try to determine why"; \ - ss << " this exception was thrown and make sure it doesn't happen again. If it was"; \ - ss << " due to something like an invalid argument to a function then you should be"; \ - ss << " able to fix it quite easily by validating parameters as appropriate. More"; \ - ss << " complex exception scenarios (out of memory, etc) might be harder to fix and"; \ - ss << " you should replace this default handler with something which is more"; \ - ss << " meaningful to your users."; \ - ss << "\n"; \ - ss << " Exception details"; \ - ss << " -----------------"; \ - ss << " Line: " << line; \ - ss << " File: " << file; \ - ss << " Message: " << e.what(); \ - ss << "\n"; \ - PolyVox::Impl::getLoggerInstance()->logFatalMessage(ss.str()); \ - POLYVOX_HALT(); \ - } - - ThrowHandler& getThrowHandlerInstance() - { - static ThrowHandler s_fThrowHandler = &defaultThrowHandler; - return s_fThrowHandler; - } - - ThrowHandler getThrowHandler() - { - return getThrowHandlerInstance(); - } - - void setThrowHandler(ThrowHandler fNewHandler) - { - getThrowHandlerInstance() = fNewHandler; - } -#endif -} diff --git a/library/PolyVoxCore/source/Impl/Timer.cpp b/library/PolyVoxCore/source/Impl/Timer.cpp deleted file mode 100644 index e69de29b..00000000 From 07f15935616c3902c9baaf414322924e656f6fec Mon Sep 17 00:00:00 2001 From: David Williams Date: Fri, 6 Feb 2015 21:13:12 +0100 Subject: [PATCH 07/19] Made logging functions header only. --- library/PolyVoxCore/CMakeLists.txt | 2 +- .../include/PolyVoxCore/Impl/Logging.h | 11 ++++- library/PolyVoxCore/source/Impl/Logging.cpp | 43 ------------------- 3 files changed, 10 insertions(+), 46 deletions(-) delete mode 100644 library/PolyVoxCore/source/Impl/Logging.cpp diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index 76df58b2..e024eb4f 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -83,7 +83,7 @@ SET(CORE_INC_FILES SET(IMPL_SRC_FILES #source/Impl/ErrorHandling.cpp - source/Impl/Logging.cpp + #source/Impl/Logging.cpp #source/Impl/MarchingCubesTables.cpp #source/Impl/RandomUnitVectors.cpp #source/Impl/RandomVectors.cpp diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h index e86537c6..a9a3b2b5 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h @@ -70,10 +70,17 @@ namespace PolyVox namespace Impl { - Logger*& getLoggerInstance(); + inline Logger*& getLoggerInstance() + { + static Logger* s_pLogger = new DefaultLogger; + return s_pLogger; + } } - void setLogger(Logger* pLogger); + inline void setLogger(Logger* pLogger) + { + Impl::getLoggerInstance() = pLogger; + } } #ifdef POLYVOX_LOG_TRACE_ENABLED diff --git a/library/PolyVoxCore/source/Impl/Logging.cpp b/library/PolyVoxCore/source/Impl/Logging.cpp deleted file mode 100644 index 74712bb8..00000000 --- a/library/PolyVoxCore/source/Impl/Logging.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/******************************************************************************* -Copyright (c) 2005-2009 David Williams and Matthew Williams - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -*******************************************************************************/ - -#include "PolyVoxCore/Impl/Logging.h" - -namespace PolyVox -{ - namespace Impl - { - // Perhaps read this note when we want to move everything - // to the header file: http://stackoverflow.com/a/7834555 - Logger*& getLoggerInstance() - { - static Logger* s_pLogger = new DefaultLogger; - return s_pLogger; - } - } - - void setLogger(Logger* pLogger) - { - Impl::getLoggerInstance() = pLogger; - } -} From 9d9e3996a38a49970a42cb9fafa8f9b4d79cb3c0 Mon Sep 17 00:00:00 2001 From: David Williams Date: Fri, 6 Feb 2015 21:28:47 +0100 Subject: [PATCH 08/19] Moved utility functions to header. --- library/PolyVoxCore/CMakeLists.txt | 2 +- .../include/PolyVoxCore/Impl/Utility.h | 48 +++++++++++-- library/PolyVoxCore/source/Impl/Utility.cpp | 72 ------------------- 3 files changed, 42 insertions(+), 80 deletions(-) delete mode 100644 library/PolyVoxCore/source/Impl/Utility.cpp diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index e024eb4f..d81b093a 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -88,7 +88,7 @@ SET(IMPL_SRC_FILES #source/Impl/RandomUnitVectors.cpp #source/Impl/RandomVectors.cpp #source/Impl/Timer.cpp - source/Impl/Utility.cpp + #source/Impl/Utility.cpp ) SET(IMPL_INC_FILES diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/Utility.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/Utility.h index ff9a6e7b..e5ba354c 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Impl/Utility.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/Utility.h @@ -30,14 +30,48 @@ freely, subject to the following restrictions: namespace PolyVox { - POLYVOX_API uint8_t logBase2(uint32_t uInput); - POLYVOX_API bool isPowerOf2(uint32_t uInput); + inline bool isPowerOf2(uint32_t uInput) + { + if (uInput == 0) + return false; + else + return ((uInput & (uInput - 1)) == 0); + } - int32_t roundTowardsNegInf(float r); - int32_t roundToInteger(float r); - template - Type clamp(const Type& value, const Type& low, const Type& high); - uint32_t upperPowerOfTwo(uint32_t v); + //Note: this function only works for inputs which are a power of two and not zero + //If this is not the case then the output is undefined. + inline uint8_t logBase2(uint32_t uInput) + { + //Release mode validation + if (uInput == 0) + { + POLYVOX_THROW(std::invalid_argument, "Cannot compute the log of zero."); + } + if (!isPowerOf2(uInput)) + { + POLYVOX_THROW(std::invalid_argument, "Input must be a power of two in order to compute the log."); + } + + uint32_t uResult = 0; + while ((uInput >> uResult) != 0) + { + ++uResult; + } + return static_cast(uResult - 1); + } + + // http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2 + inline uint32_t upperPowerOfTwo(uint32_t v) + { + v--; + v |= v >> 1; + v |= v >> 2; + v |= v >> 4; + v |= v >> 8; + v |= v >> 16; + v++; + return v; + } inline int32_t roundTowardsNegInf(float r) { diff --git a/library/PolyVoxCore/source/Impl/Utility.cpp b/library/PolyVoxCore/source/Impl/Utility.cpp deleted file mode 100644 index 83be3b0a..00000000 --- a/library/PolyVoxCore/source/Impl/Utility.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/******************************************************************************* -Copyright (c) 2005-2009 David Williams - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -*******************************************************************************/ - -#include "PolyVoxCore/Impl/ErrorHandling.h" -#include "PolyVoxCore/Impl/Utility.h" - -namespace PolyVox -{ - //Note: this function only works for inputs which are a power of two and not zero - //If this is not the case then the output is undefined. - uint8_t logBase2(uint32_t uInput) - { - //Release mode validation - if(uInput == 0) - { - POLYVOX_THROW(std::invalid_argument, "Cannot compute the log of zero."); - } - if(!isPowerOf2(uInput)) - { - POLYVOX_THROW(std::invalid_argument, "Input must be a power of two in order to compute the log."); - } - - uint32_t uResult = 0; - while( (uInput >> uResult) != 0) - { - ++uResult; - } - return static_cast(uResult-1); - } - - - bool isPowerOf2(uint32_t uInput) - { - if(uInput == 0) - return false; - else - return ((uInput & (uInput-1)) == 0); - } - - // http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2 - uint32_t upperPowerOfTwo(uint32_t v) - { - v--; - v |= v >> 1; - v |= v >> 2; - v |= v >> 4; - v |= v >> 8; - v |= v >> 16; - v++; - return v; - } -} From c3f2e5217eee0c1adbce15230ae7241a0d3ceec2 Mon Sep 17 00:00:00 2001 From: David Williams Date: Fri, 6 Feb 2015 23:29:35 +0100 Subject: [PATCH 09/19] Removed CMake code which tries to build/use PolyVoxCore as a library. --- examples/Basic/CMakeLists.txt | 2 +- examples/DecodeOnGPU/CMakeLists.txt | 2 +- examples/OpenGL/CMakeLists.txt | 2 +- examples/Paging/CMakeLists.txt | 2 +- examples/SmoothLOD/CMakeLists.txt | 2 +- library/PolyVoxCore/CMakeLists.txt | 61 +++-------------------------- library/PolyVoxUtil/CMakeLists.txt | 2 +- tests/CMakeLists.txt | 2 +- 8 files changed, 13 insertions(+), 62 deletions(-) diff --git a/examples/Basic/CMakeLists.txt b/examples/Basic/CMakeLists.txt index 66546f66..153b0570 100644 --- a/examples/Basic/CMakeLists.txt +++ b/examples/Basic/CMakeLists.txt @@ -53,7 +53,7 @@ ADD_EXECUTABLE(BasicExample ${SRC_FILES} ${COMMON_RESOURCES_RCC}) IF(MSVC) SET_TARGET_PROPERTIES(BasicExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127") ENDIF(MSVC) -TARGET_LINK_LIBRARIES(BasicExample glew ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) +TARGET_LINK_LIBRARIES(BasicExample glew ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) SET_PROPERTY(TARGET BasicExample PROPERTY FOLDER "Examples") #Install - Only install the example in Windows diff --git a/examples/DecodeOnGPU/CMakeLists.txt b/examples/DecodeOnGPU/CMakeLists.txt index a812c2b5..3cb051f5 100644 --- a/examples/DecodeOnGPU/CMakeLists.txt +++ b/examples/DecodeOnGPU/CMakeLists.txt @@ -54,7 +54,7 @@ ADD_EXECUTABLE(DecodeOnGPUExample ${SRC_FILES} ${COMMON_RESOURCES_RCC} ${DECODE_ IF(MSVC) SET_TARGET_PROPERTIES(DecodeOnGPUExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127") ENDIF(MSVC) -TARGET_LINK_LIBRARIES(DecodeOnGPUExample glew ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) +TARGET_LINK_LIBRARIES(DecodeOnGPUExample glew ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) SET_PROPERTY(TARGET DecodeOnGPUExample PROPERTY FOLDER "Examples") #Install - Only install the example in Windows diff --git a/examples/OpenGL/CMakeLists.txt b/examples/OpenGL/CMakeLists.txt index 910ea0fb..129dac1b 100644 --- a/examples/OpenGL/CMakeLists.txt +++ b/examples/OpenGL/CMakeLists.txt @@ -56,7 +56,7 @@ ADD_EXECUTABLE(OpenGLExample ${SRC_FILES} ${COMMON_RESOURCES_RCC} ${OPENGLEXAMPL IF(MSVC) SET_TARGET_PROPERTIES(OpenGLExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127") ENDIF(MSVC) -TARGET_LINK_LIBRARIES(OpenGLExample glew ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) +TARGET_LINK_LIBRARIES(OpenGLExample glew ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) SET_PROPERTY(TARGET OpenGLExample PROPERTY FOLDER "Examples") #Install - Only install the example in Windows diff --git a/examples/Paging/CMakeLists.txt b/examples/Paging/CMakeLists.txt index db2f9028..b256cfa5 100644 --- a/examples/Paging/CMakeLists.txt +++ b/examples/Paging/CMakeLists.txt @@ -55,7 +55,7 @@ ADD_EXECUTABLE(PagingExample ${SRC_FILES} ${COMMON_RESOURCES_RCC}) IF(MSVC) SET_TARGET_PROPERTIES(PagingExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127") ENDIF(MSVC) -TARGET_LINK_LIBRARIES(PagingExample glew ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) +TARGET_LINK_LIBRARIES(PagingExample glew ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) SET_PROPERTY(TARGET PagingExample PROPERTY FOLDER "Examples") configure_file(../common/example.vert example.vert COPYONLY) diff --git a/examples/SmoothLOD/CMakeLists.txt b/examples/SmoothLOD/CMakeLists.txt index 15bbd4b9..e11a715a 100644 --- a/examples/SmoothLOD/CMakeLists.txt +++ b/examples/SmoothLOD/CMakeLists.txt @@ -53,7 +53,7 @@ ADD_EXECUTABLE(SmoothLODExample ${SRC_FILES} ${COMMON_RESOURCES_RCC}) IF(MSVC) SET_TARGET_PROPERTIES(SmoothLODExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127") #All warnings ENDIF(MSVC) -TARGET_LINK_LIBRARIES(SmoothLODExample glew ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) +TARGET_LINK_LIBRARIES(SmoothLODExample glew ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) SET_PROPERTY(TARGET SmoothLODExample PROPERTY FOLDER "Examples") configure_file(../common/example.vert example.vert COPYONLY) diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index d81b093a..6e9b339a 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -23,9 +23,9 @@ PROJECT(PolyVoxCore) #Projects source files -SET(CORE_SRC_FILES +#SET(CORE_SRC_FILES #source/AStarPathfinder.cpp -) +#) #Projects headers files SET(CORE_INC_FILES @@ -81,7 +81,7 @@ SET(CORE_INC_FILES include/PolyVoxCore/VoxelFilters.inl ) -SET(IMPL_SRC_FILES +#SET(IMPL_SRC_FILES #source/Impl/ErrorHandling.cpp #source/Impl/Logging.cpp #source/Impl/MarchingCubesTables.cpp @@ -89,7 +89,7 @@ SET(IMPL_SRC_FILES #source/Impl/RandomVectors.cpp #source/Impl/Timer.cpp #source/Impl/Utility.cpp -) +#) SET(IMPL_INC_FILES include/PolyVoxCore/Impl/AStarPathfinderImpl.h @@ -108,57 +108,8 @@ SET(IMPL_INC_FILES #"Sources" and "Headers" are the group names in Visual Studio. #They may have other uses too... -SOURCE_GROUP("Source Files" FILES ${CORE_SRC_FILES}) +#SOURCE_GROUP("Source Files" FILES ${CORE_SRC_FILES}) SOURCE_GROUP("Header Files" FILES ${CORE_INC_FILES}) -SOURCE_GROUP("Source Files\\Impl" FILES ${IMPL_SRC_FILES}) +#SOURCE_GROUP("Source Files\\Impl" FILES ${IMPL_SRC_FILES}) SOURCE_GROUP("Header Files\\Impl" FILES ${IMPL_INC_FILES}) - -#Tell CMake the paths -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include) - -#Core -#Build -IF(LIBRARY_TYPE STREQUAL "STATIC") - ADD_LIBRARY(PolyVoxCore STATIC ${CORE_SRC_FILES} ${CORE_INC_FILES} ${IMPL_SRC_FILES} ${IMPL_INC_FILES}) - IF(UNIX) - SET_TARGET_PROPERTIES(PolyVoxCore PROPERTIES COMPILE_FLAGS -fPIC) - ENDIF() -ENDIF() -IF(LIBRARY_TYPE STREQUAL "DYNAMIC") - ADD_LIBRARY(PolyVoxCore SHARED ${CORE_SRC_FILES} ${CORE_INC_FILES} ${IMPL_SRC_FILES} ${IMPL_INC_FILES}) - SET_TARGET_PROPERTIES(PolyVoxCore PROPERTIES COMPILE_FLAGS "-DPOLYVOX_SHARED_EXPORTS") -ENDIF() -SET_PROPERTY(TARGET PolyVoxCore PROPERTY FOLDER "Library") - -SET_TARGET_PROPERTIES(PolyVoxCore PROPERTIES VERSION ${POLYVOX_VERSION} SOVERSION ${POLYVOX_VERSION_MAJOR}) -IF(MSVC) - SET_TARGET_PROPERTIES(PolyVoxCore PROPERTIES COMPILE_FLAGS "/W4 /wd4251") #Disable warning on STL exports -ENDIF(MSVC) - -#Install -IF(WIN32) - INSTALL(TARGETS PolyVoxCore - RUNTIME DESTINATION PolyVoxCore/bin COMPONENT library - LIBRARY DESTINATION PolyVoxCore/lib COMPONENT library - ARCHIVE DESTINATION PolyVoxCore/lib COMPONENT library - ) - - #Install the core header files, including the ones in the Impl subfolder. - INSTALL(DIRECTORY include DESTINATION PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE) - - #On windows, we also install the debug information. It's unfortunate that we have to hard-code - #the 'Debug' part of the path, but CMake doesn't seem to provide a way around this. The best I - #found was: http://www.cmake.org/pipermail/cmake/2007-October/016924.html (and it is a bit ugly). - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/PolyVoxCore.pdb DESTINATION PolyVoxCore/lib CONFIGURATIONS Debug) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/PolyVoxCore.pdb DESTINATION PolyVoxCore/lib CONFIGURATIONS RelWithDebInfo) -ELSE(WIN32) - INSTALL(TARGETS PolyVoxCore - RUNTIME DESTINATION bin COMPONENT library - LIBRARY DESTINATION lib COMPONENT library - ARCHIVE DESTINATION lib COMPONENT library - ) - - #Install the core header files, including the ones in the Impl subfolder. - INSTALL(DIRECTORY include/ DESTINATION include/PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE) -ENDIF(WIN32) diff --git a/library/PolyVoxUtil/CMakeLists.txt b/library/PolyVoxUtil/CMakeLists.txt index b542e068..4df41a60 100644 --- a/library/PolyVoxUtil/CMakeLists.txt +++ b/library/PolyVoxUtil/CMakeLists.txt @@ -58,7 +58,7 @@ IF(LIBRARY_TYPE STREQUAL "DYNAMIC") ENDIF() SET_PROPERTY(TARGET PolyVoxUtil PROPERTY FOLDER "Library") -TARGET_LINK_LIBRARIES(PolyVoxUtil PolyVoxCore) +TARGET_LINK_LIBRARIES(PolyVoxUtil) SET_TARGET_PROPERTIES(PolyVoxUtil PROPERTIES VERSION ${POLYVOX_VERSION} SOVERSION ${POLYVOX_VERSION_MAJOR}) IF(MSVC) SET_TARGET_PROPERTIES(PolyVoxUtil PROPERTIES COMPILE_FLAGS "/W4 /wd4251 /wd4127") #Disable warning on STL exports diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index fbffe9d9..fe6b35eb 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -29,7 +29,7 @@ MACRO(CREATE_TEST headerfile sourcefile executablename) QT4_WRAP_CPP(test_moc_SRCS ${headerfile}) LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR} ${PolyVoxUtil_BINARY_DIR}) ADD_EXECUTABLE(${executablename} ${sourcefile} ${test_moc_SRCS}) - TARGET_LINK_LIBRARIES(${executablename} PolyVoxCore PolyVoxUtil ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY}) + TARGET_LINK_LIBRARIES(${executablename} PolyVoxUtil ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY}) #HACK. This is needed since everything is built in the base dir in Windows. As of 2.8 we should change this. IF(WIN32) SET(LATEST_TEST ${EXECUTABLE_OUTPUT_PATH}/${executablename}) From 5d54c881a12bf3b1816fb7858021711b9cfe5c99 Mon Sep 17 00:00:00 2001 From: David Williams Date: Sat, 7 Feb 2015 06:52:47 +0100 Subject: [PATCH 10/19] Added custom target (which doesn't build anything) so that our header-only library still shows up in VisualStudio for browsing the files. --- library/PolyVoxCore/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index 6e9b339a..79ddc63c 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -113,3 +113,8 @@ SOURCE_GROUP("Header Files" FILES ${CORE_INC_FILES}) #SOURCE_GROUP("Source Files\\Impl" FILES ${IMPL_SRC_FILES}) SOURCE_GROUP("Header Files\\Impl" FILES ${IMPL_INC_FILES}) + +# Although we don't build anything for PolyVox, we still add this custom target (which +# doesn't do anything) so that we can browse the source code from within Visual Studio. +ADD_CUSTOM_TARGET(PolyVoxCore SOURCES ${CORE_INC_FILES}) +SET_PROPERTY(TARGET PolyVoxCore PROPERTY FOLDER "Library") From c3305ea14bb931b8a342e64d3d1479dce3d8f76d Mon Sep 17 00:00:00 2001 From: David Williams Date: Sat, 7 Feb 2015 10:36:49 +0100 Subject: [PATCH 11/19] Reinstated some of the 'install' code. --- library/PolyVoxCore/CMakeLists.txt | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index 79ddc63c..c06c9c8a 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -23,9 +23,9 @@ PROJECT(PolyVoxCore) #Projects source files -#SET(CORE_SRC_FILES +SET(CORE_SRC_FILES #source/AStarPathfinder.cpp -#) +) #Projects headers files SET(CORE_INC_FILES @@ -81,7 +81,7 @@ SET(CORE_INC_FILES include/PolyVoxCore/VoxelFilters.inl ) -#SET(IMPL_SRC_FILES +SET(IMPL_SRC_FILES #source/Impl/ErrorHandling.cpp #source/Impl/Logging.cpp #source/Impl/MarchingCubesTables.cpp @@ -89,7 +89,7 @@ SET(CORE_INC_FILES #source/Impl/RandomVectors.cpp #source/Impl/Timer.cpp #source/Impl/Utility.cpp -#) +) SET(IMPL_INC_FILES include/PolyVoxCore/Impl/AStarPathfinderImpl.h @@ -114,7 +114,21 @@ SOURCE_GROUP("Header Files" FILES ${CORE_INC_FILES}) #SOURCE_GROUP("Source Files\\Impl" FILES ${IMPL_SRC_FILES}) SOURCE_GROUP("Header Files\\Impl" FILES ${IMPL_INC_FILES}) +#Tell CMake the paths +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include) + +#Core + +#Build # Although we don't build anything for PolyVox, we still add this custom target (which # doesn't do anything) so that we can browse the source code from within Visual Studio. ADD_CUSTOM_TARGET(PolyVoxCore SOURCES ${CORE_INC_FILES}) SET_PROPERTY(TARGET PolyVoxCore PROPERTY FOLDER "Library") + +#Install the core header files, including the ones in the Impl subfolder. +IF(WIN32) + INSTALL(DIRECTORY include DESTINATION PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE) +ELSE(WIN32) + + INSTALL(DIRECTORY include/ DESTINATION include/PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE) +ENDIF(WIN32) From 630affbf4da4c9d7f4638a0f40d56390c480e1b5 Mon Sep 17 00:00:00 2001 From: David Williams Date: Sat, 7 Feb 2015 14:47:21 +0100 Subject: [PATCH 12/19] Moved bindings from inside 'library' folder to root folder. --- CMakeLists.txt | 1 + {library/bindings => bindings}/Array.i | 0 {library/bindings => bindings}/BaseVolume.i | 0 {library/bindings => bindings}/Block.i | 0 {library/bindings => bindings}/BlockCompressor.i | 0 {library/bindings => bindings}/CMakeLists.txt | 0 {library/bindings => bindings}/Chunk.i | 0 {library/bindings => bindings}/CleanCSharpBindings.bat | 0 {library/bindings => bindings}/CompressedBlock.i | 0 {library/bindings => bindings}/CubicSurfaceExtractor.i | 0 .../bindings => bindings}/CubicSurfaceExtractorWithNormals.i | 0 {library/bindings => bindings}/DefaultMarchingCubesController.i | 0 {library/bindings => bindings}/FilePager.i | 0 {library/bindings => bindings}/LargeVolume.i | 0 {library/bindings => bindings}/MakeCSharpBindings.bat | 0 {library/bindings => bindings}/MarchingCubesSurfaceExtractor.i | 0 {library/bindings => bindings}/MeshDecimator.i | 0 {library/bindings => bindings}/MinizBlockCompressor.i | 0 {library/bindings => bindings}/PagedVolume.i | 0 {library/bindings => bindings}/Pager.i | 0 {library/bindings => bindings}/Picking.i | 0 {library/bindings => bindings}/PolyVoxCore.i | 0 {library/bindings => bindings}/RLEBlockCompressor.i | 0 {library/bindings => bindings}/RawVolume.i | 0 {library/bindings => bindings}/Raycast.i | 0 {library/bindings => bindings}/Region.i | 0 {library/bindings => bindings}/SimpleVolume.i | 0 {library/bindings => bindings}/SimpleVolumeSampler.i | 0 {library/bindings => bindings}/SubArray.i | 0 {library/bindings => bindings}/SurfaceMesh.i | 0 {library/bindings => bindings}/TypeDef.i | 0 {library/bindings => bindings}/UncompressedBlock.i | 0 {library/bindings => bindings}/Vector.i | 0 {library/bindings => bindings}/VertexTypes.i | 0 library/CMakeLists.txt | 1 - 35 files changed, 1 insertion(+), 1 deletion(-) rename {library/bindings => bindings}/Array.i (100%) rename {library/bindings => bindings}/BaseVolume.i (100%) rename {library/bindings => bindings}/Block.i (100%) rename {library/bindings => bindings}/BlockCompressor.i (100%) rename {library/bindings => bindings}/CMakeLists.txt (100%) rename {library/bindings => bindings}/Chunk.i (100%) rename {library/bindings => bindings}/CleanCSharpBindings.bat (100%) rename {library/bindings => bindings}/CompressedBlock.i (100%) rename {library/bindings => bindings}/CubicSurfaceExtractor.i (100%) rename {library/bindings => bindings}/CubicSurfaceExtractorWithNormals.i (100%) rename {library/bindings => bindings}/DefaultMarchingCubesController.i (100%) rename {library/bindings => bindings}/FilePager.i (100%) rename {library/bindings => bindings}/LargeVolume.i (100%) rename {library/bindings => bindings}/MakeCSharpBindings.bat (100%) rename {library/bindings => bindings}/MarchingCubesSurfaceExtractor.i (100%) rename {library/bindings => bindings}/MeshDecimator.i (100%) rename {library/bindings => bindings}/MinizBlockCompressor.i (100%) rename {library/bindings => bindings}/PagedVolume.i (100%) rename {library/bindings => bindings}/Pager.i (100%) rename {library/bindings => bindings}/Picking.i (100%) rename {library/bindings => bindings}/PolyVoxCore.i (100%) rename {library/bindings => bindings}/RLEBlockCompressor.i (100%) rename {library/bindings => bindings}/RawVolume.i (100%) rename {library/bindings => bindings}/Raycast.i (100%) rename {library/bindings => bindings}/Region.i (100%) rename {library/bindings => bindings}/SimpleVolume.i (100%) rename {library/bindings => bindings}/SimpleVolumeSampler.i (100%) rename {library/bindings => bindings}/SubArray.i (100%) rename {library/bindings => bindings}/SurfaceMesh.i (100%) rename {library/bindings => bindings}/TypeDef.i (100%) rename {library/bindings => bindings}/UncompressedBlock.i (100%) rename {library/bindings => bindings}/Vector.i (100%) rename {library/bindings => bindings}/VertexTypes.i (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index bce84941..5fe7322c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,6 +90,7 @@ ENDIF() ADD_SUBDIRECTORY(documentation) +ADD_SUBDIRECTORY(bindings) set_package_properties(Doxygen PROPERTIES URL http://www.doxygen.org DESCRIPTION "API documentation generator" TYPE OPTIONAL PURPOSE "Building the API documentation") set_package_properties(Qt4 PROPERTIES DESCRIPTION "C++ framework" URL http://qt-project.org) diff --git a/library/bindings/Array.i b/bindings/Array.i similarity index 100% rename from library/bindings/Array.i rename to bindings/Array.i diff --git a/library/bindings/BaseVolume.i b/bindings/BaseVolume.i similarity index 100% rename from library/bindings/BaseVolume.i rename to bindings/BaseVolume.i diff --git a/library/bindings/Block.i b/bindings/Block.i similarity index 100% rename from library/bindings/Block.i rename to bindings/Block.i diff --git a/library/bindings/BlockCompressor.i b/bindings/BlockCompressor.i similarity index 100% rename from library/bindings/BlockCompressor.i rename to bindings/BlockCompressor.i diff --git a/library/bindings/CMakeLists.txt b/bindings/CMakeLists.txt similarity index 100% rename from library/bindings/CMakeLists.txt rename to bindings/CMakeLists.txt diff --git a/library/bindings/Chunk.i b/bindings/Chunk.i similarity index 100% rename from library/bindings/Chunk.i rename to bindings/Chunk.i diff --git a/library/bindings/CleanCSharpBindings.bat b/bindings/CleanCSharpBindings.bat similarity index 100% rename from library/bindings/CleanCSharpBindings.bat rename to bindings/CleanCSharpBindings.bat diff --git a/library/bindings/CompressedBlock.i b/bindings/CompressedBlock.i similarity index 100% rename from library/bindings/CompressedBlock.i rename to bindings/CompressedBlock.i diff --git a/library/bindings/CubicSurfaceExtractor.i b/bindings/CubicSurfaceExtractor.i similarity index 100% rename from library/bindings/CubicSurfaceExtractor.i rename to bindings/CubicSurfaceExtractor.i diff --git a/library/bindings/CubicSurfaceExtractorWithNormals.i b/bindings/CubicSurfaceExtractorWithNormals.i similarity index 100% rename from library/bindings/CubicSurfaceExtractorWithNormals.i rename to bindings/CubicSurfaceExtractorWithNormals.i diff --git a/library/bindings/DefaultMarchingCubesController.i b/bindings/DefaultMarchingCubesController.i similarity index 100% rename from library/bindings/DefaultMarchingCubesController.i rename to bindings/DefaultMarchingCubesController.i diff --git a/library/bindings/FilePager.i b/bindings/FilePager.i similarity index 100% rename from library/bindings/FilePager.i rename to bindings/FilePager.i diff --git a/library/bindings/LargeVolume.i b/bindings/LargeVolume.i similarity index 100% rename from library/bindings/LargeVolume.i rename to bindings/LargeVolume.i diff --git a/library/bindings/MakeCSharpBindings.bat b/bindings/MakeCSharpBindings.bat similarity index 100% rename from library/bindings/MakeCSharpBindings.bat rename to bindings/MakeCSharpBindings.bat diff --git a/library/bindings/MarchingCubesSurfaceExtractor.i b/bindings/MarchingCubesSurfaceExtractor.i similarity index 100% rename from library/bindings/MarchingCubesSurfaceExtractor.i rename to bindings/MarchingCubesSurfaceExtractor.i diff --git a/library/bindings/MeshDecimator.i b/bindings/MeshDecimator.i similarity index 100% rename from library/bindings/MeshDecimator.i rename to bindings/MeshDecimator.i diff --git a/library/bindings/MinizBlockCompressor.i b/bindings/MinizBlockCompressor.i similarity index 100% rename from library/bindings/MinizBlockCompressor.i rename to bindings/MinizBlockCompressor.i diff --git a/library/bindings/PagedVolume.i b/bindings/PagedVolume.i similarity index 100% rename from library/bindings/PagedVolume.i rename to bindings/PagedVolume.i diff --git a/library/bindings/Pager.i b/bindings/Pager.i similarity index 100% rename from library/bindings/Pager.i rename to bindings/Pager.i diff --git a/library/bindings/Picking.i b/bindings/Picking.i similarity index 100% rename from library/bindings/Picking.i rename to bindings/Picking.i diff --git a/library/bindings/PolyVoxCore.i b/bindings/PolyVoxCore.i similarity index 100% rename from library/bindings/PolyVoxCore.i rename to bindings/PolyVoxCore.i diff --git a/library/bindings/RLEBlockCompressor.i b/bindings/RLEBlockCompressor.i similarity index 100% rename from library/bindings/RLEBlockCompressor.i rename to bindings/RLEBlockCompressor.i diff --git a/library/bindings/RawVolume.i b/bindings/RawVolume.i similarity index 100% rename from library/bindings/RawVolume.i rename to bindings/RawVolume.i diff --git a/library/bindings/Raycast.i b/bindings/Raycast.i similarity index 100% rename from library/bindings/Raycast.i rename to bindings/Raycast.i diff --git a/library/bindings/Region.i b/bindings/Region.i similarity index 100% rename from library/bindings/Region.i rename to bindings/Region.i diff --git a/library/bindings/SimpleVolume.i b/bindings/SimpleVolume.i similarity index 100% rename from library/bindings/SimpleVolume.i rename to bindings/SimpleVolume.i diff --git a/library/bindings/SimpleVolumeSampler.i b/bindings/SimpleVolumeSampler.i similarity index 100% rename from library/bindings/SimpleVolumeSampler.i rename to bindings/SimpleVolumeSampler.i diff --git a/library/bindings/SubArray.i b/bindings/SubArray.i similarity index 100% rename from library/bindings/SubArray.i rename to bindings/SubArray.i diff --git a/library/bindings/SurfaceMesh.i b/bindings/SurfaceMesh.i similarity index 100% rename from library/bindings/SurfaceMesh.i rename to bindings/SurfaceMesh.i diff --git a/library/bindings/TypeDef.i b/bindings/TypeDef.i similarity index 100% rename from library/bindings/TypeDef.i rename to bindings/TypeDef.i diff --git a/library/bindings/UncompressedBlock.i b/bindings/UncompressedBlock.i similarity index 100% rename from library/bindings/UncompressedBlock.i rename to bindings/UncompressedBlock.i diff --git a/library/bindings/Vector.i b/bindings/Vector.i similarity index 100% rename from library/bindings/Vector.i rename to bindings/Vector.i diff --git a/library/bindings/VertexTypes.i b/bindings/VertexTypes.i similarity index 100% rename from library/bindings/VertexTypes.i rename to bindings/VertexTypes.i diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 79467307..483cef00 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -26,7 +26,6 @@ PROJECT(PolyVox) add_subdirectory(PolyVoxCore) add_subdirectory(PolyVoxUtil) -add_subdirectory(bindings) #Set up install paths e.g. for PolyVoxConfig.cmake if(WIN32) From a296807ed90661c39759d20396f88a37720aa449 Mon Sep 17 00:00:00 2001 From: David Williams Date: Sat, 7 Feb 2015 14:59:08 +0100 Subject: [PATCH 13/19] Removed PolyVoxUtil. --- examples/Basic/CMakeLists.txt | 7 --- examples/DecodeOnGPU/CMakeLists.txt | 7 --- examples/OpenGL/CMakeLists.txt | 7 --- examples/Paging/CMakeLists.txt | 7 --- examples/SmoothLOD/CMakeLists.txt | 7 --- library/CMakeLists.txt | 5 -- library/PolyVoxUtil/CMakeLists.txt | 92 ---------------------------- library/PolyVoxUtil/source/Dummy.cpp | 16 ----- tests/CMakeLists.txt | 3 +- 9 files changed, 1 insertion(+), 150 deletions(-) delete mode 100644 library/PolyVoxUtil/CMakeLists.txt delete mode 100644 library/PolyVoxUtil/source/Dummy.cpp diff --git a/examples/Basic/CMakeLists.txt b/examples/Basic/CMakeLists.txt index 153b0570..98e42789 100644 --- a/examples/Basic/CMakeLists.txt +++ b/examples/Basic/CMakeLists.txt @@ -64,11 +64,4 @@ IF(WIN32) ARCHIVE DESTINATION Examples/OpenGL/lib COMPONENT example ) - - #.dlls should be installed in shared builds. - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../release/PolyVoxCore.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Release) - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../release/PolyVoxUtil.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Release) - - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../debug/PolyVoxCore.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Debug) - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../debug/PolyVoxUtil.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Debug) ENDIF(WIN32) diff --git a/examples/DecodeOnGPU/CMakeLists.txt b/examples/DecodeOnGPU/CMakeLists.txt index 3cb051f5..60a3bfb5 100644 --- a/examples/DecodeOnGPU/CMakeLists.txt +++ b/examples/DecodeOnGPU/CMakeLists.txt @@ -65,11 +65,4 @@ IF(WIN32) ARCHIVE DESTINATION Examples/OpenGL/lib COMPONENT example ) - - #.dlls should be installed in shared builds. - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../release/PolyVoxCore.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Release) - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../release/PolyVoxUtil.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Release) - - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../debug/PolyVoxCore.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Debug) - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../debug/PolyVoxUtil.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Debug) ENDIF(WIN32) diff --git a/examples/OpenGL/CMakeLists.txt b/examples/OpenGL/CMakeLists.txt index 129dac1b..ef950a07 100644 --- a/examples/OpenGL/CMakeLists.txt +++ b/examples/OpenGL/CMakeLists.txt @@ -67,11 +67,4 @@ IF(WIN32) ARCHIVE DESTINATION Examples/OpenGL/lib COMPONENT example ) - - #.dlls should be installed in shared builds. - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../release/PolyVoxCore.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Release) - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../release/PolyVoxUtil.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Release) - - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../debug/PolyVoxCore.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Debug) - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../debug/PolyVoxUtil.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Debug) ENDIF(WIN32) diff --git a/examples/Paging/CMakeLists.txt b/examples/Paging/CMakeLists.txt index b256cfa5..cc67d64d 100644 --- a/examples/Paging/CMakeLists.txt +++ b/examples/Paging/CMakeLists.txt @@ -69,11 +69,4 @@ IF(WIN32) ARCHIVE DESTINATION Examples/OpenGL/lib COMPONENT example ) - - #.dlls should be installed in shared builds. - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../release/PolyVoxCore.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Release) - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../release/PolyVoxUtil.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Release) - - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../debug/PolyVoxCore.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Debug) - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../debug/PolyVoxUtil.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Debug) ENDIF(WIN32) diff --git a/examples/SmoothLOD/CMakeLists.txt b/examples/SmoothLOD/CMakeLists.txt index e11a715a..05cf87f3 100644 --- a/examples/SmoothLOD/CMakeLists.txt +++ b/examples/SmoothLOD/CMakeLists.txt @@ -67,11 +67,4 @@ IF(WIN32) ARCHIVE DESTINATION Examples/OpenGL/lib COMPONENT example ) - - #.dlls should be installed in shared builds. - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../release/PolyVoxCore.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Release) - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../release/PolyVoxUtil.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Release) - - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../debug/PolyVoxCore.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Debug) - #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../debug/PolyVoxUtil.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Debug) ENDIF(WIN32) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 483cef00..5e5e5e96 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -25,22 +25,17 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) PROJECT(PolyVox) add_subdirectory(PolyVoxCore) -add_subdirectory(PolyVoxUtil) #Set up install paths e.g. for PolyVoxConfig.cmake if(WIN32) set(CONFIG_FILE_DIR "CMake") set(PolyVoxCore_LIBRARY_INSTALL_DIRS "PolyVoxCore/lib") - set(PolyVoxUtil_LIBRARY_INSTALL_DIRS "PolyVoxUtil/lib") set(PolyVoxCore_INCLUDE_INSTALL_DIRS "PolyVoxCore/include") - set(PolyVoxUtil_INCLUDE_INSTALL_DIRS "PolyVoxUtil/include") set(PolyVox_DOC_INSTALL_DIR "PolyVox/doc") else(WIN32) set(CONFIG_FILE_DIR "share/PolyVox/cmake") set(PolyVoxCore_LIBRARY_INSTALL_DIRS "lib") - set(PolyVoxUtil_LIBRARY_INSTALL_DIRS "lib") set(PolyVoxCore_INCLUDE_INSTALL_DIRS "include/PolyVoxCore") - set(PolyVoxUtil_INCLUDE_INSTALL_DIRS "include/PolyVoxUtil") set(PolyVox_DOC_INSTALL_DIR "share/doc/packages/polyvox") endif(WIN32) diff --git a/library/PolyVoxUtil/CMakeLists.txt b/library/PolyVoxUtil/CMakeLists.txt deleted file mode 100644 index 4df41a60..00000000 --- a/library/PolyVoxUtil/CMakeLists.txt +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright (c) 2008-2012 Matt Williams -# Copyright (c) 2008-2012 David Williams -# -# This software is provided 'as-is', without any express or implied -# warranty. In no event will the authors be held liable for any damages -# arising from the use of this software. -# -# Permission is granted to anyone to use this software for any purpose, -# including commercial applications, and to alter it and redistribute it -# freely, subject to the following restrictions: -# -# 1. The origin of this software must not be misrepresented; you must not -# claim that you wrote the original software. If you use this software -# in a product, an acknowledgment in the product documentation would be -# appreciated but is not required. -# -# 2. Altered source versions must be plainly marked as such, and must not be -# misrepresented as being the original software. -# -# 3. This notice may not be removed or altered from any source -# distribution. - -PROJECT(PolyVoxUtil) - -#Projects source files -SET(UTIL_SRC_FILES - source/Dummy.cpp -) - -#Projects headers files -SET(UTIL_INC_FILES - #Nothing here at the moment... -) - -ADD_DEFINITIONS(-DPOLYVOX_SHARED_EXPORTS) #Export symbols in the .dll - -#"Sources" and "Headers" are the group names in Visual Studio. -#They may have other uses too... -SOURCE_GROUP("Source Files" FILES ${UTIL_SRC_FILES}) -SOURCE_GROUP("Header Files" FILES ${UTIL_INC_FILES}) - -#Tell CMake the paths -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include ${PolyVoxCore_BINARY_DIR}/include ${PolyVoxCore_SOURCE_DIR}/include) -#There has to be a better way! -LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}/debug ${PolyVoxCore_BINARY_DIR}/release ${PolyVoxCore_BINARY_DIR}) - -#Util -#Build -IF(LIBRARY_TYPE STREQUAL "STATIC") - ADD_LIBRARY(PolyVoxUtil STATIC ${UTIL_SRC_FILES} ${UTIL_INC_FILES}) - IF(UNIX) - SET_TARGET_PROPERTIES(PolyVoxCore PROPERTIES COMPILE_FLAGS -fPIC) - ENDIF() -ENDIF() -IF(LIBRARY_TYPE STREQUAL "DYNAMIC") - ADD_LIBRARY(PolyVoxUtil SHARED ${UTIL_SRC_FILES} ${UTIL_INC_FILES}) - SET_TARGET_PROPERTIES(PolyVoxUtil PROPERTIES COMPILE_FLAGS "-DPOLYVOX_SHARED_EXPORTS") -ENDIF() -SET_PROPERTY(TARGET PolyVoxUtil PROPERTY FOLDER "Library") - -TARGET_LINK_LIBRARIES(PolyVoxUtil) -SET_TARGET_PROPERTIES(PolyVoxUtil PROPERTIES VERSION ${POLYVOX_VERSION} SOVERSION ${POLYVOX_VERSION_MAJOR}) -IF(MSVC) - SET_TARGET_PROPERTIES(PolyVoxUtil PROPERTIES COMPILE_FLAGS "/W4 /wd4251 /wd4127") #Disable warning on STL exports -ENDIF(MSVC) - -#Install -IF(WIN32) - INSTALL(TARGETS PolyVoxUtil - RUNTIME DESTINATION PolyVoxUtil/bin COMPONENT library - LIBRARY DESTINATION PolyVoxUtil/lib COMPONENT library - ARCHIVE DESTINATION PolyVoxUtil/lib COMPONENT library - ) - - #Install the util header files. - INSTALL(DIRECTORY include DESTINATION PolyVoxUtil COMPONENT development PATTERN "*.svn*" EXCLUDE) - - #On windows, we also install the debug information. It's unfortunate that we have to hard-code - #the 'Debug' part of the path, but CMake doesn't seem to provide a way around this. The best I - #found was: http://www.cmake.org/pipermail/cmake/2007-October/016924.html (and it is a bit ugly). - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/PolyVoxUtil.pdb DESTINATION PolyVoxUtil/lib CONFIGURATIONS Debug) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/PolyVoxUtil.pdb DESTINATION PolyVoxUtil/lib CONFIGURATIONS RelWithDebInfo) -ELSE(WIN32) - INSTALL(TARGETS PolyVoxUtil - RUNTIME DESTINATION bin COMPONENT library - LIBRARY DESTINATION lib COMPONENT library - ARCHIVE DESTINATION lib COMPONENT library - ) - - #Install the util header files. - INSTALL(DIRECTORY include/ DESTINATION include/PolyVoxUtil COMPONENT development PATTERN "*.svn*" EXCLUDE) -ENDIF(WIN32) diff --git a/library/PolyVoxUtil/source/Dummy.cpp b/library/PolyVoxUtil/source/Dummy.cpp deleted file mode 100644 index 73e5e376..00000000 --- a/library/PolyVoxUtil/source/Dummy.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "PolyVoxCore/Impl/TypeDef.h" - -namespace PolyVox -{ - class POLYVOX_API DummyClass - { - public: - int getx(void); - int x; - }; - - int DummyClass::getx(void) - { - return x; - } -} diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index fe6b35eb..02bdee0b 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -27,9 +27,8 @@ MACRO(CREATE_TEST headerfile sourcefile executablename) UNSET(test_moc_SRCS) #clear out the MOCs from previous tests QT4_WRAP_CPP(test_moc_SRCS ${headerfile}) - LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR} ${PolyVoxUtil_BINARY_DIR}) ADD_EXECUTABLE(${executablename} ${sourcefile} ${test_moc_SRCS}) - TARGET_LINK_LIBRARIES(${executablename} PolyVoxUtil ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY}) + TARGET_LINK_LIBRARIES(${executablename} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY}) #HACK. This is needed since everything is built in the base dir in Windows. As of 2.8 we should change this. IF(WIN32) SET(LATEST_TEST ${EXECUTABLE_OUTPUT_PATH}/${executablename}) From 6e2004d9c579d6f195b43df5a0f760d7651b241c Mon Sep 17 00:00:00 2001 From: David Williams Date: Sat, 7 Feb 2015 15:04:34 +0100 Subject: [PATCH 14/19] Really removed PolyVoxUtil. --- library/PolyVoxUtil/include/PolyVoxUtil/Placeholder.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 library/PolyVoxUtil/include/PolyVoxUtil/Placeholder.txt diff --git a/library/PolyVoxUtil/include/PolyVoxUtil/Placeholder.txt b/library/PolyVoxUtil/include/PolyVoxUtil/Placeholder.txt deleted file mode 100644 index eb0a80de..00000000 --- a/library/PolyVoxUtil/include/PolyVoxUtil/Placeholder.txt +++ /dev/null @@ -1 +0,0 @@ -I don't think Git allows empty directories, so this is just a placeholder until we decide what to do with PolyVoxUtil. \ No newline at end of file From 97bd3a232a7304b8cdf6bdb3e57077cdfadb8c34 Mon Sep 17 00:00:00 2001 From: David Williams Date: Sat, 7 Feb 2015 15:21:33 +0100 Subject: [PATCH 15/19] Renamed 'library' folder to 'include' (as it just contains headers now). --- CMakeLists.txt | 2 +- {library => include}/CMakeLists.txt | 0 {library => include}/Doxyfile.in | 0 {library => include}/Mainpage.dox | 0 {library => include}/PolyVoxConfig.cmake.in | 0 {library => include}/PolyVoxCore/CMakeLists.txt | 1 - .../PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h | 0 .../PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl | 0 .../include/PolyVoxCore/AmbientOcclusionCalculator.h | 0 .../include/PolyVoxCore/AmbientOcclusionCalculator.inl | 0 {library => include}/PolyVoxCore/include/PolyVoxCore/Array.h | 0 .../PolyVoxCore/include/PolyVoxCore/BaseVolume.h | 0 .../PolyVoxCore/include/PolyVoxCore/BaseVolume.inl | 0 .../PolyVoxCore/include/PolyVoxCore/BaseVolumeSampler.inl | 0 .../PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h | 0 .../PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl | 0 .../PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h | 0 .../include/PolyVoxCore/DefaultMarchingCubesController.h | 0 {library => include}/PolyVoxCore/include/PolyVoxCore/Density.h | 0 .../PolyVoxCore/include/PolyVoxCore/FilePager.h | 0 .../PolyVoxCore/include/PolyVoxCore/GradientEstimators.h | 0 .../PolyVoxCore/include/PolyVoxCore/GradientEstimators.inl | 0 .../PolyVoxCore/include/PolyVoxCore/Impl/AStarPathfinderImpl.h | 0 .../PolyVoxCore/include/PolyVoxCore/Impl/Config.h | 0 .../PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h | 0 .../PolyVoxCore/include/PolyVoxCore/Impl/Logging.h | 0 .../PolyVoxCore/include/PolyVoxCore/Impl/MarchingCubesTables.h | 0 .../PolyVoxCore/include/PolyVoxCore/Impl/RandomUnitVectors.h | 0 .../PolyVoxCore/include/PolyVoxCore/Impl/RandomVectors.h | 0 .../PolyVoxCore/include/PolyVoxCore/Impl/Timer.h | 0 .../PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h | 0 .../PolyVoxCore/include/PolyVoxCore/Impl/Utility.h | 0 .../PolyVoxCore/include/PolyVoxCore/Interpolation.h | 0 .../PolyVoxCore/include/PolyVoxCore/IteratorController.h | 0 .../PolyVoxCore/include/PolyVoxCore/IteratorController.inl | 0 .../PolyVoxCore/include/PolyVoxCore/LargeVolume.h | 0 .../PolyVoxCore/include/PolyVoxCore/LowPassFilter.h | 0 .../PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl | 0 .../include/PolyVoxCore/MarchingCubesSurfaceExtractor.h | 0 .../include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl | 0 {library => include}/PolyVoxCore/include/PolyVoxCore/Material.h | 0 .../PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h | 0 {library => include}/PolyVoxCore/include/PolyVoxCore/Mesh.h | 0 {library => include}/PolyVoxCore/include/PolyVoxCore/Mesh.inl | 0 .../PolyVoxCore/include/PolyVoxCore/PagedVolume.h | 0 .../PolyVoxCore/include/PolyVoxCore/PagedVolume.inl | 0 .../PolyVoxCore/include/PolyVoxCore/PagedVolumeChunk.inl | 0 .../PolyVoxCore/include/PolyVoxCore/PagedVolumeSampler.inl | 0 {library => include}/PolyVoxCore/include/PolyVoxCore/Picking.h | 0 .../PolyVoxCore/include/PolyVoxCore/Picking.inl | 0 .../include/PolyVoxCore/PolyVoxForwardDeclarations.h | 0 .../PolyVoxCore/include/PolyVoxCore/RawVolume.h | 0 .../PolyVoxCore/include/PolyVoxCore/RawVolume.inl | 0 .../PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl | 0 {library => include}/PolyVoxCore/include/PolyVoxCore/Raycast.h | 0 .../PolyVoxCore/include/PolyVoxCore/Raycast.inl | 0 {library => include}/PolyVoxCore/include/PolyVoxCore/Region.h | 0 {library => include}/PolyVoxCore/include/PolyVoxCore/Region.inl | 0 .../PolyVoxCore/include/PolyVoxCore/SimpleVolume.h | 0 {library => include}/PolyVoxCore/include/PolyVoxCore/Vector.h | 0 {library => include}/PolyVoxCore/include/PolyVoxCore/Vector.inl | 0 {library => include}/PolyVoxCore/include/PolyVoxCore/Vertex.h | 0 .../PolyVoxCore/include/PolyVoxCore/VolumeResampler.h | 0 .../PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl | 0 .../PolyVoxCore/include/PolyVoxCore/VoxelFilters.h | 0 .../PolyVoxCore/include/PolyVoxCore/VoxelFilters.inl | 0 {library => include}/polyvox.qhcp.in | 0 67 files changed, 1 insertion(+), 2 deletions(-) rename {library => include}/CMakeLists.txt (100%) rename {library => include}/Doxyfile.in (100%) rename {library => include}/Mainpage.dox (100%) rename {library => include}/PolyVoxConfig.cmake.in (100%) rename {library => include}/PolyVoxCore/CMakeLists.txt (98%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Array.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/BaseVolume.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/BaseVolume.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/BaseVolumeSampler.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/DefaultMarchingCubesController.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Density.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/FilePager.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/GradientEstimators.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Impl/AStarPathfinderImpl.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Impl/Config.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Impl/MarchingCubesTables.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Impl/RandomUnitVectors.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Impl/RandomVectors.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Impl/Timer.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Impl/Utility.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Interpolation.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/IteratorController.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/IteratorController.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/LargeVolume.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/LowPassFilter.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Material.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Mesh.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Mesh.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/PagedVolume.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/PagedVolume.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/PagedVolumeChunk.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/PagedVolumeSampler.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Picking.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Picking.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/RawVolume.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/RawVolume.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Raycast.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Raycast.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Region.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Region.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Vector.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Vector.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/Vertex.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/VolumeResampler.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/VoxelFilters.h (100%) rename {library => include}/PolyVoxCore/include/PolyVoxCore/VoxelFilters.inl (100%) rename {library => include}/polyvox.qhcp.in (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fe7322c..342fd9e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ endif() FIND_PACKAGE(Doxygen) -ADD_SUBDIRECTORY(library) +ADD_SUBDIRECTORY(include) diff --git a/library/CMakeLists.txt b/include/CMakeLists.txt similarity index 100% rename from library/CMakeLists.txt rename to include/CMakeLists.txt diff --git a/library/Doxyfile.in b/include/Doxyfile.in similarity index 100% rename from library/Doxyfile.in rename to include/Doxyfile.in diff --git a/library/Mainpage.dox b/include/Mainpage.dox similarity index 100% rename from library/Mainpage.dox rename to include/Mainpage.dox diff --git a/library/PolyVoxConfig.cmake.in b/include/PolyVoxConfig.cmake.in similarity index 100% rename from library/PolyVoxConfig.cmake.in rename to include/PolyVoxConfig.cmake.in diff --git a/library/PolyVoxCore/CMakeLists.txt b/include/PolyVoxCore/CMakeLists.txt similarity index 98% rename from library/PolyVoxCore/CMakeLists.txt rename to include/PolyVoxCore/CMakeLists.txt index c06c9c8a..d3e66eef 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/include/PolyVoxCore/CMakeLists.txt @@ -123,7 +123,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_CURRENT_SOURCE_D # Although we don't build anything for PolyVox, we still add this custom target (which # doesn't do anything) so that we can browse the source code from within Visual Studio. ADD_CUSTOM_TARGET(PolyVoxCore SOURCES ${CORE_INC_FILES}) -SET_PROPERTY(TARGET PolyVoxCore PROPERTY FOLDER "Library") #Install the core header files, including the ones in the Impl subfolder. IF(WIN32) diff --git a/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h b/include/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h rename to include/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl b/include/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl rename to include/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.h b/include/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.h rename to include/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl b/include/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl rename to include/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/Array.h b/include/PolyVoxCore/include/PolyVoxCore/Array.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Array.h rename to include/PolyVoxCore/include/PolyVoxCore/Array.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/BaseVolume.h b/include/PolyVoxCore/include/PolyVoxCore/BaseVolume.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/BaseVolume.h rename to include/PolyVoxCore/include/PolyVoxCore/BaseVolume.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/BaseVolume.inl b/include/PolyVoxCore/include/PolyVoxCore/BaseVolume.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/BaseVolume.inl rename to include/PolyVoxCore/include/PolyVoxCore/BaseVolume.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/BaseVolumeSampler.inl b/include/PolyVoxCore/include/PolyVoxCore/BaseVolumeSampler.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/BaseVolumeSampler.inl rename to include/PolyVoxCore/include/PolyVoxCore/BaseVolumeSampler.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h b/include/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h rename to include/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl b/include/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl rename to include/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h b/include/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h rename to include/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/DefaultMarchingCubesController.h b/include/PolyVoxCore/include/PolyVoxCore/DefaultMarchingCubesController.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/DefaultMarchingCubesController.h rename to include/PolyVoxCore/include/PolyVoxCore/DefaultMarchingCubesController.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Density.h b/include/PolyVoxCore/include/PolyVoxCore/Density.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Density.h rename to include/PolyVoxCore/include/PolyVoxCore/Density.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/FilePager.h b/include/PolyVoxCore/include/PolyVoxCore/FilePager.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/FilePager.h rename to include/PolyVoxCore/include/PolyVoxCore/FilePager.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h b/include/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h rename to include/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.inl b/include/PolyVoxCore/include/PolyVoxCore/GradientEstimators.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.inl rename to include/PolyVoxCore/include/PolyVoxCore/GradientEstimators.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/AStarPathfinderImpl.h b/include/PolyVoxCore/include/PolyVoxCore/Impl/AStarPathfinderImpl.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Impl/AStarPathfinderImpl.h rename to include/PolyVoxCore/include/PolyVoxCore/Impl/AStarPathfinderImpl.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/Config.h b/include/PolyVoxCore/include/PolyVoxCore/Impl/Config.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Impl/Config.h rename to include/PolyVoxCore/include/PolyVoxCore/Impl/Config.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h b/include/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h rename to include/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h b/include/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h rename to include/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/MarchingCubesTables.h b/include/PolyVoxCore/include/PolyVoxCore/Impl/MarchingCubesTables.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Impl/MarchingCubesTables.h rename to include/PolyVoxCore/include/PolyVoxCore/Impl/MarchingCubesTables.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/RandomUnitVectors.h b/include/PolyVoxCore/include/PolyVoxCore/Impl/RandomUnitVectors.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Impl/RandomUnitVectors.h rename to include/PolyVoxCore/include/PolyVoxCore/Impl/RandomUnitVectors.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/RandomVectors.h b/include/PolyVoxCore/include/PolyVoxCore/Impl/RandomVectors.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Impl/RandomVectors.h rename to include/PolyVoxCore/include/PolyVoxCore/Impl/RandomVectors.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/Timer.h b/include/PolyVoxCore/include/PolyVoxCore/Impl/Timer.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Impl/Timer.h rename to include/PolyVoxCore/include/PolyVoxCore/Impl/Timer.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h b/include/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h rename to include/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/Utility.h b/include/PolyVoxCore/include/PolyVoxCore/Impl/Utility.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Impl/Utility.h rename to include/PolyVoxCore/include/PolyVoxCore/Impl/Utility.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Interpolation.h b/include/PolyVoxCore/include/PolyVoxCore/Interpolation.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Interpolation.h rename to include/PolyVoxCore/include/PolyVoxCore/Interpolation.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/IteratorController.h b/include/PolyVoxCore/include/PolyVoxCore/IteratorController.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/IteratorController.h rename to include/PolyVoxCore/include/PolyVoxCore/IteratorController.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/IteratorController.inl b/include/PolyVoxCore/include/PolyVoxCore/IteratorController.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/IteratorController.inl rename to include/PolyVoxCore/include/PolyVoxCore/IteratorController.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h b/include/PolyVoxCore/include/PolyVoxCore/LargeVolume.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h rename to include/PolyVoxCore/include/PolyVoxCore/LargeVolume.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.h b/include/PolyVoxCore/include/PolyVoxCore/LowPassFilter.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.h rename to include/PolyVoxCore/include/PolyVoxCore/LowPassFilter.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl b/include/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl rename to include/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h b/include/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h rename to include/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl b/include/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl rename to include/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/Material.h b/include/PolyVoxCore/include/PolyVoxCore/Material.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Material.h rename to include/PolyVoxCore/include/PolyVoxCore/Material.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h b/include/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h rename to include/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Mesh.h b/include/PolyVoxCore/include/PolyVoxCore/Mesh.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Mesh.h rename to include/PolyVoxCore/include/PolyVoxCore/Mesh.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Mesh.inl b/include/PolyVoxCore/include/PolyVoxCore/Mesh.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Mesh.inl rename to include/PolyVoxCore/include/PolyVoxCore/Mesh.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/PagedVolume.h b/include/PolyVoxCore/include/PolyVoxCore/PagedVolume.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/PagedVolume.h rename to include/PolyVoxCore/include/PolyVoxCore/PagedVolume.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/PagedVolume.inl b/include/PolyVoxCore/include/PolyVoxCore/PagedVolume.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/PagedVolume.inl rename to include/PolyVoxCore/include/PolyVoxCore/PagedVolume.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/PagedVolumeChunk.inl b/include/PolyVoxCore/include/PolyVoxCore/PagedVolumeChunk.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/PagedVolumeChunk.inl rename to include/PolyVoxCore/include/PolyVoxCore/PagedVolumeChunk.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/PagedVolumeSampler.inl b/include/PolyVoxCore/include/PolyVoxCore/PagedVolumeSampler.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/PagedVolumeSampler.inl rename to include/PolyVoxCore/include/PolyVoxCore/PagedVolumeSampler.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/Picking.h b/include/PolyVoxCore/include/PolyVoxCore/Picking.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Picking.h rename to include/PolyVoxCore/include/PolyVoxCore/Picking.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Picking.inl b/include/PolyVoxCore/include/PolyVoxCore/Picking.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Picking.inl rename to include/PolyVoxCore/include/PolyVoxCore/Picking.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h b/include/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h rename to include/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/RawVolume.h b/include/PolyVoxCore/include/PolyVoxCore/RawVolume.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/RawVolume.h rename to include/PolyVoxCore/include/PolyVoxCore/RawVolume.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/RawVolume.inl b/include/PolyVoxCore/include/PolyVoxCore/RawVolume.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/RawVolume.inl rename to include/PolyVoxCore/include/PolyVoxCore/RawVolume.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl b/include/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl rename to include/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/Raycast.h b/include/PolyVoxCore/include/PolyVoxCore/Raycast.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Raycast.h rename to include/PolyVoxCore/include/PolyVoxCore/Raycast.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Raycast.inl b/include/PolyVoxCore/include/PolyVoxCore/Raycast.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Raycast.inl rename to include/PolyVoxCore/include/PolyVoxCore/Raycast.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/Region.h b/include/PolyVoxCore/include/PolyVoxCore/Region.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Region.h rename to include/PolyVoxCore/include/PolyVoxCore/Region.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Region.inl b/include/PolyVoxCore/include/PolyVoxCore/Region.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Region.inl rename to include/PolyVoxCore/include/PolyVoxCore/Region.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h b/include/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h rename to include/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Vector.h b/include/PolyVoxCore/include/PolyVoxCore/Vector.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Vector.h rename to include/PolyVoxCore/include/PolyVoxCore/Vector.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Vector.inl b/include/PolyVoxCore/include/PolyVoxCore/Vector.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Vector.inl rename to include/PolyVoxCore/include/PolyVoxCore/Vector.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/Vertex.h b/include/PolyVoxCore/include/PolyVoxCore/Vertex.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/Vertex.h rename to include/PolyVoxCore/include/PolyVoxCore/Vertex.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.h b/include/PolyVoxCore/include/PolyVoxCore/VolumeResampler.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.h rename to include/PolyVoxCore/include/PolyVoxCore/VolumeResampler.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl b/include/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl rename to include/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/VoxelFilters.h b/include/PolyVoxCore/include/PolyVoxCore/VoxelFilters.h similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/VoxelFilters.h rename to include/PolyVoxCore/include/PolyVoxCore/VoxelFilters.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/VoxelFilters.inl b/include/PolyVoxCore/include/PolyVoxCore/VoxelFilters.inl similarity index 100% rename from library/PolyVoxCore/include/PolyVoxCore/VoxelFilters.inl rename to include/PolyVoxCore/include/PolyVoxCore/VoxelFilters.inl diff --git a/library/polyvox.qhcp.in b/include/polyvox.qhcp.in similarity index 100% rename from library/polyvox.qhcp.in rename to include/polyvox.qhcp.in From 16a75d06063112e4204b86c4d30c45f0f95c8bbf Mon Sep 17 00:00:00 2001 From: David Williams Date: Sat, 7 Feb 2015 17:16:54 +0100 Subject: [PATCH 16/19] Reoranising header structure. --- examples/Basic/CMakeLists.txt | 3 +- examples/DecodeOnGPU/CMakeLists.txt | 3 +- examples/OpenGL/CMakeLists.txt | 3 +- examples/Paging/CMakeLists.txt | 3 +- examples/SmoothLOD/CMakeLists.txt | 3 +- include/CMakeLists.txt | 97 ++++++++++++- .../PolyVoxCore => }/AStarPathfinder.h | 0 .../PolyVoxCore => }/AStarPathfinder.inl | 0 .../AmbientOcclusionCalculator.h | 0 .../AmbientOcclusionCalculator.inl | 0 .../{include/PolyVoxCore => }/Array.h | 0 .../{include/PolyVoxCore => }/BaseVolume.h | 0 .../{include/PolyVoxCore => }/BaseVolume.inl | 0 .../PolyVoxCore => }/BaseVolumeSampler.inl | 0 include/PolyVoxCore/CMakeLists.txt | 133 ------------------ .../PolyVoxCore => }/CubicSurfaceExtractor.h | 0 .../CubicSurfaceExtractor.inl | 0 .../PolyVoxCore => }/DefaultIsQuadNeeded.h | 0 .../DefaultMarchingCubesController.h | 0 .../{include/PolyVoxCore => }/Density.h | 0 .../{include/PolyVoxCore => }/FilePager.h | 0 .../PolyVoxCore => }/GradientEstimators.h | 0 .../PolyVoxCore => }/GradientEstimators.inl | 0 .../Impl/AStarPathfinderImpl.h | 0 .../{include/PolyVoxCore => }/Impl/Config.h | 0 .../PolyVoxCore => }/Impl/ErrorHandling.h | 0 .../{include/PolyVoxCore => }/Impl/Logging.h | 0 .../Impl/MarchingCubesTables.h | 0 .../PolyVoxCore => }/Impl/RandomUnitVectors.h | 0 .../PolyVoxCore => }/Impl/RandomVectors.h | 0 .../{include/PolyVoxCore => }/Impl/Timer.h | 0 .../{include/PolyVoxCore => }/Impl/TypeDef.h | 0 .../{include/PolyVoxCore => }/Impl/Utility.h | 0 .../{include/PolyVoxCore => }/Interpolation.h | 0 .../PolyVoxCore => }/IteratorController.h | 0 .../PolyVoxCore => }/IteratorController.inl | 0 .../{include/PolyVoxCore => }/LargeVolume.h | 0 .../{include/PolyVoxCore => }/LowPassFilter.h | 0 .../PolyVoxCore => }/LowPassFilter.inl | 0 .../MarchingCubesSurfaceExtractor.h | 0 .../MarchingCubesSurfaceExtractor.inl | 0 .../{include/PolyVoxCore => }/Material.h | 0 .../PolyVoxCore => }/MaterialDensityPair.h | 0 .../{include/PolyVoxCore => }/Mesh.h | 0 .../{include/PolyVoxCore => }/Mesh.inl | 0 .../{include/PolyVoxCore => }/PagedVolume.h | 0 .../{include/PolyVoxCore => }/PagedVolume.inl | 0 .../PolyVoxCore => }/PagedVolumeChunk.inl | 0 .../PolyVoxCore => }/PagedVolumeSampler.inl | 0 .../{include/PolyVoxCore => }/Picking.h | 0 .../{include/PolyVoxCore => }/Picking.inl | 0 .../PolyVoxForwardDeclarations.h | 0 .../{include/PolyVoxCore => }/RawVolume.h | 0 .../{include/PolyVoxCore => }/RawVolume.inl | 0 .../PolyVoxCore => }/RawVolumeSampler.inl | 0 .../{include/PolyVoxCore => }/Raycast.h | 0 .../{include/PolyVoxCore => }/Raycast.inl | 0 .../{include/PolyVoxCore => }/Region.h | 0 .../{include/PolyVoxCore => }/Region.inl | 0 .../{include/PolyVoxCore => }/SimpleVolume.h | 0 .../{include/PolyVoxCore => }/Vector.h | 0 .../{include/PolyVoxCore => }/Vector.inl | 0 .../{include/PolyVoxCore => }/Vertex.h | 0 .../PolyVoxCore => }/VolumeResampler.h | 0 .../PolyVoxCore => }/VolumeResampler.inl | 0 .../{include/PolyVoxCore => }/VoxelFilters.h | 0 .../PolyVoxCore => }/VoxelFilters.inl | 0 tests/CMakeLists.txt | 2 +- 68 files changed, 101 insertions(+), 146 deletions(-) rename include/PolyVoxCore/{include/PolyVoxCore => }/AStarPathfinder.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/AStarPathfinder.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/AmbientOcclusionCalculator.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/AmbientOcclusionCalculator.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Array.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/BaseVolume.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/BaseVolume.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/BaseVolumeSampler.inl (100%) delete mode 100644 include/PolyVoxCore/CMakeLists.txt rename include/PolyVoxCore/{include/PolyVoxCore => }/CubicSurfaceExtractor.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/CubicSurfaceExtractor.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/DefaultIsQuadNeeded.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/DefaultMarchingCubesController.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Density.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/FilePager.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/GradientEstimators.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/GradientEstimators.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/AStarPathfinderImpl.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/Config.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/ErrorHandling.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/Logging.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/MarchingCubesTables.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/RandomUnitVectors.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/RandomVectors.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/Timer.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/TypeDef.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/Utility.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Interpolation.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/IteratorController.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/IteratorController.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/LargeVolume.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/LowPassFilter.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/LowPassFilter.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/MarchingCubesSurfaceExtractor.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/MarchingCubesSurfaceExtractor.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Material.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/MaterialDensityPair.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Mesh.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Mesh.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/PagedVolume.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/PagedVolume.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/PagedVolumeChunk.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/PagedVolumeSampler.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Picking.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Picking.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/PolyVoxForwardDeclarations.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/RawVolume.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/RawVolume.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/RawVolumeSampler.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Raycast.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Raycast.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Region.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Region.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/SimpleVolume.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Vector.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Vector.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/Vertex.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/VolumeResampler.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/VolumeResampler.inl (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/VoxelFilters.h (100%) rename include/PolyVoxCore/{include/PolyVoxCore => }/VoxelFilters.inl (100%) diff --git a/examples/Basic/CMakeLists.txt b/examples/Basic/CMakeLists.txt index 98e42789..43cd16b7 100644 --- a/examples/Basic/CMakeLists.txt +++ b/examples/Basic/CMakeLists.txt @@ -39,8 +39,7 @@ add_definitions(-DGLEW_STATIC) FIND_PACKAGE(OpenGL REQUIRED) #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location) -INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxCore_BINARY_DIR}/include ${PolyVoxCore_SOURCE_DIR}/include ${GLEW_SOURCE_DIR}) -LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}) +INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxHeaders_SOURCE_DIR} ${GLEW_SOURCE_DIR}) #This will include the shader files inside the compiled binary QT4_ADD_RESOURCES(COMMON_RESOURCES_RCC ../common/example.qrc) diff --git a/examples/DecodeOnGPU/CMakeLists.txt b/examples/DecodeOnGPU/CMakeLists.txt index 60a3bfb5..071ba223 100644 --- a/examples/DecodeOnGPU/CMakeLists.txt +++ b/examples/DecodeOnGPU/CMakeLists.txt @@ -39,8 +39,7 @@ add_definitions(-DGLEW_STATIC) FIND_PACKAGE(OpenGL REQUIRED) #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location) -INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxCore_BINARY_DIR}/include ${PolyVoxCore_SOURCE_DIR}/include ${GLEW_SOURCE_DIR}) -LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}) +INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxHeaders_SOURCE_DIR} ${GLEW_SOURCE_DIR}) #This will include the shader files inside the compiled binary QT4_ADD_RESOURCES(COMMON_RESOURCES_RCC ../common/example.qrc) diff --git a/examples/OpenGL/CMakeLists.txt b/examples/OpenGL/CMakeLists.txt index ef950a07..86770566 100644 --- a/examples/OpenGL/CMakeLists.txt +++ b/examples/OpenGL/CMakeLists.txt @@ -41,8 +41,7 @@ add_definitions(-DGLEW_STATIC) FIND_PACKAGE(OpenGL REQUIRED) #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location) -INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxCore_BINARY_DIR}/include ${PolyVoxCore_SOURCE_DIR}/include ${GLEW_SOURCE_DIR}) -LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}) +INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxHeaders_SOURCE_DIR} ${GLEW_SOURCE_DIR}) #This will include the shader files inside the compiled binary QT4_ADD_RESOURCES(COMMON_RESOURCES_RCC ../common/example.qrc) diff --git a/examples/Paging/CMakeLists.txt b/examples/Paging/CMakeLists.txt index cc67d64d..f6a099d5 100644 --- a/examples/Paging/CMakeLists.txt +++ b/examples/Paging/CMakeLists.txt @@ -41,8 +41,7 @@ add_definitions(-DGLEW_STATIC) FIND_PACKAGE(OpenGL REQUIRED) #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location) -INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxCore_BINARY_DIR}/include ${PolyVoxCore_SOURCE_DIR}/include ${GLEW_SOURCE_DIR}) -LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}) +INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxHeaders_SOURCE_DIR} ${GLEW_SOURCE_DIR}) #This will include the shader files inside the compiled binary QT4_ADD_RESOURCES(COMMON_RESOURCES_RCC ../common/example.qrc) diff --git a/examples/SmoothLOD/CMakeLists.txt b/examples/SmoothLOD/CMakeLists.txt index 05cf87f3..d4e32582 100644 --- a/examples/SmoothLOD/CMakeLists.txt +++ b/examples/SmoothLOD/CMakeLists.txt @@ -39,8 +39,7 @@ add_definitions(-DGLEW_STATIC) FIND_PACKAGE(OpenGL REQUIRED) #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location) -INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxCore_BINARY_DIR}/include ${PolyVoxCore_SOURCE_DIR}/include ${GLEW_SOURCE_DIR}) -LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}) +INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxHeaders_SOURCE_DIR} ${GLEW_SOURCE_DIR}) #This will include the shader files inside the compiled binary QT4_ADD_RESOURCES(COMMON_RESOURCES_RCC ../common/example.qrc) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 5e5e5e96..109d0a9e 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -22,9 +22,102 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(PolyVox) +PROJECT(PolyVoxHeaders) -add_subdirectory(PolyVoxCore) +#Projects headers files +SET(CORE_INC_FILES + PolyVoxCore/AmbientOcclusionCalculator.h + PolyVoxCore/AmbientOcclusionCalculator.inl + PolyVoxCore/Array.h + PolyVoxCore/AStarPathfinder.h + PolyVoxCore/AStarPathfinder.inl + PolyVoxCore/BaseVolume.h + PolyVoxCore/BaseVolume.inl + PolyVoxCore/BaseVolumeSampler.inl + PolyVoxCore/CubicSurfaceExtractor.h + PolyVoxCore/CubicSurfaceExtractor.inl + PolyVoxCore/DefaultIsQuadNeeded.h + PolyVoxCore/DefaultMarchingCubesController.h + PolyVoxCore/Density.h + PolyVoxCore/FilePager.h + PolyVoxCore/GradientEstimators.h + PolyVoxCore/GradientEstimators.inl + PolyVoxCore/Interpolation.h + PolyVoxCore/IteratorController.h + PolyVoxCore/IteratorController.inl + PolyVoxCore/LargeVolume.h + PolyVoxCore/LowPassFilter.h + PolyVoxCore/LowPassFilter.inl + PolyVoxCore/MarchingCubesSurfaceExtractor.h + PolyVoxCore/MarchingCubesSurfaceExtractor.inl + PolyVoxCore/Material.h + PolyVoxCore/MaterialDensityPair.h + PolyVoxCore/Mesh.h + PolyVoxCore/Mesh.inl + PolyVoxCore/PagedVolume.h + PolyVoxCore/PagedVolume.inl + PolyVoxCore/PagedVolumeChunk.inl + PolyVoxCore/PagedVolumeSampler.inl + PolyVoxCore/PolyVoxForwardDeclarations.h + PolyVoxCore/Picking.h + PolyVoxCore/Picking.inl + PolyVoxCore/RawVolume.h + PolyVoxCore/RawVolume.inl + PolyVoxCore/RawVolumeSampler.inl + PolyVoxCore/Raycast.h + PolyVoxCore/Raycast.inl + PolyVoxCore/Region.h + PolyVoxCore/Region.inl + PolyVoxCore/SimpleVolume.h + PolyVoxCore/Vector.h + PolyVoxCore/Vector.inl + PolyVoxCore/Vertex.h + PolyVoxCore/VolumeResampler.h + PolyVoxCore/VolumeResampler.inl + PolyVoxCore/VoxelFilters.h + PolyVoxCore/VoxelFilters.inl +) + +SET(IMPL_INC_FILES + PolyVoxCore/Impl/AStarPathfinderImpl.h + PolyVoxCore/Impl/Config.h + PolyVoxCore/Impl/ErrorHandling.h + PolyVoxCore/Impl/Logging.h + PolyVoxCore/Impl/MarchingCubesTables.h + PolyVoxCore/Impl/RandomUnitVectors.h + PolyVoxCore/Impl/RandomVectors.h + PolyVoxCore/Impl/Timer.h + PolyVoxCore/Impl/TypeDef.h + PolyVoxCore/Impl/Utility.h +) + +#NOTE: The following line should be uncommented when building shared libs. + +#"Sources" and "Headers" are the group names in Visual Studio. +#They may have other uses too... +#SOURCE_GROUP("Source Files" FILES ${CORE_SRC_FILES}) +SOURCE_GROUP("Header Files" FILES ${CORE_INC_FILES}) + +#SOURCE_GROUP("Source Files\\Impl" FILES ${IMPL_SRC_FILES}) +SOURCE_GROUP("Header Files\\Impl" FILES ${IMPL_INC_FILES}) + +#Tell CMake the paths +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include) + +#Core + +#Build +# Although we don't build anything for PolyVox, we still add this custom target (which +# doesn't do anything) so that we can browse the source code from within Visual Studio. +ADD_CUSTOM_TARGET(PolyVoxCore SOURCES ${CORE_INC_FILES}) + +#Install the core header files, including the ones in the Impl subfolder. +IF(WIN32) + INSTALL(DIRECTORY include DESTINATION PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE) +ELSE(WIN32) + + INSTALL(DIRECTORY include/ DESTINATION include/PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE) +ENDIF(WIN32) #Set up install paths e.g. for PolyVoxConfig.cmake if(WIN32) diff --git a/include/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h b/include/PolyVoxCore/AStarPathfinder.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h rename to include/PolyVoxCore/AStarPathfinder.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl b/include/PolyVoxCore/AStarPathfinder.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl rename to include/PolyVoxCore/AStarPathfinder.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.h b/include/PolyVoxCore/AmbientOcclusionCalculator.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.h rename to include/PolyVoxCore/AmbientOcclusionCalculator.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl b/include/PolyVoxCore/AmbientOcclusionCalculator.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl rename to include/PolyVoxCore/AmbientOcclusionCalculator.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/Array.h b/include/PolyVoxCore/Array.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Array.h rename to include/PolyVoxCore/Array.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/BaseVolume.h b/include/PolyVoxCore/BaseVolume.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/BaseVolume.h rename to include/PolyVoxCore/BaseVolume.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/BaseVolume.inl b/include/PolyVoxCore/BaseVolume.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/BaseVolume.inl rename to include/PolyVoxCore/BaseVolume.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/BaseVolumeSampler.inl b/include/PolyVoxCore/BaseVolumeSampler.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/BaseVolumeSampler.inl rename to include/PolyVoxCore/BaseVolumeSampler.inl diff --git a/include/PolyVoxCore/CMakeLists.txt b/include/PolyVoxCore/CMakeLists.txt deleted file mode 100644 index d3e66eef..00000000 --- a/include/PolyVoxCore/CMakeLists.txt +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright (c) 2008-2012 Matt Williams -# Copyright (c) 2008-2012 David Williams -# -# This software is provided 'as-is', without any express or implied -# warranty. In no event will the authors be held liable for any damages -# arising from the use of this software. -# -# Permission is granted to anyone to use this software for any purpose, -# including commercial applications, and to alter it and redistribute it -# freely, subject to the following restrictions: -# -# 1. The origin of this software must not be misrepresented; you must not -# claim that you wrote the original software. If you use this software -# in a product, an acknowledgment in the product documentation would be -# appreciated but is not required. -# -# 2. Altered source versions must be plainly marked as such, and must not be -# misrepresented as being the original software. -# -# 3. This notice may not be removed or altered from any source -# distribution. - -PROJECT(PolyVoxCore) - -#Projects source files -SET(CORE_SRC_FILES - #source/AStarPathfinder.cpp -) - -#Projects headers files -SET(CORE_INC_FILES - include/PolyVoxCore/AmbientOcclusionCalculator.h - include/PolyVoxCore/AmbientOcclusionCalculator.inl - include/PolyVoxCore/Array.h - include/PolyVoxCore/AStarPathfinder.h - include/PolyVoxCore/AStarPathfinder.inl - include/PolyVoxCore/BaseVolume.h - include/PolyVoxCore/BaseVolume.inl - include/PolyVoxCore/BaseVolumeSampler.inl - include/PolyVoxCore/CubicSurfaceExtractor.h - include/PolyVoxCore/CubicSurfaceExtractor.inl - include/PolyVoxCore/DefaultIsQuadNeeded.h - include/PolyVoxCore/DefaultMarchingCubesController.h - include/PolyVoxCore/Density.h - include/PolyVoxCore/FilePager.h - include/PolyVoxCore/GradientEstimators.h - include/PolyVoxCore/GradientEstimators.inl - include/PolyVoxCore/Interpolation.h - include/PolyVoxCore/IteratorController.h - include/PolyVoxCore/IteratorController.inl - include/PolyVoxCore/LargeVolume.h - include/PolyVoxCore/LowPassFilter.h - include/PolyVoxCore/LowPassFilter.inl - include/PolyVoxCore/MarchingCubesSurfaceExtractor.h - include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl - include/PolyVoxCore/Material.h - include/PolyVoxCore/MaterialDensityPair.h - include/PolyVoxCore/Mesh.h - include/PolyVoxCore/Mesh.inl - include/PolyVoxCore/PagedVolume.h - include/PolyVoxCore/PagedVolume.inl - include/PolyVoxCore/PagedVolumeChunk.inl - include/PolyVoxCore/PagedVolumeSampler.inl - include/PolyVoxCore/PolyVoxForwardDeclarations.h - include/PolyVoxCore/Picking.h - include/PolyVoxCore/Picking.inl - include/PolyVoxCore/RawVolume.h - include/PolyVoxCore/RawVolume.inl - include/PolyVoxCore/RawVolumeSampler.inl - include/PolyVoxCore/Raycast.h - include/PolyVoxCore/Raycast.inl - include/PolyVoxCore/Region.h - include/PolyVoxCore/Region.inl - include/PolyVoxCore/SimpleVolume.h - include/PolyVoxCore/Vector.h - include/PolyVoxCore/Vector.inl - include/PolyVoxCore/Vertex.h - include/PolyVoxCore/VolumeResampler.h - include/PolyVoxCore/VolumeResampler.inl - include/PolyVoxCore/VoxelFilters.h - include/PolyVoxCore/VoxelFilters.inl -) - -SET(IMPL_SRC_FILES - #source/Impl/ErrorHandling.cpp - #source/Impl/Logging.cpp - #source/Impl/MarchingCubesTables.cpp - #source/Impl/RandomUnitVectors.cpp - #source/Impl/RandomVectors.cpp - #source/Impl/Timer.cpp - #source/Impl/Utility.cpp -) - -SET(IMPL_INC_FILES - include/PolyVoxCore/Impl/AStarPathfinderImpl.h - include/PolyVoxCore/Impl/Config.h - include/PolyVoxCore/Impl/ErrorHandling.h - include/PolyVoxCore/Impl/Logging.h - include/PolyVoxCore/Impl/MarchingCubesTables.h - include/PolyVoxCore/Impl/RandomUnitVectors.h - include/PolyVoxCore/Impl/RandomVectors.h - include/PolyVoxCore/Impl/Timer.h - include/PolyVoxCore/Impl/TypeDef.h - include/PolyVoxCore/Impl/Utility.h -) - -#NOTE: The following line should be uncommented when building shared libs. - -#"Sources" and "Headers" are the group names in Visual Studio. -#They may have other uses too... -#SOURCE_GROUP("Source Files" FILES ${CORE_SRC_FILES}) -SOURCE_GROUP("Header Files" FILES ${CORE_INC_FILES}) - -#SOURCE_GROUP("Source Files\\Impl" FILES ${IMPL_SRC_FILES}) -SOURCE_GROUP("Header Files\\Impl" FILES ${IMPL_INC_FILES}) - -#Tell CMake the paths -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include) - -#Core - -#Build -# Although we don't build anything for PolyVox, we still add this custom target (which -# doesn't do anything) so that we can browse the source code from within Visual Studio. -ADD_CUSTOM_TARGET(PolyVoxCore SOURCES ${CORE_INC_FILES}) - -#Install the core header files, including the ones in the Impl subfolder. -IF(WIN32) - INSTALL(DIRECTORY include DESTINATION PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE) -ELSE(WIN32) - - INSTALL(DIRECTORY include/ DESTINATION include/PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE) -ENDIF(WIN32) diff --git a/include/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h b/include/PolyVoxCore/CubicSurfaceExtractor.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h rename to include/PolyVoxCore/CubicSurfaceExtractor.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl b/include/PolyVoxCore/CubicSurfaceExtractor.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl rename to include/PolyVoxCore/CubicSurfaceExtractor.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h b/include/PolyVoxCore/DefaultIsQuadNeeded.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h rename to include/PolyVoxCore/DefaultIsQuadNeeded.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/DefaultMarchingCubesController.h b/include/PolyVoxCore/DefaultMarchingCubesController.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/DefaultMarchingCubesController.h rename to include/PolyVoxCore/DefaultMarchingCubesController.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/Density.h b/include/PolyVoxCore/Density.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Density.h rename to include/PolyVoxCore/Density.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/FilePager.h b/include/PolyVoxCore/FilePager.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/FilePager.h rename to include/PolyVoxCore/FilePager.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h b/include/PolyVoxCore/GradientEstimators.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h rename to include/PolyVoxCore/GradientEstimators.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/GradientEstimators.inl b/include/PolyVoxCore/GradientEstimators.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/GradientEstimators.inl rename to include/PolyVoxCore/GradientEstimators.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/AStarPathfinderImpl.h b/include/PolyVoxCore/Impl/AStarPathfinderImpl.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Impl/AStarPathfinderImpl.h rename to include/PolyVoxCore/Impl/AStarPathfinderImpl.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/Config.h b/include/PolyVoxCore/Impl/Config.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Impl/Config.h rename to include/PolyVoxCore/Impl/Config.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h b/include/PolyVoxCore/Impl/ErrorHandling.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h rename to include/PolyVoxCore/Impl/ErrorHandling.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h b/include/PolyVoxCore/Impl/Logging.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h rename to include/PolyVoxCore/Impl/Logging.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/MarchingCubesTables.h b/include/PolyVoxCore/Impl/MarchingCubesTables.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Impl/MarchingCubesTables.h rename to include/PolyVoxCore/Impl/MarchingCubesTables.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/RandomUnitVectors.h b/include/PolyVoxCore/Impl/RandomUnitVectors.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Impl/RandomUnitVectors.h rename to include/PolyVoxCore/Impl/RandomUnitVectors.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/RandomVectors.h b/include/PolyVoxCore/Impl/RandomVectors.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Impl/RandomVectors.h rename to include/PolyVoxCore/Impl/RandomVectors.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/Timer.h b/include/PolyVoxCore/Impl/Timer.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Impl/Timer.h rename to include/PolyVoxCore/Impl/Timer.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h b/include/PolyVoxCore/Impl/TypeDef.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h rename to include/PolyVoxCore/Impl/TypeDef.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/Utility.h b/include/PolyVoxCore/Impl/Utility.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Impl/Utility.h rename to include/PolyVoxCore/Impl/Utility.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/Interpolation.h b/include/PolyVoxCore/Interpolation.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Interpolation.h rename to include/PolyVoxCore/Interpolation.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/IteratorController.h b/include/PolyVoxCore/IteratorController.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/IteratorController.h rename to include/PolyVoxCore/IteratorController.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/IteratorController.inl b/include/PolyVoxCore/IteratorController.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/IteratorController.inl rename to include/PolyVoxCore/IteratorController.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/LargeVolume.h b/include/PolyVoxCore/LargeVolume.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/LargeVolume.h rename to include/PolyVoxCore/LargeVolume.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/LowPassFilter.h b/include/PolyVoxCore/LowPassFilter.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/LowPassFilter.h rename to include/PolyVoxCore/LowPassFilter.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl b/include/PolyVoxCore/LowPassFilter.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl rename to include/PolyVoxCore/LowPassFilter.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h b/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h rename to include/PolyVoxCore/MarchingCubesSurfaceExtractor.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl b/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl rename to include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/Material.h b/include/PolyVoxCore/Material.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Material.h rename to include/PolyVoxCore/Material.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h b/include/PolyVoxCore/MaterialDensityPair.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h rename to include/PolyVoxCore/MaterialDensityPair.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/Mesh.h b/include/PolyVoxCore/Mesh.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Mesh.h rename to include/PolyVoxCore/Mesh.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/Mesh.inl b/include/PolyVoxCore/Mesh.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Mesh.inl rename to include/PolyVoxCore/Mesh.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/PagedVolume.h b/include/PolyVoxCore/PagedVolume.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/PagedVolume.h rename to include/PolyVoxCore/PagedVolume.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/PagedVolume.inl b/include/PolyVoxCore/PagedVolume.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/PagedVolume.inl rename to include/PolyVoxCore/PagedVolume.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/PagedVolumeChunk.inl b/include/PolyVoxCore/PagedVolumeChunk.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/PagedVolumeChunk.inl rename to include/PolyVoxCore/PagedVolumeChunk.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/PagedVolumeSampler.inl b/include/PolyVoxCore/PagedVolumeSampler.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/PagedVolumeSampler.inl rename to include/PolyVoxCore/PagedVolumeSampler.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/Picking.h b/include/PolyVoxCore/Picking.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Picking.h rename to include/PolyVoxCore/Picking.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/Picking.inl b/include/PolyVoxCore/Picking.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Picking.inl rename to include/PolyVoxCore/Picking.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h b/include/PolyVoxCore/PolyVoxForwardDeclarations.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h rename to include/PolyVoxCore/PolyVoxForwardDeclarations.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/RawVolume.h b/include/PolyVoxCore/RawVolume.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/RawVolume.h rename to include/PolyVoxCore/RawVolume.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/RawVolume.inl b/include/PolyVoxCore/RawVolume.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/RawVolume.inl rename to include/PolyVoxCore/RawVolume.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl b/include/PolyVoxCore/RawVolumeSampler.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl rename to include/PolyVoxCore/RawVolumeSampler.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/Raycast.h b/include/PolyVoxCore/Raycast.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Raycast.h rename to include/PolyVoxCore/Raycast.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/Raycast.inl b/include/PolyVoxCore/Raycast.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Raycast.inl rename to include/PolyVoxCore/Raycast.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/Region.h b/include/PolyVoxCore/Region.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Region.h rename to include/PolyVoxCore/Region.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/Region.inl b/include/PolyVoxCore/Region.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Region.inl rename to include/PolyVoxCore/Region.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h b/include/PolyVoxCore/SimpleVolume.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h rename to include/PolyVoxCore/SimpleVolume.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/Vector.h b/include/PolyVoxCore/Vector.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Vector.h rename to include/PolyVoxCore/Vector.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/Vector.inl b/include/PolyVoxCore/Vector.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Vector.inl rename to include/PolyVoxCore/Vector.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/Vertex.h b/include/PolyVoxCore/Vertex.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/Vertex.h rename to include/PolyVoxCore/Vertex.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/VolumeResampler.h b/include/PolyVoxCore/VolumeResampler.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/VolumeResampler.h rename to include/PolyVoxCore/VolumeResampler.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl b/include/PolyVoxCore/VolumeResampler.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl rename to include/PolyVoxCore/VolumeResampler.inl diff --git a/include/PolyVoxCore/include/PolyVoxCore/VoxelFilters.h b/include/PolyVoxCore/VoxelFilters.h similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/VoxelFilters.h rename to include/PolyVoxCore/VoxelFilters.h diff --git a/include/PolyVoxCore/include/PolyVoxCore/VoxelFilters.inl b/include/PolyVoxCore/VoxelFilters.inl similarity index 100% rename from include/PolyVoxCore/include/PolyVoxCore/VoxelFilters.inl rename to include/PolyVoxCore/VoxelFilters.inl diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 02bdee0b..bccadd75 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -44,7 +44,7 @@ MACRO(CREATE_TEST headerfile sourcefile executablename) ENDIF() ENDMACRO(CREATE_TEST) -INCLUDE_DIRECTORIES(${PolyVoxCore_BINARY_DIR}/include ${PolyVox_SOURCE_DIR}/PolyVoxCore/include ${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${PolyVoxHeaders_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) REMOVE_DEFINITIONS(-DQT_GUI_LIB) #Make sure the tests don't link to the QtGui # Test Template. Copy and paste this template for consistant naming. From 049a77cd0cac1c0bfbde93645a8fd594eaaa29ec Mon Sep 17 00:00:00 2001 From: David Williams Date: Sat, 7 Feb 2015 17:26:36 +0100 Subject: [PATCH 17/19] Moved all headers from 'PolyVoxCore' to 'PolyVox', as we no longer have the core/util distinction. --- examples/Basic/main.cpp | 8 +- examples/DecodeOnGPU/main.cpp | 8 +- examples/OpenGL/Shapes.cpp | 2 +- examples/OpenGL/Shapes.h | 4 +- examples/OpenGL/main.cpp | 14 +- examples/Paging/main.cpp | 10 +- examples/SmoothLOD/main.cpp | 12 +- examples/common/OpenGLWidget.h | 2 +- include/CMakeLists.txt | 120 +++++++++--------- .../AStarPathfinder.h | 2 +- .../AStarPathfinder.inl | 2 +- .../AmbientOcclusionCalculator.h | 12 +- .../AmbientOcclusionCalculator.inl | 0 include/{PolyVoxCore => PolyVox}/Array.h | 2 +- include/{PolyVoxCore => PolyVox}/BaseVolume.h | 8 +- .../{PolyVoxCore => PolyVox}/BaseVolume.inl | 0 .../BaseVolumeSampler.inl | 2 +- .../CubicSurfaceExtractor.h | 12 +- .../CubicSurfaceExtractor.inl | 2 +- .../DefaultIsQuadNeeded.h | 2 +- .../DefaultMarchingCubesController.h | 2 +- include/{PolyVoxCore => PolyVox}/Density.h | 2 +- include/{PolyVoxCore => PolyVox}/FilePager.h | 6 +- .../GradientEstimators.h | 6 +- .../GradientEstimators.inl | 0 .../Impl/AStarPathfinderImpl.h | 2 +- .../{PolyVoxCore => PolyVox}/Impl/Config.h | 0 .../Impl/ErrorHandling.h | 4 +- .../{PolyVoxCore => PolyVox}/Impl/Logging.h | 2 +- .../Impl/MarchingCubesTables.h | 2 +- .../Impl/RandomUnitVectors.h | 4 +- .../Impl/RandomVectors.h | 4 +- include/{PolyVoxCore => PolyVox}/Impl/Timer.h | 0 .../{PolyVoxCore => PolyVox}/Impl/TypeDef.h | 0 .../{PolyVoxCore => PolyVox}/Impl/Utility.h | 2 +- .../{PolyVoxCore => PolyVox}/Interpolation.h | 0 .../IteratorController.h | 4 +- .../IteratorController.inl | 0 .../{PolyVoxCore => PolyVox}/LargeVolume.h | 0 .../{PolyVoxCore => PolyVox}/LowPassFilter.h | 8 +- .../LowPassFilter.inl | 0 .../MarchingCubesSurfaceExtractor.h | 12 +- .../MarchingCubesSurfaceExtractor.inl | 2 +- include/{PolyVoxCore => PolyVox}/Material.h | 2 +- .../MaterialDensityPair.h | 4 +- include/{PolyVoxCore => PolyVox}/Mesh.h | 8 +- include/{PolyVoxCore => PolyVox}/Mesh.inl | 0 .../{PolyVoxCore => PolyVox}/PagedVolume.h | 12 +- .../{PolyVoxCore => PolyVox}/PagedVolume.inl | 2 +- .../PagedVolumeChunk.inl | 2 +- .../PagedVolumeSampler.inl | 0 include/{PolyVoxCore => PolyVox}/Picking.h | 4 +- include/{PolyVoxCore => PolyVox}/Picking.inl | 2 +- .../PolyVoxForwardDeclarations.h | 0 include/{PolyVoxCore => PolyVox}/RawVolume.h | 10 +- .../{PolyVoxCore => PolyVox}/RawVolume.inl | 0 .../RawVolumeSampler.inl | 0 include/{PolyVoxCore => PolyVox}/Raycast.h | 4 +- include/{PolyVoxCore => PolyVox}/Raycast.inl | 0 include/{PolyVoxCore => PolyVox}/Region.h | 4 +- include/{PolyVoxCore => PolyVox}/Region.inl | 0 .../{PolyVoxCore => PolyVox}/SimpleVolume.h | 0 include/{PolyVoxCore => PolyVox}/Vector.h | 2 +- include/{PolyVoxCore => PolyVox}/Vector.inl | 0 include/{PolyVoxCore => PolyVox}/Vertex.h | 2 +- .../VolumeResampler.h | 4 +- .../VolumeResampler.inl | 2 +- .../{PolyVoxCore => PolyVox}/VoxelFilters.h | 2 +- .../{PolyVoxCore => PolyVox}/VoxelFilters.inl | 0 tests/TestAStarPathfinder.cpp | 6 +- tests/TestAmbientOcclusionGenerator.cpp | 4 +- tests/TestArray.cpp | 2 +- tests/TestCubicSurfaceExtractor.cpp | 12 +- tests/TestLowPassFilter.cpp | 6 +- tests/TestPicking.cpp | 4 +- tests/TestRaycast.cpp | 8 +- tests/TestRegion.cpp | 2 +- tests/TestSurfaceExtractor.cpp | 12 +- tests/TestVolumeSubclass.cpp | 10 +- tests/testmaterial.cpp | 2 +- tests/testvector.cpp | 2 +- tests/testvolume.cpp | 6 +- tests/testvolume.h | 2 +- 83 files changed, 215 insertions(+), 215 deletions(-) rename include/{PolyVoxCore => PolyVox}/AStarPathfinder.h (99%) rename include/{PolyVoxCore => PolyVox}/AStarPathfinder.inl (99%) rename include/{PolyVoxCore => PolyVox}/AmbientOcclusionCalculator.h (92%) rename include/{PolyVoxCore => PolyVox}/AmbientOcclusionCalculator.inl (100%) rename include/{PolyVoxCore => PolyVox}/Array.h (98%) rename include/{PolyVoxCore => PolyVox}/BaseVolume.h (98%) rename include/{PolyVoxCore => PolyVox}/BaseVolume.inl (100%) rename include/{PolyVoxCore => PolyVox}/BaseVolumeSampler.inl (99%) rename include/{PolyVoxCore => PolyVox}/CubicSurfaceExtractor.h (98%) rename include/{PolyVoxCore => PolyVox}/CubicSurfaceExtractor.inl (99%) rename include/{PolyVoxCore => PolyVox}/DefaultIsQuadNeeded.h (94%) rename include/{PolyVoxCore => PolyVox}/DefaultMarchingCubesController.h (99%) rename include/{PolyVoxCore => PolyVox}/Density.h (97%) rename include/{PolyVoxCore => PolyVox}/FilePager.h (98%) rename include/{PolyVoxCore => PolyVox}/GradientEstimators.h (95%) rename include/{PolyVoxCore => PolyVox}/GradientEstimators.inl (100%) rename include/{PolyVoxCore => PolyVox}/Impl/AStarPathfinderImpl.h (99%) rename include/{PolyVoxCore => PolyVox}/Impl/Config.h (100%) rename include/{PolyVoxCore => PolyVox}/Impl/ErrorHandling.h (99%) rename include/{PolyVoxCore => PolyVox}/Impl/Logging.h (99%) rename include/{PolyVoxCore => PolyVox}/Impl/MarchingCubesTables.h (99%) rename include/{PolyVoxCore => PolyVox}/Impl/RandomUnitVectors.h (99%) rename include/{PolyVoxCore => PolyVox}/Impl/RandomVectors.h (99%) rename include/{PolyVoxCore => PolyVox}/Impl/Timer.h (100%) rename include/{PolyVoxCore => PolyVox}/Impl/TypeDef.h (100%) rename include/{PolyVoxCore => PolyVox}/Impl/Utility.h (98%) rename include/{PolyVoxCore => PolyVox}/Interpolation.h (100%) rename include/{PolyVoxCore => PolyVox}/IteratorController.h (94%) rename include/{PolyVoxCore => PolyVox}/IteratorController.inl (100%) rename include/{PolyVoxCore => PolyVox}/LargeVolume.h (100%) rename include/{PolyVoxCore => PolyVox}/LowPassFilter.h (90%) rename include/{PolyVoxCore => PolyVox}/LowPassFilter.inl (100%) rename include/{PolyVoxCore => PolyVox}/MarchingCubesSurfaceExtractor.h (98%) rename include/{PolyVoxCore => PolyVox}/MarchingCubesSurfaceExtractor.inl (99%) rename include/{PolyVoxCore => PolyVox}/Material.h (96%) rename include/{PolyVoxCore => PolyVox}/MaterialDensityPair.h (96%) rename include/{PolyVoxCore => PolyVox}/Mesh.h (93%) rename include/{PolyVoxCore => PolyVox}/Mesh.inl (100%) rename include/{PolyVoxCore => PolyVox}/PagedVolume.h (98%) rename include/{PolyVoxCore => PolyVox}/PagedVolume.inl (99%) rename include/{PolyVoxCore => PolyVox}/PagedVolumeChunk.inl (99%) rename include/{PolyVoxCore => PolyVox}/PagedVolumeSampler.inl (100%) rename include/{PolyVoxCore => PolyVox}/Picking.h (96%) rename include/{PolyVoxCore => PolyVox}/Picking.inl (98%) rename include/{PolyVoxCore => PolyVox}/PolyVoxForwardDeclarations.h (100%) rename include/{PolyVoxCore => PolyVox}/RawVolume.h (97%) rename include/{PolyVoxCore => PolyVox}/RawVolume.inl (100%) rename include/{PolyVoxCore => PolyVox}/RawVolumeSampler.inl (100%) rename include/{PolyVoxCore => PolyVox}/Raycast.h (98%) rename include/{PolyVoxCore => PolyVox}/Raycast.inl (100%) rename include/{PolyVoxCore => PolyVox}/Region.h (99%) rename include/{PolyVoxCore => PolyVox}/Region.inl (100%) rename include/{PolyVoxCore => PolyVox}/SimpleVolume.h (100%) rename include/{PolyVoxCore => PolyVox}/Vector.h (99%) rename include/{PolyVoxCore => PolyVox}/Vector.inl (100%) rename include/{PolyVoxCore => PolyVox}/Vertex.h (97%) rename include/{PolyVoxCore => PolyVox}/VolumeResampler.h (95%) rename include/{PolyVoxCore => PolyVox}/VolumeResampler.inl (99%) rename include/{PolyVoxCore => PolyVox}/VoxelFilters.h (96%) rename include/{PolyVoxCore => PolyVox}/VoxelFilters.inl (100%) diff --git a/examples/Basic/main.cpp b/examples/Basic/main.cpp index b2d7bb3d..3fba8964 100644 --- a/examples/Basic/main.cpp +++ b/examples/Basic/main.cpp @@ -23,10 +23,10 @@ freely, subject to the following restrictions: #include "OpenGLWidget.h" -#include "PolyVoxCore/CubicSurfaceExtractor.h" -#include "PolyVoxCore/MarchingCubesSurfaceExtractor.h" -#include "PolyVoxCore/Mesh.h" -#include "PolyVoxCore/PagedVolume.h" +#include "PolyVox/CubicSurfaceExtractor.h" +#include "PolyVox/MarchingCubesSurfaceExtractor.h" +#include "PolyVox/Mesh.h" +#include "PolyVox/PagedVolume.h" #include diff --git a/examples/DecodeOnGPU/main.cpp b/examples/DecodeOnGPU/main.cpp index a13dd677..52091119 100644 --- a/examples/DecodeOnGPU/main.cpp +++ b/examples/DecodeOnGPU/main.cpp @@ -23,10 +23,10 @@ freely, subject to the following restrictions: #include "OpenGLWidget.h" -#include "PolyVoxCore/CubicSurfaceExtractor.h" -#include "PolyVoxCore/MarchingCubesSurfaceExtractor.h" -#include "PolyVoxCore/Mesh.h" -#include "PolyVoxCore/PagedVolume.h" +#include "PolyVox/CubicSurfaceExtractor.h" +#include "PolyVox/MarchingCubesSurfaceExtractor.h" +#include "PolyVox/Mesh.h" +#include "PolyVox/PagedVolume.h" #include diff --git a/examples/OpenGL/Shapes.cpp b/examples/OpenGL/Shapes.cpp index 434ff1ca..1ebe6e58 100644 --- a/examples/OpenGL/Shapes.cpp +++ b/examples/OpenGL/Shapes.cpp @@ -23,7 +23,7 @@ freely, subject to the following restrictions: #include "Shapes.h" -#include "PolyVoxCore/MaterialDensityPair.h" +#include "PolyVox/MaterialDensityPair.h" using namespace PolyVox; diff --git a/examples/OpenGL/Shapes.h b/examples/OpenGL/Shapes.h index 140fdea3..f2f5b193 100644 --- a/examples/OpenGL/Shapes.h +++ b/examples/OpenGL/Shapes.h @@ -24,8 +24,8 @@ freely, subject to the following restrictions: #ifndef __OpenGLExample_Shapes_H__ #define __OpenGLExample_Shapes_H__ -#include "PolyVoxCore/PagedVolume.h" -#include "PolyVoxCore/MaterialDensityPair.h" +#include "PolyVox/PagedVolume.h" +#include "PolyVox/MaterialDensityPair.h" void createSphereInVolume(PolyVox::LargeVolume& volData, float fRadius, uint8_t uValue); void createCubeInVolume(PolyVox::LargeVolume& volData, PolyVox::Vector3DInt32 lowerCorner, PolyVox::Vector3DInt32 upperCorner, uint8_t uValue); diff --git a/examples/OpenGL/main.cpp b/examples/OpenGL/main.cpp index a76c2800..6e94c5b8 100644 --- a/examples/OpenGL/main.cpp +++ b/examples/OpenGL/main.cpp @@ -21,13 +21,13 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#include "PolyVoxCore/FilePager.h" -#include "PolyVoxCore/MarchingCubesSurfaceExtractor.h" -#include "PolyVoxCore/MaterialDensityPair.h" -#include "PolyVoxCore/LowPassFilter.h" -#include "PolyVoxCore/RawVolume.h" -#include "PolyVoxCore/Mesh.h" -#include "PolyVoxCore/Impl/Utility.h" +#include "PolyVox/FilePager.h" +#include "PolyVox/MarchingCubesSurfaceExtractor.h" +#include "PolyVox/MaterialDensityPair.h" +#include "PolyVox/LowPassFilter.h" +#include "PolyVox/RawVolume.h" +#include "PolyVox/Mesh.h" +#include "PolyVox/Impl/Utility.h" #include "Shapes.h" diff --git a/examples/Paging/main.cpp b/examples/Paging/main.cpp index a3e60356..09b325d8 100644 --- a/examples/Paging/main.cpp +++ b/examples/Paging/main.cpp @@ -24,11 +24,11 @@ freely, subject to the following restrictions: #include "OpenGLWidget.h" #include "Perlin.h" -#include "PolyVoxCore/MaterialDensityPair.h" -#include "PolyVoxCore/CubicSurfaceExtractor.h" -#include "PolyVoxCore/MarchingCubesSurfaceExtractor.h" -#include "PolyVoxCore/Mesh.h" -#include "PolyVoxCore/PagedVolume.h" +#include "PolyVox/MaterialDensityPair.h" +#include "PolyVox/CubicSurfaceExtractor.h" +#include "PolyVox/MarchingCubesSurfaceExtractor.h" +#include "PolyVox/Mesh.h" +#include "PolyVox/PagedVolume.h" #include diff --git a/examples/SmoothLOD/main.cpp b/examples/SmoothLOD/main.cpp index da90282c..b8c56f08 100644 --- a/examples/SmoothLOD/main.cpp +++ b/examples/SmoothLOD/main.cpp @@ -23,12 +23,12 @@ freely, subject to the following restrictions: #include "OpenGLWidget.h" -#include "PolyVoxCore/Density.h" -#include "PolyVoxCore/MarchingCubesSurfaceExtractor.h" -#include "PolyVoxCore/Mesh.h" -#include "PolyVoxCore/RawVolume.h" -#include "PolyVoxCore/PagedVolume.h" -#include "PolyVoxCore/VolumeResampler.h" +#include "PolyVox/Density.h" +#include "PolyVox/MarchingCubesSurfaceExtractor.h" +#include "PolyVox/Mesh.h" +#include "PolyVox/RawVolume.h" +#include "PolyVox/PagedVolume.h" +#include "PolyVox/VolumeResampler.h" #include diff --git a/examples/common/OpenGLWidget.h b/examples/common/OpenGLWidget.h index 4112a2fa..ba8fdedc 100644 --- a/examples/common/OpenGLWidget.h +++ b/examples/common/OpenGLWidget.h @@ -24,7 +24,7 @@ distribution. #ifndef __BasicExample_OpenGLWidget_H__ #define __BasicExample_OpenGLWidget_H__ -#include "PolyVoxCore/Mesh.h" +#include "PolyVox/Mesh.h" #include "glew/glew.h" diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 109d0a9e..db01270d 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -26,69 +26,69 @@ PROJECT(PolyVoxHeaders) #Projects headers files SET(CORE_INC_FILES - PolyVoxCore/AmbientOcclusionCalculator.h - PolyVoxCore/AmbientOcclusionCalculator.inl - PolyVoxCore/Array.h - PolyVoxCore/AStarPathfinder.h - PolyVoxCore/AStarPathfinder.inl - PolyVoxCore/BaseVolume.h - PolyVoxCore/BaseVolume.inl - PolyVoxCore/BaseVolumeSampler.inl - PolyVoxCore/CubicSurfaceExtractor.h - PolyVoxCore/CubicSurfaceExtractor.inl - PolyVoxCore/DefaultIsQuadNeeded.h - PolyVoxCore/DefaultMarchingCubesController.h - PolyVoxCore/Density.h - PolyVoxCore/FilePager.h - PolyVoxCore/GradientEstimators.h - PolyVoxCore/GradientEstimators.inl - PolyVoxCore/Interpolation.h - PolyVoxCore/IteratorController.h - PolyVoxCore/IteratorController.inl - PolyVoxCore/LargeVolume.h - PolyVoxCore/LowPassFilter.h - PolyVoxCore/LowPassFilter.inl - PolyVoxCore/MarchingCubesSurfaceExtractor.h - PolyVoxCore/MarchingCubesSurfaceExtractor.inl - PolyVoxCore/Material.h - PolyVoxCore/MaterialDensityPair.h - PolyVoxCore/Mesh.h - PolyVoxCore/Mesh.inl - PolyVoxCore/PagedVolume.h - PolyVoxCore/PagedVolume.inl - PolyVoxCore/PagedVolumeChunk.inl - PolyVoxCore/PagedVolumeSampler.inl - PolyVoxCore/PolyVoxForwardDeclarations.h - PolyVoxCore/Picking.h - PolyVoxCore/Picking.inl - PolyVoxCore/RawVolume.h - PolyVoxCore/RawVolume.inl - PolyVoxCore/RawVolumeSampler.inl - PolyVoxCore/Raycast.h - PolyVoxCore/Raycast.inl - PolyVoxCore/Region.h - PolyVoxCore/Region.inl - PolyVoxCore/SimpleVolume.h - PolyVoxCore/Vector.h - PolyVoxCore/Vector.inl - PolyVoxCore/Vertex.h - PolyVoxCore/VolumeResampler.h - PolyVoxCore/VolumeResampler.inl - PolyVoxCore/VoxelFilters.h - PolyVoxCore/VoxelFilters.inl + PolyVox/AmbientOcclusionCalculator.h + PolyVox/AmbientOcclusionCalculator.inl + PolyVox/Array.h + PolyVox/AStarPathfinder.h + PolyVox/AStarPathfinder.inl + PolyVox/BaseVolume.h + PolyVox/BaseVolume.inl + PolyVox/BaseVolumeSampler.inl + PolyVox/CubicSurfaceExtractor.h + PolyVox/CubicSurfaceExtractor.inl + PolyVox/DefaultIsQuadNeeded.h + PolyVox/DefaultMarchingCubesController.h + PolyVox/Density.h + PolyVox/FilePager.h + PolyVox/GradientEstimators.h + PolyVox/GradientEstimators.inl + PolyVox/Interpolation.h + PolyVox/IteratorController.h + PolyVox/IteratorController.inl + PolyVox/LargeVolume.h + PolyVox/LowPassFilter.h + PolyVox/LowPassFilter.inl + PolyVox/MarchingCubesSurfaceExtractor.h + PolyVox/MarchingCubesSurfaceExtractor.inl + PolyVox/Material.h + PolyVox/MaterialDensityPair.h + PolyVox/Mesh.h + PolyVox/Mesh.inl + PolyVox/PagedVolume.h + PolyVox/PagedVolume.inl + PolyVox/PagedVolumeChunk.inl + PolyVox/PagedVolumeSampler.inl + PolyVox/PolyVoxForwardDeclarations.h + PolyVox/Picking.h + PolyVox/Picking.inl + PolyVox/RawVolume.h + PolyVox/RawVolume.inl + PolyVox/RawVolumeSampler.inl + PolyVox/Raycast.h + PolyVox/Raycast.inl + PolyVox/Region.h + PolyVox/Region.inl + PolyVox/SimpleVolume.h + PolyVox/Vector.h + PolyVox/Vector.inl + PolyVox/Vertex.h + PolyVox/VolumeResampler.h + PolyVox/VolumeResampler.inl + PolyVox/VoxelFilters.h + PolyVox/VoxelFilters.inl ) SET(IMPL_INC_FILES - PolyVoxCore/Impl/AStarPathfinderImpl.h - PolyVoxCore/Impl/Config.h - PolyVoxCore/Impl/ErrorHandling.h - PolyVoxCore/Impl/Logging.h - PolyVoxCore/Impl/MarchingCubesTables.h - PolyVoxCore/Impl/RandomUnitVectors.h - PolyVoxCore/Impl/RandomVectors.h - PolyVoxCore/Impl/Timer.h - PolyVoxCore/Impl/TypeDef.h - PolyVoxCore/Impl/Utility.h + PolyVox/Impl/AStarPathfinderImpl.h + PolyVox/Impl/Config.h + PolyVox/Impl/ErrorHandling.h + PolyVox/Impl/Logging.h + PolyVox/Impl/MarchingCubesTables.h + PolyVox/Impl/RandomUnitVectors.h + PolyVox/Impl/RandomVectors.h + PolyVox/Impl/Timer.h + PolyVox/Impl/TypeDef.h + PolyVox/Impl/Utility.h ) #NOTE: The following line should be uncommented when building shared libs. diff --git a/include/PolyVoxCore/AStarPathfinder.h b/include/PolyVox/AStarPathfinder.h similarity index 99% rename from include/PolyVoxCore/AStarPathfinder.h rename to include/PolyVox/AStarPathfinder.h index 0c9d7a89..d453cff3 100644 --- a/include/PolyVoxCore/AStarPathfinder.h +++ b/include/PolyVox/AStarPathfinder.h @@ -224,6 +224,6 @@ namespace PolyVox }; } -#include "PolyVoxCore/AStarPathfinder.inl" +#include "PolyVox/AStarPathfinder.inl" #endif //__PolyVox_AStarPathfinder_H__ diff --git a/include/PolyVoxCore/AStarPathfinder.inl b/include/PolyVox/AStarPathfinder.inl similarity index 99% rename from include/PolyVoxCore/AStarPathfinder.inl rename to include/PolyVox/AStarPathfinder.inl index e0c570bd..42f1cf35 100644 --- a/include/PolyVoxCore/AStarPathfinder.inl +++ b/include/PolyVox/AStarPathfinder.inl @@ -21,7 +21,7 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#include "PolyVoxCore/Impl/ErrorHandling.h" +#include "PolyVox/Impl/ErrorHandling.h" namespace PolyVox { diff --git a/include/PolyVoxCore/AmbientOcclusionCalculator.h b/include/PolyVox/AmbientOcclusionCalculator.h similarity index 92% rename from include/PolyVoxCore/AmbientOcclusionCalculator.h rename to include/PolyVox/AmbientOcclusionCalculator.h index b9ca636a..2560127d 100644 --- a/include/PolyVoxCore/AmbientOcclusionCalculator.h +++ b/include/PolyVox/AmbientOcclusionCalculator.h @@ -27,13 +27,13 @@ freely, subject to the following restrictions: #include "Impl/RandomUnitVectors.h" #include "Impl/RandomVectors.h" -#include "PolyVoxCore/Array.h" -#include "PolyVoxCore/Region.h" -#include "PolyVoxCore/Raycast.h" +#include "PolyVox/Array.h" +#include "PolyVox/Region.h" +#include "PolyVox/Raycast.h" //These two should not be here! -#include "PolyVoxCore/Material.h" -#include "PolyVoxCore/PagedVolume.h" +#include "PolyVox/Material.h" +#include "PolyVox/PagedVolume.h" #include @@ -77,6 +77,6 @@ namespace PolyVox void calculateAmbientOcclusion(VolumeType* volInput, Array<3, uint8_t>* arrayResult, Region region, float fRayLength, uint8_t uNoOfSamplesPerOutputElement, IsVoxelTransparentCallback isVoxelTransparentCallback); } -#include "PolyVoxCore/AmbientOcclusionCalculator.inl" +#include "PolyVox/AmbientOcclusionCalculator.inl" #endif //__AmbientOcclusionCalculator_H__ diff --git a/include/PolyVoxCore/AmbientOcclusionCalculator.inl b/include/PolyVox/AmbientOcclusionCalculator.inl similarity index 100% rename from include/PolyVoxCore/AmbientOcclusionCalculator.inl rename to include/PolyVox/AmbientOcclusionCalculator.inl diff --git a/include/PolyVoxCore/Array.h b/include/PolyVox/Array.h similarity index 98% rename from include/PolyVoxCore/Array.h rename to include/PolyVox/Array.h index aa03f604..68f54db5 100644 --- a/include/PolyVoxCore/Array.h +++ b/include/PolyVox/Array.h @@ -24,7 +24,7 @@ distribution. #ifndef __PolyVox_Array_H__ #define __PolyVox_Array_H__ -#include +#include #include diff --git a/include/PolyVoxCore/BaseVolume.h b/include/PolyVox/BaseVolume.h similarity index 98% rename from include/PolyVoxCore/BaseVolume.h rename to include/PolyVox/BaseVolume.h index 6947188f..57898ffb 100644 --- a/include/PolyVoxCore/BaseVolume.h +++ b/include/PolyVox/BaseVolume.h @@ -24,8 +24,8 @@ freely, subject to the following restrictions: #ifndef __PolyVox_BaseVolume_H__ #define __PolyVox_BaseVolume_H__ -#include "PolyVoxCore/Region.h" -#include "PolyVoxCore/Vector.h" +#include "PolyVox/Region.h" +#include "PolyVox/Vector.h" #include @@ -211,7 +211,7 @@ namespace PolyVox }; } -#include "PolyVoxCore/BaseVolume.inl" -#include "PolyVoxCore/BaseVolumeSampler.inl" +#include "PolyVox/BaseVolume.inl" +#include "PolyVox/BaseVolumeSampler.inl" #endif //__PolyVox_BaseVolume_H__ diff --git a/include/PolyVoxCore/BaseVolume.inl b/include/PolyVox/BaseVolume.inl similarity index 100% rename from include/PolyVoxCore/BaseVolume.inl rename to include/PolyVox/BaseVolume.inl diff --git a/include/PolyVoxCore/BaseVolumeSampler.inl b/include/PolyVox/BaseVolumeSampler.inl similarity index 99% rename from include/PolyVoxCore/BaseVolumeSampler.inl rename to include/PolyVox/BaseVolumeSampler.inl index 0084f0db..993113a3 100644 --- a/include/PolyVoxCore/BaseVolumeSampler.inl +++ b/include/PolyVox/BaseVolumeSampler.inl @@ -21,7 +21,7 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#include "PolyVoxCore/Impl/Utility.h" +#include "PolyVox/Impl/Utility.h" namespace PolyVox { diff --git a/include/PolyVoxCore/CubicSurfaceExtractor.h b/include/PolyVox/CubicSurfaceExtractor.h similarity index 98% rename from include/PolyVoxCore/CubicSurfaceExtractor.h rename to include/PolyVox/CubicSurfaceExtractor.h index 6ea600e9..b0855061 100644 --- a/include/PolyVoxCore/CubicSurfaceExtractor.h +++ b/include/PolyVox/CubicSurfaceExtractor.h @@ -28,11 +28,11 @@ freely, subject to the following restrictions: #include "PolyVoxForwardDeclarations.h" -#include "PolyVoxCore/Array.h" -#include "PolyVoxCore/BaseVolume.h" //For wrap modes... should move these? -#include "PolyVoxCore/DefaultIsQuadNeeded.h" -#include "PolyVoxCore/Mesh.h" -#include "PolyVoxCore/Vertex.h" +#include "PolyVox/Array.h" +#include "PolyVox/BaseVolume.h" //For wrap modes... should move these? +#include "PolyVox/DefaultIsQuadNeeded.h" +#include "PolyVox/Mesh.h" +#include "PolyVox/Vertex.h" namespace PolyVox { @@ -223,6 +223,6 @@ namespace PolyVox } } -#include "PolyVoxCore/CubicSurfaceExtractor.inl" +#include "PolyVox/CubicSurfaceExtractor.inl" #endif diff --git a/include/PolyVoxCore/CubicSurfaceExtractor.inl b/include/PolyVox/CubicSurfaceExtractor.inl similarity index 99% rename from include/PolyVoxCore/CubicSurfaceExtractor.inl rename to include/PolyVox/CubicSurfaceExtractor.inl index 429140e9..6eefe3ec 100644 --- a/include/PolyVoxCore/CubicSurfaceExtractor.inl +++ b/include/PolyVox/CubicSurfaceExtractor.inl @@ -21,7 +21,7 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#include "PolyVoxCore/Impl/Timer.h" +#include "PolyVox/Impl/Timer.h" namespace PolyVox { diff --git a/include/PolyVoxCore/DefaultIsQuadNeeded.h b/include/PolyVox/DefaultIsQuadNeeded.h similarity index 94% rename from include/PolyVoxCore/DefaultIsQuadNeeded.h rename to include/PolyVox/DefaultIsQuadNeeded.h index ef15444e..5c25c8c1 100644 --- a/include/PolyVoxCore/DefaultIsQuadNeeded.h +++ b/include/PolyVox/DefaultIsQuadNeeded.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_DefaultIsQuadNeeded_H__ #define __PolyVox_DefaultIsQuadNeeded_H__ -#include "PolyVoxCore/Impl/TypeDef.h" +#include "PolyVox/Impl/TypeDef.h" #include diff --git a/include/PolyVoxCore/DefaultMarchingCubesController.h b/include/PolyVox/DefaultMarchingCubesController.h similarity index 99% rename from include/PolyVoxCore/DefaultMarchingCubesController.h rename to include/PolyVox/DefaultMarchingCubesController.h index 2d1b6144..5e99f3ae 100644 --- a/include/PolyVoxCore/DefaultMarchingCubesController.h +++ b/include/PolyVox/DefaultMarchingCubesController.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_MarchingCubesController_H__ #define __PolyVox_MarchingCubesController_H__ -#include "PolyVoxCore/BaseVolume.h" +#include "PolyVox/BaseVolume.h" #include diff --git a/include/PolyVoxCore/Density.h b/include/PolyVox/Density.h similarity index 97% rename from include/PolyVoxCore/Density.h rename to include/PolyVox/Density.h index 1cb18065..22b24f85 100644 --- a/include/PolyVoxCore/Density.h +++ b/include/PolyVox/Density.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_Density_H__ #define __PolyVox_Density_H__ -#include "PolyVoxCore/DefaultMarchingCubesController.h" //We'll specialise the controller contained in here +#include "PolyVox/DefaultMarchingCubesController.h" //We'll specialise the controller contained in here #include "Impl/TypeDef.h" diff --git a/include/PolyVoxCore/FilePager.h b/include/PolyVox/FilePager.h similarity index 98% rename from include/PolyVoxCore/FilePager.h rename to include/PolyVox/FilePager.h index ed3b7a9a..19c8ca62 100644 --- a/include/PolyVoxCore/FilePager.h +++ b/include/PolyVox/FilePager.h @@ -24,10 +24,10 @@ freely, subject to the following restrictions: #ifndef __PolyVox_FilePager_H__ #define __PolyVox_FilePager_H__ -#include "PolyVoxCore/Impl/TypeDef.h" +#include "PolyVox/Impl/TypeDef.h" -#include "PolyVoxCore/PagedVolume.h" -#include "PolyVoxCore/Region.h" +#include "PolyVox/PagedVolume.h" +#include "PolyVox/Region.h" #include #include diff --git a/include/PolyVoxCore/GradientEstimators.h b/include/PolyVox/GradientEstimators.h similarity index 95% rename from include/PolyVoxCore/GradientEstimators.h rename to include/PolyVox/GradientEstimators.h index 02b1eb0c..30ea14ab 100644 --- a/include/PolyVoxCore/GradientEstimators.h +++ b/include/PolyVox/GradientEstimators.h @@ -24,8 +24,8 @@ freely, subject to the following restrictions: #ifndef __PolyVox_GradientEstimators_H__ #define __PolyVox_GradientEstimators_H__ -#include "PolyVoxCore/Vector.h" -#include "PolyVoxCore/VoxelFilters.h" +#include "PolyVox/Vector.h" +#include "PolyVox/VoxelFilters.h" #include @@ -59,6 +59,6 @@ namespace PolyVox //POLYVOX_API Vector3DFloat computeNormal(VolumeType* volumeData, const Vector3DFloat& v3dPos, NormalGenerationMethod normalGenerationMethod); } -#include "PolyVoxCore/GradientEstimators.inl" +#include "PolyVox/GradientEstimators.inl" #endif //__PolyVox_GradientEstimators_H__ diff --git a/include/PolyVoxCore/GradientEstimators.inl b/include/PolyVox/GradientEstimators.inl similarity index 100% rename from include/PolyVoxCore/GradientEstimators.inl rename to include/PolyVox/GradientEstimators.inl diff --git a/include/PolyVoxCore/Impl/AStarPathfinderImpl.h b/include/PolyVox/Impl/AStarPathfinderImpl.h similarity index 99% rename from include/PolyVoxCore/Impl/AStarPathfinderImpl.h rename to include/PolyVox/Impl/AStarPathfinderImpl.h index f37bbfa8..37165eb9 100644 --- a/include/PolyVoxCore/Impl/AStarPathfinderImpl.h +++ b/include/PolyVox/Impl/AStarPathfinderImpl.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_AStarPathfinderImpl_H__ #define __PolyVox_AStarPathfinderImpl_H__ -#include "PolyVoxCore/Vector.h" +#include "PolyVox/Vector.h" #include #include //For numeric_limits diff --git a/include/PolyVoxCore/Impl/Config.h b/include/PolyVox/Impl/Config.h similarity index 100% rename from include/PolyVoxCore/Impl/Config.h rename to include/PolyVox/Impl/Config.h diff --git a/include/PolyVoxCore/Impl/ErrorHandling.h b/include/PolyVox/Impl/ErrorHandling.h similarity index 99% rename from include/PolyVoxCore/Impl/ErrorHandling.h rename to include/PolyVox/Impl/ErrorHandling.h index a1049bf7..bab86143 100644 --- a/include/PolyVoxCore/Impl/ErrorHandling.h +++ b/include/PolyVox/Impl/ErrorHandling.h @@ -24,9 +24,9 @@ freely, subject to the following restrictions: #ifndef __PolyVox_ErrorHandling_H__ #define __PolyVox_ErrorHandling_H__ -#include "PolyVoxCore/Impl/Config.h" +#include "PolyVox/Impl/Config.h" -#include "PolyVoxCore/Impl/Logging.h" +#include "PolyVox/Impl/Logging.h" #include // For std::exit #include // For std::cerr diff --git a/include/PolyVoxCore/Impl/Logging.h b/include/PolyVox/Impl/Logging.h similarity index 99% rename from include/PolyVoxCore/Impl/Logging.h rename to include/PolyVox/Impl/Logging.h index a9a3b2b5..ca8cb3cb 100644 --- a/include/PolyVoxCore/Impl/Logging.h +++ b/include/PolyVox/Impl/Logging.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_Logging_H__ #define __PolyVox_Logging_H__ -#include "PolyVoxCore/Impl/Config.h" +#include "PolyVox/Impl/Config.h" #include #include diff --git a/include/PolyVoxCore/Impl/MarchingCubesTables.h b/include/PolyVox/Impl/MarchingCubesTables.h similarity index 99% rename from include/PolyVoxCore/Impl/MarchingCubesTables.h rename to include/PolyVox/Impl/MarchingCubesTables.h index 2a251120..793208d3 100644 --- a/include/PolyVoxCore/Impl/MarchingCubesTables.h +++ b/include/PolyVox/Impl/MarchingCubesTables.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_MarchingCubeTables_H__ #define __PolyVox_MarchingCubeTables_H__ -#include "PolyVoxCore/Impl/TypeDef.h" +#include "PolyVox/Impl/TypeDef.h" #include diff --git a/include/PolyVoxCore/Impl/RandomUnitVectors.h b/include/PolyVox/Impl/RandomUnitVectors.h similarity index 99% rename from include/PolyVoxCore/Impl/RandomUnitVectors.h rename to include/PolyVox/Impl/RandomUnitVectors.h index aac04c05..95ff60e3 100644 --- a/include/PolyVoxCore/Impl/RandomUnitVectors.h +++ b/include/PolyVox/Impl/RandomUnitVectors.h @@ -24,9 +24,9 @@ freely, subject to the following restrictions: #ifndef __PolyVox_RandomUnitVectors_H__ #define __PolyVox_RandomUnitVectors_H__ -#include "PolyVoxCore/Impl/TypeDef.h" +#include "PolyVox/Impl/TypeDef.h" -#include "PolyVoxCore/Vector.h" +#include "PolyVox/Vector.h" namespace PolyVox { diff --git a/include/PolyVoxCore/Impl/RandomVectors.h b/include/PolyVox/Impl/RandomVectors.h similarity index 99% rename from include/PolyVoxCore/Impl/RandomVectors.h rename to include/PolyVox/Impl/RandomVectors.h index a18d5e1f..346587f6 100644 --- a/include/PolyVoxCore/Impl/RandomVectors.h +++ b/include/PolyVox/Impl/RandomVectors.h @@ -24,9 +24,9 @@ freely, subject to the following restrictions: #ifndef __PolyVox_RandomVectors_H__ #define __PolyVox_RandomVectors_H__ -#include "PolyVoxCore/Impl/TypeDef.h" +#include "PolyVox/Impl/TypeDef.h" -#include "PolyVoxCore/Vector.h" +#include "PolyVox/Vector.h" namespace PolyVox { diff --git a/include/PolyVoxCore/Impl/Timer.h b/include/PolyVox/Impl/Timer.h similarity index 100% rename from include/PolyVoxCore/Impl/Timer.h rename to include/PolyVox/Impl/Timer.h diff --git a/include/PolyVoxCore/Impl/TypeDef.h b/include/PolyVox/Impl/TypeDef.h similarity index 100% rename from include/PolyVoxCore/Impl/TypeDef.h rename to include/PolyVox/Impl/TypeDef.h diff --git a/include/PolyVoxCore/Impl/Utility.h b/include/PolyVox/Impl/Utility.h similarity index 98% rename from include/PolyVoxCore/Impl/Utility.h rename to include/PolyVox/Impl/Utility.h index e5ba354c..2fb3e59e 100644 --- a/include/PolyVoxCore/Impl/Utility.h +++ b/include/PolyVox/Impl/Utility.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_Utility_H__ #define __PolyVox_Utility_H__ -#include "PolyVoxCore/Impl/TypeDef.h" +#include "PolyVox/Impl/TypeDef.h" #include diff --git a/include/PolyVoxCore/Interpolation.h b/include/PolyVox/Interpolation.h similarity index 100% rename from include/PolyVoxCore/Interpolation.h rename to include/PolyVox/Interpolation.h diff --git a/include/PolyVoxCore/IteratorController.h b/include/PolyVox/IteratorController.h similarity index 94% rename from include/PolyVoxCore/IteratorController.h rename to include/PolyVox/IteratorController.h index b819fd6e..a03ffc75 100644 --- a/include/PolyVoxCore/IteratorController.h +++ b/include/PolyVox/IteratorController.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_IteratorController_H__ #define __PolyVox_IteratorController_H__ -#include "PolyVoxCore/Region.h" +#include "PolyVox/Region.h" namespace PolyVox { @@ -41,6 +41,6 @@ namespace PolyVox }; } -#include "PolyVoxCore/IteratorController.inl" +#include "PolyVox/IteratorController.inl" #endif //__PolyVox_IteratorController_H__ diff --git a/include/PolyVoxCore/IteratorController.inl b/include/PolyVox/IteratorController.inl similarity index 100% rename from include/PolyVoxCore/IteratorController.inl rename to include/PolyVox/IteratorController.inl diff --git a/include/PolyVoxCore/LargeVolume.h b/include/PolyVox/LargeVolume.h similarity index 100% rename from include/PolyVoxCore/LargeVolume.h rename to include/PolyVox/LargeVolume.h diff --git a/include/PolyVoxCore/LowPassFilter.h b/include/PolyVox/LowPassFilter.h similarity index 90% rename from include/PolyVoxCore/LowPassFilter.h rename to include/PolyVox/LowPassFilter.h index 5ec1ea71..75fcbb37 100644 --- a/include/PolyVoxCore/LowPassFilter.h +++ b/include/PolyVox/LowPassFilter.h @@ -24,9 +24,9 @@ freely, subject to the following restrictions: #ifndef __PolyVox_LowPassFilter_H__ #define __PolyVox_LowPassFilter_H__ -#include "PolyVoxCore/IteratorController.h" -#include "PolyVoxCore/RawVolume.h" //Is this desirable? -#include "PolyVoxCore/Region.h" +#include "PolyVox/IteratorController.h" +#include "PolyVox/RawVolume.h" //Is this desirable? +#include "PolyVox/Region.h" namespace PolyVox { @@ -54,7 +54,7 @@ namespace PolyVox }//namespace PolyVox -#include "PolyVoxCore/LowPassFilter.inl" +#include "PolyVox/LowPassFilter.inl" #endif //__PolyVox_LowPassFilter_H__ diff --git a/include/PolyVoxCore/LowPassFilter.inl b/include/PolyVox/LowPassFilter.inl similarity index 100% rename from include/PolyVoxCore/LowPassFilter.inl rename to include/PolyVox/LowPassFilter.inl diff --git a/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h b/include/PolyVox/MarchingCubesSurfaceExtractor.h similarity index 98% rename from include/PolyVoxCore/MarchingCubesSurfaceExtractor.h rename to include/PolyVox/MarchingCubesSurfaceExtractor.h index d1702f22..69ec0569 100644 --- a/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h +++ b/include/PolyVox/MarchingCubesSurfaceExtractor.h @@ -27,11 +27,11 @@ freely, subject to the following restrictions: #include "Impl/MarchingCubesTables.h" #include "Impl/TypeDef.h" -#include "PolyVoxCore/Array.h" -#include "PolyVoxCore/BaseVolume.h" //For wrap modes... should move these? -#include "PolyVoxCore/Mesh.h" -#include "PolyVoxCore/DefaultMarchingCubesController.h" -#include "PolyVoxCore/Vertex.h" +#include "PolyVox/Array.h" +#include "PolyVox/BaseVolume.h" //For wrap modes... should move these? +#include "PolyVox/Mesh.h" +#include "PolyVox/DefaultMarchingCubesController.h" +#include "PolyVox/Vertex.h" namespace PolyVox { @@ -353,6 +353,6 @@ namespace PolyVox } } -#include "PolyVoxCore/MarchingCubesSurfaceExtractor.inl" +#include "PolyVox/MarchingCubesSurfaceExtractor.inl" #endif diff --git a/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl b/include/PolyVox/MarchingCubesSurfaceExtractor.inl similarity index 99% rename from include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl rename to include/PolyVox/MarchingCubesSurfaceExtractor.inl index cf8dcf67..4fb98272 100644 --- a/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl +++ b/include/PolyVox/MarchingCubesSurfaceExtractor.inl @@ -21,7 +21,7 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#include "PolyVoxCore/Impl/Timer.h" +#include "PolyVox/Impl/Timer.h" namespace PolyVox { diff --git a/include/PolyVoxCore/Material.h b/include/PolyVox/Material.h similarity index 96% rename from include/PolyVoxCore/Material.h rename to include/PolyVox/Material.h index 2958d7e5..e3d98c99 100644 --- a/include/PolyVoxCore/Material.h +++ b/include/PolyVox/Material.h @@ -26,7 +26,7 @@ freely, subject to the following restrictions: #include "Impl/TypeDef.h" -#include "PolyVoxCore/DefaultIsQuadNeeded.h" //we'll specialise this function for this voxel type +#include "PolyVox/DefaultIsQuadNeeded.h" //we'll specialise this function for this voxel type namespace PolyVox { diff --git a/include/PolyVoxCore/MaterialDensityPair.h b/include/PolyVox/MaterialDensityPair.h similarity index 96% rename from include/PolyVoxCore/MaterialDensityPair.h rename to include/PolyVox/MaterialDensityPair.h index 83cc1739..87592ce7 100644 --- a/include/PolyVoxCore/MaterialDensityPair.h +++ b/include/PolyVox/MaterialDensityPair.h @@ -24,8 +24,8 @@ freely, subject to the following restrictions: #ifndef __PolyVox_MaterialDensityPair_H__ #define __PolyVox_MaterialDensityPair_H__ -#include "PolyVoxCore/DefaultIsQuadNeeded.h" //we'll specialise this function for this voxel type -#include "PolyVoxCore/DefaultMarchingCubesController.h" //We'll specialise the controller contained in here +#include "PolyVox/DefaultIsQuadNeeded.h" //we'll specialise this function for this voxel type +#include "PolyVox/DefaultMarchingCubesController.h" //We'll specialise the controller contained in here #include "Impl/TypeDef.h" diff --git a/include/PolyVoxCore/Mesh.h b/include/PolyVox/Mesh.h similarity index 93% rename from include/PolyVoxCore/Mesh.h rename to include/PolyVox/Mesh.h index 4c1b3582..08bc0d07 100644 --- a/include/PolyVoxCore/Mesh.h +++ b/include/PolyVox/Mesh.h @@ -26,9 +26,9 @@ freely, subject to the following restrictions: #include "Impl/TypeDef.h" -#include "PolyVoxCore/PolyVoxForwardDeclarations.h" -#include "PolyVoxCore/Region.h" -#include "PolyVoxCore/Vertex.h" //Should probably do away with this on in the future... +#include "PolyVox/PolyVoxForwardDeclarations.h" +#include "PolyVox/Region.h" +#include "PolyVox/Vertex.h" //Should probably do away with this on in the future... #include #include @@ -98,6 +98,6 @@ namespace PolyVox } } -#include "PolyVoxCore/Mesh.inl" +#include "PolyVox/Mesh.inl" #endif /* __Mesh_H__ */ diff --git a/include/PolyVoxCore/Mesh.inl b/include/PolyVox/Mesh.inl similarity index 100% rename from include/PolyVoxCore/Mesh.inl rename to include/PolyVox/Mesh.inl diff --git a/include/PolyVoxCore/PagedVolume.h b/include/PolyVox/PagedVolume.h similarity index 98% rename from include/PolyVoxCore/PagedVolume.h rename to include/PolyVox/PagedVolume.h index adf27243..e5ca536f 100644 --- a/include/PolyVoxCore/PagedVolume.h +++ b/include/PolyVox/PagedVolume.h @@ -24,9 +24,9 @@ freely, subject to the following restrictions: #ifndef __PolyVox_PagedVolume_H__ #define __PolyVox_PagedVolume_H__ -#include "PolyVoxCore/BaseVolume.h" -#include "PolyVoxCore/Region.h" -#include "PolyVoxCore/Vector.h" +#include "PolyVox/BaseVolume.h" +#include "PolyVox/Region.h" +#include "PolyVox/Vector.h" #include #include //For abort() @@ -359,8 +359,8 @@ namespace PolyVox }; } -#include "PolyVoxCore/PagedVolume.inl" -#include "PolyVoxCore/PagedVolumeChunk.inl" -#include "PolyVoxCore/PagedVolumeSampler.inl" +#include "PolyVox/PagedVolume.inl" +#include "PolyVox/PagedVolumeChunk.inl" +#include "PolyVox/PagedVolumeSampler.inl" #endif //__PolyVox_PagedVolume_H__ diff --git a/include/PolyVoxCore/PagedVolume.inl b/include/PolyVox/PagedVolume.inl similarity index 99% rename from include/PolyVoxCore/PagedVolume.inl rename to include/PolyVox/PagedVolume.inl index 642c1ff8..e6c5b04b 100644 --- a/include/PolyVoxCore/PagedVolume.inl +++ b/include/PolyVox/PagedVolume.inl @@ -21,7 +21,7 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#include "PolyVoxCore/Impl/ErrorHandling.h" +#include "PolyVox/Impl/ErrorHandling.h" #include #include diff --git a/include/PolyVoxCore/PagedVolumeChunk.inl b/include/PolyVox/PagedVolumeChunk.inl similarity index 99% rename from include/PolyVoxCore/PagedVolumeChunk.inl rename to include/PolyVox/PagedVolumeChunk.inl index d7e249bd..7a51c79b 100644 --- a/include/PolyVoxCore/PagedVolumeChunk.inl +++ b/include/PolyVox/PagedVolumeChunk.inl @@ -21,7 +21,7 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#include "PolyVoxCore/Impl/Utility.h" +#include "PolyVox/Impl/Utility.h" namespace PolyVox { diff --git a/include/PolyVoxCore/PagedVolumeSampler.inl b/include/PolyVox/PagedVolumeSampler.inl similarity index 100% rename from include/PolyVoxCore/PagedVolumeSampler.inl rename to include/PolyVox/PagedVolumeSampler.inl diff --git a/include/PolyVoxCore/Picking.h b/include/PolyVox/Picking.h similarity index 96% rename from include/PolyVoxCore/Picking.h rename to include/PolyVox/Picking.h index ee757ddb..49b026ca 100644 --- a/include/PolyVoxCore/Picking.h +++ b/include/PolyVox/Picking.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_Picking_H__ #define __PolyVox_Picking_H__ -#include "PolyVoxCore/Vector.h" +#include "PolyVox/Vector.h" namespace PolyVox { @@ -44,6 +44,6 @@ namespace PolyVox PickResult pickVoxel(VolumeType* volData, const Vector3DFloat& v3dStart, const Vector3DFloat& v3dDirectionAndLength, const typename VolumeType::VoxelType& emptyVoxelExample); } -#include "PolyVoxCore/Picking.inl" +#include "PolyVox/Picking.inl" #endif //__PolyVox_Picking_H__ diff --git a/include/PolyVoxCore/Picking.inl b/include/PolyVox/Picking.inl similarity index 98% rename from include/PolyVoxCore/Picking.inl rename to include/PolyVox/Picking.inl index c776ee00..c5829f09 100644 --- a/include/PolyVoxCore/Picking.inl +++ b/include/PolyVox/Picking.inl @@ -21,7 +21,7 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#include "PolyVoxCore/Raycast.h" +#include "PolyVox/Raycast.h" namespace PolyVox { diff --git a/include/PolyVoxCore/PolyVoxForwardDeclarations.h b/include/PolyVox/PolyVoxForwardDeclarations.h similarity index 100% rename from include/PolyVoxCore/PolyVoxForwardDeclarations.h rename to include/PolyVox/PolyVoxForwardDeclarations.h diff --git a/include/PolyVoxCore/RawVolume.h b/include/PolyVox/RawVolume.h similarity index 97% rename from include/PolyVoxCore/RawVolume.h rename to include/PolyVox/RawVolume.h index 3201bb8a..73a2f1e5 100644 --- a/include/PolyVoxCore/RawVolume.h +++ b/include/PolyVox/RawVolume.h @@ -24,9 +24,9 @@ freely, subject to the following restrictions: #ifndef __PolyVox_RawVolume_H__ #define __PolyVox_RawVolume_H__ -#include "PolyVoxCore/BaseVolume.h" -#include "PolyVoxCore/Region.h" -#include "PolyVoxCore/Vector.h" +#include "PolyVox/BaseVolume.h" +#include "PolyVox/Region.h" +#include "PolyVox/Vector.h" #include //For abort() #include @@ -167,7 +167,7 @@ namespace PolyVox }; } -#include "PolyVoxCore/RawVolume.inl" -#include "PolyVoxCore/RawVolumeSampler.inl" +#include "PolyVox/RawVolume.inl" +#include "PolyVox/RawVolumeSampler.inl" #endif //__PolyVox_RawVolume_H__ diff --git a/include/PolyVoxCore/RawVolume.inl b/include/PolyVox/RawVolume.inl similarity index 100% rename from include/PolyVoxCore/RawVolume.inl rename to include/PolyVox/RawVolume.inl diff --git a/include/PolyVoxCore/RawVolumeSampler.inl b/include/PolyVox/RawVolumeSampler.inl similarity index 100% rename from include/PolyVoxCore/RawVolumeSampler.inl rename to include/PolyVox/RawVolumeSampler.inl diff --git a/include/PolyVoxCore/Raycast.h b/include/PolyVox/Raycast.h similarity index 98% rename from include/PolyVoxCore/Raycast.h rename to include/PolyVox/Raycast.h index 3adb28c4..4d4888b8 100644 --- a/include/PolyVoxCore/Raycast.h +++ b/include/PolyVox/Raycast.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_Raycast_H__ #define __PolyVox_Raycast_H__ -#include "PolyVoxCore/Vector.h" +#include "PolyVox/Vector.h" namespace PolyVox { @@ -98,6 +98,6 @@ namespace PolyVox RaycastResult raycastWithDirection(VolumeType* volData, const Vector3DFloat& v3dStart, const Vector3DFloat& v3dDirectionAndLength, Callback& callback); } -#include "PolyVoxCore/Raycast.inl" +#include "PolyVox/Raycast.inl" #endif //__PolyVox_Raycast_H__ diff --git a/include/PolyVoxCore/Raycast.inl b/include/PolyVox/Raycast.inl similarity index 100% rename from include/PolyVoxCore/Raycast.inl rename to include/PolyVox/Raycast.inl diff --git a/include/PolyVoxCore/Region.h b/include/PolyVox/Region.h similarity index 99% rename from include/PolyVoxCore/Region.h rename to include/PolyVox/Region.h index 6221b87b..71cdb09f 100644 --- a/include/PolyVoxCore/Region.h +++ b/include/PolyVox/Region.h @@ -26,7 +26,7 @@ freely, subject to the following restrictions: #include "Impl/TypeDef.h" -#include "PolyVoxCore/Vector.h" +#include "PolyVox/Vector.h" namespace PolyVox { @@ -458,6 +458,6 @@ namespace PolyVox } } -#include "PolyVoxCore/Region.inl" +#include "PolyVox/Region.inl" #endif diff --git a/include/PolyVoxCore/Region.inl b/include/PolyVox/Region.inl similarity index 100% rename from include/PolyVoxCore/Region.inl rename to include/PolyVox/Region.inl diff --git a/include/PolyVoxCore/SimpleVolume.h b/include/PolyVox/SimpleVolume.h similarity index 100% rename from include/PolyVoxCore/SimpleVolume.h rename to include/PolyVox/SimpleVolume.h diff --git a/include/PolyVoxCore/Vector.h b/include/PolyVox/Vector.h similarity index 99% rename from include/PolyVoxCore/Vector.h rename to include/PolyVox/Vector.h index 416158ed..695ce8c0 100644 --- a/include/PolyVoxCore/Vector.h +++ b/include/PolyVox/Vector.h @@ -242,7 +242,7 @@ namespace std } -#include "PolyVoxCore/Vector.inl" +#include "PolyVox/Vector.inl" #endif diff --git a/include/PolyVoxCore/Vector.inl b/include/PolyVox/Vector.inl similarity index 100% rename from include/PolyVoxCore/Vector.inl rename to include/PolyVox/Vector.inl diff --git a/include/PolyVoxCore/Vertex.h b/include/PolyVox/Vertex.h similarity index 97% rename from include/PolyVoxCore/Vertex.h rename to include/PolyVox/Vertex.h index 1eb6f429..12900c5a 100644 --- a/include/PolyVoxCore/Vertex.h +++ b/include/PolyVox/Vertex.h @@ -26,7 +26,7 @@ freely, subject to the following restrictions: #include "Impl/TypeDef.h" -#include "PolyVoxCore/Vector.h" +#include "PolyVox/Vector.h" #include #include diff --git a/include/PolyVoxCore/VolumeResampler.h b/include/PolyVox/VolumeResampler.h similarity index 95% rename from include/PolyVoxCore/VolumeResampler.h rename to include/PolyVox/VolumeResampler.h index ec7aed00..c2869262 100644 --- a/include/PolyVoxCore/VolumeResampler.h +++ b/include/PolyVox/VolumeResampler.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_VolumeResampler_H__ #define __PolyVox_VolumeResampler_H__ -#include "PolyVoxCore/Region.h" +#include "PolyVox/Region.h" namespace PolyVox { @@ -51,7 +51,7 @@ namespace PolyVox }//namespace PolyVox -#include "PolyVoxCore/VolumeResampler.inl" +#include "PolyVox/VolumeResampler.inl" #endif diff --git a/include/PolyVoxCore/VolumeResampler.inl b/include/PolyVox/VolumeResampler.inl similarity index 99% rename from include/PolyVoxCore/VolumeResampler.inl rename to include/PolyVox/VolumeResampler.inl index ae09dfb9..3360d54b 100644 --- a/include/PolyVoxCore/VolumeResampler.inl +++ b/include/PolyVox/VolumeResampler.inl @@ -21,7 +21,7 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#include "PolyVoxCore/Interpolation.h" +#include "PolyVox/Interpolation.h" #include diff --git a/include/PolyVoxCore/VoxelFilters.h b/include/PolyVox/VoxelFilters.h similarity index 96% rename from include/PolyVoxCore/VoxelFilters.h rename to include/PolyVox/VoxelFilters.h index 1c54b9ea..af48dd6d 100644 --- a/include/PolyVoxCore/VoxelFilters.h +++ b/include/PolyVox/VoxelFilters.h @@ -32,6 +32,6 @@ namespace PolyVox float computeSmoothedVoxel(typename VolumeType::Sampler& volIter); } -#include "PolyVoxCore/VoxelFilters.inl" +#include "PolyVox/VoxelFilters.inl" #endif diff --git a/include/PolyVoxCore/VoxelFilters.inl b/include/PolyVox/VoxelFilters.inl similarity index 100% rename from include/PolyVoxCore/VoxelFilters.inl rename to include/PolyVox/VoxelFilters.inl diff --git a/tests/TestAStarPathfinder.cpp b/tests/TestAStarPathfinder.cpp index 15c118d7..c6c52da0 100644 --- a/tests/TestAStarPathfinder.cpp +++ b/tests/TestAStarPathfinder.cpp @@ -23,9 +23,9 @@ freely, subject to the following restrictions: #include "TestAStarPathfinder.h" -#include "PolyVoxCore/AStarPathfinder.h" -#include "PolyVoxCore/Material.h" -#include "PolyVoxCore/RawVolume.h" +#include "PolyVox/AStarPathfinder.h" +#include "PolyVox/Material.h" +#include "PolyVox/RawVolume.h" #include diff --git a/tests/TestAmbientOcclusionGenerator.cpp b/tests/TestAmbientOcclusionGenerator.cpp index 97ab7993..253af603 100644 --- a/tests/TestAmbientOcclusionGenerator.cpp +++ b/tests/TestAmbientOcclusionGenerator.cpp @@ -23,8 +23,8 @@ freely, subject to the following restrictions: #include "TestAmbientOcclusionGenerator.h" -#include "PolyVoxCore/AmbientOcclusionCalculator.h" -#include "PolyVoxCore/PagedVolume.h" +#include "PolyVox/AmbientOcclusionCalculator.h" +#include "PolyVox/PagedVolume.h" #include diff --git a/tests/TestArray.cpp b/tests/TestArray.cpp index 13aeaee1..5c3a5bfb 100644 --- a/tests/TestArray.cpp +++ b/tests/TestArray.cpp @@ -23,7 +23,7 @@ freely, subject to the following restrictions: #include "TestArray.h" -#include "PolyVoxCore/Array.h" +#include "PolyVox/Array.h" #include diff --git a/tests/TestCubicSurfaceExtractor.cpp b/tests/TestCubicSurfaceExtractor.cpp index 61398777..0b12bb34 100644 --- a/tests/TestCubicSurfaceExtractor.cpp +++ b/tests/TestCubicSurfaceExtractor.cpp @@ -23,12 +23,12 @@ freely, subject to the following restrictions: #include "TestCubicSurfaceExtractor.h" -#include "PolyVoxCore/Density.h" -#include "PolyVoxCore/Material.h" -#include "PolyVoxCore/MaterialDensityPair.h" -#include "PolyVoxCore/RawVolume.h" -#include "PolyVoxCore/PagedVolume.h" -#include "PolyVoxCore/CubicSurfaceExtractor.h" +#include "PolyVox/Density.h" +#include "PolyVox/Material.h" +#include "PolyVox/MaterialDensityPair.h" +#include "PolyVox/RawVolume.h" +#include "PolyVox/PagedVolume.h" +#include "PolyVox/CubicSurfaceExtractor.h" #include diff --git a/tests/TestLowPassFilter.cpp b/tests/TestLowPassFilter.cpp index 5af198b9..849cf927 100644 --- a/tests/TestLowPassFilter.cpp +++ b/tests/TestLowPassFilter.cpp @@ -23,9 +23,9 @@ freely, subject to the following restrictions: #include "TestLowPassFilter.h" -#include "PolyVoxCore/Density.h" -#include "PolyVoxCore/LowPassFilter.h" -#include "PolyVoxCore/RawVolume.h" +#include "PolyVox/Density.h" +#include "PolyVox/LowPassFilter.h" +#include "PolyVox/RawVolume.h" #include diff --git a/tests/TestPicking.cpp b/tests/TestPicking.cpp index fa255b55..78f2b5c6 100644 --- a/tests/TestPicking.cpp +++ b/tests/TestPicking.cpp @@ -23,8 +23,8 @@ freely, subject to the following restrictions: #include "TestPicking.h" -#include "PolyVoxCore/Picking.h" -#include "PolyVoxCore/PagedVolume.h" +#include "PolyVox/Picking.h" +#include "PolyVox/PagedVolume.h" #include diff --git a/tests/TestRaycast.cpp b/tests/TestRaycast.cpp index a7b148fa..655d2b0b 100644 --- a/tests/TestRaycast.cpp +++ b/tests/TestRaycast.cpp @@ -23,11 +23,11 @@ freely, subject to the following restrictions: #include "TestRaycast.h" -#include "PolyVoxCore/Density.h" -#include "PolyVoxCore/Raycast.h" -#include "PolyVoxCore/PagedVolume.h" +#include "PolyVox/Density.h" +#include "PolyVox/Raycast.h" +#include "PolyVox/PagedVolume.h" -#include "PolyVoxCore/Impl/RandomUnitVectors.h" +#include "PolyVox/Impl/RandomUnitVectors.h" #include diff --git a/tests/TestRegion.cpp b/tests/TestRegion.cpp index a0f74913..12a100a1 100644 --- a/tests/TestRegion.cpp +++ b/tests/TestRegion.cpp @@ -23,7 +23,7 @@ freely, subject to the following restrictions: #include "TestRegion.h" -#include "PolyVoxCore/Region.h" +#include "PolyVox/Region.h" #include diff --git a/tests/TestSurfaceExtractor.cpp b/tests/TestSurfaceExtractor.cpp index 92e28755..bbdca389 100644 --- a/tests/TestSurfaceExtractor.cpp +++ b/tests/TestSurfaceExtractor.cpp @@ -23,12 +23,12 @@ freely, subject to the following restrictions: #include "TestSurfaceExtractor.h" -#include "PolyVoxCore/Density.h" -#include "PolyVoxCore/FilePager.h" -#include "PolyVoxCore/MaterialDensityPair.h" -#include "PolyVoxCore/RawVolume.h" -#include "PolyVoxCore/PagedVolume.h" -#include "PolyVoxCore/MarchingCubesSurfaceExtractor.h" +#include "PolyVox/Density.h" +#include "PolyVox/FilePager.h" +#include "PolyVox/MaterialDensityPair.h" +#include "PolyVox/RawVolume.h" +#include "PolyVox/PagedVolume.h" +#include "PolyVox/MarchingCubesSurfaceExtractor.h" #include diff --git a/tests/TestVolumeSubclass.cpp b/tests/TestVolumeSubclass.cpp index 9be146d4..0a301e3e 100644 --- a/tests/TestVolumeSubclass.cpp +++ b/tests/TestVolumeSubclass.cpp @@ -23,12 +23,12 @@ freely, subject to the following restrictions: #include "TestVolumeSubclass.h" -#include "PolyVoxCore/Array.h" +#include "PolyVox/Array.h" -#include "PolyVoxCore/BaseVolume.h" -#include "PolyVoxCore/CubicSurfaceExtractor.h" -#include "PolyVoxCore/Material.h" -#include "PolyVoxCore/Vector.h" +#include "PolyVox/BaseVolume.h" +#include "PolyVox/CubicSurfaceExtractor.h" +#include "PolyVox/Material.h" +#include "PolyVox/Vector.h" #include diff --git a/tests/testmaterial.cpp b/tests/testmaterial.cpp index a4662e34..4e8b6843 100644 --- a/tests/testmaterial.cpp +++ b/tests/testmaterial.cpp @@ -23,7 +23,7 @@ freely, subject to the following restrictions: #include "testmaterial.h" -#include "PolyVoxCore/Material.h" +#include "PolyVox/Material.h" #include diff --git a/tests/testvector.cpp b/tests/testvector.cpp index 08649f28..61aa4760 100644 --- a/tests/testvector.cpp +++ b/tests/testvector.cpp @@ -23,7 +23,7 @@ freely, subject to the following restrictions: #include "testvector.h" -#include "PolyVoxCore/Vector.h" +#include "PolyVox/Vector.h" #include diff --git a/tests/testvolume.cpp b/tests/testvolume.cpp index 3eafceb2..df2a3a97 100644 --- a/tests/testvolume.cpp +++ b/tests/testvolume.cpp @@ -23,9 +23,9 @@ freely, subject to the following restrictions: #include "testvolume.h" -#include "PolyVoxCore/FilePager.h" -#include "PolyVoxCore/PagedVolume.h" -#include "PolyVoxCore/RawVolume.h" +#include "PolyVox/FilePager.h" +#include "PolyVox/PagedVolume.h" +#include "PolyVox/RawVolume.h" #include #include diff --git a/tests/testvolume.h b/tests/testvolume.h index ea1a1d0b..41ec64dd 100644 --- a/tests/testvolume.h +++ b/tests/testvolume.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_TestVolume_H__ #define __PolyVox_TestVolume_H__ -#include "PolyVoxCore/PolyVoxForwardDeclarations.h" +#include "PolyVox/PolyVoxForwardDeclarations.h" #include From 7946e55357408b5de8bca17cc4e810362050ab0f Mon Sep 17 00:00:00 2001 From: David Williams Date: Sat, 7 Feb 2015 23:11:56 +0100 Subject: [PATCH 18/19] Fixed install on Linux. --- include/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index db01270d..ed978529 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -116,7 +116,7 @@ IF(WIN32) INSTALL(DIRECTORY include DESTINATION PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE) ELSE(WIN32) - INSTALL(DIRECTORY include/ DESTINATION include/PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE) + INSTALL(DIRECTORY PolyVox/ DESTINATION include/PolyVox COMPONENT development PATTERN "*.git*" EXCLUDE) ENDIF(WIN32) #Set up install paths e.g. for PolyVoxConfig.cmake From 72be03262a3be40cedfdfdf7739742530ae26692 Mon Sep 17 00:00:00 2001 From: David Williams Date: Sat, 7 Feb 2015 23:21:25 +0100 Subject: [PATCH 19/19] Fixed install to work on Windows. --- include/CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index ed978529..ce37965f 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -112,12 +112,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_CURRENT_SOURCE_D ADD_CUSTOM_TARGET(PolyVoxCore SOURCES ${CORE_INC_FILES}) #Install the core header files, including the ones in the Impl subfolder. -IF(WIN32) - INSTALL(DIRECTORY include DESTINATION PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE) -ELSE(WIN32) - - INSTALL(DIRECTORY PolyVox/ DESTINATION include/PolyVox COMPONENT development PATTERN "*.git*" EXCLUDE) -ENDIF(WIN32) +INSTALL(DIRECTORY PolyVox/ DESTINATION include/PolyVox COMPONENT development PATTERN "*.git*" EXCLUDE) #Set up install paths e.g. for PolyVoxConfig.cmake if(WIN32)