FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Converted osg::notify to OSG_INFO etc.

Browse Source
This commit is contained in:
Robert Osfield
2010-05-28 16:27:02 +00:00
parent 0fefe9a789
commit a7da775353
6 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgPlugins/ive/DataInputStream.cpp
View File

@@ -155,7 +155,7 @@ DataInputStream::DataInputStream(std::istream* istream, const osgDB::ReaderWrite
if (_options.get())
{
setLoadExternalReferenceFiles(_options->getOptionString().find("noLoadExternalReferenceFiles")==std::string::npos);
OSG_NOTIFY(osg::DEBUG_INFO) << "ive::DataInputStream.setLoadExternalReferenceFiles()=" << getLoadExternalReferenceFiles() << std::endl;
OSG_DEBUG << "ive::DataInputStream.setLoadExternalReferenceFiles()=" << getLoadExternalReferenceFiles() << std::endl;
}
if(!istream){
@@ -169,7 +169,7 @@ DataInputStream::DataInputStream(std::istream* istream, const osgDB::ReaderWrite
if ( endianType != OPPOSITE_ENDIAN_TYPE ) {
throwException("DataInputStream::DataInputStream(): This file has an unreadable endian type.") ;
}
OSG_NOTIFY(osg::INFO)<<"DataInputStream::DataInputStream: Reading a byteswapped file" << std::endl ;
OSG_INFO<<"DataInputStream::DataInputStream: Reading a byteswapped file" << std::endl ;
_byteswap = 1 ;
}
@@ -186,7 +186,7 @@ DataInputStream::DataInputStream(std::istream* istream, const osgDB::ReaderWrite
if (compressionLevel>0)
{
OSG_NOTIFY(osg::INFO)<<"compressed ive stream"<<std::endl;
OSG_INFO<<"compressed ive stream"<<std::endl;
unsigned int maxSize = readUInt();
@@ -204,7 +204,7 @@ DataInputStream::DataInputStream(std::istream* istream, const osgDB::ReaderWrite
}
else
{
OSG_NOTIFY(osg::INFO)<<"uncompressed ive stream"<<std::endl;
OSG_INFO<<"uncompressed ive stream"<<std::endl;
}
}
}
@@ -240,7 +240,7 @@ bool DataInputStream::uncompress(std::istream& fin, std::string& destination) co
);
if (ret != Z_OK)
{
OSG_NOTIFY(osg::INFO)<<"failed to init"<<std::endl;
OSG_INFO<<"failed to init"<<std::endl;
return ret != 0;
}

28
src/osgPlugins/ive/DataOutputStream.cpp
View File

@@ -174,22 +174,22 @@ DataOutputStream::DataOutputStream(std::ostream * ostream, const osgDB::ReaderWr
} else if(optionsString.find("compressImageData")!=std::string::npos) {
setIncludeImageMode(IMAGE_COMPRESS_DATA);
}
OSG_NOTIFY(osg::DEBUG_INFO) << "ive::DataOutputStream.setIncludeImageMode()=" << getIncludeImageMode() << std::endl;
OSG_DEBUG << "ive::DataOutputStream.setIncludeImageMode()=" << getIncludeImageMode() << std::endl;
setIncludeExternalReferences(optionsString.find("inlineExternalReferencesInIVEFile")!=std::string::npos);
OSG_NOTIFY(osg::DEBUG_INFO) << "ive::DataOutputStream.setIncludeExternalReferences()=" << getIncludeExternalReferences() << std::endl;
OSG_DEBUG << "ive::DataOutputStream.setIncludeExternalReferences()=" << getIncludeExternalReferences() << std::endl;
setWriteExternalReferenceFiles(optionsString.find("noWriteExternalReferenceFiles")==std::string::npos);
OSG_NOTIFY(osg::DEBUG_INFO) << "ive::DataOutputStream.setWriteExternalReferenceFiles()=" << getWriteExternalReferenceFiles() << std::endl;
OSG_DEBUG << "ive::DataOutputStream.setWriteExternalReferenceFiles()=" << getWriteExternalReferenceFiles() << std::endl;
setUseOriginalExternalReferences(optionsString.find("useOriginalExternalReferences")!=std::string::npos);
OSG_NOTIFY(osg::DEBUG_INFO) << "ive::DataOutputStream.setUseOriginalExternalReferences()=" << getUseOriginalExternalReferences() << std::endl;
OSG_DEBUG << "ive::DataOutputStream.setUseOriginalExternalReferences()=" << getUseOriginalExternalReferences() << std::endl;
setOutputTextureFiles(optionsString.find("OutputTextureFiles")!=std::string::npos);
OSG_NOTIFY(osg::DEBUG_INFO) << "ive::DataOutputStream.setOutputTextureFiles()=" << getOutputTextureFiles() << std::endl;
OSG_DEBUG << "ive::DataOutputStream.setOutputTextureFiles()=" << getOutputTextureFiles() << std::endl;
_compressionLevel = (optionsString.find("compressed")!=std::string::npos) ? 1 : 0;
OSG_NOTIFY(osg::DEBUG_INFO) << "ive::DataOutputStream._compressionLevel=" << _compressionLevel << std::endl;
OSG_DEBUG << "ive::DataOutputStream._compressionLevel=" << _compressionLevel << std::endl;
std::string::size_type terrainErrorPos = optionsString.find("TerrainMaximumErrorToSizeRatio=");
if (terrainErrorPos!=std::string::npos)
@@ -205,11 +205,11 @@ DataOutputStream::DataOutputStream(std::ostream * ostream, const osgDB::ReaderWr
std::string numberString = optionsString.substr(endOfToken+1, numOfCharInNumber);
_maximumErrorToSizeRatio = osg::asciiToDouble(numberString.c_str());
OSG_NOTIFY(osg::DEBUG_INFO)<<"TerrainMaximumErrorToSizeRatio = "<<_maximumErrorToSizeRatio<<std::endl;
OSG_DEBUG<<"TerrainMaximumErrorToSizeRatio = "<<_maximumErrorToSizeRatio<<std::endl;
}
else
{
OSG_NOTIFY(osg::DEBUG_INFO)<<"Error no value to TerrainMaximumErrorToSizeRatio assigned"<<std::endl;
OSG_DEBUG<<"Error no value to TerrainMaximumErrorToSizeRatio assigned"<<std::endl;
}
}
}
@@ -217,7 +217,7 @@ DataOutputStream::DataOutputStream(std::ostream * ostream, const osgDB::ReaderWr
#ifndef USE_ZLIB
if (_compressionLevel>0)
{
OSG_NOTIFY(osg::NOTICE) << "Compression not supported in this .ive version." << std::endl;
OSG_NOTICE << "Compression not supported in this .ive version." << std::endl;
_compressionLevel = 0;
}
#endif
@@ -298,7 +298,7 @@ bool DataOutputStream::compress(std::ostream& fout, const std::string& source) c
if (ret == Z_STREAM_ERROR)
{
OSG_NOTIFY(osg::NOTICE)<<"Z_STREAM_ERROR"<<std::endl;
OSG_NOTICE<<"Z_STREAM_ERROR"<<std::endl;
return false;
}
@@ -668,7 +668,7 @@ void DataOutputStream::writePackedFloatArray(const osg::FloatArray* a, float max
if (minValue==maxValue)
{
OSG_NOTIFY(osg::DEBUG_INFO)<<"Writing out "<<size<<" same values "<<minValue<<std::endl;
OSG_DEBUG<<"Writing out "<<size<<" same values "<<minValue<<std::endl;
writeBool(true);
writeFloat(minValue);
@@ -707,14 +707,14 @@ void DataOutputStream::writePackedFloatArray(const osg::FloatArray* a, float max
if (error_short>max_error_short) max_error_short = error_short;
}
OSG_NOTIFY(osg::DEBUG_INFO)<<"maxError "<<maxError<<std::endl;
OSG_NOTIFY(osg::DEBUG_INFO)<<"Values to write "<<size<<" max_error_byte = "<<max_error_byte<<" max_error_short="<<max_error_short<<std::endl;
OSG_DEBUG<<"maxError "<<maxError<<std::endl;
OSG_DEBUG<<"Values to write "<<size<<" max_error_byte = "<<max_error_byte<<" max_error_short="<<max_error_short<<std::endl;
if (max_error_byte < maxError) packingSize = 1;
else if (max_error_short < maxError) packingSize = 2;
OSG_NOTIFY(osg::DEBUG_INFO)<<"packingSize "<<packingSize<<std::endl;
OSG_DEBUG<<"packingSize "<<packingSize<<std::endl;
}

2
src/osgPlugins/ive/Image.cpp
View File

@@ -47,7 +47,7 @@ void Image::write(DataOutputStream* out)
out->writeInt(r());
OSG_NOTIFY(osg::DEBUG_INFO) << "image written '" << getFileName()<<"'\t"<<s()<<"\t"<<t()<<std::endl;
OSG_DEBUG << "image written '" << getFileName()<<"'\t"<<s()<<"\t"<<t()<<std::endl;
// Write formats, type and packing
out->writeInt(getInternalTextureFormat());

4
src/osgPlugins/ive/ReaderWriterIVE.cpp
View File

@@ -165,7 +165,7 @@ class ReaderWriterIVE : public ReaderWriter
if (fout.fail()) return WriteResult::ERROR_IN_WRITING_FILE;
if (out.getException())
{
osg::notify(osg::WARN)<<"Error writing IVE image: "<< out.getException()->getError() << std::endl;
OSG_WARN<<"Error writing IVE image: "<< out.getException()->getError() << std::endl;
return WriteResult::FILE_NOT_HANDLED;
}
return WriteResult::FILE_SAVED;
@@ -180,7 +180,7 @@ class ReaderWriterIVE : public ReaderWriter
if ( fout.fail() ) return WriteResult::ERROR_IN_WRITING_FILE;
if (out.getException())
{
osg::notify(osg::WARN)<<"Error writing IVE image: "<< out.getException()->getError() << std::endl;
OSG_WARN<<"Error writing IVE image: "<< out.getException()->getError() << std::endl;
return WriteResult::FILE_NOT_HANDLED;
}

2
src/osgPlugins/ive/TerrainTile.cpp
View File

@@ -102,7 +102,7 @@ void TerrainTile::read(DataInputStream* in)
int y = in->readInt();
setTileID(osgTerrain::TileID(level,x,y));
// osg::notify(osg::NOTICE)<<"Read TileID("<<level<<", "<<x<<", "<<y<<")"<<std::endl;
// OSG_NOTICE<<"Read TileID("<<level<<", "<<x<<", "<<y<<")"<<std::endl;
}
if (in->getVersion() >= VERSION_0023)

4
src/osgPlugins/ive/Uniform.cpp
View File

@@ -134,7 +134,7 @@ void Uniform::write(DataOutputStream* out){
}
default:
{
OSG_NOTIFY(osg::WARN)<<"Warning : uniform "<<getType()<<"type not supported for writing."<<std::endl;
OSG_WARN<<"Warning : uniform "<<getType()<<"type not supported for writing."<<std::endl;
break;
}
}
@@ -253,7 +253,7 @@ void Uniform::read(DataInputStream* in)
}
default:
{
OSG_NOTIFY(osg::WARN)<<"Warning : uniform "<<getType()<<"type not supported for reading."<<std::endl;
OSG_WARN<<"Warning : uniform "<<getType()<<"type not supported for reading."<<std::endl;
break;
}
}