From def6234d8cd84888a6930ece227378462427e331 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 15 Dec 2001 10:00:43 +0000 Subject: [PATCH] updates for windows build. --- src/osgPlugins/osg/Matrix.cpp | 8 +++---- src/osgPlugins/osg/Node.cpp | 22 ++++++++--------- src/osgPlugins/osg/Point.cpp | 6 ++--- src/osgPlugins/osg/PolygonMode.cpp | 18 +++++++------- src/osgPlugins/osg/PolygonOffset.cpp | 4 ++-- src/osgPlugins/osg/ReaderWriterOSG.cpp | 2 +- src/osgPlugins/osg/StateSet.cpp | 20 ++++++++-------- src/osgPlugins/osg/Stencil.cpp | 14 +++++------ src/osgPlugins/osg/Switch.cpp | 6 ++--- src/osgPlugins/osg/TexEnv.cpp | 2 +- src/osgPlugins/osg/TexGen.cpp | 10 ++++---- src/osgPlugins/osg/TexMat.cpp | 8 +++---- src/osgPlugins/osg/Texture.cpp | 22 ++++++++--------- src/osgPlugins/osg/Transparency.cpp | 4 ++-- src/osgPlugins/rgb/ReaderWriterRGB.cpp | 16 ++++++------- src/osgUtil/CullVisitor.cpp | 33 +++++++++++++------------- src/osgUtil/DriveManipulator.cpp | 16 ++++++------- src/osgUtil/FlightManipulator.cpp | 2 +- src/osgUtil/IntersectVisitor.cpp | 10 ++++---- src/osgUtil/NvTriStripObjects.cpp | 22 ++++++++--------- src/osgUtil/Optimizer.cpp | 20 ++++++++-------- src/osgUtil/RenderStage.cpp | 2 +- src/osgUtil/SceneView.cpp | 8 +++---- src/osgUtil/Tesselator.cpp | 8 +++---- src/osgUtil/TriStripVisitor.cpp | 2 +- 25 files changed, 143 insertions(+), 142 deletions(-) diff --git a/src/osgPlugins/osg/Matrix.cpp b/src/osgPlugins/osg/Matrix.cpp index bd4cb2441..dae9807c8 100644 --- a/src/osgPlugins/osg/Matrix.cpp +++ b/src/osgPlugins/osg/Matrix.cpp @@ -55,10 +55,10 @@ bool Matrix_writeLocalData(const Object& obj, Output& fw) { const Matrix& matrix = static_cast(obj); - fw.indent() << matrix(0,0) << " " << matrix(0,1) << " " << matrix(0,2) << " " << matrix(0,3) << endl; - fw.indent() << matrix(1,0) << " " << matrix(1,1) << " " << matrix(1,2) << " " << matrix(1,3) << endl; - fw.indent() << matrix(2,0) << " " << matrix(2,1) << " " << matrix(2,2) << " " << matrix(2,3) << endl; - fw.indent() << matrix(3,0) << " " << matrix(3,1) << " " << matrix(3,2) << " " << matrix(3,3) << endl; + fw.indent() << matrix(0,0) << " " << matrix(0,1) << " " << matrix(0,2) << " " << matrix(0,3) << std::endl; + fw.indent() << matrix(1,0) << " " << matrix(1,1) << " " << matrix(1,2) << " " << matrix(1,3) << std::endl; + fw.indent() << matrix(2,0) << " " << matrix(2,1) << " " << matrix(2,2) << " " << matrix(2,3) << std::endl; + fw.indent() << matrix(3,0) << " " << matrix(3,1) << " " << matrix(3,2) << " " << matrix(3,3) << std::endl; return true; } diff --git a/src/osgPlugins/osg/Node.cpp b/src/osgPlugins/osg/Node.cpp index 91491302e..9d13db2d0 100644 --- a/src/osgPlugins/osg/Node.cpp +++ b/src/osgPlugins/osg/Node.cpp @@ -52,7 +52,7 @@ bool Node_readLocalData(Object& obj, Input& fr) // if (fr.matchSequence("user_data {")) // { - // notify(DEBUG) << "Matched user_data {"<(obj); - if (!node.getName().empty()) fw.indent() << "name "<<'"'<(_userData); // if (object) // { - // fw.indent() << "user_data {"<write(fw); // fw.moveOut(); - // fw.indent() << "}"<(obj); - fw.indent() << "size " << point.getSize() << endl; - fw.indent() << "fade_threshold_size " << point.getFadeThresholdSize() << endl; - fw.indent() << "distance_attenuation " << point.getDistanceAttenuation() << endl; + fw.indent() << "size " << point.getSize() << std::endl; + fw.indent() << "fade_threshold_size " << point.getFadeThresholdSize() << std::endl; + fw.indent() << "distance_attenuation " << point.getDistanceAttenuation() << std::endl; return true; } diff --git a/src/osgPlugins/osg/PolygonMode.cpp b/src/osgPlugins/osg/PolygonMode.cpp index 68dc8601f..6f9ee9dc7 100644 --- a/src/osgPlugins/osg/PolygonMode.cpp +++ b/src/osgPlugins/osg/PolygonMode.cpp @@ -65,24 +65,24 @@ bool PolygonMode_writeLocalData(const Object& obj, Output& fw) { switch(polygonmode.getMode(PolygonMode::FRONT)) { - case(PolygonMode::POINT): fw.indent() << "mode FRONT_AND_BACK POINT" << endl; break; - case(PolygonMode::LINE): fw.indent() << "mode FRONT_AND_BACK LINE" << endl; break; - case(PolygonMode::FILL): fw.indent() << "mode FRONT_AND_BACK FILL" << endl; break; + case(PolygonMode::POINT): fw.indent() << "mode FRONT_AND_BACK POINT" << std::endl; break; + case(PolygonMode::LINE): fw.indent() << "mode FRONT_AND_BACK LINE" << std::endl; break; + case(PolygonMode::FILL): fw.indent() << "mode FRONT_AND_BACK FILL" << std::endl; break; } } else { switch(polygonmode.getMode(PolygonMode::FRONT)) { - case(PolygonMode::POINT): fw.indent() << "mode FRONT POINT" << endl; break; - case(PolygonMode::LINE): fw.indent() << "mode FRONT LINE" << endl; break; - case(PolygonMode::FILL): fw.indent() << "mode FRONT FILL" << endl; break; + case(PolygonMode::POINT): fw.indent() << "mode FRONT POINT" << std::endl; break; + case(PolygonMode::LINE): fw.indent() << "mode FRONT LINE" << std::endl; break; + case(PolygonMode::FILL): fw.indent() << "mode FRONT FILL" << std::endl; break; } switch(polygonmode.getMode(PolygonMode::BACK)) { - case(PolygonMode::POINT): fw.indent() << "mode BACK POINT" << endl; break; - case(PolygonMode::LINE): fw.indent() << "mode BACK LINE" << endl; break; - case(PolygonMode::FILL): fw.indent() << "mode BACK FILL" << endl; break; + case(PolygonMode::POINT): fw.indent() << "mode BACK POINT" << std::endl; break; + case(PolygonMode::LINE): fw.indent() << "mode BACK LINE" << std::endl; break; + case(PolygonMode::FILL): fw.indent() << "mode BACK FILL" << std::endl; break; } } diff --git a/src/osgPlugins/osg/PolygonOffset.cpp b/src/osgPlugins/osg/PolygonOffset.cpp index 2db163c96..35dde873b 100644 --- a/src/osgPlugins/osg/PolygonOffset.cpp +++ b/src/osgPlugins/osg/PolygonOffset.cpp @@ -53,7 +53,7 @@ bool PolygonOffset_writeLocalData(const Object& obj, Output& fw) { const PolygonOffset& polygonoffset = static_cast(obj); - fw.indent() << "factor " << polygonoffset.getFactor() << endl; - fw.indent() << "units " << polygonoffset.getUnits() << endl; + fw.indent() << "factor " << polygonoffset.getFactor() << std::endl; + fw.indent() << "units " << polygonoffset.getUnits() << std::endl; return true; } diff --git a/src/osgPlugins/osg/ReaderWriterOSG.cpp b/src/osgPlugins/osg/ReaderWriterOSG.cpp index e0c0baac3..2667eb5eb 100644 --- a/src/osgPlugins/osg/ReaderWriterOSG.cpp +++ b/src/osgPlugins/osg/ReaderWriterOSG.cpp @@ -26,7 +26,7 @@ class OSGReaderWriter : public ReaderWriter std::string ext = getFileExtension(fileName); if (!acceptsExtension(ext)) return ReadResult::FILE_NOT_HANDLED; - ifstream fin(fileName.c_str()); + std::ifstream fin(fileName.c_str()); if (fin) { Input fr; diff --git a/src/osgPlugins/osg/StateSet.cpp b/src/osgPlugins/osg/StateSet.cpp index 8ce147cc4..52539c3a5 100644 --- a/src/osgPlugins/osg/StateSet.cpp +++ b/src/osgPlugins/osg/StateSet.cpp @@ -97,7 +97,7 @@ void initGLNames() // itr!=s_GLNameToGLModeMap.end(); // ++itr) // { -// cout << "Name ["<first<<","<second<<"]"<first<<","<second<<"]"<< std::endl; // } first_time = false; @@ -356,24 +356,24 @@ bool StateSet_writeLocalData(const Object& obj, Output& fw) switch(stateset.getRenderingHint()) { case(StateSet::DEFAULT_BIN): - fw<<"DEFAULT_BIN"<first); if (nitr!=s_GLModeToGLNameMap.end()) { - fw.indent() << nitr->second << " " << StateSet_getModeStr(mitr->second) << endl; + fw.indent() << nitr->second << " " << StateSet_getModeStr(mitr->second) << std::endl; } else { // no name defined for GLMode so just pass its value to fw. - fw.indent() << "0x" << std::hex << (osg::uint)mitr->first << std::dec <<" " << StateSet_getModeStr(mitr->second) << endl; + fw.indent() << "0x" << std::hex << (osg::uint)mitr->first << std::dec <<" " << StateSet_getModeStr(mitr->second) << std::endl; } } diff --git a/src/osgPlugins/osg/Stencil.cpp b/src/osgPlugins/osg/Stencil.cpp index b2ff76776..b186aa22f 100644 --- a/src/osgPlugins/osg/Stencil.cpp +++ b/src/osgPlugins/osg/Stencil.cpp @@ -104,15 +104,15 @@ bool Stencil_writeLocalData(const Object& obj,Output& fw) { const Stencil& stencil = static_cast(obj); - fw.indent() << "function " << Stencil_getFuncStr(stencil.getFunction()) << endl; - fw.indent() << "functionRef " << stencil.getFunctionRef() << endl; - fw.indent() << "functionMask 0x" << std::hex << stencil.getFunctionMask() << std::dec << endl; + fw.indent() << "function " << Stencil_getFuncStr(stencil.getFunction()) << std::endl; + fw.indent() << "functionRef " << stencil.getFunctionRef() << std::endl; + fw.indent() << "functionMask 0x" << std::hex << stencil.getFunctionMask() << std::dec << std::endl; - fw.indent() << "stencilFailOperation " << Stencil_getOperationStr(stencil.getStencilFailOperation()) << endl; - fw.indent() << "stencilPassAndDepthFailOperation " << Stencil_getOperationStr(stencil.getStencilPassAndDepthFailOperation()) << endl; - fw.indent() << "stencilPassAndDepthPassOperation " << Stencil_getOperationStr(stencil.getStencilPassAndDepthPassOperation()) << endl; + fw.indent() << "stencilFailOperation " << Stencil_getOperationStr(stencil.getStencilFailOperation()) << std::endl; + fw.indent() << "stencilPassAndDepthFailOperation " << Stencil_getOperationStr(stencil.getStencilPassAndDepthFailOperation()) << std::endl; + fw.indent() << "stencilPassAndDepthPassOperation " << Stencil_getOperationStr(stencil.getStencilPassAndDepthPassOperation()) << std::endl; - fw.indent() << "writeMask 0x" << std::hex << stencil.getWriteMask() << std::dec << endl; + fw.indent() << "writeMask 0x" << std::hex << stencil.getWriteMask() << std::dec << std::endl; return true; } diff --git a/src/osgPlugins/osg/Switch.cpp b/src/osgPlugins/osg/Switch.cpp index 1f41351f1..4fe7ca25f 100644 --- a/src/osgPlugins/osg/Switch.cpp +++ b/src/osgPlugins/osg/Switch.cpp @@ -62,9 +62,9 @@ bool Switch_writeLocalData(const Object& obj, Output& fw) fw.indent() << "value "; switch(sw.getValue()) { - case(Switch::ALL_CHILDREN_ON): fw<<"ALL_CHILDREN_ON"<(obj); - fw.indent() << "mode " << TexEnv_getModeStr(texenv.getMode()) << endl; + fw.indent() << "mode " << TexEnv_getModeStr(texenv.getMode()) << std::endl; return true; } diff --git a/src/osgPlugins/osg/TexGen.cpp b/src/osgPlugins/osg/TexGen.cpp index 704ff22fa..08c793466 100644 --- a/src/osgPlugins/osg/TexGen.cpp +++ b/src/osgPlugins/osg/TexGen.cpp @@ -115,13 +115,13 @@ bool TexGen_writeLocalData(const Object& obj, Output& fw) { const TexGen& texgen = static_cast(obj); - fw.indent() << "mode " << TexGen_getModeStr(texgen.getMode()) << endl; + fw.indent() << "mode " << TexGen_getModeStr(texgen.getMode()) << std::endl; if (texgen.getMode() == TexGen::OBJECT_LINEAR || texgen.getMode() == TexGen::EYE_LINEAR) { - fw.indent() << "plane_s " << texgen.getPlane(TexGen::S) << endl; - fw.indent() << "plane_t " << texgen.getPlane(TexGen::T) << endl; - fw.indent() << "plane_r " << texgen.getPlane(TexGen::R) << endl; - fw.indent() << "plane_q " << texgen.getPlane(TexGen::Q) << endl; + fw.indent() << "plane_s " << texgen.getPlane(TexGen::S) << std::endl; + fw.indent() << "plane_t " << texgen.getPlane(TexGen::T) << std::endl; + fw.indent() << "plane_r " << texgen.getPlane(TexGen::R) << std::endl; + fw.indent() << "plane_q " << texgen.getPlane(TexGen::Q) << std::endl; } return true; diff --git a/src/osgPlugins/osg/TexMat.cpp b/src/osgPlugins/osg/TexMat.cpp index c583caeed..2caf2a64b 100644 --- a/src/osgPlugins/osg/TexMat.cpp +++ b/src/osgPlugins/osg/TexMat.cpp @@ -59,9 +59,9 @@ bool TexMat_writeLocalData(const Object& obj, Output& fw) { const TexMat& texmat = static_cast(obj); const Matrix& matrix = texmat.getMatrix(); - fw.indent() << matrix(0,0) << " " << matrix(0,1) << " " << matrix(0,2) << " " << matrix(0,3) << endl; - fw.indent() << matrix(1,0) << " " << matrix(1,1) << " " << matrix(1,2) << " " << matrix(1,3) << endl; - fw.indent() << matrix(2,0) << " " << matrix(2,1) << " " << matrix(2,2) << " " << matrix(2,3) << endl; - fw.indent() << matrix(3,0) << " " << matrix(3,1) << " " << matrix(3,2) << " " << matrix(3,3) << endl; + fw.indent() << matrix(0,0) << " " << matrix(0,1) << " " << matrix(0,2) << " " << matrix(0,3) << std::endl; + fw.indent() << matrix(1,0) << " " << matrix(1,1) << " " << matrix(1,2) << " " << matrix(1,3) << std::endl; + fw.indent() << matrix(2,0) << " " << matrix(2,1) << " " << matrix(2,2) << " " << matrix(2,3) << std::endl; + fw.indent() << matrix(3,0) << " " << matrix(3,1) << " " << matrix(3,2) << " " << matrix(3,3) << std::endl; return true; } diff --git a/src/osgPlugins/osg/Texture.cpp b/src/osgPlugins/osg/Texture.cpp index 861f87025..d56ee8468 100644 --- a/src/osgPlugins/osg/Texture.cpp +++ b/src/osgPlugins/osg/Texture.cpp @@ -139,31 +139,31 @@ bool Texture_writeLocalData(const Object& obj, Output& fw) if (texture.getImage() && !(texture.getImage()->getFileName().empty())) { - fw.indent() << "file \""<getFileName())<<"\""<getFileName())<<"\""<< std::endl; } - fw.indent() << "wrap_s " << Texture_getWrapStr(texture.getWrap(Texture::WRAP_S)) << endl; - fw.indent() << "wrap_t " << Texture_getWrapStr(texture.getWrap(Texture::WRAP_T)) << endl; - fw.indent() << "wrap_r " << Texture_getWrapStr(texture.getWrap(Texture::WRAP_R)) << endl; + fw.indent() << "wrap_s " << Texture_getWrapStr(texture.getWrap(Texture::WRAP_S)) << std::endl; + fw.indent() << "wrap_t " << Texture_getWrapStr(texture.getWrap(Texture::WRAP_T)) << std::endl; + fw.indent() << "wrap_r " << Texture_getWrapStr(texture.getWrap(Texture::WRAP_R)) << std::endl; - fw.indent() << "min_filter " << Texture_getFilterStr(texture.getFilter(Texture::MIN_FILTER)) << endl; - fw.indent() << "mag_filter " << Texture_getFilterStr(texture.getFilter(Texture::MAG_FILTER)) << endl; + fw.indent() << "min_filter " << Texture_getFilterStr(texture.getFilter(Texture::MIN_FILTER)) << std::endl; + fw.indent() << "mag_filter " << Texture_getFilterStr(texture.getFilter(Texture::MAG_FILTER)) << std::endl; - fw.indent() << "internalFormatMode " << Texture_getInternalFormatModeStr(texture.getInternalFormatMode()) << endl; + fw.indent() << "internalFormatMode " << Texture_getInternalFormatModeStr(texture.getInternalFormatMode()) << std::endl; if (texture.getInternalFormatMode()==Texture::USE_USER_DEFINED_FORMAT) { const char* str = Texture_getInternalFormatValueStr(texture.getInternalFormatValue()); - if (str) fw.indent() << "internalFormatValue " << str << endl; - else fw.indent() << "internalFormatValue " << texture.getInternalFormatValue() << endl; + if (str) fw.indent() << "internalFormatValue " << str << std::endl; + else fw.indent() << "internalFormatValue " << texture.getInternalFormatValue() << std::endl; } - fw.indent() << "subloadMode " << Texture_getSubloadModeStr(texture.getSubloadMode()) << endl; + fw.indent() << "subloadMode " << Texture_getSubloadModeStr(texture.getSubloadMode()) << std::endl; if (texture.getSubloadMode()!=Texture::OFF) { int x, y; texture.getSubloadOffset(x, y); - fw.indent() << "subloadOffset " << x << " " << y << endl; + fw.indent() << "subloadOffset " << x << " " << y << std::endl; } return true; diff --git a/src/osgPlugins/osg/Transparency.cpp b/src/osgPlugins/osg/Transparency.cpp index 6715d0c47..e45afa946 100644 --- a/src/osgPlugins/osg/Transparency.cpp +++ b/src/osgPlugins/osg/Transparency.cpp @@ -53,8 +53,8 @@ bool Transparency_writeLocalData(const Object& obj, Output& fw) { const Transparency& transparency = static_cast(obj); - fw.indent() << "source " << Transparency_getModeStr(transparency.getSource()) << endl; - fw.indent() << "destination " << Transparency_getModeStr(transparency.getDestination()) << endl; + fw.indent() << "source " << Transparency_getModeStr(transparency.getSource()) << std::endl; + fw.indent() << "destination " << Transparency_getModeStr(transparency.getDestination()) << std::endl; return true; } diff --git a/src/osgPlugins/rgb/ReaderWriterRGB.cpp b/src/osgPlugins/rgb/ReaderWriterRGB.cpp index 2a0048cbd..dd62dd95c 100644 --- a/src/osgPlugins/rgb/ReaderWriterRGB.cpp +++ b/src/osgPlugins/rgb/ReaderWriterRGB.cpp @@ -93,7 +93,7 @@ static rawImageRec *RawImageOpen(const char *fileName) raw = (rawImageRec *)malloc(sizeof(rawImageRec)); if (raw == NULL) { - notify(WARN)<< "Out of memory!"<file = fopen(fileName, "rb")) == NULL) @@ -114,7 +114,7 @@ static rawImageRec *RawImageOpen(const char *fileName) raw->tmp = (unsigned char *)malloc(raw->sizeX*256); if (raw->tmp == NULL ) { - notify(FATAL)<< "Out of memory!"<tmpR = (unsigned char *)malloc(raw->sizeX)) == NULL ) { - notify(FATAL)<< "Out of memory!"<tmp ); return NULL; } @@ -131,7 +131,7 @@ static rawImageRec *RawImageOpen(const char *fileName) { if( (raw->tmpG = (unsigned char *)malloc(raw->sizeX)) == NULL ) { - notify(FATAL)<< "Out of memory!"<tmp ); free( raw->tmpR ); return NULL; @@ -141,7 +141,7 @@ static rawImageRec *RawImageOpen(const char *fileName) { if( (raw->tmpB = (unsigned char *)malloc(raw->sizeX)) == NULL ) { - notify(FATAL)<< "Out of memory!"<tmp ); free( raw->tmpR ); free( raw->tmpG ); @@ -152,7 +152,7 @@ static rawImageRec *RawImageOpen(const char *fileName) { if( (raw->tmpA = (unsigned char *)malloc(raw->sizeX)) == NULL ) { - notify(FATAL)<< "Out of memory!"<tmp ); free( raw->tmpR ); free( raw->tmpG ); @@ -168,7 +168,7 @@ static rawImageRec *RawImageOpen(const char *fileName) raw->rowSize = (GLint *)malloc(x); if (raw->rowStart == NULL || raw->rowSize == NULL) { - notify(FATAL)<< "Out of memory!"<rleEnd = 512 + (2 * x); @@ -346,7 +346,7 @@ class ReaderWriterRGB : public osgDB::ReaderWriter dataType, data); - notify(INFO) << "image read ok "<far in range calculation,"<far in range calculation,"<< std::endl; + osg::notify(osg::WARN)<<" correcting by swapping values d_near="<_lookVector.x()<<","<<_tvs->_lookVector.y()<<","<<_tvs->_lookVector.z()<<"]"<_lookVector.x()<<","<<_tvs->_lookVector.y()<<","<<_tvs->_lookVector.z()<<"]"<< std::endl; } float depth; @@ -515,9 +515,9 @@ void CullVisitor::apply(Billboard& node) if (g_debugging2) { - notify(INFO) << "center ["<_lookVector.x()<<","<<_tvs->_lookVector.y()<<","<<_tvs->_lookVector.z()<<"]"<_lookVector.x()<<","<<_tvs->_lookVector.y()<<","<<_tvs->_lookVector.z()<<"]"<< std::endl; } float depth; @@ -647,7 +647,7 @@ void CullVisitor::apply(LOD& node) StateSet* node_state = node.getStateSet(); if (node_state) pushStateSet(node_state); - //notify(INFO) << "selecting child "<accept(*this); // pop the node's state off the render graph stack. @@ -775,9 +775,9 @@ void CullVisitor::apply(Impostor& node) if (g_debugging2) { - notify(INFO) << "center ["<_lookVector.x()<<","<<_tvs->_lookVector.y()<<","<<_tvs->_lookVector.z()<<"]"<_lookVector.x()<<","<<_tvs->_lookVector.y()<<","<<_tvs->_lookVector.z()<<"]"<< std::endl; } float depth; @@ -896,6 +896,7 @@ ImpostorSprite* CullVisitor::createImpostorSprite(Impostor& node) _tvs = new CullViewState; // store the previous camera setting + ref_ptr previous_camera = _camera; // sets up the _tvs to reflect the new camera. @@ -967,7 +968,7 @@ ImpostorSprite* CullVisitor::createImpostorSprite(Impostor& node) if (local_znear>local_zfar) { - notify(WARN) << "Warning : problem with osg::CullVisitor::creatImpostorSprite() local_znear ("< ("< ("<unref(); _intersectStateStack.pop_back(); } - // notify(INFO) << << "IntersectVisitor::popMatrix()"<m_face1 != NULL) - osg::notify(osg::WARN)<<"BuildStripifyInfo: > 2 triangles on an edge... uncertain consequences\n"< 2 triangles on an edge... uncertain consequences\n"<< std::endl; else edgeInfo01->m_face1 = faceInfo; } @@ -217,7 +217,7 @@ void NvStripifier::BuildStripifyInfo(NvFaceInfoVec &faceInfos, NvEdgeInfoVec &ed else { if (edgeInfo12->m_face1 != NULL) - osg::notify(osg::WARN)<<"BuildStripifyInfo: > 2 triangles on an edge... uncertain consequences\n"< 2 triangles on an edge... uncertain consequences\n"<< std::endl; else edgeInfo12->m_face1 = faceInfo; } @@ -242,7 +242,7 @@ void NvStripifier::BuildStripifyInfo(NvFaceInfoVec &faceInfos, NvEdgeInfoVec &ed else { if (edgeInfo20->m_face1 != NULL) - osg::notify(osg::WARN)<<"BuildStripifyInfo: > 2 triangles on an edge... uncertain consequences\n"< 2 triangles on an edge... uncertain consequences\n"<< std::endl; else edgeInfo20->m_face1 = faceInfo; } @@ -418,8 +418,8 @@ inline int NvStripifier::GetNextIndex(const WordVec &indices, NvFaceInfo *face) { if ((fv1 != v0 && fv1 != v1) || (fv2 != v0 && fv2 != v1)) { - osg::notify(osg::WARN)<<"GetNextIndex: Triangle doesn't have all of its vertices\n"<m_v0 == 2302) && (faces[0]->m_v1 == 3215) && (faces[0]->m_v2 == 2603) ) - osg::notify(osg::WARN)<<"BLEH"<className()<className()<< std::endl; } - osg::notify(osg::INFO) << "searching for duplicate attributes"<className()<<" first="<<*first_unique<<" current="<<*current<className()<<" first="<<*first_unique<<" current="<<*current<< std::endl; StateSetList& statesetlist = _attributeToStateSetMap[*current]; for(StateSetList::iterator sitr=statesetlist.begin(); sitr!=statesetlist.end(); ++sitr) { - osg::notify(osg::INFO) << " replace duplicate "<<*current<<" with "<<*first_unique<< endl; + osg::notify(osg::INFO) << " replace duplicate "<<*current<<" with "<<*first_unique<< std::endl; osg::StateSet* stateset = *sitr; stateset->setAttribute(*first_unique); } @@ -246,7 +246,7 @@ void Optimizer::StateVisitor::optimize() // other. std::sort(_statesetSortList.begin(),_statesetSortList.end(),LessStateSetFunctor()); - osg::notify(osg::INFO) << "searching for duplicate attributes"<className()<<" first="<<*first_unique<<" current="<<*current<className()<<" first="<<*first_unique<<" current="<<*current<< std::endl; ObjectSet& objSet = _statesets[*current]; for(ObjectSet::iterator sitr=objSet.begin(); sitr!=objSet.end(); ++sitr) { - osg::notify(osg::INFO) << " replace duplicate "<<*current<<" with "<<*first_unique<< endl; + osg::notify(osg::INFO) << " replace duplicate "<<*current<<" with "<<*first_unique<< std::endl; osg::Object* obj = *sitr; osg::Drawable* drawable = dynamic_cast(obj); if (drawable) diff --git a/src/osgUtil/RenderStage.cpp b/src/osgUtil/RenderStage.cpp index 6ceaf7cf0..b6ca738a9 100644 --- a/src/osgUtil/RenderStage.cpp +++ b/src/osgUtil/RenderStage.cpp @@ -48,7 +48,7 @@ void RenderStage::draw(osg::State& state,RenderLeaf*& previous) if (!_viewport) { - notify(FATAL) << "Error: cannot drawm stage due to undefined viewport."<draw(*_state,previous); } break; @@ -355,7 +355,7 @@ void SceneView::draw() GLenum errorNo = glGetError(); if (errorNo!=GL_NO_ERROR) { - osg::notify(WARN)<<"Warning: detected OpenGL error '"<