fly/terragear
1
0
Fork 0
Code Activity

Updates for 0.9.8 release.

Browse source
This commit is contained in:
curt 2005-01-11 21:11:27 +00:00
parent 71c793f9b1
commit 168b41e4a2
9 changed files with 61 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -7,4 +7,4 @@ EXTRA_DIST = \
SUBDIRS = src SUBDIRS = src
dist-hook: dist-hook:
(cd $(top_srcdir); $(HOME)/projects/FlightGear-0.9/admin/am2dsp.pl) (cd $(top_srcdir); $(HOME)/Projects/FlightGear-0.9/admin/am2dsp.pl)

21
NEWS
View file

@ -1,3 +1,24 @@
New in 0.9.8
* January 11, 2005
* World builder:
- fixed a logical bug in the routine that strips out holes from a
multi-contour polygon
* Airport generator:
- fixed a bug that caused threshold lighting to be omitted in some
situations.
- add airport surface bases for towers, windsocks, and beacons so
these are never floating or buried.
- much improved airport surface smoothing and fitting via a least
squares nurbs approximation.
- directly support Robin Peel's airport database format.
- fix a bug that could put the same airport object in the final .stg
file twice. This never affected rendering, but could
significantly impact performance. This bug has been around for a
while and we just noticed it now. Dohhh!
New in 0.9.5 New in 0.9.5
* July 30, 2004 * July 30, 2004

6
configure.ac
View file

