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

Added random prefix to filename to prevent name conflicts.

Browse Source
This commit is contained in:
David Williams 2013-07-30 15:42:51 +02:00
parent a4fc814a51
commit 020ac9655a
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,8 @@ freely, subject to the following restrictions:
#include "PolyVoxCore/Pager.h" #include "PolyVoxCore/Pager.h"
#include "PolyVoxCore/Region.h" #include "PolyVoxCore/Region.h"
#include <cstdlib>
#include <ctime>
#include <fstream> #include <fstream>
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
@ -47,6 +49,12 @@ namespace PolyVox
:Pager<VoxelType>() :Pager<VoxelType>()
,m_strFolderName(strFolderName) ,m_strFolderName(strFolderName)
{ {
srand(time(0));
int iRandomValue = rand();
std::stringstream ss;
ss << std::hex << iRandomValue;
m_strRandomPrefix = ss.str();
} }
/// Destructor /// Destructor
@ -57,11 +65,12 @@ namespace PolyVox
POLYVOX_ASSERT(pBlockData, "Attempting to page in NULL block"); POLYVOX_ASSERT(pBlockData, "Attempting to page in NULL block");
//POLYVOX_ASSERT(pBlockData->hasUncompressedData() == false, "Block should not have uncompressed data"); //POLYVOX_ASSERT(pBlockData->hasUncompressedData() == false, "Block should not have uncompressed data");
std::stringstream ss; std::stringstream ssFilename;
ss << region.getLowerX() << "_" << region.getLowerY() << "_" << region.getLowerZ() << "_" ssFilename << m_strFolderName << "/" << m_strRandomPrefix << "-"
<< region.getLowerX() << "_" << region.getLowerY() << "_" << region.getLowerZ() << "_"
<< region.getUpperX() << "_" << region.getUpperY() << "_" << region.getUpperZ(); << region.getUpperX() << "_" << region.getUpperY() << "_" << region.getUpperZ();
std::string filename = m_strFolderName + ss.str(); std::string filename = ssFilename.str();
// FIXME - This should be replaced by C++ style IO, but currently this causes problems with // FIXME - This should be replaced by C++ style IO, but currently this causes problems with
// the gameplay-cubiquity integration. See: https://github.com/blackberry/GamePlay/issues/919 // the gameplay-cubiquity integration. See: https://github.com/blackberry/GamePlay/issues/919
@ -100,11 +109,12 @@ namespace PolyVox
logTrace() << "Paging out data for " << region; logTrace() << "Paging out data for " << region;
std::stringstream ss; std::stringstream ssFilename;
ss << region.getLowerX() << "_" << region.getLowerY() << "_" << region.getLowerZ() << "_" ssFilename << m_strFolderName << "/" << m_strRandomPrefix << "-"
<< region.getLowerX() << "_" << region.getLowerY() << "_" << region.getLowerZ() << "_"
<< region.getUpperX() << "_" << region.getUpperY() << "_" << region.getUpperZ(); << region.getUpperX() << "_" << region.getUpperY() << "_" << region.getUpperZ();
std::string filename = m_strFolderName + ss.str(); std::string filename = ssFilename.str();
// FIXME - This should be replaced by C++ style IO, but currently this causes problems with // FIXME - This should be replaced by C++ style IO, but currently this causes problems with
// the gameplay-cubiquity integration. See: https://github.com/blackberry/GamePlay/issues/919 // the gameplay-cubiquity integration. See: https://github.com/blackberry/GamePlay/issues/919
@ -127,6 +137,7 @@ namespace PolyVox
protected: protected:
std::string m_strFolderName; std::string m_strFolderName;
std::string m_strRandomPrefix;
}; };
} }