[pkg-fgfs-crew] r144 - in /flightgear/trunk: src/Main/fgviewer.cxx utils/fgviewer/fgviewer.cxx

ovek at users.alioth.debian.org ovek at users.alioth.debian.org
Thu Jul 21 23:55:23 UTC 2011


Author: ovek
Date: Thu Jul 21 23:55:23 2011
New Revision: 144

URL: http://svn.debian.org/wsvn/pkg-fgfs/?sc=1&rev=144
Log:
Apply upstream commit 473cea7f1724c27d895aa136d41727ddcf7d2fb2
"remove references to osgGA::MatrixManipulator"

Modified:
    flightgear/trunk/src/Main/fgviewer.cxx
    flightgear/trunk/utils/fgviewer/fgviewer.cxx

Modified: flightgear/trunk/src/Main/fgviewer.cxx
URL: http://svn.debian.org/wsvn/pkg-fgfs/flightgear/trunk/src/Main/fgviewer.cxx?rev=144&op=diff
==============================================================================
--- flightgear/trunk/src/Main/fgviewer.cxx (original)
+++ flightgear/trunk/src/Main/fgviewer.cxx Thu Jul 21 23:55:23 2011
@@ -149,15 +149,14 @@
     osgGA::KeySwitchMatrixManipulator* keyswitchManipulator;
     keyswitchManipulator = new osgGA::KeySwitchMatrixManipulator;
 
-    osgGA::MatrixManipulator* mm = new osgGA::TrackballManipulator;
-    keyswitchManipulator->addMatrixManipulator('1', "Trackball", mm);
-    mm = new osgGA::FlightManipulator;
-    keyswitchManipulator->addMatrixManipulator('2', "Flight", mm);
-    mm = new osgGA::DriveManipulator;
-    keyswitchManipulator->addMatrixManipulator('3', "Drive", mm);
-    mm = new osgGA::TerrainManipulator;
-    keyswitchManipulator->addMatrixManipulator('4', "Terrain", mm);
-
+    keyswitchManipulator->addMatrixManipulator('1', "Trackball",
+                                               new osgGA::TrackballManipulator);
+    keyswitchManipulator->addMatrixManipulator('2', "Flight",
+                                               new osgGA::FlightManipulator);
+    keyswitchManipulator->addMatrixManipulator('3', "Drive",
+                                               new osgGA::DriveManipulator);
+    keyswitchManipulator->addMatrixManipulator('4', "Terrain",
+                                               new osgGA::TerrainManipulator);
     viewer.setCameraManipulator(keyswitchManipulator);
 
     // Usefull stats

Modified: flightgear/trunk/utils/fgviewer/fgviewer.cxx
URL: http://svn.debian.org/wsvn/pkg-fgfs/flightgear/trunk/utils/fgviewer/fgviewer.cxx?rev=144&op=diff
==============================================================================
--- flightgear/trunk/utils/fgviewer/fgviewer.cxx (original)
+++ flightgear/trunk/utils/fgviewer/fgviewer.cxx Thu Jul 21 23:55:23 2011
@@ -58,14 +58,14 @@
     osgGA::KeySwitchMatrixManipulator* keyswitchManipulator;
     keyswitchManipulator = new osgGA::KeySwitchMatrixManipulator;
     
-    osgGA::MatrixManipulator* mm = new osgGA::TrackballManipulator;
-    keyswitchManipulator->addMatrixManipulator('1', "Trackball", mm);
-    mm = new osgGA::FlightManipulator;
-    keyswitchManipulator->addMatrixManipulator('2', "Flight", mm);
-    mm = new osgGA::DriveManipulator;
-    keyswitchManipulator->addMatrixManipulator('3', "Drive", mm);
-    mm = new osgGA::TerrainManipulator;
-    keyswitchManipulator->addMatrixManipulator('4', "Terrain", mm);
+    keyswitchManipulator->addMatrixManipulator('1', "Trackball",
+                                               new osgGA::TrackballManipulator);
+    keyswitchManipulator->addMatrixManipulator('2', "Flight",
+                                               new osgGA::FlightManipulator);
+    keyswitchManipulator->addMatrixManipulator('3', "Drive",
+                                               new osgGA::DriveManipulator);
+    keyswitchManipulator->addMatrixManipulator('4', "Terrain",
+                                               new osgGA::TerrainManipulator);
     
     viewer.setCameraManipulator(keyswitchManipulator);
 




More information about the pkg-fgfs-crew mailing list