Remove fans/strips routines. We don't create fans anymore
This commit is contained in:
Christian Schmitt
parent
05e1670b56
commit
df4e685c84
9 changed files with 3 additions and 501 deletions
|
|
@ -20,7 +20,7 @@ add_executable(genapts
|
|||
|
||||
target_link_libraries(genapts
|
||||
Polygon Geometry
|
||||
Array Optimize Output poly2tri
|
||||
Array Output poly2tri
|
||||
TriangleJRS
|
||||
${SIMGEAR_CORE_LIBRARIES}
|
||||
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ add_executable(genapts850
|
|||
|
||||
target_link_libraries(genapts850
|
||||
Polygon Geometry
|
||||
Array Optimize Output poly2tri
|
||||
Array Output poly2tri
|
||||
TriangleJRS
|
||||
${POCO_FOUNDATION}
|
||||
${POCO_NET}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ target_link_libraries(fgfs-construct
|
|||
Osgb36
|
||||
Match
|
||||
Polygon Geometry
|
||||
Array Optimize landcover poly2tri
|
||||
Array landcover poly2tri
|
||||
TriangleJRS
|
||||
${GDAL_LIBRARY}
|
||||
${SIMGEAR_CORE_LIBRARIES}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ add_subdirectory(Array)
|
|||
add_subdirectory(DEM)
|
||||
add_subdirectory(Geometry)
|
||||
add_subdirectory(HGT)
|
||||
add_subdirectory(Optimize)
|
||||
add_subdirectory(Output)
|
||||
add_subdirectory(Polygon)
|
||||
add_subdirectory(TriangleJRS)
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
|
||||
|
||||
add_library(Optimize STATIC
|
||||
genfans.cxx
|
||||
genfans.hxx
|
||||
genstrips.cxx
|
||||
genstrips.hxx
|
||||
)
|
||||
|
||||
|
|
@ -1,257 +0,0 @@
|
|||
// genfans.cxx -- Combine individual triangles into more optimal fans.
|
||||
//
|
||||
// Written by Curtis Olson, started March 1999.
|
||||
//
|
||||
// Copyright (C) 1999 Curtis L. Olson - http://www.flightgear.org/~curt
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License as
|
||||
// published by the Free Software Foundation; either version 2 of the
|
||||
// License, or (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful, but
|
||||
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
// General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
//
|
||||
// $Id: genfans.cxx,v 1.9 2004-11-19 22:25:50 curt Exp $
|
||||
|
||||
|
||||
#include <simgear/compiler.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <iostream>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "genfans.hxx"
|
||||
|
||||
using std:: cout ;
|
||||
using std:: endl ;
|
||||
|
||||
|
||||
// make sure the list is expanded at least to hold "n" and then push
|
||||
// "i" onto the back of the "n" list.
|
||||
static void add_and_expand( opt_list& by_node, int n, int i ) {
|
||||
int_list empty;
|
||||
|
||||
int size = (int)by_node.size();
|
||||
if ( size > n ) {
|
||||
// ok
|
||||
} else {
|
||||
// cout << "capacity = " << by_node.capacity() << endl;
|
||||
// cout << "size = " << size << " n = " << n
|
||||
// << " need to push = " << n - size + 1 << endl;
|
||||
for ( int i = 0; i < n - size + 1; ++i ) {
|
||||
by_node.push_back(empty);
|
||||
}
|
||||
}
|
||||
|
||||
by_node[n].push_back(i);
|
||||
}
|
||||
|
||||
|
||||
// given an input triangle, shuffle nodes so that "center" is the
|
||||
// first node, but maintain winding order.
|
||||
static TGTriEle canonify( const TGTriEle& t, int center ) {
|
||||
if ( t.get_n1() == center ) {
|
||||
// already ok
|
||||
return t;
|
||||
} else if ( t.get_n2() == center ) {
|
||||
return TGTriEle( t.get_n2(), t.get_n3(), t.get_n1(), 0.0 );
|
||||
} else if ( t.get_n3() == center ) {
|
||||
return TGTriEle( t.get_n3(), t.get_n1(), t.get_n2(), 0.0 );
|
||||
} else {
|
||||
cout << "ERROR, index doesn't refer to this triangle!!!" << endl;
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
// MSVC kludge (code should never reach this point, but it makes
|
||||
// the MSVC compiler happy)
|
||||
return t;
|
||||
}
|
||||
|
||||
// returns a list of triangle indices
|
||||
static int_list make_best_fan( const triele_list& master_tris,
|
||||
const int center, const int_list& local_tris )
|
||||
{
|
||||
int_list best_result;
|
||||
|
||||
// try starting with each of local_tris to find the best fan
|
||||
// arrangement
|
||||
for ( int start = 0; start < (int)local_tris.size(); ++start ) {
|
||||
// cout << "trying with first triangle = " << local_tris[start] << endl;
|
||||
|
||||
int_list tmp_result;
|
||||
tmp_result.clear();
|
||||
|
||||
TGTriEle current_tri;
|
||||
TGTriEle test;
|
||||
current_tri = canonify( master_tris[local_tris[start]], center );
|
||||
tmp_result.push_back( local_tris[start] );
|
||||
|
||||
// follow the ring
|
||||
int next = -1;
|
||||
bool matches = true;
|
||||
while ( (next != start) && matches ) {
|
||||
// find next triangle in ring
|
||||
matches = false;
|
||||
for ( int i = 0; i < (int)local_tris.size(); ++i ) {
|
||||
test = canonify( master_tris[local_tris[i]], center );
|
||||
if ( current_tri.get_n3() == test.get_n2() ) {
|
||||
if ( i != start ) {
|
||||
// cout << " next triangle = " << local_tris[i] << endl;
|
||||
current_tri = test;
|
||||
tmp_result.push_back( local_tris[i] );
|
||||
matches = true;
|
||||
next = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ( tmp_result.size() == local_tris.size() ) {
|
||||
// we found a complete usage, no need to go on
|
||||
// cout << "we found a complete usage, no need to go on" << endl;
|
||||
best_result = tmp_result;
|
||||
break;
|
||||
} else if ( tmp_result.size() > best_result.size() ) {
|
||||
// we found a better way to fan
|
||||
// cout << "we found a better fan arrangement" << endl;
|
||||
best_result = tmp_result;
|
||||
}
|
||||
}
|
||||
|
||||
return best_result;
|
||||
}
|
||||
|
||||
|
||||
static bool in_fan(int index, const int_list& fan ) {
|
||||
const_int_list_iterator current = fan.begin();
|
||||
const_int_list_iterator last = fan.end();
|
||||
|
||||
for ( ; current != last; ++current ) {
|
||||
if ( index == *current ) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// recursive build fans from triangle list
|
||||
opt_list TGGenFans::greedy_build( triele_list tris ) {
|
||||
cout << "starting greedy build of fans" << endl;
|
||||
|
||||
fans.clear();
|
||||
|
||||
while ( ! tris.empty() ) {
|
||||
// traverse the triangle list and for each node, build a list of
|
||||
// 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 ) {
|
||||
int n1 = tris[i].get_n1();
|
||||
int n2 = tris[i].get_n2();
|
||||
int n3 = tris[i].get_n3();
|
||||
|
||||
add_and_expand( by_node, n1, i );
|
||||
add_and_expand( by_node, n2, i );
|
||||
add_and_expand( by_node, n3, i );
|
||||
}
|
||||
|
||||
// find the node in the tris list that attaches to the most
|
||||
// triangles
|
||||
|
||||
// cout << "find most connected node" << endl;
|
||||
|
||||
int_list biggest_group;
|
||||
opt_list_iterator r_current = by_node.begin();
|
||||
opt_list_iterator r_last = by_node.end();
|
||||
int index = 0;
|
||||
int counter = 0;
|
||||
for ( ; r_current != r_last; ++r_current ) {
|
||||
if ( r_current->size() > biggest_group.size() ) {
|
||||
biggest_group = *r_current;
|
||||
index = counter;
|
||||
}
|
||||
++counter;
|
||||
}
|
||||
// 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
|
||||
// cout << "before make_best_fan()" << endl;
|
||||
int_list best_fan = make_best_fan( tris, index, biggest_group );
|
||||
// cout << "after make_best_fan()" << endl;
|
||||
|
||||
// generate point form of best_fan
|
||||
int_list node_list;
|
||||
node_list.clear();
|
||||
|
||||
int_list_iterator i_start = best_fan.begin();
|
||||
int_list_iterator i_current = i_start;
|
||||
int_list_iterator i_last = best_fan.end();
|
||||
for ( ; i_current != i_last; ++i_current ) {
|
||||
TGTriEle t = canonify( tris[*i_current], index );
|
||||
if ( i_start == i_current ) {
|
||||
node_list.push_back( t.get_n1() );
|
||||
node_list.push_back( t.get_n2() );
|
||||
}
|
||||
node_list.push_back( t.get_n3() );
|
||||
}
|
||||
// cout << "best list size = " << node_list.size() << endl;
|
||||
|
||||
// add this fan to the fan list
|
||||
fans.push_back( node_list );
|
||||
|
||||
// delete the triangles in best_fan out of tris and repeat
|
||||
triele_list_iterator t_current = tris.begin();
|
||||
triele_list_iterator t_last = tris.end();
|
||||
counter = 0;
|
||||
while ( t_current != t_last ) {
|
||||
if ( in_fan(counter, best_fan) ) {
|
||||
// cout << "erasing "
|
||||
// << t_current->get_n1() << ","
|
||||
// << t_current->get_n2() << ","
|
||||
// << t_current->get_n3()
|
||||
// << " from master tri pool"
|
||||
// << endl;
|
||||
tris.erase( t_current );
|
||||
} else {
|
||||
++t_current;
|
||||
}
|
||||
++counter;
|
||||
}
|
||||
}
|
||||
|
||||
cout << "end of greedy build of fans" << endl;
|
||||
cout << "average fan size = " << ave_size() << endl;
|
||||
|
||||
return fans;
|
||||
}
|
||||
|
||||
|
||||
// report average fan size
|
||||
double TGGenFans::ave_size() {
|
||||
double sum = 0.0;
|
||||
|
||||
opt_list_iterator current = fans.begin();
|
||||
opt_list_iterator last = fans.end();
|
||||
for ( ; current != last; ++current ) {
|
||||
sum += current->size();
|
||||
}
|
||||
|
||||
return sum / (double)fans.size();
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
// genfans.hxx -- Combine individual triangles into more optimal fans.
|
||||
//
|
||||
// Written by Curtis Olson, started March 1999.
|
||||
//
|
||||
// Copyright (C) 1999 Curtis L. Olson - http://www.flightgear.org/~curt
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License as
|
||||
// published by the Free Software Foundation; either version 2 of the
|
||||
// License, or (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful, but
|
||||
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
// General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
//
|
||||
// $Id: genfans.hxx,v 1.7 2004-11-19 22:25:50 curt Exp $
|
||||
|
||||
|
||||
#ifndef _GENFANS_HXX
|
||||
#define _GENFANS_HXX
|
||||
|
||||
|
||||
#ifndef __cplusplus
|
||||
# error This library requires C++
|
||||
#endif
|
||||
|
||||
|
||||
#include <simgear/compiler.h>
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include <simgear/math/sg_types.hxx>
|
||||
|
||||
#include <Geometry/trieles.hxx>
|
||||
|
||||
typedef std::vector < int_list > opt_list;
|
||||
typedef opt_list::iterator opt_list_iterator;
|
||||
typedef opt_list::const_iterator const_opt_list_iterator;
|
||||
|
||||
|
||||
class TGGenFans {
|
||||
|
||||
private:
|
||||
|
||||
opt_list fans;
|
||||
|
||||
// make sure the list is expanded at least to hold "n" and then
|
||||
// push "i" onto the back of the "n" list.
|
||||
// void add_and_expand( opt_list& by_node, int n, int i );
|
||||
|
||||
public:
|
||||
|
||||
// Constructor && Destructor
|
||||
inline TGGenFans() { }
|
||||
inline ~TGGenFans() { }
|
||||
|
||||
// recursive build fans from triangle list
|
||||
// opt_list greedy_build( triele_list tris );
|
||||
opt_list greedy_build( triele_list tris );
|
||||
|
||||
// report average fan size
|
||||
double ave_size();
|
||||
};
|
||||
|
||||
|
||||
#endif // _GENFANS_HXX
|
||||
|
||||
|
||||
|
|
@ -1,103 +0,0 @@
|
|||
// genstrips.cxx -- Optimize a collection of individual triangles into
|
||||
// strips.
|
||||
//
|
||||
// Written by Curtis Olson, started May 2000.
|
||||
//
|
||||
// Copyright (C) 2000 Curtis L. Olson - http://www.flightgear.org/~curt
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License as
|
||||
// published by the Free Software Foundation; either version 2 of the
|
||||
// License, or (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful, but
|
||||
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
// General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
//
|
||||
// $Id: genstrips.cxx,v 1.3 2004-11-19 22:25:50 curt Exp $
|
||||
|
||||
|
||||
#include <simgear/compiler.h>
|
||||
|
||||
#include "genstrips.hxx"
|
||||
|
||||
|
||||
// make sure the list is expanded at least to hold "n" and then push
|
||||
// "i" onto the back of the "n" list.
|
||||
static void add_and_expand( opt_list& by_node, int n, int i ) {
|
||||
int_list empty;
|
||||
|
||||
int size = (int)by_node.size();
|
||||
if ( size > n ) {
|
||||
// ok
|
||||
} else {
|
||||
// cout << "capacity = " << by_node.capacity() << endl;
|
||||
// cout << "size = " << size << " n = " << n
|
||||
// << " need to push = " << n - size + 1 << endl;
|
||||
for ( int i = 0; i < n - size + 1; ++i ) {
|
||||
by_node.push_back(empty);
|
||||
}
|
||||
}
|
||||
|
||||
by_node[n].push_back(i);
|
||||
}
|
||||
|
||||
|
||||
// generate a set of tri-strips from a random collection of triangles.
|
||||
// Note, the triangle verticies are integer indices into a vertex list
|
||||
// and not actual vertex data.
|
||||
opt_list tgGenStrips( const triele_list tris ) {
|
||||
|
||||
triele_list remaining = tris;
|
||||
opt_list by_node;
|
||||
int i;
|
||||
|
||||
while ( remaining.size() ) {
|
||||
// traverse the triangle list and for each node, build a list of
|
||||
// triangles that attach to it.
|
||||
|
||||
// cout << "building by_node list" << endl;
|
||||
by_node.clear();
|
||||
|
||||
for ( i = 0; i < (int)remaining.size(); ++i ) {
|
||||
int n1 = remaining[i].get_n1();
|
||||
int n2 = remaining[i].get_n2();
|
||||
int n3 = remaining[i].get_n3();
|
||||
|
||||
add_and_expand( by_node, n1, i );
|
||||
add_and_expand( by_node, n2, i );
|
||||
add_and_expand( by_node, n3, i );
|
||||
}
|
||||
|
||||
// find the least connected triangle (this is a popular
|
||||
// heuristic for starting finding a good set of triangle
|
||||
// strips.)
|
||||
|
||||
int min_size = 32768;
|
||||
int min_tri = -1;
|
||||
for ( i = 0; i < (int)remaining.size(); ++i ) {
|
||||
int n1 = remaining[i].get_n1();
|
||||
int n2 = remaining[i].get_n2();
|
||||
int n3 = remaining[i].get_n3();
|
||||
int metric = 0;
|
||||
|
||||
metric += by_node[n1].size();
|
||||
metric += by_node[n2].size();
|
||||
metric += by_node[n3].size();
|
||||
|
||||
if ( metric < min_size ) {
|
||||
min_size = metric;
|
||||
min_tri = i;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return by_node;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
// genstrips.hxx -- Optimize a collection of individual triangles into
|
||||
// strips.
|
||||
//
|
||||
// Written by Curtis Olson, started May 2000.
|
||||
//
|
||||
// Copyright (C) 2000 Curtis L. Olson - http://www.flightgear.org/~curt
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License as
|
||||
// published by the Free Software Foundation; either version 2 of the
|
||||
// License, or (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful, but
|
||||
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
// General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
//
|
||||
// $Id: genstrips.hxx,v 1.4 2004-11-19 22:25:50 curt Exp $
|
||||
|
||||
|
||||
#ifndef _GENSTRIPS_HXX
|
||||
#define _GENSTRIPS_HXX
|
||||
|
||||
|
||||
#ifndef __cplusplus
|
||||
# error This library requires C++
|
||||
#endif
|
||||
|
||||
|
||||
#include <simgear/compiler.h>
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include <simgear/math/sg_types.hxx>
|
||||
|
||||
#include <Geometry/trieles.hxx>
|
||||
|
||||
typedef std::vector < int_list > opt_list;
|
||||
typedef opt_list::iterator opt_list_iterator;
|
||||
typedef opt_list::const_iterator const_opt_list_iterator;
|
||||
|
||||
|
||||
// generate a set of tri-strips from a random collection of triangles.
|
||||
// Note, the triangle verticies are integer indices into a vertex list
|
||||
// and not actual vertex data.
|
||||
opt_list tgGenStrips( const triele_list tris );
|
||||
|
||||
|
||||
#endif // _GENSTRIPS_HXX
|
||||
|
||||
|
||||
Loading…
Reference in a new issue