fly/flightgear
1
0
Fork 0
Code Activity

Updated front end script to keep plugging away on tile fitting.

Browse source
This commit is contained in:
curt 1998-01-14 02:15:51 +00:00
parent 419b95f564
commit 9f8ffba6a7
2 changed files with 149 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Tools/TODO
View file

@ -1,6 +1,17 @@
- Try reversing cw-wound strips rather than calling glFrontFace() in the --------------------------------------------------------------------------
display list. | Done
--------------------------------------------------------------------------
- Generate a face adjacency matrix 1/10/98 - Split areas into smaller tiles
- Split areas into smaller chunks
--------------------------------------------------------------------------
| Todo
--------------------------------------------------------------------------
1/12/98 - Try reversing cw-wound strips rather than calling glFrontFace()
in the display list.
1/12/98 - Generate a face adjacency matrix
1/12/98 - Don't create shared corners or edges if one already exists.

239
Tools/process-dem.pl
View file

@ -28,6 +28,15 @@
$| = 1; # flush buffers after every write $| = 1; # flush buffers after every write
$do_demfit = 0;
$do_triangle_1 = 0;
$do_fixnode = 0;
$do_splittris = 1;
$do_tri2obj = 0;
$do_strips = 0;
$do_fixobj = 0;
# return the file name root (ending at last ".") # return the file name root (ending at last ".")
sub file_root { sub file_root {
@ -69,20 +78,21 @@ if ( $error < 0.5 ) {
# splits dem file into 64 file.node's which contain the # splits dem file into 64 file.node's which contain the
# irregularly fitted vertices # irregularly fitted vertices
$command = "./Dem2node/demfit $ENV{FG_ROOT} $dem_file $error"; if ( $do_demfit ) {
$command = "./Dem2node/demfit $ENV{FG_ROOT} $dem_file $error";
print "Running '$command'\n"; print "Running '$command'\n";
open(OUT, "$command |"); open(OUT, "$command |");
while ( <OUT> ) { while ( <OUT> ) {
print $_; print $_;
if ( m/Scenery/ ) { if ( m/Scenery/ ) {
$subdir = $_; $subdir = $_;
$subdir =~ s/Dir = //; $subdir =~ s/Dir = //;
}
} }
close(OUT);
} }
close(OUT);
# 3. triangle -q file (Takes file.node and produces file.1.node and # 3. triangle -q file (Takes file.node and produces file.1.node and
# file.1.ele) # file.1.ele)
@ -90,68 +100,78 @@ close(OUT);
$subdir = "../Scenery/w120n030/w111n033"; $subdir = "../Scenery/w120n030/w111n033";
print "Subdirectory for this dem file is $subdir\n"; print "Subdirectory for this dem file is $subdir\n";
@FILES = `ls $subdir`; if ( $do_triangle_1 ) {
foreach $file ( @FILES ) { @FILES = `ls $subdir`;
print $file; foreach $file ( @FILES ) {
chop($file); print $file;
if ( ($file =~ m/\.node$/) && ($file !~ m/\.\d\.node$/) ) { chop($file);
$command = "./Triangle/triangle -q $subdir/$file"; if ( ($file =~ m/\.node$/) && ($file !~ m/\.\d\.node$/) ) {
print "Running '$command'\n"; $command = "./Triangle/triangle -q $subdir/$file";
open(OUT, "$command |"); print "Running '$command'\n";
while ( <OUT> ) { open(OUT, "$command |");
print $_; while ( <OUT> ) {
} print $_;
close(OUT); }
close(OUT);
# remove input file.node # remove input file.node
unlink("$subdir/$file"); unlink("$subdir/$file");
}
} }
} }
# 4. fixnode file.dem subdir # 4. fixnode file.dem subdir
# #
# Take the original .dem file (for interpolating Z values) and the # Take the original .dem file (for interpolating Z values) and the
# subdirecotry containing all the file.1.node's and replace with # subdirecotry containing all the file.1.node's and replace with
# fixed file.1.node # fixed file.1.node
$command = "./FixNode/fixnode $dem_file $subdir"; if ( $do_fixnode ) {
print "Running '$command'\n"; $command = "./FixNode/fixnode $dem_file $subdir";
open(OUT, "$command |"); print "Running '$command'\n";
while ( <OUT> ) { open(OUT, "$command |");
print $_; while ( <OUT> ) {
print $_;
}
close(OUT);
} }
close(OUT);
# 4.1 findedges file (.1.node) (.1.ele) # 4.1 splittris file (.1.node) (.1.ele)
# Extract the edge vertices (in original geodetic coordinates) and # Extract the corner, edge, and body vertices (in original
# normals (in cartesian coordinates) and save them in something # geodetic coordinates) and normals (in cartesian coordinates) and
# very close to the .obj format as file.north, file.south, # save them in something very close to the .obj format as file.se,
# file.east file.west. # file.sw, file.nw, file.ne, file.north, file.south, file.east,
# file.west, and file.body. This way we can reconstruct the
# region using consistant edges and corners.
@FILES = `ls $subdir`; # Arbitration rules: If an opposite edge file already exists,
foreach $file ( @FILES ) { # don't create our matching edge. If a corner already exists,
chop($file); # don't create ours. Basically, the early bird gets the worm and
if ( $file =~ m/\.1\.node$/ ) { # gets to define the edge verticies and normals. All the other
$file =~ s/\.node$//; # strip off the ".node" # adjacent tiles must use these.
$command = "./FindEdges/findedges $subdir/$file"; if ( $do_splittris ) {
print "Running '$command'\n"; @FILES = `ls $subdir`;
open(OUT, "$command |"); foreach $file ( @FILES ) {
while ( <OUT> ) { chop($file);
print $_; if ( $file =~ m/\.1\.node$/ ) {
$file =~ s/\.node$//; # strip off the ".node"
$command = "./SplitTris/splittris $subdir/$file";
print "Running '$command'\n";
open(OUT, "$command |");
while ( <OUT> ) {
print $_;
}
close(OUT);
} }
close(OUT);
} }
} }
exit(1); # 4.2 read in tile sections/ele) skipping edges, read edges out of
# 4.2 read in tri files (node/ele) skipping edges, read edges out of
# edge files, save including proper shared edges (as node/ele) # edge files, save including proper shared edges (as node/ele)
# files. If my edge and adjacent edge both exist, use other, # files. If my edge and adjacent edge both exist, use other,
# delete mine. If only mine exists, use it. # delete mine. If only mine exists, use it.
@ -164,23 +184,25 @@ exit(1);
# #
# Take the file.1.node and file.1.ele and produce file.1.obj # Take the file.1.node and file.1.ele and produce file.1.obj
@FILES = `ls $subdir`; if ( $do_tri2obj ) {
foreach $file ( @FILES ) { @FILES = `ls $subdir`;
chop($file); foreach $file ( @FILES ) {
if ( $file =~ m/\.1\.node$/ ) { chop($file);
$file =~ s/\.node$//; # strip off the ".node" if ( $file =~ m/\.1\.node$/ ) {
$file =~ s/\.node$//; # strip off the ".node"
$command = "./Tri2obj/tri2obj $subdir/$file";
print "Running '$command'\n"; $command = "./Tri2obj/tri2obj $subdir/$file";
open(OUT, "$command |"); print "Running '$command'\n";
while ( <OUT> ) { open(OUT, "$command |");
print $_; while ( <OUT> ) {
print $_;
}
close(OUT);
unlink("$subdir/$file.node");
unlink("$subdir/$file.node.orig");
unlink("$subdir/$file.ele");
} }
close(OUT);
unlink("$subdir/$file.node");
unlink("$subdir/$file.node.orig");
unlink("$subdir/$file.ele");
} }
} }
@ -193,31 +215,33 @@ foreach $file ( @FILES ) {
# #
# strips produces a file called "bands.d" ... copy this to file.2.obj # strips produces a file called "bands.d" ... copy this to file.2.obj
@FILES = `ls $subdir`; if ( $do_strips ) {
foreach $file ( @FILES ) { @FILES = `ls $subdir`;
chop($file); foreach $file ( @FILES ) {
if ( $file =~ m/\.1\.obj$/ ) { chop($file);
$command = "./Stripe_u/strips $subdir/$file"; if ( $file =~ m/\.1\.obj$/ ) {
print "Running '$command'\n"; $command = "./Stripe_u/strips $subdir/$file";
open(OUT, "$command |"); print "Running '$command'\n";
while ( <OUT> ) { open(OUT, "$command |");
print $_; while ( <OUT> ) {
print $_;
}
close(OUT);
# copy to destination file
$newfile = $file;
$newfile =~ s/\.1\.obj$//;
print "Copying to $subdir/$newfile.2.obj\n";
open(IN, "<bands.d");
open(OUT, ">$subdir/$newfile.2.obj");
while ( <IN> ) {
print OUT $_;
}
close(IN);
close(OUT);
unlink("$subdir/$file");
} }
close(OUT);
# copy to destination file
$newfile = $file;
$newfile =~ s/\.1\.obj$//;
print "Copying to $subdir/$newfile.2.obj\n";
open(IN, "<bands.d");
open(OUT, ">$subdir/$newfile.2.obj");
while ( <IN> ) {
print OUT $_;
}
close(IN);
close(OUT);
unlink("$subdir/$file");
} }
} }
@ -226,28 +250,33 @@ foreach $file ( @FILES ) {
# #
# Sort file.2.obj by strip winding # Sort file.2.obj by strip winding
@FILES = `ls $subdir`; if ( $do_fixobj ) {
foreach $file ( @FILES ) { @FILES = `ls $subdir`;
chop($file); foreach $file ( @FILES ) {
if ( $file =~ m/\.2\.obj$/ ) { chop($file);
$newfile = $file; if ( $file =~ m/\.2\.obj$/ ) {
$newfile =~ s/\.2\.obj$/.obj/; $newfile = $file;
$newfile =~ s/\.2\.obj$/.obj/;
$command = "./FixObj/fixobj $subdir/$file $subdir/$newfile";
print "Running '$command'\n";
open(OUT, "$command |");
while ( <OUT> ) {
print $_;
}
close(OUT);
$command = "./FixObj/fixobj $subdir/$file $subdir/$newfile"; unlink("$subdir/$file");
print "Running '$command'\n";
open(OUT, "$command |");
while ( <OUT> ) {
print $_;
} }
close(OUT);
unlink("$subdir/$file");
} }
} }
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.3 1998/01/14 02:15:52 curt
# Updated front end script to keep plugging away on tile fitting.
#
# Revision 1.2 1998/01/12 20:42:08 curt # Revision 1.2 1998/01/12 20:42:08 curt
# Working on fitting tiles together in a seamless manner. # Working on fitting tiles together in a seamless manner.
# #