RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added this so I can make a root character for ships

This commit is contained in:
Zachary Pavlov 2008-04-20 22:12:25 +00:00
parent 1dc357a7f1
commit 894493de24
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,7 +126,7 @@ dupe_for_flatten() const {
////////////////////////////////////////////////////////////////////
// Function: Character::combine_with
// Access: Public, Virtual
// Access: Published, Virtual
// Description: Collapses this node with the other node, if possible,
// and returns a pointer to the combined node, or NULL
// if the two nodes cannot safely be combined.

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

@ -53,7 +53,6 @@ public:
virtual PandaNode *make_copy() const;
virtual PandaNode *dupe_for_flatten() const;
virtual PandaNode *combine_with(PandaNode *other);
virtual bool cull_callback(CullTraverser *trav, CullTraverserData &data);
virtual CPT(TransformState)
@ -63,6 +62,8 @@ public:
Thread *current_thread) const;
PUBLISHED:
virtual PandaNode *combine_with(PandaNode *other);
INLINE CharacterJointBundle *get_bundle(int i) const;
void merge_bundles(PartBundle *old_bundle, PartBundle *other_bundle);
void merge_bundles(PartBundleHandle *old_bundle_handle,