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

*** empty log message ***

Browse Source
This commit is contained in:
Joe Shochet 2000-11-10 08:46:14 +00:00
parent 0390e3d4d8
commit 6821563bdb
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
direct/src/showbase/DirectNotify.py
View File

@ -43,12 +43,12 @@ class DirectNotify:
self.__categories[categoryName] = category self.__categories[categoryName] = category
return(1) return(1)
def newCategory(self, categoryName): def newCategory(self, categoryName, logger=None):
"""newCategory(self, string) """newCategory(self, string)
Make a new notify category named categoryName. Return new category Make a new notify category named categoryName. Return new category
if no such category exists, else return existing category""" if no such category exists, else return existing category"""
if (not self.__categories.has_key(categoryName)): if (not self.__categories.has_key(categoryName)):
self.__categories[categoryName] = Notifier.Notifier(categoryName) self.__categories[categoryName] = Notifier.Notifier(categoryName, logger)
else: else:
print "Warning: DirectNotify: category '%s' already exists" % \ print "Warning: DirectNotify: category '%s' already exists" % \
(categoryName) (categoryName)

2
direct/src/showbase/EventManager.py
View File

@ -1,5 +1,5 @@
from PandaModules import * from libpandaexpressModules import *
from MessengerGlobal import * from MessengerGlobal import *
from TaskManagerGlobal import * from TaskManagerGlobal import *
from DirectNotifyGlobal import * from DirectNotifyGlobal import *

2
direct/src/showbase/Logger.py
View File

@ -57,7 +57,7 @@ class Logger:
Open a file for logging error/warning messages""" Open a file for logging error/warning messages"""
self.resetStartTime() self.resetStartTime()
t = time.localtime(self.__startTime) t = time.localtime(self.__startTime)
st = time.strftime("%m.%d.%Y-%H:%M:%S", t) st = time.strftime("%m-%d-%Y-%H-%M-%S", t)
logFileName = self.__logFileName + "." + st logFileName = self.__logFileName + "." + st
self.__logFile = open(logFileName, "w") self.__logFile = open(logFileName, "w")

6
direct/src/showbase/Task.py
View File

@ -1,5 +1,5 @@
from PandaModules import * from libpandaexpressModules import *
from DirectNotify import * from DirectNotify import *
from PythonUtil import * from PythonUtil import *
@ -239,7 +239,11 @@ class TaskManager:
for task in self.taskList: for task in self.taskList:
task.setCurrentTimeFrame(self.currentTime, self.currentFrame) task.setCurrentTimeFrame(self.currentTime, self.currentFrame)
# Run the task and check the return value # Run the task and check the return value
if task.name == 'test':
print 'before task'
ret = task(task) ret = task(task)
if task.name == 'test':
print 'after task'
if (ret == cont): if (ret == cont):
continue continue
elif (ret == done): elif (ret == done):