Moved some loading code out of PolyVoxSceneManager.
This commit is contained in:
		@@ -37,8 +37,7 @@ namespace Ogre
 | 
			
		||||
	// PolyVoxSceneManager
 | 
			
		||||
	//////////////////////////////////////////////////////////////////////////
 | 
			
		||||
	PolyVoxSceneManager::PolyVoxSceneManager()
 | 
			
		||||
		:volumeResource(0)
 | 
			
		||||
		,volumeData(0)
 | 
			
		||||
		:volumeData(0)
 | 
			
		||||
		,useNormalSmoothing(false)
 | 
			
		||||
		,normalSmoothingFilterSize(1)
 | 
			
		||||
		,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> 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);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	bool PolyVoxSceneManager::saveScene(const String& filename)
 | 
			
		||||
	{
 | 
			
		||||
		volumeData->saveToFile(filename);
 | 
			
		||||
		return true; //FIXME - check for error...
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	uint PolyVoxSceneManager::getSideLength(void)
 | 
			
		||||
	{
 | 
			
		||||
		return OGRE_VOLUME_SIDE_LENGTH;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user