mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 10:22:45 -04:00
whoops
This commit is contained in:
parent
c5962febe8
commit
7c0ef38c85
@ -883,11 +883,15 @@ do_event_forward(CMetaInterval::PlaybackEvent *event,
|
|||||||
ai = find(new_active.begin(), new_active.end(), event->_begin_event);
|
ai = find(new_active.begin(), new_active.end(), event->_begin_event);
|
||||||
if (ai != new_active.end()) {
|
if (ai != new_active.end()) {
|
||||||
new_active.erase(ai);
|
new_active.erase(ai);
|
||||||
|
// This interval was new this frame; we must invoke it as
|
||||||
|
// an instant event.
|
||||||
|
enqueue_event(event->_n, ET_instant, is_initial);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
ai = find(_active.begin(), _active.end(), event->_begin_event);
|
ai = find(_active.begin(), _active.end(), event->_begin_event);
|
||||||
if (ai != _active.end()) {
|
if (ai != _active.end()) {
|
||||||
_active.erase(ai);
|
_active.erase(ai);
|
||||||
|
enqueue_event(event->_n, ET_finalize, is_initial);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// Hmm, this event wasn't on either list. Maybe there was a
|
// Hmm, this event wasn't on either list. Maybe there was a
|
||||||
@ -960,11 +964,15 @@ do_event_reverse(CMetaInterval::PlaybackEvent *event,
|
|||||||
ai = find(new_active.begin(), new_active.end(), event);
|
ai = find(new_active.begin(), new_active.end(), event);
|
||||||
if (ai != new_active.end()) {
|
if (ai != new_active.end()) {
|
||||||
new_active.erase(ai);
|
new_active.erase(ai);
|
||||||
|
// This interval was new this frame; we invoke it as an
|
||||||
|
// instant event.
|
||||||
|
enqueue_event(event->_n, ET_reverse_instant, is_initial);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
ai = find(_active.begin(), _active.end(), event);
|
ai = find(_active.begin(), _active.end(), event);
|
||||||
if (ai != _active.end()) {
|
if (ai != _active.end()) {
|
||||||
_active.erase(ai);
|
_active.erase(ai);
|
||||||
|
enqueue_event(event->_n, ET_reverse_finalize, is_initial);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// Hmm, this event wasn't on either list. Maybe there was a
|
// Hmm, this event wasn't on either list. Maybe there was a
|
||||||
|
Loading…
x
Reference in New Issue
Block a user