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

removed dolaters upfront

Browse Source
This commit is contained in:
Joe Shochet 2003-06-23 16:11:14 +00:00
parent a418991da6
commit fc34f9aeb8
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
direct/src/task/Task.py
View File

@ -70,6 +70,13 @@ class Task:
self.runningTotal = 0.0 self.runningTotal = 0.0
self.pstats = None self.pstats = None
self.__removed = 0 self.__removed = 0
self.__onDoLaterList = 0
def setOnDoLaterList(self, status):
self.__onDoLaterList = status
def isOnDoLaterList(self):
return self.__onDoLaterList
def remove(self): def remove(self):
self.__removed = 1 self.__removed = 1
@ -356,6 +363,7 @@ class TaskManager:
dl = self.doLaterList[0] dl = self.doLaterList[0]
if dl.isRemoved(): if dl.isRemoved():
del self.doLaterList[0] del self.doLaterList[0]
dl.setOnDoLaterList(0)
continue continue
# If the time now is less than the start of the doLater + delay # If the time now is less than the start of the doLater + delay
# then we are not ready yet, continue to next one # then we are not ready yet, continue to next one
@ -367,6 +375,8 @@ class TaskManager:
assert(TaskManager.notify.debug('__doLaterProcessor: spawning %s' % (dl))) assert(TaskManager.notify.debug('__doLaterProcessor: spawning %s' % (dl)))
del self.doLaterList[0] del self.doLaterList[0]
dl.setStartTimeFrame(self.currentTime, self.currentFrame) dl.setStartTimeFrame(self.currentTime, self.currentFrame)
# No longer on the doLaterList
dl.setOnDoLaterList(0)
self.__addPendingTask(dl) self.__addPendingTask(dl)
continue continue
return cont return cont
@ -383,6 +393,8 @@ class TaskManager:
task.setStartTimeFrame(currentTime, self.currentFrame) task.setStartTimeFrame(currentTime, self.currentFrame)
# Cache the time we should wake up for easier sorting # Cache the time we should wake up for easier sorting
task.wakeTime = task.starttime + task.delayTime task.wakeTime = task.starttime + task.delayTime
# For more efficient removal, note that it is on the doLaterList
task.setOnDoLaterList(1)
index = self.doLaterList.add(task) index = self.doLaterList.add(task)
if self.fVerbose: if self.fVerbose:
# Alert the world, a new task is born! # Alert the world, a new task is born!
@ -520,6 +532,8 @@ class TaskManager:
assert(TaskManager.notify.debug('__removeTasksEqual: removing task: %s' % (task))) assert(TaskManager.notify.debug('__removeTasksEqual: removing task: %s' % (task)))
# Flag the task for removal from the real list # Flag the task for removal from the real list
task.remove() task.remove()
if task.isOnDoLaterList():
self.doLaterList.remove(task)
# Cleanup stuff # Cleanup stuff
task.finishTask(self.fVerbose) task.finishTask(self.fVerbose)
return 1 return 1
@ -533,6 +547,8 @@ class TaskManager:
for task in self.nameDict[taskName]: for task in self.nameDict[taskName]:
# Flag for removal # Flag for removal
task.remove() task.remove()
if task.isOnDoLaterList():
self.doLaterList.remove(task)
# Cleanup stuff # Cleanup stuff
task.finishTask(self.fVerbose) task.finishTask(self.fVerbose)
# Record the number of tasks removed # Record the number of tasks removed
@ -611,6 +627,8 @@ class TaskManager:
if not task.isRemoved(): if not task.isRemoved():
assert(TaskManager.notify.debug('__stepThroughList: task not removed %s' % (task))) assert(TaskManager.notify.debug('__stepThroughList: task not removed %s' % (task)))
task.remove() task.remove()
# Note: Should not need to remove from doLaterList here because
# this task is not in the doLaterList
task.finishTask(self.fVerbose) task.finishTask(self.fVerbose)
self.__removeTaskFromNameDict(task) self.__removeTaskFromNameDict(task)
else: else: