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

*** empty log message ***

Browse Source
This commit is contained in:
Roger Hughston 2005-02-24 05:11:57 +00:00
parent 758d8662cf
commit aa740cf5c5
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/directutil/DistributedLargeBlobSenderAI.py
View File

@ -65,5 +65,5 @@ class DistributedLargeBlobSenderAI(DistributedObjectAI.DistributedObjectAI):
def setAck(self): def setAck(self):
DistributedLargeBlobSenderAI.notify.debug('setAck') DistributedLargeBlobSenderAI.notify.debug('setAck')
assert self.air.msgSender == self.targetAvId assert self.air.GetAvatarIDFromSender() == self.targetAvId
self.requestDelete() self.requestDelete()

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

@ -809,6 +809,7 @@ class ClientRepository(ConnectionRepository.ConnectionRepository):
print "ClientRepository received datagram:" print "ClientRepository received datagram:"
di.getDatagram().dumpHex(ostream) di.getDatagram().dumpHex(ostream)
msgType = self.getMsgType() msgType = self.getMsgType()
if not wantOtpServer: if not wantOtpServer:

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

@ -358,6 +358,7 @@ class ConnectionRepository(DoInterestManager, CConnectionRepository):
self.sendDatagram(datagram) self.sendDatagram(datagram)
# debugging funcs for simulating a network-plug-pull # debugging funcs for simulating a network-plug-pull
def pullNetworkPlug(self): def pullNetworkPlug(self):
self.notify.warning('*** SIMULATING A NETWORK-PLUG-PULL ***') self.notify.warning('*** SIMULATING A NETWORK-PLUG-PULL ***')

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

@ -228,6 +228,12 @@ class DistributedObjectAI(DirectObject.DirectObject):
def GetPuppetConnectionChannel(self, doId): def GetPuppetConnectionChannel(self, doId):
return doId + ( 1L << 32); return doId + ( 1L << 32);
def GetAccountIDFromChannelCode(self, channel):
return (channel >> 32)
def GetAvatarIDFromChannelCode(self, channel):
return (channel & 0xffffffffL)
def sendUpdateToAvatarId(self, avId, fieldName, args): def sendUpdateToAvatarId(self, avId, fieldName, args):
assert self.notify.debugStateCall(self) assert self.notify.debugStateCall(self)
channelId = self.GetPuppetConnectionChannel(avId) channelId = self.GetPuppetConnectionChannel(avId)
@ -426,7 +432,7 @@ class DistributedObjectAI(DirectObject.DirectObject):
def setBarrierReady(self, context): def setBarrierReady(self, context):
# Generated by the clients to check in after a beginBarrier() # Generated by the clients to check in after a beginBarrier()
# call. # call.
avId = self.air.msgSender avId = self.air.GetAvatarIDFromSender()
assert(self.notify.debug('setBarrierReady(%s, %s)' % (context, avId))) assert(self.notify.debug('setBarrierReady(%s, %s)' % (context, avId)))
barrier = self.__barriers.get(context) barrier = self.__barriers.get(context)
if barrier == None: if barrier == None: