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

From David Callu, warning fixes and removal of spaces at end of lines.

Browse Source
This commit is contained in:
Robert Osfield
2013-06-28 12:00:43 +00:00
parent d82768417d
commit 097aedf23c
100 changed files with 496 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/osgGA/CameraManipulator.cpp
View File

@@ -21,7 +21,8 @@ CameraManipulator::CameraManipulator()
CameraManipulator::CameraManipulator(const CameraManipulator& mm, const CopyOp& copyOp)
: inherited(mm, copyOp),
: osg::Object(mm, copyOp),
inherited(mm, copyOp),
_intersectTraversalMask(mm._intersectTraversalMask),
_autoComputeHomePosition(mm._autoComputeHomePosition),
_homeEye(mm._homeEye),

2
src/osgGA/Device.cpp
View File

@@ -28,7 +28,7 @@ Device::Device(const Device& es, const osg::CopyOp& copyop):
setEventQueue(new EventQueue);
}
void Device::sendEvent(const GUIEventAdapter& event)
void Device::sendEvent(const GUIEventAdapter& /*event*/)
{
OSG_WARN << "Device::sendEvent not implemented!" << std::endl;
}

7
src/osgGA/FirstPersonManipulator.cpp
View File

@@ -44,7 +44,8 @@ FirstPersonManipulator::FirstPersonManipulator( int flags )
/// Constructor.
FirstPersonManipulator::FirstPersonManipulator( const FirstPersonManipulator& fpm, const CopyOp& copyOp )
: inherited( fpm, copyOp ),
: osg::Object(fpm, copyOp),
inherited( fpm, copyOp ),
_eye( fpm._eye ),
_rotation( fpm._rotation ),
_velocity( fpm._velocity ),
@@ -294,7 +295,7 @@ bool FirstPersonManipulator::handleMouseWheel( const GUIEventAdapter& ea, GUIAct
// doc in parent
bool FirstPersonManipulator::performMovementLeftMouseButton( const double eventTimeDelta, const double dx, const double dy )
bool FirstPersonManipulator::performMovementLeftMouseButton( const double /*eventTimeDelta*/, const double dx, const double dy )
{
// world up vector
CoordinateFrame coordinateFrame = getCoordinateFrame( _eye );
@@ -353,7 +354,7 @@ void FirstPersonManipulator::moveUp( const double distance )
}
void FirstPersonManipulator::applyAnimationStep( const double currentProgress, const double prevProgress )
void FirstPersonManipulator::applyAnimationStep( const double currentProgress, const double /*prevProgress*/ )
{
FirstPersonAnimationData *ad = dynamic_cast< FirstPersonAnimationData* >( _animationData.get() );
assert( ad );

9
src/osgGA/FlightManipulator.cpp
View File

@@ -28,7 +28,8 @@ FlightManipulator::FlightManipulator( int flags )
/// Constructor.
FlightManipulator::FlightManipulator( const FlightManipulator& fm, const CopyOp& copyOp )
: inherited( fm, copyOp ),
: osg::Object(fm, copyOp),
inherited( fm, copyOp ),
_yawMode( fm._yawMode )
{
}
@@ -221,7 +222,7 @@ bool FlightManipulator::performMovement()
}
bool FlightManipulator::performMovementLeftMouseButton( const double eventTimeDelta, const double dx, const double dy )
bool FlightManipulator::performMovementLeftMouseButton( const double eventTimeDelta, const double /*dx*/, const double /*dy*/ )
{
// pan model
_velocity += eventTimeDelta * (_acceleration + _velocity);
@@ -229,14 +230,14 @@ bool FlightManipulator::performMovementLeftMouseButton( const double eventTimeDe
}
bool FlightManipulator::performMovementMiddleMouseButton( const double eventTimeDelta, const double dx, const double dy )
bool FlightManipulator::performMovementMiddleMouseButton( const double /*eventTimeDelta*/, const double /*dx*/, const double /*dy*/ )
{
_velocity = 0.0f;
return true;
}
bool FlightManipulator::performMovementRightMouseButton( const double eventTimeDelta, const double dx, const double dy )
bool FlightManipulator::performMovementRightMouseButton( const double eventTimeDelta, const double /*dx*/, const double /*dy*/ )
{
_velocity -= eventTimeDelta * (_acceleration + _velocity);
return true;

2
src/osgGA/MultiTouchTrackballManipulator.cpp
View File

@@ -30,7 +30,7 @@ MultiTouchTrackballManipulator::MultiTouchTrackballManipulator( int flags )
/// Constructor.
MultiTouchTrackballManipulator::MultiTouchTrackballManipulator( const MultiTouchTrackballManipulator& tm, const CopyOp& copyOp )
: inherited( tm, copyOp )
: osg::Object(tm, copyOp), inherited( tm, copyOp )
{
}

5
src/osgGA/NodeTrackerManipulator.cpp
View File

@@ -30,7 +30,8 @@ NodeTrackerManipulator::NodeTrackerManipulator( int flags )
NodeTrackerManipulator::NodeTrackerManipulator( const NodeTrackerManipulator& m, const CopyOp& copyOp )
: inherited( m, copyOp ),
: osg::Object(m, copyOp),
inherited( m, copyOp ),
_trackNodePath( m._trackNodePath ),
_trackerMode( m._trackerMode )
{
@@ -281,7 +282,7 @@ bool NodeTrackerManipulator::performMovementLeftMouseButton( const double eventT
// doc in parent
bool NodeTrackerManipulator::performMovementMiddleMouseButton( const double eventTimeDelta, const double dx, const double dy )
bool NodeTrackerManipulator::performMovementMiddleMouseButton( const double /*eventTimeDelta*/, const double /*dx*/, const double /*dy*/ )
{
osg::Vec3d nodeCenter;
osg::Quat nodeRotation;

7
src/osgGA/OrbitManipulator.cpp
View File

@@ -43,7 +43,8 @@ OrbitManipulator::OrbitManipulator( int flags )
/// Constructor.
OrbitManipulator::OrbitManipulator( const OrbitManipulator& om, const CopyOp& copyOp )
: inherited( om, copyOp ),
: osg::Object(om, copyOp),
inherited( om, copyOp ),
_center( om._center ),
_rotation( om._rotation ),
_distance( om._distance ),
@@ -297,7 +298,7 @@ bool OrbitManipulator::performMovementMiddleMouseButton( const double eventTimeD
// doc in parent
bool OrbitManipulator::performMovementRightMouseButton( const double eventTimeDelta, const double dx, const double dy )
bool OrbitManipulator::performMovementRightMouseButton( const double eventTimeDelta, const double /*dx*/, const double dy )
{
// zoom model
zoomModel( dy * getThrowScale( eventTimeDelta ), true );
@@ -378,7 +379,7 @@ void OrbitManipulator::OrbitAnimationData::start( const osg::Vec3d& movement, co
Scale parameter is useful, for example, when manipulator is thrown.
It scales the amount of rotation based, for example, on the current frame time.*/
void OrbitManipulator::rotateTrackball( const float px0, const float py0,
const float px1, const float py1, const float scale )
const float px1, const float py1, const float /*scale*/ )
{
osg::Vec3d axis;
float angle;

27
src/osgGA/StandardManipulator.cpp
View File

@@ -48,7 +48,8 @@ StandardManipulator::StandardManipulator( int flags )
/// Constructor.
StandardManipulator::StandardManipulator( const StandardManipulator& uim, const CopyOp& copyOp )
: inherited( uim, copyOp ),
: osg::Object(uim, copyOp),
inherited( uim, copyOp ),
_thrown( uim._thrown ),
_allowThrow( uim._allowThrow ),
_mouseCenterX(0.0f), _mouseCenterY(0.0f),
@@ -189,7 +190,7 @@ void StandardManipulator::home( double /*currentTime*/ )
StandardManipulator implementation only updates its internal data.
If home position is expected to be supported by the descendant manipulator,
it has to reimplement the method to update manipulator transformation.*/
void StandardManipulator::home( const GUIEventAdapter& ea, GUIActionAdapter& us )
void StandardManipulator::home( const GUIEventAdapter& /*ea*/, GUIActionAdapter& us )
{
if( getAutoComputeHomePosition() )
{
@@ -207,7 +208,7 @@ void StandardManipulator::home( const GUIEventAdapter& ea, GUIActionAdapter& us
/** Start/restart the manipulator.*/
void StandardManipulator::init( const GUIEventAdapter& ea, GUIActionAdapter& us )
void StandardManipulator::init( const GUIEventAdapter& /*ea*/, GUIActionAdapter& us )
{
flushMouseEventStack();
@@ -300,7 +301,7 @@ bool StandardManipulator::handleResize( const GUIEventAdapter& ea, GUIActionAdap
/// Handles GUIEventAdapter::MOVE event.
bool StandardManipulator::handleMouseMove( const GUIEventAdapter& ea, GUIActionAdapter& us )
bool StandardManipulator::handleMouseMove( const GUIEventAdapter& /*ea*/, GUIActionAdapter& /*us*/ )
{
return false;
}
@@ -388,14 +389,14 @@ bool StandardManipulator::handleKeyDown( const GUIEventAdapter& ea, GUIActionAda
/// Handles GUIEventAdapter::KEYUP event.
bool StandardManipulator::handleKeyUp( const GUIEventAdapter& ea, GUIActionAdapter& us )
bool StandardManipulator::handleKeyUp( const GUIEventAdapter& /*ea*/, GUIActionAdapter& /*us*/ )
{
return false;
}
/// Handles GUIEventAdapter::SCROLL event.
bool StandardManipulator::handleMouseWheel( const GUIEventAdapter& ea, GUIActionAdapter& us )
bool StandardManipulator::handleMouseWheel( const GUIEventAdapter& /*ea*/, GUIActionAdapter& /*us*/ )
{
return false;
}
@@ -454,7 +455,7 @@ bool StandardManipulator::performMovement()
/** Make movement step of manipulator.
This method implements movement for left mouse button.*/
bool StandardManipulator::performMovementLeftMouseButton( const double eventTimeDelta, const double dx, const double dy )
bool StandardManipulator::performMovementLeftMouseButton( const double /*eventTimeDelta*/, const double /*dx*/, const double /*dy*/ )
{
return false;
}
@@ -463,7 +464,7 @@ bool StandardManipulator::performMovementLeftMouseButton( const double eventTime
/** Make movement step of manipulator.
This method implements movement for middle mouse button
or combination of left and right mouse button pressed together.*/
bool StandardManipulator::performMovementMiddleMouseButton( const double eventTimeDelta, const double dx, const double dy )
bool StandardManipulator::performMovementMiddleMouseButton( const double /*eventTimeDelta*/, const double /*dx*/, const double /*dy*/ )
{
return false;
}
@@ -471,7 +472,7 @@ bool StandardManipulator::performMovementMiddleMouseButton( const double eventTi
/** Make movement step of manipulator.
This method implements movement for right mouse button.*/
bool StandardManipulator::performMovementRightMouseButton( const double eventTimeDelta, const double dx, const double dy )
bool StandardManipulator::performMovementRightMouseButton( const double /*eventTimeDelta*/, const double /*dx*/, const double /*dy*/ )
{
return false;
}
@@ -494,7 +495,7 @@ bool StandardManipulator::handleMouseDeltaMovement( const GUIEventAdapter& ea, G
/// The method performs manipulator update based on relative mouse movement (mouse delta).
bool StandardManipulator::performMouseDeltaMovement( const float dx, const float dy )
bool StandardManipulator::performMouseDeltaMovement( const float /*dx*/, const float /*dy*/ )
{
return false;
}
@@ -522,7 +523,7 @@ bool StandardManipulator::performAnimationMovement( const GUIEventAdapter& ea, G
/// Updates manipulator by a single animation step
void StandardManipulator::applyAnimationStep( const double currentProgress, const double prevProgress )
void StandardManipulator::applyAnimationStep( const double /*currentProgress*/, const double /*prevProgress*/ )
{
}
@@ -719,7 +720,7 @@ void StandardManipulator::fixVerticalAxis( Quat& rotation, const Vec3d& localUp,
* right and up camera vectors are negated (changing roll by 180 degrees),
* making pitch once again between -90..+90 degrees limits.*/
void StandardManipulator::fixVerticalAxis( const osg::Vec3d& forward, const osg::Vec3d& up, osg::Vec3d& newUp,
const osg::Vec3d& localUp, bool disallowFlipOver )
const osg::Vec3d& localUp, bool /*disallowFlipOver*/ )
{
// right direction
osg::Vec3d right1 = forward ^ localUp;
@@ -826,7 +827,7 @@ bool StandardManipulator::setCenterByMousePointerIntersection( const GUIEventAda
If there is a hit, animation is started and true is returned.
Otherwise, the method returns false.*/
bool StandardManipulator::startAnimationByMousePointerIntersection(
const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us )
const osgGA::GUIEventAdapter& /*ea*/, osgGA::GUIActionAdapter& /*us*/ )
{
return false;
}

5
src/osgGA/TerrainManipulator.cpp
View File

@@ -29,7 +29,8 @@ TerrainManipulator::TerrainManipulator( int flags )
/// Constructor.
TerrainManipulator::TerrainManipulator( const TerrainManipulator& tm, const CopyOp& copyOp )
: inherited( tm, copyOp ),
: osg::Object(tm, copyOp),
inherited( tm, copyOp ),
_previousUp( tm._previousUp )
{
}
@@ -299,7 +300,7 @@ bool TerrainManipulator::performMovementMiddleMouseButton( const double eventTim
}
bool TerrainManipulator::performMovementRightMouseButton( const double eventTimeDelta, const double dx, const double dy )
bool TerrainManipulator::performMovementRightMouseButton( const double eventTimeDelta, const double /*dx*/, const double dy )
{
// zoom model
zoomModel( dy * getThrowScale( eventTimeDelta ), false );

3
src/osgGA/TrackballManipulator.cpp
View File

@@ -28,6 +28,7 @@ TrackballManipulator::TrackballManipulator( int flags )
/// Constructor.
TrackballManipulator::TrackballManipulator( const TrackballManipulator& tm, const CopyOp& copyOp )
: inherited( tm, copyOp )
: osg::Object(tm, copyOp),
inherited( tm, copyOp )
{
}