TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

changed __location to location so we can set its initial value

Browse Source
This commit is contained in:
Samir Naik 2005-05-31 17:49:28 +00:00
parent 8e983b1cfb
commit ffecbe0e9a
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
direct/src/distributed/AsyncRequest.py
View File

@ -2,6 +2,7 @@
from otp.ai.AIBaseGlobal import * from otp.ai.AIBaseGlobal import *
from direct.directnotify import DirectNotifyGlobal from direct.directnotify import DirectNotifyGlobal
from direct.showbase.DirectObject import DirectObject from direct.showbase.DirectObject import DirectObject
from ConnectionRepository import *
if __debug__: if __debug__:
BreakOnTimeout = config.GetBool("break-on-timeout", 0) BreakOnTimeout = config.GetBool("break-on-timeout", 0)
@ -41,7 +42,7 @@ class AsyncRequest(DirectObject):
timeout is how many seconds to wait before aborting the request. timeout is how many seconds to wait before aborting the request.
""" """
assert self.notify.debugCall() assert self.notify.debugCall()
#assert isinstance(air, ConnectionRepository) # The api to AsyncRequest has changed. assert isinstance(air, ConnectionRepository) # The api to AsyncRequest has changed.
#DirectObject.DirectObject.__init__(self) #DirectObject.DirectObject.__init__(self)
self.air=air self.air=air
self.replyToChannelId=replyToChannelId self.replyToChannelId=replyToChannelId

14
direct/src/distributed/DistributedObject.py
View File

@ -37,7 +37,7 @@ class DistributedObject(PandaObject):
self.cr = cr self.cr = cr
if wantOtpServer: if wantOtpServer:
# Location stores the parentId, zoneId of this object # Location stores the parentId, zoneId of this object
self.__location = (None, None) self.location = (None, None)
# Most DistributedObjects are simple and require no real # Most DistributedObjects are simple and require no real
# effort to load. Some, particularly actors, may take # effort to load. Some, particularly actors, may take
@ -156,8 +156,8 @@ class DistributedObject(PandaObject):
self.activeState = ESDisabled self.activeState = ESDisabled
self.__callbacks = {} self.__callbacks = {}
if wantOtpServer: if wantOtpServer:
#self.cr.deleteObjectLocation(self.doId, self.__location[0], self.__location[1]) #self.cr.deleteObjectLocation(self.doId, self.location[0], self.location[1])
self.__location = (None, None) self.location = (None, None)
# TODO: disable my children # TODO: disable my children
def isDisabled(self): def isDisabled(self):
@ -349,13 +349,13 @@ class DistributedObject(PandaObject):
self.cr.sendSetLocation(self.doId, parentId, zoneId) self.cr.sendSetLocation(self.doId, parentId, zoneId)
def setLocation(self, parentId, zoneId): def setLocation(self, parentId, zoneId):
self.notify.info("setLocation: %s parentId: %s zoneId: %s" % (self.doId, parentId, zoneId)) #self.notify.info("setLocation: %s parentId: %s zoneId: %s" % (self.doId, parentId, zoneId))
# The store must run first so we know the old location # The store must run first so we know the old location
#self.cr.storeObjectLocation(self.doId, parentId, zoneId) #self.cr.storeObjectLocation(self.doId, parentId, zoneId)
self.__location = (parentId, zoneId) self.location = (parentId, zoneId)
# init the parentId and zoneId
self.parentId = parentId self.parentId = parentId
self.zoneId = zoneId self.zoneId = zoneId
# Give the parent a chance to run code when a new child # Give the parent a chance to run code when a new child
# sets location to it. For example, the parent may want to # sets location to it. For example, the parent may want to
# scene graph reparent the child to some subnode it owns. # scene graph reparent the child to some subnode it owns.
@ -364,7 +364,7 @@ class DistributedObject(PandaObject):
parentObj.handleChildSetLocation(self, zoneId) parentObj.handleChildSetLocation(self, zoneId)
def getLocation(self): def getLocation(self):
return self.__location return self.location
def handleChildSetLocation(self, childObj, zoneId): def handleChildSetLocation(self, childObj, zoneId):
self.notify.info("handleChildSetLocation: %s childId: %s zoneId: %s" % self.notify.info("handleChildSetLocation: %s childId: %s zoneId: %s" %

8
direct/src/distributed/DistributedObjectAI.py
View File

@ -21,7 +21,7 @@ class DistributedObjectAI(DirectObject.DirectObject):
# Record the repository # Record the repository
self.air = air self.air = air
# Record our parentId and zoneId # Record our parentId and zoneId
self.__location = None self.location = None
# Record our distributed class # Record our distributed class
className = self.__class__.__name__ className = self.__class__.__name__
@ -167,10 +167,10 @@ class DistributedObjectAI(DirectObject.DirectObject):
self.handleLogicalZoneChange(zoneId, lastLogicalZone) self.handleLogicalZoneChange(zoneId, lastLogicalZone)
self.lastNonQuietZone = zoneId self.lastNonQuietZone = zoneId
#self.air.storeObjectLocation(self.doId, parentId, zoneId) #self.air.storeObjectLocation(self.doId, parentId, zoneId)
self.__location = (parentId, zoneId) self.location = (parentId, zoneId)
def getLocation(self): def getLocation(self):
return self.__location return self.location
else: else:
# NON OTP # NON OTP
@ -342,7 +342,7 @@ class DistributedObjectAI(DirectObject.DirectObject):
assert not hasattr(self, 'parentId') assert not hasattr(self, 'parentId')
self.parentId = parentId self.parentId = parentId
self.zoneId = zoneId self.zoneId = zoneId
self.__location = (parentId, zoneId) self.location = (parentId, zoneId)
self.generate() self.generate()
def generate(self): def generate(self):