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

Support GeomVertexFormat::remove_column(name, keep_empty_array = false)

Browse Source
This commit is contained in:
David Rose 2013-05-22 20:46:24 +00:00
parent 412c79f147
commit 48c2ea92c5
3 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
panda/src/gobj/geomVertexArrayData.I
View File

@ -445,6 +445,7 @@ get_usage_hint() const {
////////////////////////////////////////////////////////////////////
INLINE int GeomVertexArrayDataHandle::
get_num_rows() const {
nassertr(_object->_array_format->get_stride() != 0, 0);
return get_data_size_bytes() / _object->_array_format->get_stride();
}

37
panda/src/gobj/geomVertexFormat.cxx
View File

@ -375,6 +375,29 @@ clear_arrays() {
_arrays.clear();
}
////////////////////////////////////////////////////////////////////
// Function: GeomVertexFormat::remove_empty_arrays
// Access: Published
// Description: Removes the arrays that define no columns.
//
// This may not be called once the format has been
// registered.
////////////////////////////////////////////////////////////////////
void GeomVertexFormat::
remove_empty_arrays() {
nassertv(!is_registered());
Arrays orig_arrays;
orig_arrays.swap(_arrays);
Arrays::const_iterator ai;
for (ai = orig_arrays.begin(); ai != orig_arrays.end(); ++ai) {
GeomVertexArrayFormat *array_format = (*ai);
if (array_format->get_num_columns() != 0) {
_arrays.push_back(array_format);
}
}
}
////////////////////////////////////////////////////////////////////
// Function: GeomVertexFormat::get_num_columns
// Access: Published
@ -510,13 +533,13 @@ get_column(const InternalName *name) const {
// columns remaining in the array, the array is left
// with a gap where the column used to be; if this
// was the only column in the array, the array is
// removed.
// removed (unless keep_empty_array is true).
//
// This may not be called once the format has been
// registered.
////////////////////////////////////////////////////////////////////
void GeomVertexFormat::
remove_column(const InternalName *name) {
remove_column(const InternalName *name, bool keep_empty_array) {
nassertv(!_is_registered);
// Since the format's not registered, it doesn't yet have an index
@ -537,7 +560,7 @@ remove_column(const InternalName *name) {
array_format->remove_column(name);
// Are there any columns remaining in the array?
if (array_format->get_num_columns() == 0) {
if (!keep_empty_array && array_format->get_num_columns() == 0) {
// Remove the whole array.
remove_array(array);
}
@ -756,8 +779,12 @@ do_register() {
if (!array_format->is_registered()) {
array_format = GeomVertexArrayFormat::register_format(array_format);
}
if (array_format->get_num_columns() == 0) {
// Don't keep an empty array.
// Let's keep arrays with nonzero stride but no used columns;
// they're needed to preserve the isomorphic nature of matching
// formats. But we'll toss arrays with 0 stride, which add
// nothing of value and only cause problems later.
if (array_format->get_stride() == 0) {
gobj_cat.warning()
<< "Dropping empty array from GeomVertexFormat.\n";
continue;

3
panda/src/gobj/geomVertexFormat.h
View File

@ -87,6 +87,7 @@ PUBLISHED:
int add_array(const GeomVertexArrayFormat *array_format);
void insert_array(int array, const GeomVertexArrayFormat *array_format);
void clear_arrays();
void remove_empty_arrays();
int get_num_columns() const;
int get_array_with(int i) const;
@ -98,7 +99,7 @@ PUBLISHED:
MAKE_SEQ(get_columns, get_num_columns, get_column);
void remove_column(const InternalName *name);
void remove_column(const InternalName *name, bool keep_empty_array = false);
void pack_columns();
void align_columns_for_animation();
void maybe_align_columns_for_animation();