fly/terragear
1
0
Fork 0
Code Activity

Minor tweaks for scenery building process.

Browse source
This commit is contained in:
curt 2003-03-14 22:22:48 +00:00
parent b286e6f600
commit 9f73338a1f
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/BuildTiles/Parallel/fgfs-launch-clients
View file

@ -31,10 +31,10 @@ if [ $# != 1 ]; then
exit exit
else else
BASE_DIR=$1 BASE_DIR=$1
CLIENT_LIST_RUDE="${BASE_DIR}/clients.rude"
CLIENT_LIST_NICE="${BASE_DIR}/clients.nice"
WORK_BASE="${BASE_DIR}/Work" 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" LOG_DIR="${WORK_BASE}/Status"
SERVER_LOG_FILE=${LOG_DIR}/server.log SERVER_LOG_FILE=${LOG_DIR}/server.log
echo "Base directory is $BASE_DIR" echo "Base directory is $BASE_DIR"
@ -100,8 +100,7 @@ for i in $CLIENTS_RUDE; do
# KILL_COMMAND="killall $CLIENT" # KILL_COMMAND="killall $CLIENT"
# ssh -n $i "$KILL_COMMAND" # 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 --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"
# 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"
echo "client command:" echo "client command:"
echo "" echo ""
echo "$RMT_COMMAND" echo "$RMT_COMMAND"

2
src/BuildTiles/Parallel/fgfs-launch-server
View file

@ -33,7 +33,7 @@ else
BASE_DIR=$1 BASE_DIR=$1
shift shift
WORK_BASE="${BASE_DIR}/Work" 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" MASTER_ON="${WORK_BASE}/Status/MASTER_ON"
LOG_DIR="${WORK_BASE}/Status" LOG_DIR="${WORK_BASE}/Status"
LOG_FILE="${LOG_DIR}/server.log" LOG_FILE="${LOG_DIR}/server.log"

2
src/Lib/Geometry/trinodes.cxx
View file

@ -40,7 +40,7 @@ int TGTriNodes::unique_add( const Point3D& p ) {
point_list_iterator current, last; point_list_iterator current, last;
int counter = 0; int counter = 0;
cout << "unique add = " << p << endl; // cout << "unique add = " << p << endl;
// see if point already exists // see if point already exists
current = node_list.begin(); current = node_list.begin();