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

updates for windows build.

Browse Source
This commit is contained in:
Robert Osfield
2001-12-15 10:00:43 +00:00
parent 478274ae7d
commit def6234d8c
25 changed files with 143 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/osgUtil/CullVisitor.cpp
View File

@@ -43,13 +43,13 @@ class PrintVisitor : public NodeVisitor
inline void moveOut() { _indent -= _step; }
inline void writeIndent()
{
for(int i=0;i<_indent;++i) cout << " ";
for(int i=0;i<_indent;++i) std::cout << " ";
}
virtual void apply(Node& node)
{
moveIn();
writeIndent(); cout << node.className() <<endl;
writeIndent(); std::cout << node.className() <<std::endl;
traverse(node);
moveOut();
}
@@ -280,7 +280,7 @@ void CullVisitor::updateCalculatedNearFar(const osg::BoundingBox& bb)
if (!bb.isValid())
{
osg::notify(osg::WARN)<<"Warning: CullVisitor::updateCalculatedNearFar(..) passed a null bounding box."<<endl;
osg::notify(osg::WARN)<<"Warning: CullVisitor::updateCalculatedNearFar(..) passed a null bounding box."<< std::endl;
return;
}
@@ -314,8 +314,8 @@ void CullVisitor::updateCalculatedNearFar(const osg::BoundingBox& bb)
{
if ( !EQUAL_F(d_near, d_far) )
{
osg::notify(osg::WARN)<<"Warning: CullVisitor::updateCalculatedNearFar(.) near>far in range calculation,"<<endl;
osg::notify(osg::WARN)<<" correcting by swapping values d_near="<<d_near<<" dfar="<<d_far<<endl;
osg::notify(osg::WARN)<<"Warning: CullVisitor::updateCalculatedNearFar(.) near>far in range calculation,"<< std::endl;
osg::notify(osg::WARN)<<" correcting by swapping values d_near="<<d_near<<" dfar="<<d_far<< std::endl;
}
// note, need to reverse the d_near/d_far association because they are
// the wrong way around...
@@ -429,9 +429,9 @@ void CullVisitor::apply(Geode& node)
if (g_debugging2)
{
notify(INFO) << "center ["<<center.x()<<","<<center.y()<<","<<center.z()<<"]"<<endl;
notify(INFO) << "delta_center ["<<delta_center.x()<<","<<delta_center.y()<<","<<delta_center.z()<<"]"<<endl;
notify(INFO) << "_lookVector ["<<_tvs->_lookVector.x()<<","<<_tvs->_lookVector.y()<<","<<_tvs->_lookVector.z()<<"]"<<endl;
notify(INFO) << "center ["<<center.x()<<","<<center.y()<<","<<center.z()<<"]"<< std::endl;
notify(INFO) << "delta_center ["<<delta_center.x()<<","<<delta_center.y()<<","<<delta_center.z()<<"]"<< std::endl;
notify(INFO) << "_lookVector ["<<_tvs->_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 ["<<center.x()<<","<<center.y()<<","<<center.z()<<"]"<<endl;
notify(INFO) << "delta_center ["<<delta_center.x()<<","<<delta_center.y()<<","<<delta_center.z()<<"]"<<endl;
notify(INFO) << "_lookVector ["<<_tvs->_lookVector.x()<<","<<_tvs->_lookVector.y()<<","<<_tvs->_lookVector.z()<<"]"<<endl;
notify(INFO) << "center ["<<center.x()<<","<<center.y()<<","<<center.z()<<"]"<< std::endl;
notify(INFO) << "delta_center ["<<delta_center.x()<<","<<delta_center.y()<<","<<delta_center.z()<<"]"<< std::endl;
notify(INFO) << "_lookVector ["<<_tvs->_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 "<<eval<<endl;
//notify(INFO) << "selecting child "<<eval<< std::endl;
node.getChild(eval)->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 ["<<center.x()<<","<<center.y()<<","<<center.z()<<"]"<<endl;
notify(INFO) << "delta_center ["<<delta_center.x()<<","<<delta_center.y()<<","<<delta_center.z()<<"]"<<endl;
notify(INFO) << "_lookVector ["<<_tvs->_lookVector.x()<<","<<_tvs->_lookVector.y()<<","<<_tvs->_lookVector.z()<<"]"<<endl;
notify(INFO) << "center ["<<center.x()<<","<<center.y()<<","<<center.z()<<"]"<< std::endl;
notify(INFO) << "delta_center ["<<delta_center.x()<<","<<delta_center.y()<<","<<delta_center.z()<<"]"<< std::endl;
notify(INFO) << "_lookVector ["<<_tvs->_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<const Camera> 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 ("<<local_znear<<") "<<" > ("<<local_zfar<<") local_zfar"<<endl;
notify(WARN) << "Warning : problem with osg::CullVisitor::creatImpostorSprite() local_znear ("<<local_znear<<") "<<" > ("<<local_zfar<<") local_zfar"<< std::endl;
return NULL;
}

16
src/osgUtil/DriveManipulator.cpp
View File

@@ -71,7 +71,7 @@ void DriveManipulator::home(const GUIEventAdapter& ea,GUIActionAdapter& us)
osgUtil::IntersectVisitor::HitList& hitList = iv.getHitList(segDown.get());
if (!hitList.empty())
{
// notify(INFO) << "Hit terrain ok"<<endl;
// notify(INFO) << "Hit terrain ok"<< std::endl;
osg::Vec3 ip = hitList.front()._intersectPoint;
osg::Vec3 np = hitList.front()._intersectNormal;
@@ -110,7 +110,7 @@ void DriveManipulator::home(const GUIEventAdapter& ea,GUIActionAdapter& us)
osgUtil::IntersectVisitor::HitList& hitList = iv.getHitList(segUp.get());
if (!hitList.empty())
{
// notify(INFO) << "Hit terrain ok"<<endl;
// notify(INFO) << "Hit terrain ok"<< std::endl;
osg::Vec3 ip = hitList.front()._intersectPoint;
osg::Vec3 np = hitList.front()._intersectNormal;
@@ -186,7 +186,7 @@ void DriveManipulator::init(const GUIEventAdapter& ea,GUIActionAdapter& us)
osgUtil::IntersectVisitor::HitList& hitList = iv.getHitList(segDown.get());
if (!hitList.empty())
{
// notify(INFO) << "Hit terrain ok"<<endl;
// notify(INFO) << "Hit terrain ok"<< std::endl;
osg::Vec3 ip = hitList.front()._intersectPoint;
osg::Vec3 np = hitList.front()._intersectNormal;
@@ -225,7 +225,7 @@ void DriveManipulator::init(const GUIEventAdapter& ea,GUIActionAdapter& us)
osgUtil::IntersectVisitor::HitList& hitList = iv.getHitList(segUp.get());
if (!hitList.empty())
{
// notify(INFO) << "Hit terrain ok"<<endl;
// notify(INFO) << "Hit terrain ok"<< std::endl;
osg::Vec3 ip = hitList.front()._intersectPoint;
osg::Vec3 np = hitList.front()._intersectNormal;
@@ -357,7 +357,7 @@ bool DriveManipulator::calcMovement()
if (dt<0.0f)
{
notify(WARN) << "warning dt = "<<dt<<endl;
notify(WARN) << "warning dt = "<<dt<< std::endl;
dt = 0.0f;
}
@@ -446,7 +446,7 @@ bool DriveManipulator::calcMovement()
osgUtil::IntersectVisitor::HitList& hitList = iv.getHitList(segForward.get());
if (!hitList.empty())
{
// notify(INFO) << "Hit obstruction"<<endl;
// notify(INFO) << "Hit obstruction"<< std::endl;
osg::Vec3 ip = hitList.front()._intersectPoint;
distanceToMove = (ip-ep).length()-_buffer;
_velocity = 0.0f;
@@ -471,7 +471,7 @@ bool DriveManipulator::calcMovement()
osgUtil::IntersectVisitor::HitList& hitList = iv.getHitList(segNormal.get());
if (!hitList.empty())
{
// notify(INFO) << "Hit terrain ok"<<endl;
// notify(INFO) << "Hit terrain ok"<< std::endl;
osg::Vec3 ip = hitList.front()._intersectPoint;
osg::Vec3 np = hitList.front()._intersectNormal;
@@ -510,7 +510,7 @@ bool DriveManipulator::calcMovement()
if (!hitList.empty())
{
notify(INFO) << "Hit terrain on decent ok"<<endl;
notify(INFO) << "Hit terrain on decent ok"<< std::endl;
osg::Vec3 ip = hitList.front()._intersectPoint;
osg::Vec3 np = hitList.front()._intersectNormal;

2
src/osgUtil/FlightManipulator.cpp
View File

@@ -165,7 +165,7 @@ bool FlightManipulator::calcMovement()
if (dt<0.0f)
{
notify(WARN) << "warning dt = "<<dt<<endl;
notify(WARN) << "warning dt = "<<dt<< std::endl;
dt = 0.0f;
}

10
src/osgUtil/IntersectVisitor.cpp
View File

@@ -56,7 +56,7 @@ bool IntersectState::isCulled(const BoundingSphere& bs,LineSegmentmentMask& segM
}
mask = mask << 1;
}
// notify(INFO) << << "mask = "<<segMaskOut<<endl;
// notify(INFO) << << "mask = "<<segMaskOut<< std::endl;
return !hit;
}
@@ -216,7 +216,7 @@ void IntersectVisitor::addLineSegment(LineSegment* seg)
if (!seg->valid())
{
notify(WARN)<<"Warning: invalid line segment passed to IntersectVisitor::addLineSegment(..), segment ignored.."<<endl;
notify(WARN)<<"Warning: invalid line segment passed to IntersectVisitor::addLineSegment(..), segment ignored.."<< std::endl;
return;
}
@@ -281,7 +281,7 @@ void IntersectVisitor::pushMatrix(const Matrix& matrix)
_intersectStateStack.push_back(nis);
// notify(INFO) << << "IntersectVisitor::pushMatrix()"<<endl;
// notify(INFO) << << "IntersectVisitor::pushMatrix()"<< std::endl;
}
@@ -293,7 +293,7 @@ void IntersectVisitor::popMatrix()
// pvs->unref();
_intersectStateStack.pop_back();
}
// notify(INFO) << << "IntersectVisitor::popMatrix()"<<endl;
// notify(INFO) << << "IntersectVisitor::popMatrix()"<< std::endl;
}
@@ -511,7 +511,7 @@ bool IntersectVisitor::intersect(GeoSet& gset)
}
}
}
// else notify(INFO) << << "no BB hit"<<endl;
// else notify(INFO) << << "no BB hit"<< std::endl;
}
return hitFlag;

