delayed pandac import for Toontown launcher

This commit is contained in:
Darren Ranalli 2008-05-13 21:13:49 +00:00
parent 86d3cfc6d3
commit 11aaf2ffce

View File

@ -13,12 +13,14 @@ from direct.task.Task import Task
# downloaded. # downloaded.
#from pandac.PandaModules import * #from pandac.PandaModules import *
from pandac.PandaModules import PStatCollector
class EventManager: class EventManager:
notify = None notify = None
# delayed import, since this is imported by the Toontown Launcher
# before the complete PandaModules have been downloaded.
PStatCollector = None
# for efficiency, only call import once per module # for efficiency, only call import once per module
EventStorePandaNode = None EventStorePandaNode = None
EventQueue = None EventQueue = None
@ -43,6 +45,8 @@ class EventManager:
""" """
if self._wantPstats is None: if self._wantPstats is None:
self._wantPstats = config.GetBool('pstats-eventmanager', 0) self._wantPstats = config.GetBool('pstats-eventmanager', 0)
from pandac.PandaModules import PStatCollector
EventManager.PStatCollector = PStatCollector
# use different methods for handling events with and without pstats tracking # use different methods for handling events with and without pstats tracking
# for efficiency # for efficiency
if self._wantPstats: if self._wantPstats:
@ -155,10 +159,10 @@ class EventManager:
hyphen = name.find('-') hyphen = name.find('-')
if hyphen >= 0: if hyphen >= 0:
name = name[0:hyphen] name = name[0:hyphen]
pstatCollector = PStatCollector('App:Show code:eventManager:' + name) pstatCollector = EventManager.PStatCollector('App:Show code:eventManager:' + name)
pstatCollector.start() pstatCollector.start()
if self.eventHandler: if self.eventHandler:
cppPstatCollector = PStatCollector( cppPstatCollector = EventManager.PStatCollector(
'App:Show code:eventManager:' + name + ':C++') 'App:Show code:eventManager:' + name + ':C++')
if paramList: if paramList: