Lots of updates to get back in sync with changes made over in .../Src/

[flightgear.git] / Tools / process-dem.pl

diff --git a/Tools/process-dem.pl b/Tools/process-dem.pl
index 7d59eaf7327050c5b752187e3d019f0641c5ed38..209df364b0f62f1214a16a3cc595371803edd818 100755 (executable)
--- a/Tools/process-dem.pl
+++ b/Tools/process-dem.pl
@@ -28,16 +28,16 @@
 
 $| = 1;                         # flush buffers after every write
 
-$do_demfit =     0;
-$do_triangle_1 = 0;
-$do_fixnode =    0;
-$do_splittris =  0;
-$do_assemtris =  0;
-$do_triangle_2 = 0;
+$do_demfit =     1;
+$do_triangle_1 = 1;
+$do_fixnode =    1;
+$do_splittris =  1;
+$do_assemtris =  1;
+$do_triangle_2 = 1;
 
 $do_tri2obj =    1;
-$do_strips =     0;
-$do_fixobj =     0;
+$do_strips =     1;
+$do_fixobj =     1;
 
 
 # return the file name root (ending at last ".")
@@ -96,7 +96,7 @@ if ( $do_demfit ) {
     }
     close(OUT);
 } else {
-    $subdir = "../Scenery/w120n030/w111n033";
+    $subdir = "../Scenery/w100n040/w093n045";
     print "WARNING:  Hardcoding subdir = $subdir\n";
 }
 
@@ -189,7 +189,7 @@ if ( $do_assemtris ) {
     foreach $file ( @FILES ) {
        chop($file);
        if ( $file =~ m/\.1\.body$/ ) {
-           $file =~ s/\.body$//;  # strip off the ".node"
+           $file =~ s/\.body$//;  # strip off the ".body"
        
            $command = "./AssemTris/assemtris $subdir/$file";
            print "Running '$command'\n";
@@ -199,6 +199,7 @@ if ( $do_assemtris ) {
            }
            close(OUT);
        }
+       unlink("$subdir/$file.body");
     }
 }
 
@@ -252,9 +253,9 @@ if ( $do_tri2obj ) {
            }
            close(OUT);
            
-           # unlink("$subdir/$file.node");
-           # unlink("$subdir/$file.node.orig");
-           # unlink("$subdir/$file.ele");
+           unlink("$subdir/$file.node");
+           unlink("$subdir/$file.node.orig");
+           unlink("$subdir/$file.ele");
        }
     }
 }
@@ -262,7 +263,8 @@ if ( $do_tri2obj ) {
 
 # 6.  strip file.1.obj
 # 
-#     Strip the file.1.obj's
+#     Strip the file.1.obj's.  Note, strips doesn't handle the minimal
+#     case of striping a square correctly.
 #
 # 7.  cp bands.d file.2.obj
 #
@@ -327,6 +329,15 @@ if ( $do_fixobj ) {
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.9  1998/01/27 18:36:54  curt
+# Lots of updates to get back in sync with changes made over in .../Src/
+#
+# Revision 1.8  1998/01/21 17:59:05  curt
+# Uncomment lines to remove several intermediate files.
+#
+# Revision 1.7  1998/01/19 19:51:06  curt
+# A couple final pre-release tweaks.
+#
 # Revision 1.6  1998/01/15 21:33:33  curt
 # Assembling triangles and building a new .node file with the proper shared
 # vertices now works.  Now we just have to use the shared normals and we'll