TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 11:28:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

oops

Browse Source
This commit is contained in:
David Rose 2001-11-16 02:24:44 +00:00
parent d7b0ea6c67
commit fb66a4add7
1 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
panda/src/builder/mesherTempl.I
View File

@ -500,13 +500,17 @@ find_fans() {
Verts::iterator vi; Verts::iterator vi;
// Build up a list of far fan edges. // Build up several lists of far fan edges.
typedef pvector<FanMaker> FanMakers; typedef pvector<FanMaker> FanMakers;
FanMakers fans; typedef pvector<FanMakers> FanGroups;
FanGroups fan_groups;
for (vi = _verts.begin(); vi != _verts.end(); ++vi) { for (vi = _verts.begin(); vi != _verts.end(); ++vi) {
EdgePtrs &edges = (*vi).second; EdgePtrs &edges = (*vi).second;
fan_groups.push_back(FanMakers());
FanMakers &fans = fan_groups.back();
// 14 is the magic number of edges. 12 edges or fewer are likely // 14 is the magic number of edges. 12 edges or fewer are likely
// to be found on nearly every vertex in a quadsheet (six edges // to be found on nearly every vertex in a quadsheet (six edges
// times two, one each way). We don't want to waste time fanning // times two, one each way). We don't want to waste time fanning
@ -529,34 +533,41 @@ find_fans() {
} }
} }
} }
}
// Sort the fans list by edge pointers, and remove duplicates. // Sort the fans list by edge pointers, and remove duplicates.
sort(fans.begin(), fans.end()); sort(fans.begin(), fans.end());
fans.erase(unique(fans.begin(), fans.end()), fans.end()); fans.erase(unique(fans.begin(), fans.end()), fans.end());
FanMakers::iterator fi, fi2;
FanMakers::iterator fi, fi2; // Now pull out connected edges.
int joined_any;
// Now pull out connected edges. do {
int joined_any; joined_any = false;
do { for (fi = fans.begin(); fi != fans.end(); ++fi) {
joined_any = false; if (!(*fi).is_empty()) {
for (fi = fans.begin(); fi != fans.end(); ++fi) { fi2 = fi;
if (!(*fi).is_empty()) { for (++fi2; fi2 != fans.end(); ++fi2) {
fi2 = fi; if (!(*fi2).is_empty()) {
for (++fi2; fi2 != fans.end(); ++fi2) { joined_any = (*fi).join(*fi2);
if (!(*fi2).is_empty()) { }
joined_any = (*fi).join(*fi2);
} }
} }
} }
} } while (joined_any);
} while (joined_any); }
for (fi = fans.begin(); fi != fans.end(); ++fi) { // Now try to make all the fans. We do this after we have gone
cerr << "Got fan, is_valid = " << (*fi).is_valid() << "\n"; // completely through the list of vertices, above, since making fans
if ((*fi).is_valid()) { // may add more (false) triangles to the pool.
(*fi).build(); FanGroups::iterator gi;
for (gi = fan_groups.begin(); gi != fan_groups.end(); ++gi) {
FanMakers &fans = (*gi);
FanMakers::iterator fi;
for (fi = fans.begin(); fi != fans.end(); ++fi) {
if ((*fi).is_valid()) {
(*fi).build();
}
} }
} }
#endif #endif