From 9f73338a1fc719698b4eef9137bedd7df53756ff Mon Sep 17 00:00:00 2001 From: curt Date: Fri, 14 Mar 2003 22:22:48 +0000 Subject: [PATCH] Minor tweaks for scenery building process. --- src/BuildTiles/Parallel/fgfs-launch-clients | 9 ++++----- src/BuildTiles/Parallel/fgfs-launch-server | 2 +- src/Lib/Geometry/trinodes.cxx | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/BuildTiles/Parallel/fgfs-launch-clients b/src/BuildTiles/Parallel/fgfs-launch-clients index 0a39f720..a76d0954 100755 --- a/src/BuildTiles/Parallel/fgfs-launch-clients +++ b/src/BuildTiles/Parallel/fgfs-launch-clients @@ -31,10 +31,10 @@ if [ $# != 1 ]; then exit else BASE_DIR=$1 - CLIENT_LIST_RUDE="${BASE_DIR}/clients.rude" - CLIENT_LIST_NICE="${BASE_DIR}/clients.nice" WORK_BASE="${BASE_DIR}/Work" - OUTPUT_DIR="${BASE_DIR}/FlightGear" + CLIENT_LIST_RUDE="${WORK_BASE}/clients.rude" + CLIENT_LIST_NICE="${WORK_BASE}/clients.nice" + OUTPUT_DIR="${BASE_DIR}/Scenery-0.9.1" LOG_DIR="${WORK_BASE}/Status" SERVER_LOG_FILE=${LOG_DIR}/server.log echo "Base directory is $BASE_DIR" @@ -100,8 +100,7 @@ for i in $CLIENTS_RUDE; do # KILL_COMMAND="killall $CLIENT" # ssh -n $i "$KILL_COMMAND" - RMT_COMMAND="source ~/.profile; nice $CLIENT --host=$SERVER_HOST --port=$SERVER_PORT --work-dir=$WORK_BASE --output-dir=$OUTPUT_DIR --rude --cover=$WORK_BASE/LC-Global/gusgs2_0ll.img AirportArea AirportObj GSHHS-Ponds GSHHS-Islands GSHHS-Lakes GSHHS-LandMass USA-Hydro USA-Urban DEM-3 DEM-30" - # RMT_COMMAND="source ~/.profile; nice $CLIENT --host=$SERVER_HOST --port=$SERVER_PORT --work-dir=$WORK_BASE --output-dir=$OUTPUT_DIR --rude AirportArea AirportObj GSHHS-Ponds GSHHS-Islands GSHHS-Lakes GSHHS-LandMass LC-USA USA-Hydro USA-Urban DEM-3 DEM-30" + RMT_COMMAND="source ~/.profile; nice $CLIENT --host=$SERVER_HOST --port=$SERVER_PORT --work-dir=$WORK_BASE --output-dir=$OUTPUT_DIR --rude --min-angle=0 --cover=$WORK_BASE/LC-Global/gusgs2_0ll.img AirportArea AirportObj GSHHS-Ponds GSHHS-Islands GSHHS-Lakes GSHHS-LandMass USA-Hydro USA-Urban SRTM-1 SRTM-3 DEM-3 DEM-30" echo "client command:" echo "" echo "$RMT_COMMAND" diff --git a/src/BuildTiles/Parallel/fgfs-launch-server b/src/BuildTiles/Parallel/fgfs-launch-server index 642237cc..c54d842f 100755 --- a/src/BuildTiles/Parallel/fgfs-launch-server +++ b/src/BuildTiles/Parallel/fgfs-launch-server @@ -33,7 +33,7 @@ else BASE_DIR=$1 shift WORK_BASE="${BASE_DIR}/Work" - OUTPUT_DIR="${BASE_DIR}/FlightGear" + OUTPUT_DIR="${BASE_DIR}/Scenery-0.9.1" MASTER_ON="${WORK_BASE}/Status/MASTER_ON" LOG_DIR="${WORK_BASE}/Status" LOG_FILE="${LOG_DIR}/server.log" diff --git a/src/Lib/Geometry/trinodes.cxx b/src/Lib/Geometry/trinodes.cxx index 0d0ea450..cad64da7 100644 --- a/src/Lib/Geometry/trinodes.cxx +++ b/src/Lib/Geometry/trinodes.cxx @@ -40,7 +40,7 @@ int TGTriNodes::unique_add( const Point3D& p ) { point_list_iterator current, last; int counter = 0; - cout << "unique add = " << p << endl; + // cout << "unique add = " << p << endl; // see if point already exists current = node_list.begin();