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

Changed some logging statements to macros which can be #defined out.

Browse Source
This commit is contained in:
David Williams
2014-01-26 23:53:10 +01:00
parent f58161c748
commit a9238051fa
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,9 +199,9 @@ namespace PolyVox
lodRecord.endIndex = m_meshCurrent->getNoOfIndices();
m_meshCurrent->m_vecLodRecords.push_back(lodRecord);
logTrace() << "Cubic surface extraction took " << timer.elapsedTimeInMilliSeconds()
POLYVOX_LOG_TRACE("Cubic surface extraction took " << timer.elapsedTimeInMilliSeconds()
<< "ms (Region size = " << m_regSizeInVoxels.getWidthInVoxels() << "x" << m_regSizeInVoxels.getHeightInVoxels()
<< "x" << m_regSizeInVoxels.getDepthInVoxels() << ")";
<< "x" << m_regSizeInVoxels.getDepthInVoxels() << ")");
}
template<typename VolumeType, typename IsQuadNeeded>

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

@@ -130,8 +130,8 @@ namespace PolyVox
lodRecord.endIndex = m_meshCurrent->getNoOfIndices();
m_meshCurrent->m_vecLodRecords.push_back(lodRecord);
logTrace() << "Cubic surface extraction took " << timer.elapsedTimeInMilliSeconds()
POLYVOX_LOG_TRACE("Cubic surface extraction took " << timer.elapsedTimeInMilliSeconds()
<< "ms (Region size = " << m_regSizeInVoxels.getWidthInVoxels() << "x" << m_regSizeInVoxels.getHeightInVoxels()
<< "x" << m_regSizeInVoxels.getDepthInVoxels() << ")";
<< "x" << m_regSizeInVoxels.getDepthInVoxels() << ")");
}
}

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

@@ -89,7 +89,7 @@ namespace PolyVox
FILE* pFile = fopen(filename.c_str(), "rb");
if(pFile)
{
logTrace() << "Paging in data for " << region;
POLYVOX_LOG_TRACE("Paging in data for " << region);
fseek(pFile, 0L, SEEK_END);
size_t fileSizeInBytes = ftell(pFile);
@@ -109,7 +109,7 @@ namespace PolyVox
}
else
{
logTrace() << "No data found for " << region << " during paging in.";
POLYVOX_LOG_TRACE("No data found for " << region << " during paging in.");
}
}
@@ -118,7 +118,7 @@ namespace PolyVox
POLYVOX_ASSERT(pBlockData, "Attempting to page out NULL block");
//POLYVOX_ASSERT(pBlockData->hasUncompressedData() == false, "Block should not have uncompressed data");
logTrace() << "Paging out data for " << region;
POLYVOX_LOG_TRACE("Paging out data for " << region);
std::stringstream ssFilename;
ssFilename << m_strFolderName << "/" << m_strRandomPrefix << "-"

24
library/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h
View File

