[Flightgear-devel] TerraGear bits and pieces

[Julian Foad]

I am carrying some local changes to TerraGear which probably ought to go into CVS. Patch attached. They are just minor and cosmetic fixes; nothing that affects the generated scenery.

- Julian

Index: acinclude.m4
===================================================================
RCS file: /var/cvs/TerraGear-0.0/TerraGear/acinclude.m4,v
retrieving revision 1.1
diff -u -3 -p -d -r1.1 acinclude.m4
--- acinclude.m4        28 Aug 2002 14:13:51 -0000      1.1
+++ acinclude.m4        24 Oct 2002 14:26:38 -0000
@@ -102,7 +102,7 @@ for exdir in $exdirs ; do
                mylibdir="${exdir}/lib${subexdir}"
                wi_EXTRA_LDIR($mylibdir)
 
-               progdir="${exdir}/bin${subexdirr}"
+               progdir="${exdir}/bin${subexdir}"
                wi_EXTRA_PDIR($progdir)
        fi
 done
Index: configure.ac
===================================================================
RCS file: /var/cvs/TerraGear-0.0/TerraGear/configure.ac,v
retrieving revision 1.5
diff -u -3 -p -d -r1.5 configure.ac
--- configure.ac        18 Oct 2002 22:25:45 -0000      1.5
+++ configure.ac        24 Oct 2002 14:26:40 -0000
@@ -240,6 +240,8 @@ fi
 AC_MSG_CHECKING(for proper simgear version)
 
 AC_TRY_RUN([
+#include <stdio.h>
+
 #include <simgear/version.h>
 
 #if !defined(SIMGEAR_VERSION)
@@ -256,7 +258,8 @@ AC_TRY_RUN([
 int main() {
     int major, minor, micro;
 
-    printf("%d.%d.%d or greater... ", MIN_MAJOR, MIN_MINOR, MIN_MICRO);
+    printf("need %d.%d.%d, have %s... ", MIN_MAJOR, MIN_MINOR, MIN_MICRO,
+        STRINGIFY(SIMGEAR_VERSION));
 
     sscanf( STRINGIFY(SIMGEAR_VERSION), "%d.%d.%d", &major, &minor, &micro );
 
Index: src/Airports/GenAirports/rwy_prec.cxx
===================================================================
RCS file: /var/cvs/TerraGear-0.0/TerraGear/src/Airports/GenAirports/rwy_prec.cxx,v
retrieving revision 1.3
diff -u -3 -p -d -r1.3 rwy_prec.cxx
--- src/Airports/GenAirports/rwy_prec.cxx       22 Mar 2002 15:05:54 -0000      1.3
+++ src/Airports/GenAirports/rwy_prec.cxx       24 Oct 2002 14:26:41 -0000
@@ -88,7 +88,7 @@ void gen_precision_rwy( const FGRunway& 
     double length = rwy_info.length / 2.0;
     if ( length < 3075 ) {
         SG_LOG(SG_GENERAL, SG_ALERT,
-              "This runway is not long enough for precision markings!");
+              "Runway " << rwy_info.rwy_no << " is not long enough (" << 
+rwy_info.length << ") for precision markings!");
     }
 
     double start_pct = 0;
Index: src/BuildTiles/Parallel/client.cxx
===================================================================
RCS file: /var/cvs/TerraGear-0.0/TerraGear/src/BuildTiles/Parallel/client.cxx,v
retrieving revision 1.11
diff -u -3 -p -d -r1.11 client.cxx
--- src/BuildTiles/Parallel/client.cxx  30 Jan 2002 14:10:00 -0000      1.11
+++ src/BuildTiles/Parallel/client.cxx  24 Oct 2002 14:26:43 -0000
@@ -200,7 +200,7 @@ bool construct_tile( const SGBucket& b,
        for (int i = 0; i < (int)load_dirs.size(); i++) {
          command = command + " " + load_dirs[i];
        }
-       command = command + "> " + result_file + " 2>&1";
+       command = command + " > " + result_file + " 2>&1";
        cout << command << endl;
        
        system( command.c_str() );
@@ -253,7 +253,8 @@ usage (const string name)
   cout << "  --host=<address>" << endl;
   cout << "  --port=<number>" << endl;
   cout << "  --rude" << endl;
-  cout << "  --cover=<landcover-raster> ]" << endl;
+  cout << "  --cover=<landcover-raster>" << endl;
+  cout << "  --min-angle=<degrees> ]" << endl;
   cout << "<load directory...>" << endl;
   exit(-1);
 }
Index: src/Lib/Geometry/line.cxx
===================================================================
RCS file: /var/cvs/TerraGear-0.0/TerraGear/src/Lib/Geometry/line.cxx,v
retrieving revision 1.4
diff -u -3 -p -d -r1.4 line.cxx
--- src/Lib/Geometry/line.cxx   14 Aug 2002 15:41:54 -0000      1.4
+++ src/Lib/Geometry/line.cxx   24 Oct 2002 14:26:46 -0000
@@ -48,7 +48,7 @@ Line::addPoint (const Point3D &point)
   _points.push_back(point);
 }
 
-const Rectangle
+Rectangle
 Line::getBounds () const
 {
   Point3D min;
@@ -68,11 +68,9 @@ Line::getBounds () const
       if (_points[i].y() > max.y())
        max.sety(_points[i].y());
     }
-    return Rectangle(min, max);
   }
 
-  Rectangle bounds;
-  return bounds;
+  return Rectangle(min, max);
 }
 
 };
Index: src/Lib/Geometry/line.hxx
===================================================================
RCS file: /var/cvs/TerraGear-0.0/TerraGear/src/Lib/Geometry/line.hxx,v
retrieving revision 1.3
diff -u -3 -p -d -r1.3 line.hxx
--- src/Lib/Geometry/line.hxx   14 Aug 2002 15:41:54 -0000      1.3
+++ src/Lib/Geometry/line.hxx   24 Oct 2002 14:26:46 -0000
@@ -82,7 +82,7 @@ public:
    *
    * @return The bounding rectangle.
    */
-  virtual const Rectangle getBounds () const;
+  virtual Rectangle getBounds () const;
 
 private:
   vector<Point3D> _points;