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

wait_pending should return void

Browse Source
This commit is contained in:
David Rose 2008-09-13 03:58:44 +00:00
parent fd0af5b6ef
commit 57bbde2ab2
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/chan/animControl.cxx
View File

@ -115,7 +115,7 @@ AnimControl::
// Description: Blocks the current thread until the AnimControl has // Description: Blocks the current thread until the AnimControl has
// finished loading and is fully bound. // finished loading and is fully bound.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
bool AnimControl:: void AnimControl::
wait_pending() { wait_pending() {
MutexHolder holder(_pending_lock); MutexHolder holder(_pending_lock);
while (_pending) { while (_pending) {

2
panda/src/chan/animControl.h
View File

@ -50,7 +50,7 @@ PUBLISHED:
virtual ~AnimControl(); virtual ~AnimControl();
INLINE bool is_pending() const; INLINE bool is_pending() const;
bool wait_pending(); void wait_pending();
INLINE bool has_anim() const; INLINE bool has_anim() const;
void set_pending_done_event(const string &done_event); void set_pending_done_event(const string &done_event);
string get_pending_done_event() const; string get_pending_done_event() const;

2
panda/src/chan/partBundle.cxx
View File

@ -369,7 +369,7 @@ load_bind_anim(Loader *loader, const Filename &filename,
// AnimControls, with a nonzero control effect, have // AnimControls, with a nonzero control effect, have
// been loaded and are properly bound. // been loaded and are properly bound.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
bool PartBundle:: void PartBundle::
wait_pending() { wait_pending() {
CDReader cdata(_cycler); CDReader cdata(_cycler);
ChannelBlend::const_iterator cbi; ChannelBlend::const_iterator cbi;

2
panda/src/chan/partBundle.h
View File

@ -133,7 +133,7 @@ PUBLISHED:
int hierarchy_match_flags, int hierarchy_match_flags,
const PartSubset &subset, const PartSubset &subset,
bool allow_async); bool allow_async);
bool wait_pending(); void wait_pending();
bool freeze_joint(const string &joint_name, const TransformState *transform); bool freeze_joint(const string &joint_name, const TransformState *transform);
bool control_joint(const string &joint_name, PandaNode *node); bool control_joint(const string &joint_name, PandaNode *node);