22
src/osgUtil/NvTriStripObjects.cpp
View File

@@ -192,7 +192,7 @@ void NvStripifier::BuildStripifyInfo(NvFaceInfoVec &faceInfos, NvEdgeInfoVec &ed
else
{
if (edgeInfo01->m_face1 != NULL)
osg::notify(osg::WARN)<<"BuildStripifyInfo: > 2 triangles on an edge... uncertain consequences\n"<<endl;
osg::notify(osg::WARN)<<"BuildStripifyInfo: > 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"<<endl;
osg::notify(osg::WARN)<<"BuildStripifyInfo: > 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"<<endl;
osg::notify(osg::WARN)<<"BuildStripifyInfo: > 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"<<endl;
osg::notify(osg::WARN)<<"GetNextIndex: Duplicate triangle probably got us derailed\n"<<endl;
osg::notify(osg::WARN)<<"GetNextIndex: Triangle doesn't have all of its vertices\n"<< std::endl;
osg::notify(osg::WARN)<<"GetNextIndex: Duplicate triangle probably got us derailed\n"<< std::endl;
}
return fv0;
}
@@ -427,8 +427,8 @@ inline int NvStripifier::GetNextIndex(const WordVec &indices, NvFaceInfo *face)
{
if ((fv0 != v0 && fv0 != v1) || (fv2 != v0 && fv2 != v1))
{
osg::notify(osg::WARN)<<"GetNextIndex: Triangle doesn't have all of its vertices\n"<<endl;
osg::notify(osg::WARN)<<"GetNextIndex: Duplicate triangle probably got us derailed\n"<<endl;
osg::notify(osg::WARN)<<"GetNextIndex: Triangle doesn't have all of its vertices\n"<< std::endl;
osg::notify(osg::WARN)<<"GetNextIndex: Duplicate triangle probably got us derailed\n"<< std::endl;
}
return fv1;
}
@@ -436,14 +436,14 @@ inline int NvStripifier::GetNextIndex(const WordVec &indices, NvFaceInfo *face)
{
if ((fv0 != v0 && fv0 != v1) || (fv1 != v0 && fv1 != v1))
{
osg::notify(osg::WARN)<<"GetNextIndex: Triangle doesn't have all of its vertices\n"<<endl;
osg::notify(osg::WARN)<<"GetNextIndex: Duplicate triangle probably got us derailed\n"<<endl;
osg::notify(osg::WARN)<<"GetNextIndex: Triangle doesn't have all of its vertices\n"<< std::endl;
osg::notify(osg::WARN)<<"GetNextIndex: Duplicate triangle probably got us derailed\n"<< std::endl;
}
return fv2;
}
// shouldn't get here
osg::notify(osg::WARN)<<"GetNextIndex: Duplicate triangle sent\n"<<endl;
osg::notify(osg::WARN)<<"GetNextIndex: Duplicate triangle sent\n"<< std::endl;
return -1;
}
@@ -706,7 +706,7 @@ void NvStripifier::CommitStrips(NvStripInfoVec &allStrips, const NvStripInfoVec
if( (faces[0]->m_v0 == 2302) &&
(faces[0]->m_v1 == 3215) &&
(faces[0]->m_v2 == 2603) )
osg::notify(osg::WARN)<<"BLEH"<<endl;
osg::notify(osg::WARN)<<"BLEH"<< std::endl;
for (int j = 0; j < numFaces; j++)
{

20
src/osgUtil/Optimizer.cpp
View File

@@ -149,7 +149,7 @@ void Optimizer::StateVisitor::apply(osg::Geode& geode)
void Optimizer::StateVisitor::optimize()
{
osg::notify(osg::INFO) << "Num of StateSet="<<_statesets.size()<<endl;
osg::notify(osg::INFO) << "Num of StateSet="<<_statesets.size()<< std::endl;
{
@@ -176,7 +176,7 @@ void Optimizer::StateVisitor::optimize()
if (_attributeToStateSetMap.size()<2)
{
osg::notify(osg::INFO) << "Too few state attributes to optimize."<<endl;
osg::notify(osg::INFO) << "Too few state attributes to optimize."<< std::endl;
return;
}
@@ -196,15 +196,15 @@ void Optimizer::StateVisitor::optimize()
std::sort(_attributeList.begin(),_attributeList.end(),LessAttributeFunctor());
osg::notify(osg::INFO) << "state attribute list"<<endl;
osg::notify(osg::INFO) << "state attribute list"<< std::endl;
for(AttributeList::iterator aaitr = _attributeList.begin();
aaitr!=_attributeList.end();
++aaitr)
{
osg::notify(osg::INFO) << " "<<*aaitr << " "<<(*aaitr)->className()<<endl;
osg::notify(osg::INFO) << " "<<*aaitr << " "<<(*aaitr)->className()<< std::endl;
}
osg::notify(osg::INFO) << "searching for duplicate attributes"<<endl;
osg::notify(osg::INFO) << "searching for duplicate attributes"<< std::endl;
// find the duplicates.
AttributeList::iterator first_unique = _attributeList.begin();
AttributeList::iterator current = first_unique; ++current;
@@ -212,13 +212,13 @@ void Optimizer::StateVisitor::optimize()
{
if (**current==**first_unique)
{
osg::notify(osg::INFO) << " found duplicate "<<(*current)->className()<<" first="<<*first_unique<<" current="<<*current<<endl;
osg::notify(osg::INFO) << " found duplicate "<<(*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"<<endl;
osg::notify(osg::INFO) << "searching for duplicate attributes"<< std::endl;
// find the duplicates.
StateSetSortList::iterator first_unique = _statesetSortList.begin();
StateSetSortList::iterator current = first_unique; ++current;
@@ -254,13 +254,13 @@ void Optimizer::StateVisitor::optimize()
{
if (**current==**first_unique)
{
osg::notify(osg::INFO) << " found duplicate "<<(*current)->className()<<" first="<<*first_unique<<" current="<<*current<<endl;
osg::notify(osg::INFO) << " found duplicate "<<(*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<osg::Drawable*>(obj);
if (drawable)

2
src/osgUtil/RenderStage.cpp
View File

@@ -48,7 +48,7 @@ void RenderStage::draw(osg::State& state,RenderLeaf*& previous)
if (!_viewport)
{
notify(FATAL) << "Error: cannot drawm stage due to undefined viewport."<<endl;
notify(FATAL) << "Error: cannot drawm stage due to undefined viewport."<< std::endl;
return;
}

8
src/osgUtil/SceneView.cpp
View File

@@ -272,8 +272,8 @@ void SceneView::draw()
if (!_state)
{
osg::notify(osg::WARN) << "Warning: no valid osgUtil::SceneView::_state"<<endl;
osg::notify(osg::WARN) << " creating a state automatically."<<endl;
osg::notify(osg::WARN) << "Warning: no valid osgUtil::SceneView::_state"<< std::endl;
osg::notify(osg::WARN) << " creating a state automatically."<< std::endl;
// note the constructor for osg::State will set ContextID to 0.
_state = new osg::State;
@@ -346,7 +346,7 @@ void SceneView::draw()
break;
default:
{
osg::notify(osg::NOTICE)<<"Warning: stereo camera mode not implemented yet."<<endl;
osg::notify(osg::NOTICE)<<"Warning: stereo camera mode not implemented yet."<< std::endl;
_renderStage->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 '"<<gluErrorString(errorNo)<<"'"<<endl;
osg::notify(WARN)<<"Warning: detected OpenGL error '"<<gluErrorString(errorNo)<<"'"<< std::endl;
}
}

8
src/osgUtil/Tesselator.cpp
View File

@@ -150,8 +150,8 @@ void Tesselator::do_it()
if (_errorCode!=0)
{
const GLubyte *estring = gluErrorString((GLenum)_errorCode);
osg::notify(osg::WARN)<<"Tessellation Error: "<<estring<<endl;
osg::notify(osg::WARN)<<" Num indices created = "<<_tesselated_indices.size()<<endl;
osg::notify(osg::WARN)<<"Tessellation Error: "<<estring<< std::endl;
osg::notify(osg::WARN)<<" Num indices created = "<<_tesselated_indices.size()<< std::endl;
}
}
@@ -189,8 +189,8 @@ void Tesselator::do_it()
if (_errorCode!=0)
{
const GLubyte *estring = gluErrorString((GLenum)_errorCode);
osg::notify(osg::WARN)<<"Tessellation Error: "<<estring<<endl;
osg::notify(osg::WARN)<<" Num indices created = "<<_tesselated_indices.size()<<endl;
osg::notify(osg::WARN)<<"Tessellation Error: "<<estring<< std::endl;
osg::notify(osg::WARN)<<" Num indices created = "<<_tesselated_indices.size()<< std::endl;
}
}

2
src/osgUtil/TriStripVisitor.cpp
View File

@@ -294,7 +294,7 @@ void TriStripVisitor::stripify(GeoSet& gset)
}
else
{
notify(INFO) << "No triangles to stripify"<<endl;
notify(INFO) << "No triangles to stripify"<< std::endl;
}
}