fly/terragear
1
0
Fork 0
Code Activity

Code reorg.

Browse source
This commit is contained in:
curt 2000-05-08 17:17:21 +00:00
parent c963e6304a
commit 16ef7b7bbc
3 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Lib/Optimize/Makefile.am
View file

@ -1,5 +1,7 @@
noinst_LIBRARIES = libCombine.a noinst_LIBRARIES = libOptimize.a
libCombine_a_SOURCES = genfans.cxx genfans.hxx libOptimize_a_SOURCES = \
genfans.cxx genfans.hxx \
genstrips.cxx genstrips.hxx
INCLUDES += -I$(top_builddir)/src/Lib -I$(top_builddir)/src/Construct INCLUDES += -I$(top_builddir)/src/Lib -I$(top_builddir)/src/Construct

20
src/Lib/Optimize/genfans.cxx
View file

@ -26,7 +26,7 @@
// make sure the list is expanded at least to hold "n" and then push // make sure the list is expanded at least to hold "n" and then push
// "i" onto the back of the "n" list. // "i" onto the back of the "n" list.
void FGGenFans::add_and_expand( reverse_list& by_node, int n, int i ) { static void add_and_expand( opt_list& by_node, int n, int i ) {
int_list empty; int_list empty;
int size = (int)by_node.size(); int size = (int)by_node.size();
@ -132,19 +132,19 @@ static bool in_fan(int index, const int_list& fan ) {
// recursive build fans from triangle list // recursive build fans from triangle list
fan_list FGGenFans::greedy_build( triele_list tris ) { opt_list FGGenFans::greedy_build( triele_list tris ) {
cout << "starting greedy build of fans" << endl; cout << "starting greedy build of fans" << endl;
fans.clear(); fans.clear();
while ( ! tris.empty() ) { while ( ! tris.empty() ) {
// cout << "building reverse_list" << endl;
reverse_list by_node;
by_node.clear();
// traverse the triangle list and for each node, build a list of // traverse the triangle list and for each node, build a list of
// triangles that attach to it. // triangles that attach to it.
// cout << "building by_node list" << endl;
opt_list by_node;
by_node.clear();
for ( int i = 0; i < (int)tris.size(); ++i ) { for ( int i = 0; i < (int)tris.size(); ++i ) {
int n1 = tris[i].get_n1(); int n1 = tris[i].get_n1();
int n2 = tris[i].get_n2(); int n2 = tris[i].get_n2();
@ -161,8 +161,8 @@ fan_list FGGenFans::greedy_build( triele_list tris ) {
// cout << "find most connected node" << endl; // cout << "find most connected node" << endl;
int_list biggest_group; int_list biggest_group;
reverse_list_iterator r_current = by_node.begin(); opt_list_iterator r_current = by_node.begin();
reverse_list_iterator r_last = by_node.end(); opt_list_iterator r_last = by_node.end();
int index = 0; int index = 0;
int counter = 0; int counter = 0;
for ( ; r_current != r_last; ++r_current ) { for ( ; r_current != r_last; ++r_current ) {
@ -232,8 +232,8 @@ fan_list FGGenFans::greedy_build( triele_list tris ) {
double FGGenFans::ave_size() { double FGGenFans::ave_size() {
double sum = 0.0; double sum = 0.0;
fan_list_iterator current = fans.begin(); opt_list_iterator current = fans.begin();
fan_list_iterator last = fans.end(); opt_list_iterator last = fans.end();
for ( ; current != last; ++current ) { for ( ; current != last; ++current ) {
sum += current->size(); sum += current->size();
} }

19
src/Lib/Optimize/genfans.hxx
View file

@ -41,25 +41,20 @@
FG_USING_STD(vector); FG_USING_STD(vector);
typedef vector < int_list > fan_list; typedef vector < int_list > opt_list;
typedef fan_list::iterator fan_list_iterator; typedef opt_list::iterator opt_list_iterator;
typedef fan_list::const_iterator const_fan_list_iterator; typedef opt_list::const_iterator const_opt_list_iterator;
typedef vector < int_list > reverse_list;
typedef reverse_list::iterator reverse_list_iterator;
typedef reverse_list::const_iterator const_reverse_list_iterator;
class FGGenFans { class FGGenFans {
private: private:
fan_list fans; opt_list fans;
// make sure the list is expanded at least to hold "n" and then // make sure the list is expanded at least to hold "n" and then
// push "i" onto the back of the "n" list. // push "i" onto the back of the "n" list.
void add_and_expand( reverse_list& by_node, int n, int i ); // void add_and_expand( opt_list& by_node, int n, int i );
public: public:
@ -68,8 +63,8 @@ public:
inline ~FGGenFans() { } inline ~FGGenFans() { }
// recursive build fans from triangle list // recursive build fans from triangle list
// fan_list greedy_build( triele_list tris ); // opt_list greedy_build( triele_list tris );
fan_list greedy_build( triele_list tris ); opt_list greedy_build( triele_list tris );
// report average fan size // report average fan size
double ave_size(); double ave_size();