fly/flightgear
1
0
Fork 0
Code Activity

Preparations for outputing scenery file to correct location.

Browse source 
Minor tweaks related to FGBucket usage.
This commit is contained in:
curt 1999-03-25 19:04:31 +00:00
parent f33915fd13
commit 8709db31ae
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Main/construct.cxx
View file

@ -37,13 +37,10 @@
// fitted nodes // fitted nodes
int load_dem(const string& work_base, FGBucket& b, FGArray& array) { int load_dem(const string& work_base, FGBucket& b, FGArray& array) {
fitnode_list result; fitnode_list result;
char tile_name[256];
string base = b.gen_base_path(); string base = b.gen_base_path();
long int b_index = b.gen_index();
sprintf(tile_name, "%ld", b_index);
string dem_path = work_base + ".dem" + "/Scenery/" + base string dem_path = work_base + ".dem" + "/Scenery/" + base
+ "/" + tile_name + ".dem"; + "/" + b.gen_index_str() + ".dem";
cout << "dem_path = " << dem_path << endl; cout << "dem_path = " << dem_path << endl;
if ( ! array.open(dem_path) ) { if ( ! array.open(dem_path) ) {
@ -61,11 +58,8 @@ int load_dem(const string& work_base, FGBucket& b, FGArray& array) {
// do actual scan of directory and loading of files // do actual scan of directory and loading of files
int actual_load_polys( const string& dir, FGBucket& b, FGClipper& clipper ) { int actual_load_polys( const string& dir, FGBucket& b, FGClipper& clipper ) {
int counter = 0; int counter = 0;
char tile_char[256];
string base = b.gen_base_path(); string base = b.gen_base_path();
long int b_index = b.gen_index(); string tile_str = b.gen_index_str();
sprintf(tile_char, "%ld", b_index);
string tile_str = tile_char;
string ext; string ext;
DIR *d; DIR *d;
@ -157,9 +151,9 @@ void do_triangulate( const FGArray& array, const FGClipper& clipper,
// generate the flight gear scenery file // generate the flight gear scenery file
void do_output( const FGTriangle& t, FGGenOutput& output ) { void do_output( const FGBucket &b, const FGTriangle& t, FGGenOutput& output ) {
output.build( t ); output.build( t );
output.write( "output" ); output.write( b, "output" );
} }
@ -196,11 +190,15 @@ main(int argc, char **argv) {
// generate the output // generate the output
FGGenOutput output; FGGenOutput output;
do_output( t, output ); do_output( b, t, output );
} }
// $Log$ // $Log$
// Revision 1.9 1999/03/25 19:04:31 curt
// Preparations for outputing scenery file to correct location.
// Minor tweaks related to FGBucket usage.
//
// Revision 1.8 1999/03/23 22:02:17 curt // Revision 1.8 1999/03/23 22:02:17 curt
// Worked on creating data to output ... normals, bounding spheres, etc. // Worked on creating data to output ... normals, bounding spheres, etc.
// //