Removed Ogre logging from main library.
This commit is contained in:
parent
f29af2f8d4
commit
f263714ebc
@ -21,7 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
#include "boost/cstdint.hpp"
|
||||
|
||||
|
||||
#include "TypeDef.h"
|
||||
|
||||
namespace Ogre
|
||||
|
@ -18,8 +18,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
******************************************************************************/
|
||||
|
||||
#include "OgreVector3.h"
|
||||
#include "OgreLogManager.h"
|
||||
#include "OgreStringConverter.h"
|
||||
|
||||
#include "Block.h"
|
||||
|
||||
|
@ -24,9 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#include "PolyVoxSceneManager.h"
|
||||
#include "VolumeIterator.h"
|
||||
|
||||
#include "OgreStringConverter.h"
|
||||
#include "OgreLogManager.h"
|
||||
|
||||
#include <list>
|
||||
|
||||
using namespace boost;
|
||||
@ -58,13 +55,10 @@ namespace Ogre
|
||||
//Regenerate meshes.
|
||||
for(uint16_t regionZ = 0; regionZ < OGRE_VOLUME_SIDE_LENGTH_IN_REGIONS; ++regionZ)
|
||||
{
|
||||
//LogManager::getSingleton().logMessage("regionZ = " + StringConverter::toString(regionZ));
|
||||
for(uint16_t regionY = 0; regionY < OGRE_VOLUME_SIDE_LENGTH_IN_REGIONS; ++regionY)
|
||||
{
|
||||
//LogManager::getSingleton().logMessage("regionY = " + StringConverter::toString(regionY));
|
||||
for(uint16_t regionX = 0; regionX < OGRE_VOLUME_SIDE_LENGTH_IN_REGIONS; ++regionX)
|
||||
{
|
||||
//LogManager::getSingleton().logMessage("regionX = " + StringConverter::toString(regionX));
|
||||
if(surfaceUpToDate[regionX][regionY][regionZ] == false)
|
||||
{
|
||||
//Generate the surface
|
||||
@ -238,7 +232,6 @@ namespace Ogre
|
||||
{
|
||||
//IndexedSurfacePatch* surfacePatchResult = new IndexedSurfacePatch;
|
||||
|
||||
//LogManager::getSingleton().logMessage("Generating Mesh Data");
|
||||
//First and last voxels in the region
|
||||
const uint16_t firstX = regionX * OGRE_REGION_SIDE_LENGTH;
|
||||
const uint16_t firstY = regionY * OGRE_REGION_SIDE_LENGTH;
|
||||
@ -267,8 +260,6 @@ namespace Ogre
|
||||
const uint16_t y = volIter.getPosY();
|
||||
const uint16_t z = volIter.getPosZ();
|
||||
|
||||
//LogManager::getSingleton().logMessage("x = " + StringConverter::toString(int(x)) + " y = " + StringConverter::toString(int(y)) + " z = " + StringConverter::toString(int(z)));
|
||||
|
||||
//Voxels values
|
||||
const uint8_t v000 = volIter.getVoxel();
|
||||
const uint8_t v100 = volIter.peekVoxel1px0py0pz();
|
||||
@ -537,8 +528,6 @@ namespace Ogre
|
||||
//while(noOfRemovedVertices > 10); //We don't worry about the last few vertices - it's not worth the overhead of calling the function.
|
||||
}
|
||||
|
||||
//LogManager::getSingleton().logMessage("Finished Generating Mesh Data");
|
||||
|
||||
//return singleMaterialPatch;
|
||||
}
|
||||
|
||||
@ -546,7 +535,6 @@ namespace Ogre
|
||||
{
|
||||
VolumeIterator volIter(*volumeData); //FIXME - save this somewhere - could be expensive to create?
|
||||
|
||||
//LogManager::getSingleton().logMessage("In Loop");
|
||||
const float posX = position.x;
|
||||
const float posY = position.y;
|
||||
const float posZ = position.z;
|
||||
|
@ -22,8 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#include "VolumeIterator.h"
|
||||
|
||||
#include "OgreVector3.h"
|
||||
#include "OgreLogManager.h"
|
||||
#include "OgreStringConverter.h"
|
||||
|
||||
#include <iostream> //FIXME - remove this...
|
||||
|
||||
@ -167,7 +165,7 @@ namespace Ogre
|
||||
file.open(sFilename.c_str(), std::ios::in | std::ios::binary);
|
||||
if(!file.is_open())
|
||||
{
|
||||
LogManager::getSingleton().logMessage("Failed to open volume file " + sFilename);
|
||||
//LogManager::getSingleton().logMessage("Failed to open volume file " + sFilename);
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -180,7 +178,7 @@ namespace Ogre
|
||||
file.read(reinterpret_cast<char*>(&volumeDepth), sizeof(volumeDepth));
|
||||
if(file.fail())
|
||||
{
|
||||
LogManager::getSingleton().logMessage("Failed to read dimentions");
|
||||
//LogManager::getSingleton().logMessage("Failed to read dimentions");
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -215,7 +213,7 @@ namespace Ogre
|
||||
file.open(sFilename.c_str(), std::ios::out | std::ios::binary);
|
||||
if(!file.is_open())
|
||||
{
|
||||
LogManager::getSingleton().logMessage("Failed to open file for saving volume");
|
||||
//LogManager::getSingleton().logMessage("Failed to open file for saving volume");
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -228,7 +226,7 @@ namespace Ogre
|
||||
file.write(reinterpret_cast<char*>(&volumeDepth), sizeof(volumeDepth));
|
||||
if(file.fail())
|
||||
{
|
||||
LogManager::getSingleton().logMessage("Failed to write dimensions");
|
||||
//LogManager::getSingleton().logMessage("Failed to write dimensions");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -20,8 +20,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#include "Volume.h"
|
||||
#include "VolumeIterator.h"
|
||||
|
||||
#include "OgreLogManager.h"
|
||||
#include "OgreStringConverter.h"
|
||||
#include "OgreVector3.h"
|
||||
|
||||
using namespace boost;
|
||||
@ -69,7 +67,6 @@ namespace Ogre
|
||||
|
||||
/*if(!currentBlock.unique())
|
||||
{
|
||||
//LogManager::getSingleton().logMessage("Copying Block");
|
||||
Block* copy(new Block(*currentBlock));
|
||||
currentBlock = copy;
|
||||
|
||||
@ -148,7 +145,6 @@ namespace Ogre
|
||||
|
||||
/*if(!block.unique())
|
||||
{
|
||||
//LogManager::getSingleton().logMessage("Copying Block");
|
||||
Block* copy(new Block(*block));
|
||||
block = copy;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user