Melchior FRANZ:

[simgear.git] / simgear / bucket / newbucket.cxx

diff --git a/simgear/bucket/newbucket.cxx b/simgear/bucket/newbucket.cxx
index 658434f2cb32d9cde7982b24bf7a3521ca62d78a..916485be70fd8e26d95d428fce4ca8645f11724e 100644 (file)
--- a/simgear/bucket/newbucket.cxx
+++ b/simgear/bucket/newbucket.cxx
@@ -3,7 +3,7 @@
  *
  * Written by Curtis L. Olson, started February 1999.
  *
- * Copyright (C) 1999  Curtis L. Olson - curt@flightgear.org
+ * Copyright (C) 1999  Curtis L. Olson - http://www.flightgear.org/~curt/
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -25,13 +25,12 @@
 
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#  include <simgear_config.h>
 #endif
 
-
 #include <math.h>
 
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include "newbucket.hxx"
 
@@ -42,13 +41,13 @@ SGBucket::SGBucket() {
 
 
 // constructor for specified location
-inline SGBucket::SGBucket(const double dlon, const double dlat) {
+SGBucket::SGBucket(const double dlon, const double dlat) {
     set_bucket(dlon, dlat);
 }
 
 
 // create an impossible bucket if false
-inline SGBucket::SGBucket(const bool is_good) {
+SGBucket::SGBucket(const bool is_good) {
     set_bucket(0.0, 0.0);
     if ( !is_good ) {
        lon = -1000;
@@ -57,7 +56,7 @@ inline SGBucket::SGBucket(const bool is_good) {
 
 
 // Parse a unique scenery tile index and find the lon, lat, x, and y
-inline SGBucket::SGBucket(const long int bindex) {
+SGBucket::SGBucket(const long int bindex) {
     long int index = bindex;
        
     lon = index >> 14;
@@ -76,7 +75,7 @@ inline SGBucket::SGBucket(const long int bindex) {
 
 
 // default destructor
-inline SGBucket::~SGBucket() {
+SGBucket::~SGBucket() {
 }
 
 
@@ -96,21 +95,21 @@ void SGBucket::set_bucket( double dlon, double dlat ) {
 
     // cout << "diff = " << diff << "  span = " << span << endl;
 
-    if ( (dlon >= 0) || (fabs(diff) < FG_EPSILON) ) {
+    if ( (dlon >= 0) || (fabs(diff) < SG_EPSILON) ) {
        lon = (int)dlon;
     } else {
        lon = (int)dlon - 1;
     }
 
     // find subdivision or super lon if needed
-    if ( span < FG_EPSILON ) {
+    if ( span < SG_EPSILON ) {
        // polar cap
        lon = 0;
        x = 0;
     } else if ( span <= 1.0 ) {
        x = (int)((dlon - lon) / span);
     } else {
-       if ( (dlon >= 0) || (fabs(diff) < FG_EPSILON) ) {
+       if ( (dlon >= 0) || (fabs(diff) < SG_EPSILON) ) {
            lon = (int)( (int)(lon / span) * span);
        } else {
            // cout << " lon = " << lon 
@@ -128,7 +127,7 @@ void SGBucket::set_bucket( double dlon, double dlat ) {
     //
     diff = dlat - (double)(int)dlat;
 
-    if ( (dlat >= 0) || (fabs(diff) < FG_EPSILON) ) {
+    if ( (dlat >= 0) || (fabs(diff) < SG_EPSILON) ) {
        lat = (int)dlat;
     } else {
        lat = (int)dlat - 1;
@@ -180,7 +179,7 @@ string SGBucket::gen_base_path() const {
            hem, top_lon, pole, top_lat, 
            hem, main_lon, pole, main_lat);
 
-    FGPath path( raw_path );
+    SGPath path( raw_path );
 
     return path.str();
 }
@@ -206,10 +205,10 @@ double SGBucket::get_width_m() const {
     } else {
        clat = (int)clat - 0.5;
     }
-    double clat_rad = clat * DEG_TO_RAD;
+    double clat_rad = clat * SGD_DEGREES_TO_RADIANS;
     double cos_lat = cos( clat_rad );
-    double local_radius = cos_lat * EQUATORIAL_RADIUS_M;
-    double local_perimeter = 2.0 * local_radius * FG_PI;
+    double local_radius = cos_lat * SG_EQUATORIAL_RADIUS_M;
+    double local_perimeter = 2.0 * local_radius * SGD_PI;
     double degree_width = local_perimeter / 360.0;
 
     return sg_bucket_span( get_center_lat() ) * degree_width;
@@ -218,7 +217,7 @@ double SGBucket::get_width_m() const {
 
 // return height of the tile in meters
 double SGBucket::get_height_m() const {
-    double perimeter = 2.0 * EQUATORIAL_RADIUS_M * FG_PI;
+    double perimeter = 2.0 * SG_EQUATORIAL_RADIUS_M * SGD_PI;
     double degree_height = perimeter / 360.0;
 
     return SG_BUCKET_SPAN * degree_height;