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

Moved some loading code out of PolyVoxSceneManager.

Browse Source
This commit is contained in:
David Williams 2008-01-31 20:43:57 +00:00
parent 9e9537a9ee
commit 4438660440
2 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/PolyVoxSceneManager.h
View File

@ -66,9 +66,6 @@ namespace Ogre
void setAllUpToDateFlagsTo(bool newUpToDateValue); void setAllUpToDateFlagsTo(bool newUpToDateValue);
void createSphereAt(Vector3 centre, Real radius, uchar value, bool painting); void createSphereAt(Vector3 centre, Real radius, uchar value, bool painting);
bool loadScene(const String& filename);
bool saveScene(const String& filename);
void generateLevelVolume(void); void generateLevelVolume(void);
@ -101,7 +98,7 @@ namespace Ogre
NormalGenerationMethod m_normalGenerationMethod; NormalGenerationMethod m_normalGenerationMethod;
VolumeResourcePtr volumeResource;
Volume* volumeData; Volume* volumeData;
bool m_bHaveGeneratedMeshes; bool m_bHaveGeneratedMeshes;

36
source/PolyVoxSceneManager.cpp
View File

@ -37,8 +37,7 @@ namespace Ogre
// PolyVoxSceneManager // PolyVoxSceneManager
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
PolyVoxSceneManager::PolyVoxSceneManager() PolyVoxSceneManager::PolyVoxSceneManager()
:volumeResource(0) :volumeData(0)
,volumeData(0)
,useNormalSmoothing(false) ,useNormalSmoothing(false)
,normalSmoothingFilterSize(1) ,normalSmoothingFilterSize(1)
,m_normalGenerationMethod(SOBEL) ,m_normalGenerationMethod(SOBEL)
@ -51,33 +50,6 @@ namespace Ogre
{ {
} }
bool PolyVoxSceneManager::loadScene(const String& filename)
{
volumeResource = VolumeManager::getSingletonPtr()->load(filename + ".volume", "General");
if(volumeResource.isNull())
{
LogManager::getSingleton().logMessage("Generating default volume");
generateLevelVolume();
LogManager::getSingleton().logMessage("Done generating default volume");
}
volumeData = volumeResource->volume;
volumeData->tidy();
setAllUpToDateFlagsTo(false);
//createAxis(256);
//setAxisVisible(false);
return true;
}
std::list<RegionGeometry> PolyVoxSceneManager::getChangedRegionGeometry(void) std::list<RegionGeometry> PolyVoxSceneManager::getChangedRegionGeometry(void)
{ {
std::list<RegionGeometry> listChangedRegionGeometry; std::list<RegionGeometry> listChangedRegionGeometry;
@ -724,12 +696,6 @@ namespace Ogre
markRegionChanged(0,0,0,OGRE_VOLUME_SIDE_LENGTH-1,OGRE_VOLUME_SIDE_LENGTH-1,OGRE_VOLUME_SIDE_LENGTH-1); markRegionChanged(0,0,0,OGRE_VOLUME_SIDE_LENGTH-1,OGRE_VOLUME_SIDE_LENGTH-1,OGRE_VOLUME_SIDE_LENGTH-1);
} }
bool PolyVoxSceneManager::saveScene(const String& filename)
{
volumeData->saveToFile(filename);
return true; //FIXME - check for error...
}
uint PolyVoxSceneManager::getSideLength(void) uint PolyVoxSceneManager::getSideLength(void)
{ {
return OGRE_VOLUME_SIDE_LENGTH; return OGRE_VOLUME_SIDE_LENGTH;