diff --git a/direct/src/interval/FunctionInterval.py b/direct/src/interval/FunctionInterval.py index f30579f011..cfccf205aa 100644 --- a/direct/src/interval/FunctionInterval.py +++ b/direct/src/interval/FunctionInterval.py @@ -35,8 +35,8 @@ class FunctionInterval(Interval.Interval): # Initialize superclass # Set openEnded true if IVAL_INIT calls after end time cause interval # function to be called. If false, IVAL_INIT calls have no effect - # Event, Accept, Ignore intervals default to fOpenEnded = 0 - # Parent, Pos, Hpr, etc intervals default to fOpenEnded = 1 + # Event, Accept, Ignore intervals default to openEnded = 0 + # Parent, Pos, Hpr, etc intervals default to openEnded = 1 Interval.Interval.__init__(self, name, duration = 0.0, openEnded = openEnded) def updateFunc(self, t, event = Interval.IVAL_NONE): diff --git a/direct/src/interval/Interval.py b/direct/src/interval/Interval.py index 2ad7c5da63..542ed27167 100644 --- a/direct/src/interval/Interval.py +++ b/direct/src/interval/Interval.py @@ -28,7 +28,7 @@ class Interval(DirectObject): self.stopEventList = [] self.setTHooks = [] # Set true if interval responds to setT(t): t>duration - self.fOpenEnded = openEnded + self.openEnded = openEnded self.reverse = reverse def getName(self): @@ -41,15 +41,15 @@ class Interval(DirectObject): """ return self.duration - def setfOpenEnded(self, openEnded): - """ setfOpenEnded(openEnded) + def setOpenEnded(self, openEnded): + """ setOpenEnded(openEnded) """ - self.fOpenEnded = openEnded + self.openEnded = openEnded - def getfOpenEnded(self): - """ getfOpenEnded() + def getOpenEnded(self): + """ getOpenEnded() """ - return self.fOpenEnded + return self.openEnded def setT(self, t, event = IVAL_NONE): """ setT(t, event) diff --git a/direct/src/interval/Track.py b/direct/src/interval/Track.py index e9f2406a3e..85b214da60 100644 --- a/direct/src/interval/Track.py +++ b/direct/src/interval/Track.py @@ -237,7 +237,7 @@ class Track(Interval.Interval): # execute the interval at its end time # and flag event as Interval.IVAL_DONE ival.setT(ival.getDuration(), Interval.IVAL_DONE) - elif ((event == Interval.IVAL_INIT) and ival.getfOpenEnded()): + elif ((event == Interval.IVAL_INIT) and ival.getOpenEnded()): # or its an INIT event after the interval's end # and the interval is openended, # then execute the interval at its end time