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

don't add zero-length intervals to the ivalMgr

Browse Source
This commit is contained in:
David Rose 2002-10-04 20:33:04 +00:00
parent daedc5239b
commit 4b198f45f5
2 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
direct/src/interval/MetaInterval.py
View File

@ -251,14 +251,18 @@ class MetaInterval(CMetaInterval):
CMetaInterval.setT(self, t) CMetaInterval.setT(self, t)
def start(self, startT = 0.0, endT = -1.0, playRate = 1.0): def start(self, startT = 0.0, endT = -1.0, playRate = 1.0):
self.__updateIvals() if self.getDuration() == 0.0:
self.setupPlay(startT, endT, playRate, 0) self.privInstant()
self.__manager.addInterval(self) else:
self.setupPlay(startT, endT, playRate, 0)
self.__manager.addInterval(self)
def loop(self, startT = 0.0, endT = -1.0, playRate = 1.0): def loop(self, startT = 0.0, endT = -1.0, playRate = 1.0):
self.__updateIvals() if self.getDuration() == 0.0:
self.setupPlay(startT, endT, playRate, 1) self.privInstant()
self.__manager.addInterval(self) else:
self.setupPlay(startT, endT, playRate, 1)
self.__manager.addInterval(self)
def pause(self): def pause(self):
if self.getState() == CInterval.SStarted: if self.getState() == CInterval.SStarted:
@ -268,11 +272,13 @@ class MetaInterval(CMetaInterval):
return self.getT() return self.getT()
def resume(self, t0 = None): def resume(self, t0 = None):
self.__updateIvals() if self.getDuration() == 0.0:
if t0 != None: self.privInstant()
self.setT(t0) else:
self.setupResume() if t0 != None:
self.__manager.addInterval(self) self.setT(t0)
self.setupResume()
self.__manager.addInterval(self)
def finish(self): def finish(self):
self.__updateIvals() self.__updateIvals()

31
direct/src/interval/cInterval.cxx
View File

@ -91,8 +91,12 @@ set_t(double t) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void CInterval:: void CInterval::
start(double start_t, double end_t, double play_rate) { start(double start_t, double end_t, double play_rate) {
setup_play(start_t, end_t, play_rate, false); if (get_duration() == 0.0) {
_manager->add_c_interval(this, false); priv_instant();
} else {
setup_play(start_t, end_t, play_rate, false);
_manager->add_c_interval(this, false);
}
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -109,8 +113,13 @@ start(double start_t, double end_t, double play_rate) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void CInterval:: void CInterval::
loop(double start_t, double end_t, double play_rate) { loop(double start_t, double end_t, double play_rate) {
setup_play(start_t, end_t, play_rate, true); if (get_duration() == 0.0) {
_manager->add_c_interval(this, false); // A zero-length interval can't really loop.
priv_instant();
} else {
setup_play(start_t, end_t, play_rate, true);
_manager->add_c_interval(this, false);
}
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -140,8 +149,10 @@ pause() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void CInterval:: void CInterval::
resume() { resume() {
setup_resume(); if (get_duration() != 0.0) {
_manager->add_c_interval(this, false); setup_resume();
_manager->add_c_interval(this, false);
}
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -152,9 +163,11 @@ resume() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void CInterval:: void CInterval::
resume(double start_t) { resume(double start_t) {
set_t(start_t); if (get_duration() != 0.0) {
setup_resume(); set_t(start_t);
_manager->add_c_interval(this, false); setup_resume();
_manager->add_c_interval(this, false);
}
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////