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:06:15 +00:00
parent 40dcc0cd7d
commit 44483832d5
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgManipulator/Constraint.cpp
View File

@@ -44,7 +44,7 @@ void Constraint::computeLocalToWorldAndWorldToLocal() const
{
if (!_refNode)
{
osg::notify(osg::INFO)<<"osgManipulator::Constraint::computeLocalToWorldAndWorldToLocal() error, _refNode is null"<<std::endl;
OSG_INFO<<"osgManipulator::Constraint::computeLocalToWorldAndWorldToLocal() error, _refNode is null"<<std::endl;
return;
}

6
src/osgManipulator/Dragger.cpp
View File

@@ -35,7 +35,7 @@ void osgManipulator::computeNodePathToRoot(osg::Node& node, osg::NodePath& np)
np = nodePaths.front();
if (nodePaths.size()>1)
{
osg::notify(osg::NOTICE)<<"osgManipulator::computeNodePathToRoot(,) taking first parent path, ignoring others."<<std::endl;
OSG_NOTICE<<"osgManipulator::computeNodePathToRoot(,) taking first parent path, ignoring others."<<std::endl;
}
}
}
@@ -147,7 +147,7 @@ Dragger::Dragger(const Dragger& rhs, const osg::CopyOp& copyop):
_activationPermittedByModKeyMask(false),
_activationPermittedByKeyEvent(false)
{
osg::notify(osg::NOTICE)<<"CompositeDragger::CompositeDragger(const CompositeDragger& rhs, const osg::CopyOp& copyop) not Implemented yet."<<std::endl;
OSG_NOTICE<<"CompositeDragger::CompositeDragger(const CompositeDragger& rhs, const osg::CopyOp& copyop) not Implemented yet."<<std::endl;
}
Dragger::~Dragger()
@@ -400,7 +400,7 @@ void Dragger::dispatch(MotionCommand& command)
CompositeDragger::CompositeDragger(const CompositeDragger& rhs, const osg::CopyOp& copyop):
Dragger(rhs, copyop)
{
osg::notify(osg::NOTICE)<<"CompositeDragger::CompositeDragger(const CompositeDragger& rhs, const osg::CopyOp& copyop) not Implemented yet."<<std::endl;
OSG_NOTICE<<"CompositeDragger::CompositeDragger(const CompositeDragger& rhs, const osg::CopyOp& copyop) not Implemented yet."<<std::endl;
}
bool CompositeDragger::handle(const PointerInfo& pi, const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa)

12
src/osgManipulator/Projector.cpp
View File

@@ -243,7 +243,7 @@ bool LineProjector::project(const PointerInfo& pi, osg::Vec3d& projectedPoint) c
{
if (!_line->valid())
{
osg::notify(osg::WARN) << "Warning: Invalid line set. LineProjector::project() failed."<<std::endl;
OSG_WARN << "Warning: Invalid line set. LineProjector::project() failed."<<std::endl;
return false;
}
@@ -285,7 +285,7 @@ bool PlaneProjector::project(const PointerInfo& pi, osg::Vec3d& projectedPoint)
{
if (!_plane.valid())
{
osg::notify(osg::WARN) << "Warning: Invalid plane set. PlaneProjector::project() failed."<< std::endl;
OSG_WARN << "Warning: Invalid plane set. PlaneProjector::project() failed."<< std::endl;
return false;
}
@@ -320,7 +320,7 @@ bool SphereProjector::project(const PointerInfo& pi, osg::Vec3d& projectedPoint)
{
if (!_sphere->valid())
{
osg::notify(osg::WARN) << "Warning: Invalid sphere. SphereProjector::project() failed." << std::endl;
OSG_WARN << "Warning: Invalid sphere. SphereProjector::project() failed." << std::endl;
return false;
}
@@ -429,7 +429,7 @@ bool SpherePlaneProjector::project(const PointerInfo& pi, osg::Vec3d& projectedP
{
if (!_sphere->valid())
{
osg::notify(osg::WARN) << "Warning: Invalid sphere. SpherePlaneProjector::project() failed." << std::endl;
OSG_WARN << "Warning: Invalid sphere. SpherePlaneProjector::project() failed." << std::endl;
return false;
}
@@ -502,7 +502,7 @@ bool CylinderProjector::project(const PointerInfo& pi, osg::Vec3d& projectedPoin
{
if (!_cylinder.valid())
{
osg::notify(osg::WARN) << "Warning: Invalid cylinder. CylinderProjector::project() failed."
OSG_WARN << "Warning: Invalid cylinder. CylinderProjector::project() failed."
<< std::endl;
return false;
}
@@ -549,7 +549,7 @@ bool CylinderPlaneProjector::project(const PointerInfo& pi, osg::Vec3d& projecte
{
if (!_cylinder.valid())
{
osg::notify(osg::WARN) << "Warning: Invalid cylinder. CylinderProjector::project() failed."
OSG_WARN << "Warning: Invalid cylinder. CylinderProjector::project() failed."
<< std::endl;
return false;
}