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

Fixed warnings

Browse Source
This commit is contained in:
Robert Osfield
2010-05-26 08:34:15 +00:00
parent ee78e70d78
commit 72d699e2b3
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/osgGA/NodeTrackerManipulator.cpp
View File

@@ -21,17 +21,17 @@ using namespace osgGA;
NodeTrackerManipulator::NodeTrackerManipulator( int flags )
: inherited( flags ),
_trackerMode(NODE_CENTER_AND_ROTATION)
: inherited( flags ),
_trackerMode(NODE_CENTER_AND_ROTATION)
{
setVerticalAxisFixed(false);
}
NodeTrackerManipulator::NodeTrackerManipulator( const NodeTrackerManipulator& m, const CopyOp& copyOp )
: inherited( m, copyOp ),
_trackNodePath( m._trackNodePath ),
_trackerMode( m._trackerMode )
: inherited( m, copyOp ),
_trackNodePath( m._trackNodePath ),
_trackerMode( m._trackerMode )
{
}
@@ -94,15 +94,18 @@ NodeTrackerManipulator::RotationMode NodeTrackerManipulator::getRotationMode() c
void NodeTrackerManipulator::setNode(Node* node)
{
inherited::setNode( node );
inherited::setNode( node );
// update model size
if (_flags & UPDATE_MODEL_SIZE)
if (_node.get()) {
setMinimumDistance(clampBetween(_modelSize*0.001, 0.00001, 1.0));
notify(INFO) << "NodeTrackerManipulator: setting minimum distance to "
<< _minimumDistance << std::endl;
}
// update model size
if (_flags & UPDATE_MODEL_SIZE)
{
if (_node.valid())
{
setMinimumDistance(clampBetween(_modelSize*0.001, 0.00001, 1.0));
notify(INFO) << "NodeTrackerManipulator: setting minimum distance to "
<< _minimumDistance << std::endl;
}
}
}
void NodeTrackerManipulator::setTrackNode(osg::Node* node)

4
src/osgGA/TerrainManipulator.cpp
View File

@@ -54,11 +54,11 @@ void TerrainManipulator::setNode( Node* node )
// update model size
if( _flags & UPDATE_MODEL_SIZE )
{
if( _node.get() )
if( _node.valid() )
{
setMinimumDistance( clampBetween( _modelSize * 0.001, 0.00001, 1.0 ) );
notify( INFO ) << "TerrainManipulator: setting _minimumDistance to "
<< _minimumDistance << std::endl;
<< _minimumDistance << std::endl;
}
}
}