AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git

Browse Source
This commit is contained in:
unknown
2012-03-09 16:04:22 +01:00
parent af04b96105 8e4135ad41
commit f73b2a479b
41 changed files with 51 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -23,6 +23,9 @@ endif()
IF(CMAKE_COMPILER_IS_GNUCXX) #Maybe "OR MINGW" IF(CMAKE_COMPILER_IS_GNUCXX) #Maybe "OR MINGW"
ADD_DEFINITIONS(-std=c++0x) #Enable C++0x mode ADD_DEFINITIONS(-std=c++0x) #Enable C++0x mode
ENDIF() ENDIF()
if(CMAKE_CXX_COMPILER MATCHES "clang")
ADD_DEFINITIONS(-std=c++0x) #Enable C++0x mode
endif()
ADD_SUBDIRECTORY(library) ADD_SUBDIRECTORY(library)

4
documentation/_extensions/sphinxcontrib/doxylink.py
View File

@@ -10,7 +10,7 @@ from docutils import nodes, utils
from sphinx.util.nodes import split_explicit_title from sphinx.util.nodes import split_explicit_title
from sphinx.util.console import bold, standout from sphinx.util.console import bold, standout
from parsing import normalise, ParseException from .parsing import normalise, ParseException
def find_url(doc, symbol): def find_url(doc, symbol):
""" """
@@ -156,7 +156,7 @@ def parse_tag_file(doc):
else: else:
mapping[member_symbol] = {'kind' : kind, 'arglist' : {normalised_arglist : anchor_link}} mapping[member_symbol] = {'kind' : kind, 'arglist' : {normalised_arglist : anchor_link}}
else: else:
print 'Skipping %s %s%s. Error reported from parser was: %s' % (old_tuple[2], old_tuple[0], old_tuple[1], normalised_tuple[0]) print('Skipping %s %s%s. Error reported from parser was: %s' % (old_tuple[2], old_tuple[0], old_tuple[1], normalised_tuple[0]))
#from pprint import pprint; pprint(mapping) #from pprint import pprint; pprint(mapping)
return mapping return mapping

2
documentation/_extensions/sphinxcontrib/parsing.py
View File

@@ -94,7 +94,7 @@ def normalise(symbol):
arglist_input_string = arglist_input_string[:closing_bracket_location+1] arglist_input_string = arglist_input_string[:closing_bracket_location+1]
except ValueError: except ValueError:
#This shouldn't happen. #This shouldn't happen.
print 'Could not find closing bracket in %s' % arglist_input_string print('Could not find closing bracket in %s' % arglist_input_string)
raise raise
try: try:

4
library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
View File

@@ -44,7 +44,7 @@ namespace PolyVox
extern const POLYVOX_API Vector3DInt32 arrayPathfinderCorners[8]; extern const POLYVOX_API Vector3DInt32 arrayPathfinderCorners[8];
/// This function provides the default method for checking whether a given voxel /// This function provides the default method for checking whether a given voxel
/// is vaid for the path computed by the AStarPathfinder. /// is valid for the path computed by the AStarPathfinder.
template< template<typename> class VolumeType, typename VoxelType> template< template<typename> class VolumeType, typename VoxelType>
bool aStarDefaultVoxelValidator(const VolumeType<VoxelType>* volData, const Vector3DInt32& v3dPos); bool aStarDefaultVoxelValidator(const VolumeType<VoxelType>* volData, const Vector3DInt32& v3dPos);
@@ -72,7 +72,7 @@ namespace PolyVox
float fHBias = 1.0, float fHBias = 1.0,
uint32_t uMaxNoOfNodes = 10000, uint32_t uMaxNoOfNodes = 10000,
Connectivity connectivity = TwentySixConnected, Connectivity connectivity = TwentySixConnected,
polyvox_function<bool (const VolumeType<VoxelType>*, const Vector3DInt32&)> funcIsVoxelValidForPath = &aStarDefaultVoxelValidator<VolumeType, VoxelType>, polyvox_function<bool (const VolumeType<VoxelType>*, const Vector3DInt32&)> funcIsVoxelValidForPath = &aStarDefaultVoxelValidator,
polyvox_function<void (float)> funcProgressCallback = 0 polyvox_function<void (float)> funcProgressCallback = 0
) )
:volume(volData) :volume(volData)

4
library/PolyVoxCore/include/PolyVoxImpl/MarchingCubesTables.h
View File

@@ -28,8 +28,8 @@ freely, subject to the following restrictions:
namespace PolyVox namespace PolyVox
{ {
extern POLYVOX_API int edgeTable[256]; extern const POLYVOX_API int edgeTable[256];
extern POLYVOX_API int triTable[256][16]; extern const POLYVOX_API int triTable[256][16];
} }
#endif #endif

4
library/PolyVoxCore/include/PolyVoxImpl/TypeDef.h
View File

@@ -77,6 +77,9 @@ freely, subject to the following restrictions:
#define polyvox_placeholder_1 _1 #define polyvox_placeholder_1 _1
#define polyvox_placeholder_2 _2 #define polyvox_placeholder_2 _2
#include <boost/static_assert.hpp>
#define static_assert BOOST_STATIC_ASSERT
//As long as we're requiring boost, we'll use it to compensate //As long as we're requiring boost, we'll use it to compensate
//for the missing cstdint header too. //for the missing cstdint header too.
@@ -98,6 +101,7 @@ freely, subject to the following restrictions:
#define polyvox_placeholder_1 std::placeholders::_1 #define polyvox_placeholder_1 std::placeholders::_1
#define polyvox_placeholder_2 std::placeholders::_2 #define polyvox_placeholder_2 std::placeholders::_2
#define polyvox_hash std::hash #define polyvox_hash std::hash
//#define static_assert static_assert //we can use this
#endif #endif
#endif #endif

4
library/PolyVoxCore/source/PolyVoxImpl/MarchingCubesTables.cpp
View File

@@ -30,7 +30,7 @@ freely, subject to the following restrictions:
namespace PolyVox namespace PolyVox
{ {
int edgeTable[256]= const int edgeTable[256]=
{ {
0x000, 0x109, 0x203, 0x30a, 0x80c, 0x905, 0xa0f, 0xb06, 0x000, 0x109, 0x203, 0x30a, 0x80c, 0x905, 0xa0f, 0xb06,
0x406, 0x50f, 0x605, 0x70c, 0xc0a, 0xd03, 0xe09, 0xf00, 0x406, 0x50f, 0x605, 0x70c, 0xc0a, 0xd03, 0xe09, 0xf00,
@@ -66,7 +66,7 @@ namespace PolyVox
0xb06, 0xa0f, 0x905, 0x80c, 0x30a, 0x203, 0x109, 0x000 0xb06, 0xa0f, 0x905, 0x80c, 0x30a, 0x203, 0x109, 0x000
}; };
int triTable[256][16] = const int triTable[256][16] =
{ {
{-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, -1, -1, -1, },
{ 0, 8, 3, -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, },