fly/flightgear
1
0
Fork 0
Code Activity

Debugging output tweaks.

Browse source
This commit is contained in:
curt 1999-03-31 23:46:48 +00:00
parent af55795d49
commit f8f6dbcfde
7 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Combine/Makefile.am
View file

@ -1,6 +1,6 @@
noinst_LIBRARIES = libGenFans.a
noinst_LIBRARIES = libCombine.a
libGenFans_a_SOURCES = genfans.cxx genfans.hxx
libCombine_a_SOURCES = genfans.cxx genfans.hxx
INCLUDES += \
-I$(top_builddir) \

11
Combine/genfans.cxx
View file

@ -169,9 +169,9 @@ fan_list FGGenFans::greedy_build( triele_list tris ) {
}
++counter;
}
cout << "triangle pool = " << tris.size() << endl;
cout << "biggest_group = " << biggest_group.size() << endl;
cout << "center node = " << index << endl;
// cout << "triangle pool = " << tris.size() << endl;
// cout << "biggest_group = " << biggest_group.size() << endl;
// cout << "center node = " << index << endl;
// make the best fan we can out of this group
int_list best_fan = make_best_fan( tris, index, biggest_group );
@ -191,7 +191,7 @@ fan_list FGGenFans::greedy_build( triele_list tris ) {
}
node_list.push_back( t.get_n3() );
}
cout << "best list size = " << node_list.size() << endl;
// cout << "best list size = " << node_list.size() << endl;
// add this fan to the fan list
fans.push_back( node_list );
@ -238,6 +238,9 @@ double FGGenFans::ave_size() {
// $Log$
// Revision 1.5 1999/03/31 23:46:49 curt
// Debugging output tweaks.
//
// Revision 1.4 1999/03/31 13:26:39 curt
// Debugging output tweeaks.
//

6
GenOutput/genobj.cxx
View file

@ -194,8 +194,6 @@ int FGGenOutput::build( const FGArray& array, const FGTriangle& t ) {
cout << "total triangles = " << tri_elements.size() << endl;
FGGenFans f;
for ( int i = 0; i < FG_MAX_AREA_TYPES; ++i ) {
cout << "generating fans for area = " << i << endl;
triele_list area_tris;
area_tris.erase( area_tris.begin(), area_tris.end() );
@ -208,6 +206,7 @@ int FGGenOutput::build( const FGArray& array, const FGTriangle& t ) {
}
if ( (int)area_tris.size() > 0 ) {
cout << "generating fans for area = " << i << endl;
fans[i] = f.greedy_build( area_tris );
}
}
@ -433,6 +432,9 @@ int FGGenOutput::write( const string& base, const FGBucket& b ) {
// $Log$
// Revision 1.10 1999/03/31 23:46:57 curt
// Debugging output tweaks.
//
// Revision 1.9 1999/03/31 13:26:40 curt
// Debugging output tweeaks.
//

5
GenOutput/genobj.hxx
View file

@ -40,7 +40,7 @@
#include <Math/fg_geodesy.hxx>
#include <Math/point3d.hxx>
#include <GenFans/genfans.hxx>
#include <Combine/genfans.hxx>
#include <Main/construct_types.hxx>
#include <Triangulate/triangle.hxx>
@ -131,6 +131,9 @@ public:
// $Log$
// Revision 1.9 1999/03/31 23:46:58 curt
// Debugging output tweaks.
//
// Revision 1.8 1999/03/30 23:50:44 curt
// Modifications to fanify by attribute.
//

2
Main/Makefile.am
View file

@ -6,7 +6,7 @@ construct_LDADD = \
$(top_builddir)/Tools/Construct/Array/libArray.a \
$(top_builddir)/Tools/Construct/Clipper/libClipper.a \
$(top_builddir)/Tools/Construct/GenOutput/libGenOutput.a \
$(top_builddir)/Tools/Construct/GenFans/libGenFans.a \
$(top_builddir)/Tools/Construct/Combine/libCombine.a \
$(top_builddir)/Tools/Construct/Triangulate/libTriangulate.a \
$(top_builddir)/Tools/Lib/Polygon/libPolygon.a \
$(top_builddir)/Tools/Lib/Triangle/libTriangle.a \

16
Main/construct.cxx
View file

@ -197,21 +197,22 @@ main(int argc, char **argv) {
string output_base = argv[2];
// lon = -146.248360; lat = 61.133950; // PAVD (Valdez, AK)
// lon = -110.664244; lat = 33.352890; // P13
lon = -110.664244; lat = 33.352890; // P13
// lon = -93.211389; lat = 45.145000; // KANE
lon = -92.486188; lat = 44.590190; // KRGK
// lon = -92.486188; lat = 44.590190; // KRGK
// lon = -89.744682312011719; lat= 29.314495086669922;
// lon = -122.488090; lat = 42.743183; // 64S
// lon = -114.861097; lat = 35.947480; // 61B
// lon = -112.012175; lat = 41.195944; // KOGD
// lon = -90.757128; lat = 46.790212; // WI32
// lon = -122.220717; lat = 37.721291; // KOAK
double min_x = lon - 1;
double min_y = lat - 1;
FGBucket b_min( min_x, min_y );
FGBucket b_max( lon + 1, lat + 1 );
// FGBucket b(566664L);
FGBucket b_omit(550314L);
// FGBucket b(-146.248360, 61.133950);
// construct_tile( work_base, output_base, b );
// exit(0);
@ -230,9 +231,9 @@ main(int argc, char **argv) {
for ( i = 0; i <= dx; i++ ) {
b_cur = fgBucketOffset(min_x, min_y, i, j);
// if ( b_cur != b ) {
construct_tile( work_base, output_base, b_cur );
// }
if ( b_cur != b_omit ) {
construct_tile( work_base, output_base, b_cur );
}
}
}
// string answer; cin >> answer;
@ -241,6 +242,9 @@ main(int argc, char **argv) {
// $Log$
// Revision 1.15 1999/03/31 23:47:02 curt
// Debugging output tweaks.
//
// Revision 1.14 1999/03/31 13:26:41 curt
// Debugging output tweeaks.
//

7
Triangulate/triangle.cxx
View file

@ -70,7 +70,7 @@ FGTriangle::build( const point_list& corner_list,
cout << "prepairing node list and polygons" << endl;
for ( int i = 0; i < FG_MAX_AREA_TYPES; ++i ) {
cout << "area type = " << i << endl;
// cout << "area type = " << i << endl;
current = gpc_polys.polys[i].begin();
last = gpc_polys.polys[i].end();
for ( ; current != last; ++current ) {
@ -140,7 +140,7 @@ FGTriangle::build( const point_list& corner_list,
int i1, i2;
point_list node_list = in_nodes.get_node_list();
for ( int i = 0; i < FG_MAX_AREA_TYPES; ++i ) {
cout << "area type = " << i << endl;
// cout << "area type = " << i << endl;
tripoly_list_iterator tp_current, tp_last;
tp_current = polylist[i].begin();
tp_last = polylist[i].end();
@ -398,6 +398,9 @@ int FGTriangle::run_triangulate() {
// $Log$
// Revision 1.14 1999/03/31 23:47:09 curt
// Debugging output tweaks.
//
// Revision 1.13 1999/03/29 13:11:07 curt
// Shuffled stl type names a bit.
// Began adding support for tri-fanning (or maybe other arrangments too.)