Changeset 11625

Timestamp:

06/17/10 17:23:44 (3 years ago)

Author:

robert

Message:

Fixed warnings

Location:

OpenSceneGraph/trunk/src/osgGA

Files:

• FirstPersonManipulator.cpp (modified) (2 diffs)
• OrbitManipulator.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osgGA/FirstPersonManipulator.cpp

@@ -240 +240 @@
     {
 
-        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.)) )
         {
 
@@ -262 +262 @@
     }
 
-    switch( sm ) {
+    switch( sm )
+    {
 
         // mouse scroll up event

OpenSceneGraph/trunk/src/osgGA/OrbitManipulator.cpp

@@ -224 +224 @@
     {
 
-        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.)) )
         {