TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

limit cost of test_vref_integrity()

Browse Source
This commit is contained in:
David Rose 2010-05-23 00:21:07 +00:00
parent 66b5af633b
commit 326da19431
3 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/egg/config_egg.cxx
View File

@ -144,6 +144,12 @@ ConfigVariableDouble egg_coplanar_threshold
PRC_DESC("The numerical threshold below which polygons are considered "
"to be coplanar. Determined empirically."));
ConfigVariableInt egg_test_vref_integrity
("egg-test-vref-integrity", 20,
PRC_DESC("The maximum number of vertices a primitive may have before "
"its vertices will no longer be checked for internal integrity. "
"This is meaningful in non-production builds only."));
////////////////////////////////////////////////////////////////////
// Function: init_libegg
// Description: Initializes the library. This must be called at

1
panda/src/egg/config_egg.h
View File

@ -39,6 +39,7 @@ extern EXPCL_PANDAEGG ConfigVariableBool egg_consider_fans;
extern EXPCL_PANDAEGG ConfigVariableDouble egg_max_tfan_angle;
extern EXPCL_PANDAEGG ConfigVariableInt egg_min_tfan_tris;
extern EXPCL_PANDAEGG ConfigVariableDouble egg_coplanar_threshold;
extern EXPCL_PANDAEGG ConfigVariableInt egg_test_vref_integrity;
extern EXPCL_PANDAEGG void init_libegg();

51
panda/src/egg/eggPrimitive.cxx
View File

@ -17,6 +17,7 @@
#include "eggMiscFuncs.h"
#include "eggTextureCollection.h"
#include "lexerDefs.h"
#include "config_egg.h"
#include "indent.h"
#include "vector_int.h"
@ -814,36 +815,38 @@ void EggPrimitive::
test_vref_integrity() const {
test_ref_count_integrity();
// First, we need to know how many times each vertex appears.
// Usually, this will be only one, but it's possible for a vertex to
// appear more than once.
typedef pmap<const EggVertex *, int> VertexCount;
VertexCount _count;
if ((int)size() <= egg_test_vref_integrity) {
// First, we need to know how many times each vertex appears.
// Usually, this will be only one, but it's possible for a vertex to
// appear more than once.
typedef pmap<const EggVertex *, int> VertexCount;
VertexCount _count;
// Now count up the vertices.
iterator vi;
for (vi = begin(); vi != end(); ++vi) {
const EggVertex *vert = *vi;
vert->test_ref_count_integrity();
// Now count up the vertices.
iterator vi;
for (vi = begin(); vi != end(); ++vi) {
const EggVertex *vert = *vi;
vert->test_ref_count_integrity();
VertexCount::iterator vci = _count.find(vert);
if (vci == _count.end()) {
_count[vert] = 1;
} else {
(*vci).second++;
VertexCount::iterator vci = _count.find(vert);
if (vci == _count.end()) {
_count[vert] = 1;
} else {
(*vci).second++;
}
}
}
// Ok, now walk through the vertices found and make sure the vertex
// has the proper number of entries of this primitive in its pref.
VertexCount::iterator vci;
for (vci = _count.begin(); vci != _count.end(); ++vci) {
const EggVertex *vert = (*vci).first;
// Ok, now walk through the vertices found and make sure the vertex
// has the proper number of entries of this primitive in its pref.
VertexCount::iterator vci;
for (vci = _count.begin(); vci != _count.end(); ++vci) {
const EggVertex *vert = (*vci).first;
int count = (*vci).second;
int vert_count = vert->has_pref(this);
int count = (*vci).second;
int vert_count = vert->has_pref(this);
nassertv(count == vert_count);
nassertv(count == vert_count);
}
}
}