From 1a69225101ea35b14a56e9099c5c01799d2b0c5e Mon Sep 17 00:00:00 2001 From: curt Date: Wed, 7 Apr 2004 04:05:39 +0000 Subject: [PATCH] This patch *should* fix the "open grassy" areas at the centers of runways with displaced thresholds. (Not fully tested yet.) --- src/Airports/GenAirports/apt_surface.cxx | 7 ------- src/Airports/GenAirports/rwy_nonprec.cxx | 4 ++-- src/Airports/GenAirports/rwy_prec.cxx | 4 ++-- src/Airports/GenAirports/rwy_visual.cxx | 4 ++-- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/Airports/GenAirports/apt_surface.cxx b/src/Airports/GenAirports/apt_surface.cxx index 8f2fe558..9f6a4681 100644 --- a/src/Airports/GenAirports/apt_surface.cxx +++ b/src/Airports/GenAirports/apt_surface.cxx @@ -40,13 +40,6 @@ SG_USING_NAMESPACE( PLib ); // fix node elevations. Offset is added to the final elevation static void calc_elevations( const string &root, const string_list elev_src, Matrix_Point3Df &Pts ) { - // string_list elev_src; - // elev_src.clear(); - // elev_src.push_back( "SRTM-1" ); - // elev_src.push_back( "SRTM-3" ); - // elev_src.push_back( "DEM-3" ); - // elev_src.push_back( "DEM-30" ); - bool done = false; int i, j; TGArray array; diff --git a/src/Airports/GenAirports/rwy_nonprec.cxx b/src/Airports/GenAirports/rwy_nonprec.cxx index c397843f..81b9e11a 100644 --- a/src/Airports/GenAirports/rwy_nonprec.cxx +++ b/src/Airports/GenAirports/rwy_nonprec.cxx @@ -120,7 +120,7 @@ void gen_non_precision_rwy( const TGRunway& rwy_info, double tex_pct = (200.0 - part_len) / 200.0; // starting (possibly partial chunk) - start2_pct = end2_pct; + start2_pct = -rwy_info.disp_thresh1 / length; end2_pct = start2_pct + ( part_len / length ); gen_runway_section( rwy_info, runway_b, start2_pct, end2_pct, @@ -170,7 +170,7 @@ void gen_non_precision_rwy( const TGRunway& rwy_info, double tex_pct = (200.0 - part_len) / 200.0; // starting (possibly partial chunk) - start1_pct = end1_pct; + start1_pct = -rwy_info.disp_thresh2 / length; end1_pct = start1_pct + ( part_len / length ); gen_runway_section( rwy_info, runway_a, start1_pct, end1_pct, diff --git a/src/Airports/GenAirports/rwy_prec.cxx b/src/Airports/GenAirports/rwy_prec.cxx index be3b9503..d1eea347 100644 --- a/src/Airports/GenAirports/rwy_prec.cxx +++ b/src/Airports/GenAirports/rwy_prec.cxx @@ -124,7 +124,7 @@ void gen_precision_rwy( const TGRunway& rwy_info, double tex_pct = (200.0 - part_len) / 200.0; // starting (possibly partial chunk) - start2_pct = end2_pct; + start2_pct = -rwy_info.disp_thresh1 / length; end2_pct = start2_pct + ( part_len / length ); gen_runway_section( rwy_info, runway_b, start2_pct, end2_pct, @@ -174,7 +174,7 @@ void gen_precision_rwy( const TGRunway& rwy_info, double tex_pct = (200.0 - part_len) / 200.0; // starting (possibly partial chunk) - start1_pct = end1_pct; + start1_pct = -rwy_info.disp_thresh2 / length; end1_pct = start1_pct + ( part_len / length ); gen_runway_section( rwy_info, runway_a, start1_pct, end1_pct, diff --git a/src/Airports/GenAirports/rwy_visual.cxx b/src/Airports/GenAirports/rwy_visual.cxx index caa6af99..7c2aa41e 100644 --- a/src/Airports/GenAirports/rwy_visual.cxx +++ b/src/Airports/GenAirports/rwy_visual.cxx @@ -121,7 +121,7 @@ void gen_visual_rwy( const TGRunway& rwy_info, double tex_pct = (200.0 - part_len) / 200.0; // starting (possibly partial chunk) - start2_pct = end2_pct; + start2_pct = -rwy_info.disp_thresh1 / length; end2_pct = start2_pct + ( part_len / length ); gen_runway_section( rwy_info, runway_b, start2_pct, end2_pct, @@ -171,7 +171,7 @@ void gen_visual_rwy( const TGRunway& rwy_info, double tex_pct = (200.0 - part_len) / 200.0; // starting (possibly partial chunk) - start1_pct = end1_pct; + start1_pct = -rwy_info.disp_thresh2 / length; end1_pct = start1_pct + ( part_len / length ); gen_runway_section( rwy_info, runway_a, start1_pct, end1_pct,