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

removed want global managers variable

Browse Source
This commit is contained in:
Dave Schuyler 2005-07-13 04:12:49 +00:00
parent a5be208188
commit 971b51d562
2 changed files with 29 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
direct/src/distributed/ClientRepository.py
View File

@ -316,12 +316,11 @@ class ClientRepository(ConnectionRepository):
# Update the required fields # Update the required fields
distObj.generateInit() # Only called when constructed distObj.generateInit() # Only called when constructed
distObj.generate() distObj.generate()
if not wantGlobalManagers: if wantOtpServer:
if wantOtpServer: # TODO: ROGER: where should we get parentId and zoneId?
# TODO: ROGER: where should we get parentId and zoneId? parentId = None
parentId = None zoneId = None
zoneId = None distObj.setLocation(parentId, zoneId)
distObj.setLocation(parentId, zoneId)
# updateRequiredFields calls announceGenerate # updateRequiredFields calls announceGenerate
return distObj return distObj

75
direct/src/distributed/ConnectionRepository.py
View File

@ -59,58 +59,31 @@ class ConnectionRepository(
# DC file. The AIRepository will redefine this to 'AI'. # DC file. The AIRepository will redefine this to 'AI'.
self.dcSuffix = '' self.dcSuffix = ''
if wantGlobalManagers: def generateGlobalObject(self, doId, dcname):
def generateGlobalObject(self, doId, dcname): # Look up the dclass
# Look up the dclass dclass = self.dclassesByName[dcname+self.dcSuffix]
dclass = self.dclassesByName[dcname+self.dcSuffix] # Create a new distributed object, and put it in the dictionary
# Create a new distributed object, and put it in the dictionary #distObj = self.generateWithRequiredFields(dclass, doId, di)
#distObj = self.generateWithRequiredFields(dclass, doId, di)
# Construct a new one # Construct a new one
classDef = dclass.getClassDef() classDef = dclass.getClassDef()
if classDef == None: if classDef == None:
self.notify.error("Could not create an undefined %s object."%( self.notify.error("Could not create an undefined %s object."%(
dclass.getName())) dclass.getName()))
distObj = classDef(self) distObj = classDef(self)
distObj.dclass = dclass distObj.dclass = dclass
# Assign it an Id # Assign it an Id
distObj.doId = doId distObj.doId = doId
# Put the new do in the dictionary # Put the new do in the dictionary
self.doId2do[doId] = distObj self.doId2do[doId] = distObj
# Update the required fields # Update the required fields
distObj.generateInit() # Only called when constructed distObj.generateInit() # Only called when constructed
distObj.generate() distObj.generate()
distObj.announceGenerate() distObj.announceGenerate()
distObj.parentId = 0 distObj.parentId = 0
distObj.zoneId = 0 distObj.zoneId = 0
# updateRequiredFields calls announceGenerate # updateRequiredFields calls announceGenerate
return distObj return distObj
## def generateGlobalObject(self, doId, dcname, parentId=None, zoneId=None):
## assert self.notify.debugStateCall(self)
## # Look up the dclass
## dclass = self.dclassesByName[dcname]
## # Construct a new one
## classDef = dclass.getClassDef()
## if classDef == None:
## self.notify.error("Could not create an undefined %s object."%(
## dclass.getName()))
## distObj = classDef(self)
## distObj.dclass = dclass
## assert not hasattr(self, 'parentId')
## self.doId = doId
## self.parentId = parentId
## self.zoneId = zoneId
## # Put the new DO in the dictionaries
## self.air.addDOToTables(self, location=(parentId,zoneId))
## assert not hasattr(self, 'parentId')
## self.parentId = parentId
## self.zoneId = zoneId
## distObj.generateInit() # Only called when constructed
## self.generate()
## return distObj
def readDCFile(self, dcFileNames = None): def readDCFile(self, dcFileNames = None):
""" """