fly/terragear
1
0
Fork 0
Code Activity

Tweaks to track some minor naming changes in simgear.

Browse source
This commit is contained in:
curt 2000-10-13 16:33:27 +00:00
parent 1f57a4bd06
commit 25034ea180
21 changed files with 27 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Airports/GenAirports/build.cxx
View file

@ -40,7 +40,7 @@
#include <simgear/constants.h>
#include <simgear/bucket/newbucket.hxx>
#include <simgear/math/fg_geodesy.hxx>
#include <simgear/math/sg_geodesy.hxx>
#include <simgear/misc/texcoord.hxx>
#include <Array/array.hxx>
@ -1851,7 +1851,7 @@ void build_airport( string airport_raw, string_list& runways_raw,
FGBucket b( apt_lon, apt_lat );
Point3D center_geod( b.get_center_lon() * DEG_TO_RAD,
b.get_center_lat() * DEG_TO_RAD, 0 );
Point3D gbs_center = fgGeodToCart( center_geod );
Point3D gbs_center = sgGeodToCart( center_geod );
cout << b.gen_base_path() << "/" << b.gen_index_str() << endl;
// Ignore any seaplane bases
@ -2184,7 +2184,7 @@ void build_airport( string airport_raw, string_list& runways_raw,
p.setx( geod_nodes[i].x() * DEG_TO_RAD );
p.sety( geod_nodes[i].y() * DEG_TO_RAD );
p.setz( geod_nodes[i].z() );
wgs84_nodes.push_back( fgGeodToCart( p ) );
wgs84_nodes.push_back( sgGeodToCart( p ) );
}
double gbs_radius = calc_bounding_radius( gbs_center, wgs84_nodes );
cout << "Done with wgs84 node mapping" << endl;
@ -2193,7 +2193,7 @@ void build_airport( string airport_raw, string_list& runways_raw,
p.setx( base_tris.get_pt(0, 0).x() * DEG_TO_RAD );
p.sety( base_tris.get_pt(0, 0).y() * DEG_TO_RAD );
p.setz( 0 );
Point3D tmp = fgGeodToCart( p );
Point3D tmp = sgGeodToCart( p );
// cout << "geod = " << p << endl;
// cout << "cart = " << tmp << endl;

2
src/Airports/GenAirports/convex_hull.hxx
View file

@ -32,7 +32,7 @@
using namespace std;
#endif
#include <simgear/math/fg_types.hxx>
#include <simgear/math/sg_types.hxx>
#include <Polygon/polygon.hxx>

2
src/Airports/GenAirports/output.hxx
View file

@ -37,7 +37,7 @@
#include <list>
#include STL_STRING
#include <simgear/math/fg_types.hxx>
#include <simgear/math/sg_types.hxx>
#include <Polygon/polygon.hxx>

2
src/Airports/GenAirports/point2d.hxx
View file

@ -26,7 +26,7 @@
#define _POINT2D_HXX
#include <simgear/math/fg_types.hxx>
#include <simgear/math/sg_types.hxx>
#include <simgear/math/point3d.hxx>

4
src/Airports/GenAirports/runway.cxx
View file

@ -26,8 +26,8 @@
#include <stdio.h>
#include <simgear/constants.h>
#include <simgear/math/fg_types.hxx>
#include <simgear/math/fg_geodesy.hxx>
#include <simgear/math/sg_types.hxx>
#include <simgear/math/sg_geodesy.hxx>
#include "runway.hxx"
#include "point2d.hxx"

2
src/Airports/GenAirports/texparams.hxx
View file

@ -32,7 +32,7 @@
#include <simgear/compiler.h>
#include <simgear/math/fg_types.hxx>
#include <simgear/math/sg_types.hxx>
#include <vector>

2
src/BuildTiles/Clipper/clipper.hxx
View file

@ -34,7 +34,7 @@
#include <simgear/compiler.h>
#include <simgear/math/fg_types.hxx>
#include <simgear/math/sg_types.hxx>
#include <Polygon/polygon.hxx>

2
src/BuildTiles/GenOutput/genobj.cxx
View file

@ -51,7 +51,7 @@ void FGGenOutput::calc_gbs( FGConstruct& c ) {
b.get_center_lat() * DEG_TO_RAD,
0 );
gbs_center = fgGeodToCart(p);
gbs_center = sgGeodToCart(p);
point_list wgs84_nodes = c.get_wgs84_nodes();
const_point_list_iterator current = wgs84_nodes.begin();

4
src/BuildTiles/GenOutput/genobj.hxx
View file

@ -36,9 +36,9 @@
#include STL_STRING
#include <simgear/bucket/newbucket.hxx>
#include <simgear/math/fg_geodesy.hxx>
#include <simgear/math/fg_types.hxx>
#include <simgear/math/point3d.hxx>
#include <simgear/math/sg_geodesy.hxx>
#include <simgear/math/sg_types.hxx>
#include <Optimize/genfans.hxx>
#include <Main/construct.hxx>

2
src/BuildTiles/Main/main.cxx
View file

@ -335,7 +335,7 @@ static void build_wgs_84_point_list( FGConstruct& c, const FGArray& array ) {
geod.y() * DEG_TO_RAD,
geod.z() );
cart = fgGeodToCart(radians);
cart = sgGeodToCart(radians);
// cout << cart << endl;
geod_nodes.push_back(geod);

4
src/BuildTiles/Match/match.cxx
View file

@ -25,8 +25,8 @@
# include <config.h>
#endif
#include <simgear/math/fg_geodesy.hxx>
#include <simgear/math/point3d.hxx>
#include <simgear/math/sg_geodesy.hxx>
#include <simgear/misc/fgstream.hxx>
#ifdef _MSC_VER
@ -590,7 +590,7 @@ static Point3D fake_normal( const Point3D& p ) {
Point3D radians = Point3D( p.x() * DEG_TO_RAD,
p.y() * DEG_TO_RAD,
p.z() );
Point3D cart = fgGeodToCart(radians);
Point3D cart = sgGeodToCart(radians);
double len = Point3D(0.0).distance3D(cart);
cout << "len = " << len << endl;
cart /= len;

2
src/BuildTiles/Match/match.hxx
View file

@ -31,7 +31,7 @@
#include <simgear/compiler.h>
#include <simgear/math/fg_types.hxx>
#include <simgear/math/sg_types.hxx>
#include <simgear/bucket/newbucket.hxx>
#include <Main/construct.hxx>

2
src/Lib/Array/array.hxx
View file

@ -35,8 +35,8 @@
#include <vector>
#include <simgear/bucket/newbucket.hxx>
#include <simgear/math/fg_types.hxx>
#include <simgear/math/point3d.hxx>
#include <simgear/math/sg_types.hxx>
#include <simgear/misc/fgstream.hxx>

2
src/Lib/Geometry/poly_support.cxx
View file

@ -24,8 +24,8 @@
#include <simgear/compiler.h>
#include <simgear/constants.h>
#include <simgear/math/fg_types.hxx>
#include <simgear/math/point3d.hxx>
#include <simgear/math/sg_types.hxx>
#include <Polygon/polygon.hxx>
#include <Triangulate/trieles.hxx>

2
src/Lib/Geometry/poly_support.hxx
View file

@ -32,7 +32,7 @@
#include <simgear/compiler.h>
#include <simgear/math/fg_types.hxx>
#include <simgear/math/sg_types.hxx>
#include <Polygon/polygon.hxx>
#include <Triangulate/trieles.hxx>

3
src/Lib/Geometry/trinodes.hxx
View file

@ -31,9 +31,8 @@
#include <simgear/compiler.h>
#include <simgear/math/fg_types.hxx>
#include <simgear/math/point3d.hxx>
#include <simgear/math/sg_types.hxx>
#define FG_PROXIMITY_EPSILON 0.000001

2
src/Lib/Optimize/genfans.hxx
View file

@ -34,7 +34,7 @@
#include <vector>
#include <simgear/math/fg_types.hxx>
#include <simgear/math/sg_types.hxx>
#include <Triangulate/trieles.hxx>

2
src/Lib/Optimize/genstrips.hxx
View file

@ -35,7 +35,7 @@
#include <vector>
#include <simgear/math/fg_types.hxx>
#include <simgear/math/sg_types.hxx>
#include <Triangulate/trieles.hxx>

2
src/Lib/Polygon/polygon.hxx
View file

@ -31,7 +31,7 @@
#include <simgear/compiler.h>
#include <simgear/math/fg_types.hxx>
#include <simgear/math/sg_types.hxx>
#include <string>
#include <vector>

2
src/Lib/Polygon/superpoly.hxx
View file

@ -31,7 +31,7 @@
#include <simgear/compiler.h>
#include <simgear/math/fg_types.hxx>
#include <simgear/math/sg_types.hxx>
#include <string>
#include <vector>

2
src/Prep/MergerClipper/merger.hxx
View file

@ -32,7 +32,7 @@
#include <simgear/compiler.h>
#include <simgear/math/fg_types.hxx>
#include <simgear/math/sg_types.hxx>
#include <Polygon/polygon.hxx>
#include <Polygon/names.hxx>