Sophie

Sophie

distrib > Fedora > 13 > x86_64 > by-pkgid > 6817ca5b858f8acf8bf28ced392b0f59 > files > 3

FlightGear-Atlas-0.4.0-0.5.cvs20100226.fc13.src.rpm

diff -uNrp Atlas.orig/configure.ac Atlas/configure.ac
--- Atlas.orig/configure.ac	2010-02-26 23:19:18.000000000 +0100
+++ Atlas/configure.ac	2010-02-27 17:16:18.997608237 +0100
@@ -163,6 +163,7 @@ dnl Checks for libraries.
 null_LIBS="$LIBS"
 
 AC_CHECK_LIB(m, cos)
+AC_CHECK_LIB(rt, clock_gettime, LIBS="$LIBS -lrt",)
 
 base_LIBS="$LIBS"
 
diff -uNrp Atlas.orig/src/Atlas.cxx Atlas/src/Atlas.cxx
--- Atlas.orig/src/Atlas.cxx	2010-02-15 20:07:53.000000000 +0100
+++ Atlas/src/Atlas.cxx	2010-02-27 17:16:18.993608120 +0100
@@ -31,6 +31,7 @@
 #include <plib/fnt.h>
 #include <plib/pu.h>
 #include <plib/puAux.h>
+#include <plib/sg.h>
 #include <string>
 
 #include <cassert>
@@ -2900,10 +2901,10 @@ void mouseMotion(int x, int y) 
 	    sgdVec3 axis;
 	    sgdMat4 rot;
 
-	    sgdVectorProductVec3(axis, newC.sg(), oldC.sg());
+	    sgdVectorProductVec3(axis, newC.data(), oldC.data());
 	    double theta = SGD_RADIANS_TO_DEGREES *
 		atan2(sgdLengthVec3(axis), 
-		      sgdScalarProductVec3(oldC.sg(), newC.sg()));
+		      sgdScalarProductVec3(oldC.data(), newC.data()));
 	    sgdMakeRotMat4(rot, theta, axis);
 	    
 	    // Transform the eye point and the camera up vector.
@@ -3018,7 +3019,7 @@ void keyPressed(unsigned char key, int x
 	  case 'c': 
 	    // Center the map on the current mouse position.
 	    if (cursor.validLocation) {
-		movePosition(cursor.cart.sg());
+		movePosition(cursor.cart.data());
 	    }
 	    break;
 
diff -uNrp Atlas.orig/src/Cache.cxx Atlas/src/Cache.cxx
--- Atlas.orig/src/Cache.cxx	2009-07-16 18:39:42.000000000 +0200
+++ Atlas/src/Cache.cxx	2010-02-27 17:16:18.995607480 +0100
@@ -225,7 +225,7 @@ void Cache::_load()
 	_objectsSize += c->size();
 
 	t2.stamp();
-    } while ((_toBeLoaded.size() > 0) && ((t2 - t1) < microSeconds));
+    } while ((_toBeLoaded.size() > 0) && ((t2 - t1).toUSecs() < microSeconds));
 
     // Return to the old window.
     glutPostWindowRedisplay(_window);
diff -uNrp Atlas.orig/src/Preferences.hxx Atlas/src/Preferences.hxx
--- Atlas.orig/src/Preferences.hxx	2010-02-15 20:09:26.000000000 +0100
+++ Atlas/src/Preferences.hxx	2010-02-27 17:16:18.996608104 +0100
@@ -28,6 +28,7 @@
 
 #include <vector>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/math/SGMath.hxx>
 
 // This class (of which there should only be one instantiated), keeps
 // Atlas' preferences.  Preferences come from 3 places:
diff -uNrp Atlas.orig/src/Tiles.cxx Atlas/src/Tiles.cxx
--- Atlas.orig/src/Tiles.cxx	2009-09-09 06:00:42.000000000 +0200
+++ Atlas/src/Tiles.cxx	2010-02-27 17:16:18.997608237 +0100
@@ -23,8 +23,14 @@
 
 #include <cassert>
 #include <stdexcept>
+#include <cstdlib>
+#include <math.h>
 
 #include <simgear/misc/sg_path.hxx>
+#include <plib/fnt.h>
+#include <plib/pu.h>
+#include <plib/puAux.h>
+#include <plib/sg.h>
 
 #include "Tiles.hxx"