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-06-17 15:23:44 +00:00
parent 3ecccc4a50
commit 39ee19e058
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osgGA/FirstPersonManipulator.cpp
View File

@ -239,8 +239,8 @@ bool FirstPersonManipulator::handleMouseWheel( const GUIEventAdapter& ea, GUIAct
if( _flags & SET_CENTER_ON_WHEEL_FORWARD_MOVEMENT )
{
if( sm == GUIEventAdapter::SCROLL_DOWN && _wheelMovement > 0. ||
sm == GUIEventAdapter::SCROLL_UP && _wheelMovement < 0. )
if( ((sm == GUIEventAdapter::SCROLL_DOWN) && (_wheelMovement > 0.)) ||
((sm == GUIEventAdapter::SCROLL_UP) && (_wheelMovement < 0.)) )
{
// stop thrown animation
@ -261,7 +261,8 @@ bool FirstPersonManipulator::handleMouseWheel( const GUIEventAdapter& ea, GUIAct
}
}
switch( sm ) {
switch( sm )
{
// mouse scroll up event
case GUIEventAdapter::SCROLL_UP:

4
src/osgGA/OrbitManipulator.cpp
View File

@ -223,8 +223,8 @@ bool OrbitManipulator::handleMouseWheel( const GUIEventAdapter& ea, GUIActionAda
if( _flags & SET_CENTER_ON_WHEEL_FORWARD_MOVEMENT )
{
if( sm == GUIEventAdapter::SCROLL_DOWN && _wheelZoomFactor > 0. ||
sm == GUIEventAdapter::SCROLL_UP && _wheelZoomFactor < 0. )
if( ((sm == GUIEventAdapter::SCROLL_DOWN && _wheelZoomFactor > 0.)) ||
((sm == GUIEventAdapter::SCROLL_UP && _wheelZoomFactor < 0.)) )
{
if( getAnimationTime() <= 0. )