fly/flightgear
1
0
Fork 0
Code Activity

Changes to allow multiple copies of the scenery processing tools

Browse source 
to be run concurrently.
This commit is contained in:
curt 1998-09-17 18:40:15 +00:00
parent 2e30b5bdb6
commit 52a1d87c1c
3 changed files with 40 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Stripe_w/bands.c
View file

@ -93,7 +93,7 @@ void get_time()
int main (int argc,char *argv[]) int main (int argc,char *argv[])
{ {
char *fname,*all,buff[255], *ptr, *ptr2; char *fname, *oname, *all,buff[255], *ptr, *ptr2;
FILE *file, *bands; FILE *file, *bands;
int face_id=0; int face_id=0;
int vert_count=0; int vert_count=0;
@ -125,27 +125,29 @@ int main (int argc,char *argv[])
get_time(); get_time();
/* File that will contain the triangle strip data */
bands = fopen("stripe.objf","w");
/* /*
Scan the file once to find out the number of vertices, Scan the file once to find out the number of vertices,
vertice normals, and faces so we can set up some memory vertice normals, and faces so we can set up some memory
structures structures
*/ */
/* Interpret the options specified */ /* Interpret the options specified */
norm_difference = get_options(argc,argv,&f,&t,&tr,&g); norm_difference = get_options(argc,argv,&f,&t,&tr,&g);
if (f == BINARY) if (f == BINARY)
file_open = "rb"; file_open = "rb";
else else
file_open = "r"; file_open = "r";
fname = argv[argc-1]; fname = argv[argc-2];
oname = argv[argc-1];
printf ("File: %s\n",fname); printf ("Input file: %s Output file: %s\n", fname, oname);
printf ("Scanning...%s ",file_open); printf ("Scanning...%s ",file_open);
/* File that will contain the triangle strip data */
bands = fopen(oname, "w");
/* File can be in binary for faster reading */ /* File can be in binary for faster reading */
if (file = fopen (fname,file_open)) if (file = fopen (fname,file_open))
{ {

2
Stripe_w/options.c
View file

@ -84,7 +84,7 @@ double get_options(int argc, char **argv, int *f, int *t, int *tr, int *group)
/* User has the wrong number of options */ /* User has the wrong number of options */
if ((argc > 5) || (argc < 2)) if ((argc > 5) || (argc < 2))
{ {
printf("Usage: bands -[file_option][ties_option][triangulation_option][normal_difference] file_name\n"); printf("Usage: bands -[file_option][ties_option][triangulation_option][normal_difference] in_file_name out_file_name\n");
exit(0); exit(0);
} }

34
Tools/process-dem.pl
View file

@ -30,7 +30,7 @@
$scenery_format_version = "0.1"; $scenery_format_version = "0.1";
$max_area = 10000; # maximum triangle area $max_area = 10000; # maximum triangle area
$remove_tmps = 0; $remove_tmps = 1;
$| = 1; # flush buffers after every write $| = 1; # flush buffers after every write
@ -360,16 +360,18 @@ sub tri2obj {
# Strip the file.1.obj's. Note, strips doesn't handle the minimal # Strip the file.1.obj's. Note, strips doesn't handle the minimal
# case of striping a square correctly. # case of striping a square correctly.
# #
# 7. cp bands.d file.2.obj # 7. cp stripe.objf file.2.obj
# #
# strips produces a file called "bands.d" ... copy this to file.2.obj # strips produces a file called "stripe.objf" ... copy this to file.2.obj
sub strips { sub strips {
@FILES = `ls $subdir`; @FILES = `ls $subdir`;
foreach $file ( @FILES ) { foreach $file ( @FILES ) {
chop($file); chop($file);
if ( $file =~ m/\.1\.obj$/ ) { if ( $file =~ m/\.1\.obj$/ ) {
$command = "Stripe_w/strips $subdir/$file"; $newfile = $file;
$newfile =~ s/\.1\.obj$//;
$command = "Stripe_w/strips $subdir/$file $subdir/$newfile.2.obj";
$command = fix_command($command); $command = fix_command($command);
print "Running '$command'\n"; print "Running '$command'\n";
# $input = <STDIN>; # $input = <STDIN>;
@ -380,17 +382,17 @@ sub strips {
close(OUT); close(OUT);
# copy to destination file # copy to destination file
$newfile = $file; # $newfile = $file;
$newfile =~ s/\.1\.obj$//; # $newfile =~ s/\.1\.obj$//;
print "Copying to $subdir/$newfile.2.obj\n"; # print "Copying to $subdir/$newfile.2.obj\n";
# open(IN, "<bands.d"); # open(IN, "<bands.d");
open(IN, "<stripe.objf"); # open(IN, "<stripe.objf");
open(OUT, ">$subdir/$newfile.2.obj"); # open(OUT, ">$subdir/$newfile.2.obj");
while ( <IN> ) { # while ( <IN> ) {
print OUT $_; # print OUT $_;
} # }
close(IN); # close(IN);
close(OUT); # close(OUT);
if ( $remove_tmps ) { if ( $remove_tmps ) {
unlink("$subdir/$file"); unlink("$subdir/$file");
@ -487,6 +489,10 @@ sub install {
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.28 1998/09/17 18:40:15 curt
# Changes to allow multiple copies of the scenery processing tools
# to be run concurrently.
#
# Revision 1.27 1998/09/09 20:58:35 curt # Revision 1.27 1998/09/09 20:58:35 curt
# Fixes and tweaks to handle area cutouts for airports. # Fixes and tweaks to handle area cutouts for airports.
# #