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

Work on seperating PolyVox and Thermite. Now they are two seperate solutions.

Browse Source
This commit is contained in:
David Williams 2008-05-24 09:29:20 +00:00
parent 634a6fc883
commit 06d433f559
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -1,4 +1,4 @@
PROJECT(PolyVoxSceneManager) PROJECT(PolyVox)
#Projects source files #Projects source files
SET(SRC_FILES SET(SRC_FILES
@ -58,16 +58,18 @@ SOURCE_GROUP("Headers" FILES ${INC_FILES})
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/include) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/include)
#Build #Build
ADD_LIBRARY(PolyVoxSceneManager SHARED ${SRC_FILES} ${INC_FILES}) ADD_LIBRARY(PolyVox SHARED ${SRC_FILES} ${INC_FILES})
TARGET_LINK_LIBRARIES(PolyVoxSceneManager) TARGET_LINK_LIBRARIES(PolyVox)
SET_TARGET_PROPERTIES(PolyVoxSceneManager PROPERTIES VERSION ${THERMITE_VERSION} SOVERSION ${THERMITE_VERSION_MAJOR}) SET_TARGET_PROPERTIES(PolyVox PROPERTIES VERSION ${THERMITE_VERSION} SOVERSION ${THERMITE_VERSION_MAJOR})
IF(WIN32) IF(WIN32)
SET_TARGET_PROPERTIES(PolyVoxSceneManager PROPERTIES COMPILE_FLAGS "/wd4251") #Disable warning on STL exports SET_TARGET_PROPERTIES(PolyVox PROPERTIES COMPILE_FLAGS "/wd4251") #Disable warning on STL exports
ENDIF(WIN32) ENDIF(WIN32)
#Install #Install
INSTALL(TARGETS PolyVoxSceneManager INSTALL(TARGETS PolyVox
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib ARCHIVE DESTINATION lib
) )
INSTALL(FILES ${INC_FILES} DESTINATION include/PolyVox)

2
include/VolumeIterator.inl
View File

@ -212,8 +212,6 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
void VolumeIterator<VoxelType>::setVoxel(VoxelType tValue) void VolumeIterator<VoxelType>::setVoxel(VoxelType tValue)
{ {
assert(mVolume.isVoxelLocked(mXPosInVolume,mYPosInVolume,mZPosInVolume));
const boost::uint32_t uBlockIndex = const boost::uint32_t uBlockIndex =
mXBlock + mXBlock +
mYBlock * mVolume.m_uSideLengthInBlocks + mYBlock * mVolume.m_uSideLengthInBlocks +