TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 16:20:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

pgraph: optimizations for analyze()

Browse Source
This commit is contained in:
rdb 2022-01-10 12:58:34 +01:00
parent a1538b4f7c
commit 992cbb0840
4 changed files with 65 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/gobj/geomPrimitive.I
View File

@ -604,6 +604,14 @@ get_modified() const {
return _cdata->_modified;
}
/**
*
*/
INLINE const GeomVertexArrayData *GeomPrimitivePipelineReader::
get_vertices() const {
return _vertices.p();
}
/**
*
*/

19
panda/src/gobj/geomPrimitive.cxx
View File

@ -2362,6 +2362,25 @@ get_num_primitives() const {
}
}
/**
*
*/
int GeomPrimitivePipelineReader::
get_num_faces() const {
int num_vertices_per_primitive = _object->get_num_vertices_per_primitive();
if (num_vertices_per_primitive == 0) {
int num_primitives = _cdata->_ends.size();
int num_vertices = get_num_vertices();
int min_num_vertices_per_primitive = _object->get_min_num_vertices_per_primitive();
int num_unused_vertices_per_primitive = _object->get_num_unused_vertices_per_primitive();
return num_vertices - (num_primitives * (min_num_vertices_per_primitive - 1)) - ((num_primitives - 1) * num_unused_vertices_per_primitive);
} else {
// Same as the number of primitives.
return (get_num_vertices() / num_vertices_per_primitive);
}
}
/**
* Turns on all the bits corresponding to the vertices that are referenced
* by this GeomPrimitive.

2
panda/src/gobj/geomPrimitive.h
View File

@ -372,12 +372,14 @@ public:
INLINE int get_num_vertices() const;
int get_vertex(int i) const;
int get_num_primitives() const;
int get_num_faces() const;
void get_referenced_vertices(BitArray &bits) const;
INLINE int get_min_vertex() const;
INLINE int get_max_vertex() const;
INLINE int get_data_size_bytes() const;
INLINE UpdateSeq get_modified() const;
bool check_valid(const GeomVertexDataPipelineReader *data_reader) const;
INLINE const GeomVertexArrayData *get_vertices() const;
INLINE int get_index_stride() const;
INLINE const unsigned char *get_read_pointer(bool force) const;
INLINE int get_strip_cut_index() const;

77
panda/src/pgraphnodes/sceneGraphAnalyzer.cxx
View File

@ -381,6 +381,7 @@ collect_statistics(GeomNode *geom_node) {
*/
void SceneGraphAnalyzer::
collect_statistics(const Geom *geom) {
Thread *current_thread = Thread::get_current_thread();
CPT(GeomVertexData) vdata = geom->get_vertex_data();
std::pair<VDatas::iterator, bool> result = _vdatas.insert(VDatas::value_type(vdata, VDataTracker()));
if (result.second) {
@ -408,7 +409,7 @@ collect_statistics(const Geom *geom) {
}
if (format->has_column(InternalName::get_normal())) {
_num_normals += num_rows;
GeomVertexReader rnormal(vdata, InternalName::get_normal());
GeomVertexReader rnormal(vdata, InternalName::get_normal(), current_thread);
while (!rnormal.is_at_end()) {
LVector3f normal = rnormal.get_data3f();
float length = normal.length();
@ -439,52 +440,46 @@ collect_statistics(const Geom *geom) {
int num_primitives = geom->get_num_primitives();
for (int i = 0; i < num_primitives; ++i) {
CPT(GeomPrimitive) prim = geom->get_primitive(i);
GeomPrimitivePipelineReader reader(prim, current_thread);
reader.get_referenced_vertices(tracker._referenced_vertices);
int num_vertices = prim->get_num_vertices();
int strip_cut_index = prim->get_strip_cut_index();
for (int vi = 0; vi < num_vertices; ++vi) {
int index = prim->get_vertex(vi);
if (index != strip_cut_index) {
tracker._referenced_vertices.set_bit(index);
}
}
if (prim->is_indexed()) {
collect_prim_statistics(prim->get_vertices());
if (reader.is_indexed()) {
collect_prim_statistics(reader.get_vertices());
if (prim->is_composite()) {
collect_statistics(prim->get_mins());
collect_statistics(prim->get_maxs());
reader.check_minmax();
collect_statistics(reader.get_mins());
collect_statistics(reader.get_maxs());
}
}
if (prim->is_of_type(GeomPoints::get_class_type())) {
_num_points += prim->get_num_primitives();
} else if (prim->is_of_type(GeomLines::get_class_type())) {
_num_lines += prim->get_num_primitives();
} else if (prim->is_of_type(GeomLinestrips::get_class_type())) {
_num_lines += prim->get_num_faces();
} else if (prim->is_of_type(GeomTriangles::get_class_type())) {
_num_tris += prim->get_num_primitives();
_num_individual_tris += prim->get_num_primitives();
} else if (prim->is_of_type(GeomTristrips::get_class_type())) {
_num_tris += prim->get_num_faces();
_num_tristrips += prim->get_num_primitives();
_num_triangles_in_strips += prim->get_num_faces();
} else if (prim->is_of_type(GeomTrifans::get_class_type())) {
_num_tris += prim->get_num_faces();
_num_trifans += prim->get_num_primitives();
_num_triangles_in_fans += prim->get_num_faces();
} else if (prim->is_of_type(GeomPatches::get_class_type())) {
_num_patches += prim->get_num_primitives();
_num_vertices_in_patches += prim->get_num_vertices();
} else {
_num_points += reader.get_num_primitives();
}
else if (prim->is_of_type(GeomLines::get_class_type())) {
_num_lines += reader.get_num_primitives();
}
else if (prim->is_of_type(GeomLinestrips::get_class_type())) {
_num_lines += reader.get_num_faces();
}
else if (prim->is_of_type(GeomTriangles::get_class_type())) {
_num_tris += reader.get_num_primitives();
_num_individual_tris += reader.get_num_primitives();
}
else if (prim->is_of_type(GeomTristrips::get_class_type())) {
_num_tris += reader.get_num_faces();
_num_tristrips += reader.get_num_primitives();
_num_triangles_in_strips += reader.get_num_faces();
}
else if (prim->is_of_type(GeomTrifans::get_class_type())) {
_num_tris += reader.get_num_faces();
_num_trifans += reader.get_num_primitives();
_num_triangles_in_fans += reader.get_num_faces();
}
else if (prim->is_of_type(GeomPatches::get_class_type())) {
_num_patches += reader.get_num_primitives();
_num_vertices_in_patches += reader.get_num_vertices();
}
else {
pgraph_cat.warning()
<< "Unknown GeomPrimitive type in SceneGraphAnalyzer: "
<< prim->get_type() << "\n";