From 899623f71bc687a3bbc8167ce582692694e4d56d Mon Sep 17 00:00:00 2001 From: frohlich Date: Thu, 15 Jun 2006 08:52:21 +0000 Subject: [PATCH] Remove deprecated, now unused functions. --- simgear/math/SGGeoc.hxx | 22 ---------------------- simgear/math/SGGeod.hxx | 22 ---------------------- simgear/math/SGVec3.hxx | 10 ---------- 3 files changed, 54 deletions(-) diff --git a/simgear/math/SGGeoc.hxx b/simgear/math/SGGeoc.hxx index 14929dbf..3a27e47a 100644 --- a/simgear/math/SGGeoc.hxx +++ b/simgear/math/SGGeoc.hxx @@ -27,14 +27,6 @@ class SGGeoc { public: /// Default constructor, initializes the instance to lat = lon = lat = 0 SGGeoc(void); - /// Initialize from a cartesian vector assumed to be in meters - /// Note that this conversion is relatively expensive to compute - /// depricated - SGGeoc(const SGVec3& cart); - /// Initialize from a geodetic position - /// Note that this conversion is relatively expensive to compute - /// depricated - SGGeoc(const SGGeod& geod); /// Factory from angular values in radians and radius in ft static SGGeoc fromRadFt(double lon, double lat, double radius); @@ -112,20 +104,6 @@ SGGeoc::SGGeoc(double lon, double lat, double radius) : { } -inline -SGGeoc::SGGeoc(const SGVec3& cart) -{ - SGGeodesy::SGCartToGeoc(cart, *this); -} - -inline -SGGeoc::SGGeoc(const SGGeod& geod) -{ - SGVec3 cart; - SGGeodesy::SGGeodToCart(geod, cart); - SGGeodesy::SGCartToGeoc(cart, *this); -} - inline SGGeoc SGGeoc::fromRadFt(double lon, double lat, double radius) diff --git a/simgear/math/SGGeod.hxx b/simgear/math/SGGeod.hxx index 7124fdd1..50c6b97d 100644 --- a/simgear/math/SGGeod.hxx +++ b/simgear/math/SGGeod.hxx @@ -27,14 +27,6 @@ class SGGeod { public: /// Default constructor, initializes the instance to lat = lon = elev = 0 SGGeod(void); - /// Initialize from a cartesian vector assumed to be in meters - /// Note that this conversion is relatively expensive to compute - /// depricated - SGGeod(const SGVec3& cart); - /// Initialize from a geocentric position - /// Note that this conversion is relatively expensive to compute - /// depricated - SGGeod(const SGGeoc& geoc); /// Factory from angular values in radians and elevation is 0 static SGGeod fromRad(double lon, double lat); @@ -116,20 +108,6 @@ SGGeod::SGGeod(double lon, double lat, double elevation) : { } -inline -SGGeod::SGGeod(const SGVec3& cart) -{ - SGGeodesy::SGCartToGeod(cart, *this); -} - -inline -SGGeod::SGGeod(const SGGeoc& geoc) -{ - SGVec3 cart; - SGGeodesy::SGGeocToCart(geoc, cart); - SGGeodesy::SGCartToGeod(cart, *this); -} - inline SGGeod SGGeod::fromRad(double lon, double lat) diff --git a/simgear/math/SGVec3.hxx b/simgear/math/SGVec3.hxx index 1d2a1627..b08e18f7 100644 --- a/simgear/math/SGVec3.hxx +++ b/simgear/math/SGVec3.hxx @@ -43,16 +43,6 @@ public: /// make sure it has at least 3 elements explicit SGVec3(const T* data) { _data[0] = data[0]; _data[1] = data[1]; _data[2] = data[2]; } - /// Constructor. Initialize by a geodetic coordinate - /// Note that this conversion is relatively expensive to compute - /// depricated - SGVec3(const SGGeod& geod) - { SGGeodesy::SGGeodToCart(geod, *this); } - /// Constructor. Initialize by a geocentric coordinate - /// Note that this conversion is relatively expensive to compute - /// depricated - SGVec3(const SGGeoc& geoc) - { SGGeodesy::SGGeocToCart(geoc, *this); } /// Access by index, the index is unchecked const T& operator()(unsigned i) const -- 2.39.5