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

char: remove deprecated overload of Character::merge_bundles()

Browse Source
This commit is contained in:
rdb 2020-02-10 12:01:53 +01:00
parent 21f1743c55
commit 141482fc53
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
panda/src/char/character.cxx
View File

@ -237,36 +237,6 @@ calc_tight_bounds(LPoint3 &min_point, LPoint3 &max_point, bool &found_any,
found_any, transform, current_thread); found_any, transform, current_thread);
} }
/**
* Merges old_bundle with new_bundle. old_bundle must be one of the
* PartBundles within this node. At the end of this call, the old_bundle
* pointer within this node will be replaced with the new_bundle pointer, and
* all geometry within this node will be updated to reference new_bundle.
*
* @deprecated Use the newer version of this method, below.
*/
void Character::
merge_bundles(PartBundle *old_bundle, PartBundle *new_bundle) {
if (old_bundle == new_bundle) {
// Trivially return.
return;
}
// Find the PartBundleHandle of old_bundle.
PT(PartBundleHandle) old_bundle_handle;
Bundles::const_iterator bi;
for (bi = _bundles.begin(); bi != _bundles.end(); ++bi) {
if ((*bi)->get_bundle() == old_bundle) {
old_bundle_handle = (*bi);
break;
}
}
nassertv(!old_bundle_handle.is_null());
PT(PartBundleHandle) new_bundle_handle = new PartBundleHandle(new_bundle);
merge_bundles(old_bundle_handle, new_bundle_handle);
}
/** /**
* Merges old_bundle_handle->get_bundle() with new_bundle. old_bundle_handle * Merges old_bundle_handle->get_bundle() with new_bundle. old_bundle_handle
* must be one of the PartBundleHandle within this node. At the end of this * must be one of the PartBundleHandle within this node. At the end of this

1
panda/src/char/character.h
View File

@ -59,7 +59,6 @@ PUBLISHED:
virtual PandaNode *combine_with(PandaNode *other); virtual PandaNode *combine_with(PandaNode *other);
INLINE CharacterJointBundle *get_bundle(int i) const; INLINE CharacterJointBundle *get_bundle(int i) const;
void merge_bundles(PartBundle *old_bundle, PartBundle *other_bundle);
void merge_bundles(PartBundleHandle *old_bundle_handle, void merge_bundles(PartBundleHandle *old_bundle_handle,
PartBundleHandle *other_bundle_handle); PartBundleHandle *other_bundle_handle);