@ -1,7 +1,5 @@
dnl Process this file with aclocal ; automake -a ; autoconf to produce a dnl Process this file with aclocal ; automake -a ; autoconf to produce a
dnl working configure script. dnl working configure script.
dnl
dnl $Id$
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([src/Lib/DEM/dem.cxx]) AC_CONFIG_SRCDIR([src/Lib/DEM/dem.cxx])
@ -10,7 +8,7 @@ AC_CONFIG_SRCDIR([src/Lib/DEM/dem.cxx])
AC_PREREQ(2.52) AC_PREREQ(2.52)
dnl Initialize the automake stuff dnl Initialize the automake stuff
AM_INIT_AUTOMAKE(TerraGear, 0.9.5) AM_INIT_AUTOMAKE(TerraGear, 0.9.8)
dnl Checks for programs. dnl Checks for programs.
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
@ -322,7 +320,7 @@ AC_TRY_RUN([
#define MIN_MAJOR 0 #define MIN_MAJOR 0
#define MIN_MINOR 3 #define MIN_MINOR 3
#define MIN_MICRO 6 #define MIN_MICRO 8
int main() { int main() {
int major, minor, micro; int major, minor, micro;

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

@ -1195,11 +1195,14 @@ int main(int argc, char **argv) {
cout << "Output directory is " << output_dir << endl; cout << "Output directory is " << output_dir << endl;
cout << "Working directory is " << work_dir << endl; cout << "Working directory is " << work_dir << endl;
cout << "Tile id is " << tile_id << endl; if ( tile_id > 0 ) {
cout << "Center longitude is " << lon << endl; cout << "Tile id is " << tile_id << endl;
cout << "Center latitude is " << lat << endl; } else {
cout << "X distance is " << xdist << endl; cout << "Center longitude is " << lon << endl;
cout << "Y distance is " << ydist << endl; cout << "Center latitude is " << lat << endl;
cout << "X distance is " << xdist << endl;
cout << "Y distance is " << ydist << endl;
}
for (int i = arg_pos; i < argc; i++) { for (int i = arg_pos; i < argc; i++) {
load_dirs.push_back(argv[i]); load_dirs.push_back(argv[i]);
cout << "Load directory: " << argv[i] << endl; cout << "Load directory: " << argv[i] << endl;

2
src/BuildTiles/Parallel/fgfs-launch-clients
View file

@ -34,7 +34,7 @@ else
WORK_BASE="${BASE_DIR}/Work" WORK_BASE="${BASE_DIR}/Work"
CLIENT_LIST_RUDE="${WORK_BASE}/clients.rude" CLIENT_LIST_RUDE="${WORK_BASE}/clients.rude"
CLIENT_LIST_NICE="${WORK_BASE}/clients.nice" CLIENT_LIST_NICE="${WORK_BASE}/clients.nice"
OUTPUT_DIR="${BASE_DIR}/Scenery-0.9.6" OUTPUT_DIR="${BASE_DIR}/Scenery-0.9.7"
LOG_DIR="${WORK_BASE}/Status" LOG_DIR="${WORK_BASE}/Status"
SERVER_LOG_FILE=${LOG_DIR}/server.log SERVER_LOG_FILE=${LOG_DIR}/server.log
echo "Base directory is $BASE_DIR" echo "Base directory is $BASE_DIR"

2
src/BuildTiles/Parallel/fgfs-launch-server
View file

@ -33,7 +33,7 @@ else
BASE_DIR=$1 BASE_DIR=$1
shift shift
WORK_BASE="${BASE_DIR}/Work" WORK_BASE="${BASE_DIR}/Work"
OUTPUT_DIR="${BASE_DIR}/Scenery-0.9.6" OUTPUT_DIR="${BASE_DIR}/Scenery-0.9.7"
MASTER_ON="${WORK_BASE}/Status/MASTER_ON" MASTER_ON="${WORK_BASE}/Status/MASTER_ON"
LOG_DIR="${WORK_BASE}/Status" LOG_DIR="${WORK_BASE}/Status"
LOG_FILE="${LOG_DIR}/server.log" LOG_FILE="${LOG_DIR}/server.log"

29
src/Prep/Tower/tower.pl
View file

@ -7,9 +7,10 @@ require "calc-tile.pl";
my( $arg ); my( $arg );
my( $infile ) = ""; my( $infile ) = "";
my( $outdir ) = ""; my( $outdir ) = "";
my( $countonly ) = 0;
sub usage { sub usage {
die "Usage: $0 --input=<infile> --outdir=<output_dir_tree>\n"; die "Usage: $0 --input=<infile> --outdir=<output_dir_tree> --count-only\n";
} }
@ -23,12 +24,14 @@ while( $arg = shift(@ARGV) ) {
$arg =~ s/^--outdir=//; $arg =~ s/^--outdir=//;
$outdir = $arg; $outdir = $arg;
print "outdir = $outdir\n"; print "outdir = $outdir\n";
} elsif ( $arg =~ m/^--count-only/ ) {
$countonly = 1;
} else { } else {
usage(); usage();
} }
} }
if ( $infile eq "" || $outdir eq "" ) { if ( $infile eq "" || ($countonly == 0 && $outdir eq "") ) {
usage(); usage();
} }
@ -86,18 +89,18 @@ while( <IN> ) {
my( $model ) = ""; my( $model ) = "";
my( $base_elev ) = 0.0; my( $base_elev ) = 0.0;
if ( $height < 50.0 ) { if ( $height < 100.0 ) {
# short tower # short tower
$model = "Models/Structures/radio-short.xml"; $model = "Models/Structures/radio-short.xml";
$base_elev = $top_msl - 50.0; $base_elev = $top_msl - 100.0;
$shortcount++; $shortcount++;
# but let's skip because too many of these just get too crazy # but let's skip because too many of these just get too crazy
next; next;
} elsif ( $height < 100.0 ) { } elsif ( $height < 200.0 ) {
# medium tower # medium tower
$model = "Models/Structures/radio-medium.xml"; $model = "Models/Structures/radio-medium.xml";
$base_elev = $top_msl - 100.0; $base_elev = $top_msl - 200.0;
$mediumcount++; $mediumcount++;
} else { } else {
# tall tower # tall tower
@ -108,14 +111,16 @@ while( <IN> ) {
# printf("%11.6f %10.6f %.1f %.1f %.1f \n", # printf("%11.6f %10.6f %.1f %.1f %.1f \n",
# $lon, $lat, $ground, $height, $top_msl); # $lon, $lat, $ground, $height, $top_msl);
printf(" %s/%s/%s.ind -> OBJECT_SHARED %s %.6f %.6f %.1f 0.00\n", $outdir, $dir, $index, $model, $lon, $lat, $base_elev ); # printf(" %s/%s/%s.ind -> OBJECT_SHARED %s %.6f %.6f %.1f 0.00\n", $outdir, $dir, $index, $model, $lon, $lat, $base_elev );
system( "mkdir -p $outdir/$dir" ); if ( ! $countonly ) {
system( "mkdir -p $outdir/$dir" );
my( $indfile ) = "$outdir/$dir/$index.ind"; my( $indfile ) = "$outdir/$dir/$index.ind";
open( INDEX, ">>$indfile" ); open( INDEX, ">>$indfile" );
printf( INDEX "OBJECT_SHARED %s %.6f %.6f %.1f 0.00\n", printf( INDEX "OBJECT_SHARED %s %.6f %.6f %.1f 0.00\n",
$model, $lon, $lat, $base_elev ); $model, $lon, $lat, $base_elev );
}
} }
print "short count = $shortcount\n"; print "short count = $shortcount\n";

7
src/Utils/cdrom/Makefile.am
View file

@ -1 +1,6 @@
EXTRA_DIST = mk-mklayout-script.pl sum-new-sizes.pl EXTRA_DIST = \
1-gen-layout-map.pl \
2-make-layout-link-tree.pl \
3-make-cdrom-image \
3-make-dvd-image \
sum-new-sizes.pl

8
src/Utils/download-map/download-map.pl
View file

@ -2,7 +2,7 @@
use GD; use GD;
$version = "0.9.5"; $version = "0.9.7";
if ( $#ARGV < 0 ) { if ( $#ARGV < 0 ) {
push( @ARGV, "/stage/fgfs01/ftp/pub/fgfs/Scenery-" . $version ); push( @ARGV, "/stage/fgfs01/ftp/pub/fgfs/Scenery-" . $version );
} }
@ -71,7 +71,7 @@ print HTML "<MAP NAME=\"map\">\n";
$toggle = 0; $toggle = 0;
foreach $dir ( @ARGV ) { foreach $dir ( @ARGV ) {
@files = `ls $dir/*.tar.gz`; @files = `ls $dir/*.tgz`;
foreach $file ( @files ) { foreach $file ( @files ) {
chop($file); chop($file);
@ -115,7 +115,7 @@ foreach $dir ( @ARGV ) {
} }
$file =~ s/.*\///g; $file =~ s/.*\///g;
$file =~ s/.tar.gz//; $file =~ s/.tgz//;
# print "$file\n"; # print "$file\n";
($ew, $lon, $ns, $lat) = $file =~ m/(\w)(\d\d\d)(\w)(\d\d)/; ($ew, $lon, $ns, $lat) = $file =~ m/(\w)(\d\d\d)(\w)(\d\d)/;
# print "$ew $lon, $ns, $lat\n"; # print "$ew $lon, $ns, $lat\n";
@ -145,7 +145,7 @@ foreach $dir ( @ARGV ) {
# $y1 = $height - $y1; # $y1 = $height - $y1;
# $y2 = $height - $y2; # $y2 = $height - $y2;
print HTML "<AREA SHAPE=rect COORDS=$x1,$y2,$x2,$y1 "; print HTML "<AREA SHAPE=rect COORDS=$x1,$y2,$x2,$y1 ";
print HTML "HREF=$ftpurl/$file.tar.gz "; print HTML "HREF=$ftpurl/$file.tgz ";
printf(HTML "ALT=\"%s %.2f Mb $date\">\n", $file, $mb); printf(HTML "ALT=\"%s %.2f Mb $date\">\n", $file, $mb);
} }