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

Merge branch 'develop' into feature/cubiquity-version

Browse Source
This commit is contained in:
David Williams
2013-06-28 20:26:25 +02:00
parent 7cad8388b9 edf1f5d665
commit aab1149e8f
9 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
library/PolyVoxCore/include/PolyVoxCore/FilePager.h
View File

@@ -27,6 +27,7 @@ freely, subject to the following restrictions:
#include "PolyVoxCore/Impl/TypeDef.h"
#include "PolyVoxCore/Pager.h"
#include "PolyVoxCore/Region.h"
#include <fstream>
#include <stdexcept>
@@ -38,12 +39,12 @@ namespace PolyVox
* Provides an interface for performing paging of data.
*/
template <typename VoxelType>
class FilePager : public Pager<typename VoxelType>
class FilePager : public Pager<VoxelType>
{
public:
/// Constructor
FilePager(const std::string& strFolderName)
:Pager()
:Pager<VoxelType>()
,m_strFolderName(strFolderName)
{
}

4
library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
View File

@@ -619,9 +619,7 @@ namespace PolyVox
// create the new block
Block<VoxelType> newBlock(m_uBlockSideLength, m_pCompressor);
auto retVal = m_pBlocks.insert(std::make_pair(v3dBlockPos, newBlock));
itBlock = retVal.first;
POLYVOX_ASSERT(retVal.second == true, "Element was not supposed to exist!");
itBlock = m_pBlocks.insert(std::make_pair(v3dBlockPos, newBlock)).first;
//We have created the new block. If paging is enabled it should be used to
//fill in the required data. Otherwise it is just left in the default state.

10
library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h
View File

@@ -86,6 +86,11 @@ namespace PolyVox
typedef DensityU8 Density8; //Backwards compatibility
typedef DensityU16 Density16; //Backwards compatibility
////////////////////////////////////////////////////////////////////////////////
// FilePager
////////////////////////////////////////////////////////////////////////////////
template <typename VoxelType> class FilePager;
////////////////////////////////////////////////////////////////////////////////
// LargeVolume
////////////////////////////////////////////////////////////////////////////////
@@ -112,6 +117,11 @@ namespace PolyVox
typedef MaterialDensityPair<uint8_t, 4, 4> MaterialDensityPair44;
typedef MaterialDensityPair<uint16_t, 8, 8> MaterialDensityPair88;
////////////////////////////////////////////////////////////////////////////////
// Pager
////////////////////////////////////////////////////////////////////////////////
template <typename VoxelType> class Pager;
////////////////////////////////////////////////////////////////////////////////
// PositionMaterial
////////////////////////////////////////////////////////////////////////////////