Finished splittris, started assemtris.

diff --git a/Tools/Makefile b/Tools/Makefile
index 060bc5d22015459a6e1307e37a37310a9216082b..44eb3cdebe27a030dddec20994f6bcbbaa4b361a 100644 (file)
--- a/Tools/Makefile
+++ b/Tools/Makefile
@@ -27,7 +27,7 @@
 include make.inc
 
 
-SUBDIRS = Dem2node FixNode FixObj Stripe_u Tri2obj Triangle
+SUBDIRS = AssemTris Dem2node FixNode FixObj SplitTris Stripe_u Tri2obj Triangle
 
 
 all: 
@@ -88,6 +88,9 @@ bin-zip:
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.5  1998/01/14 15:55:34  curt
+# Finished splittris, started assemtris.
+#
 # Revision 1.4  1997/12/10 01:18:25  curt
 # Initial revision.
 #

diff --git a/Tools/TODO b/Tools/TODO
index 12d62026971e3bef2deb3fa7d39cc52d809de186..bea858e49d1c4c2ea72dcd9b2ee374c0fba39bf1 100644 (file)
--- a/Tools/TODO
+++ b/Tools/TODO
@@ -4,14 +4,17 @@
 
 1/10/98 -  Split areas into smaller tiles
 
+1/14/98 -  Don't create shared corners or edges if one already exists.
+
 
 --------------------------------------------------------------------------
 | Todo 
 --------------------------------------------------------------------------
 
+1/14/98 -  Reassemble triangles using only body, shared corners, and 
+           shared edges.
+
 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.

diff --git a/Tools/process-dem.pl b/Tools/process-dem.pl
index 29b95637b59c682f110a35935086d8cc33128688..5f9ad92708e9c03360cec9c144133bb88feba897 100755 (executable)
--- a/Tools/process-dem.pl
+++ b/Tools/process-dem.pl
@@ -28,14 +28,15 @@
 
 $| = 1;                         # flush buffers after every write
 
-$do_demfit = 0;
+$do_demfit =     0;
 $do_triangle_1 = 0;
-$do_fixnode = 0;
-$do_splittris = 1;
+$do_fixnode =    0;
+$do_splittris =  0;
+$do_assemtris =  1;
 
-$do_tri2obj = 0;
-$do_strips = 0;
-$do_fixobj = 0;
+$do_tri2obj =    0;
+$do_strips =     0;
+$do_fixobj =     0;
 
 
 # return the file name root (ending at last ".")
@@ -92,12 +93,14 @@ if ( $do_demfit ) {
        }
     }
     close(OUT);
+} else {
+    $subdir = "../Scenery/w120n030/w111n033";
+    printf("WARNING:  Hardcoding subdir = $subdir
 }
 
 # 3.  triangle -q file (Takes file.node and produces file.1.node and
 #                      file.1.ele)
 
-$subdir = "../Scenery/w120n030/w111n033";
 print "Subdirectory for this dem file is $subdir\n";
 
 if ( $do_triangle_1 ) {
@@ -274,6 +277,9 @@ if ( $do_fixobj ) {
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.4  1998/01/14 15:55:34  curt
+# Finished splittris, started assemtris.
+#
 # Revision 1.3  1998/01/14 02:15:52  curt
 # Updated front end script to keep plugging away on tile fitting.
 #