@@ -159,7 +159,7 @@ namespace PolyVox
do \
{ \
/* Appending the 'std::endl' forces the stream to be flushed. */ \
*(PolyVox::Impl::getTraceStreamInstance()) << (message) << std::endl; \
*(PolyVox::Impl::getTraceStreamInstance()) << message << std::endl; \
} while(0) \
POLYVOX_MSC_WARNING_POP
@@ -174,7 +174,7 @@ namespace PolyVox
if ((condition)) \
{ \
/* Appending the 'std::endl' forces the stream to be flushed. */ \
*(PolyVox::Impl::getTraceStreamInstance()) << (message) << std::endl; \
*(PolyVox::Impl::getTraceStreamInstance()) << message << std::endl; \
} \
} while(0) \
POLYVOX_MSC_WARNING_POP
@@ -212,7 +212,7 @@ namespace PolyVox
do \
{ \
/* Appending the 'std::endl' forces the stream to be flushed. */ \
*(PolyVox::Impl::getDebugStreamInstance()) << (message) << std::endl; \
*(PolyVox::Impl::getDebugStreamInstance()) << message << std::endl; \
} while(0) \
POLYVOX_MSC_WARNING_POP
@@ -227,7 +227,7 @@ namespace PolyVox
if ((condition)) \
{ \
/* Appending the 'std::endl' forces the stream to be flushed. */ \
*(PolyVox::Impl::getDebugStreamInstance()) << (message) << std::endl; \
*(PolyVox::Impl::getDebugStreamInstance()) << message << std::endl; \
} \
} while(0) \
POLYVOX_MSC_WARNING_POP
@@ -265,7 +265,7 @@ namespace PolyVox
do \
{ \
/* Appending the 'std::endl' forces the stream to be flushed. */ \
*(PolyVox::Impl::getInfoStreamInstance()) << (message) << std::endl; \
*(PolyVox::Impl::getInfoStreamInstance()) << message << std::endl; \
} while(0) \
POLYVOX_MSC_WARNING_POP
@@ -280,7 +280,7 @@ namespace PolyVox
if ((condition)) \
{ \
/* Appending the 'std::endl' forces the stream to be flushed. */ \
*(PolyVox::Impl::getInfoStreamInstance()) << (message) << std::endl; \
*(PolyVox::Impl::getInfoStreamInstance()) << message << std::endl; \
} \
} while(0) \
POLYVOX_MSC_WARNING_POP
@@ -318,7 +318,7 @@ namespace PolyVox
do \
{ \
/* Appending the 'std::endl' forces the stream to be flushed. */ \
*(PolyVox::Impl::getWarningStreamInstance()) << (message) << std::endl; \
*(PolyVox::Impl::getWarningStreamInstance()) << message << std::endl; \
} while(0) \
POLYVOX_MSC_WARNING_POP
@@ -333,7 +333,7 @@ namespace PolyVox
if ((condition)) \
{ \
/* Appending the 'std::endl' forces the stream to be flushed. */ \
*(PolyVox::Impl::getWarningStreamInstance()) << (message) << std::endl; \
*(PolyVox::Impl::getWarningStreamInstance()) << message << std::endl; \
} \
} while(0) \
POLYVOX_MSC_WARNING_POP
@@ -371,7 +371,7 @@ namespace PolyVox
do \
{ \
/* Appending the 'std::endl' forces the stream to be flushed. */ \
*(PolyVox::Impl::getErrorStreamInstance()) << (message) << std::endl; \
*(PolyVox::Impl::getErrorStreamInstance()) << message << std::endl; \
} while(0) \
POLYVOX_MSC_WARNING_POP
@@ -386,7 +386,7 @@ namespace PolyVox
if ((condition)) \
{ \
/* Appending the 'std::endl' forces the stream to be flushed. */ \
*(PolyVox::Impl::getErrorStreamInstance()) << (message) << std::endl; \
*(PolyVox::Impl::getErrorStreamInstance()) << message << std::endl; \
} \
} while(0) \
POLYVOX_MSC_WARNING_POP
@@ -424,7 +424,7 @@ namespace PolyVox
do \
{ \
/* Appending the 'std::endl' forces the stream to be flushed. */ \
*(PolyVox::Impl::getFatalStreamInstance()) << (message) << std::endl; \
*(PolyVox::Impl::getFatalStreamInstance()) << message << std::endl; \
} while(0) \
POLYVOX_MSC_WARNING_POP
@@ -439,7 +439,7 @@ namespace PolyVox
if ((condition)) \
{ \
/* Appending the 'std::endl' forces the stream to be flushed. */ \
*(PolyVox::Impl::getFatalStreamInstance()) << (message) << std::endl; \
*(PolyVox::Impl::getFatalStreamInstance()) << message << std::endl; \
} \
} while(0) \
POLYVOX_MSC_WARNING_POP

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

@@ -130,9 +130,9 @@ namespace PolyVox
lodRecord.endIndex = m_meshCurrent->getNoOfIndices();
m_meshCurrent->m_vecLodRecords.push_back(lodRecord);
logTrace() << "Marching cubes surface extraction took " << timer.elapsedTimeInMilliSeconds()
POLYVOX_LOG_TRACE("Marching cubes surface extraction took " << timer.elapsedTimeInMilliSeconds()
<< "ms (Region size = " << m_regSizeInVoxels.getWidthInVoxels() << "x" << m_regSizeInVoxels.getHeightInVoxels()
<< "x" << m_regSizeInVoxels.getDepthInVoxels() << ")";
<< "x" << m_regSizeInVoxels.getDepthInVoxels() << ")");
}
template<typename VolumeType, typename Controller>