Changeset 11625

Show
Ignore:
Timestamp:
06/17/10 17:23:44 (5 years ago)
Author:
robert
Message:

Fixed warnings

Location:
OpenSceneGraph/trunk/src/osgGA
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgGA/FirstPersonManipulator.cpp

    r11598 r11625  
    240240    { 
    241241 
    242         if( sm == GUIEventAdapter::SCROLL_DOWN && _wheelMovement > 0. || 
    243             sm == GUIEventAdapter::SCROLL_UP   && _wheelMovement < 0. ) 
     242        if( ((sm == GUIEventAdapter::SCROLL_DOWN) && (_wheelMovement > 0.)) || 
     243            ((sm == GUIEventAdapter::SCROLL_UP)   && (_wheelMovement < 0.)) ) 
    244244        { 
    245245 
     
    262262    } 
    263263 
    264     switch( sm ) { 
     264    switch( sm ) 
     265    { 
    265266 
    266267        // mouse scroll up event 
  • OpenSceneGraph/trunk/src/osgGA/OrbitManipulator.cpp

    r11598 r11625  
    224224    { 
    225225 
    226         if( sm == GUIEventAdapter::SCROLL_DOWN && _wheelZoomFactor > 0. || 
    227             sm == GUIEventAdapter::SCROLL_UP   && _wheelZoomFactor < 0. ) 
     226        if( ((sm == GUIEventAdapter::SCROLL_DOWN && _wheelZoomFactor > 0.)) || 
     227            ((sm == GUIEventAdapter::SCROLL_UP   && _wheelZoomFactor < 0.)) ) 
    228228        { 
    229229