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

fixed 32-bit timestamp bug

Browse Source
This commit is contained in:
Darren Ranalli 2003-07-23 01:08:09 +00:00
parent bfc61341a1
commit 633409b2bf
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
direct/src/distributed/ClockDelta.py
View File

@ -52,18 +52,18 @@ class ClockDelta(DirectObject.DirectObject):
self.delta += timeDelta self.delta += timeDelta
def resynchronize(self, localTime, networkTime): def resynchronize(self, localTime, networkTime):
"""resynchronize(self, float localTime, int networkTime) """resynchronize(self, float localTime, uint32 networkTime)
Resets the relative delta so that the indicated networkTime Resets the relative delta so that the indicated networkTime
and localTime map to the same instant. The return value is and localTime map to the same instant. The return value is
the amount by which the clock changes, in seconds. the amount by which the clock changes, in seconds.
""" """
newDelta = (float(localTime) -
newDelta = float(localTime) - float(networkTime) / NetworkTimePrecision (float(networkTime) / NetworkTimePrecision))
change = newDelta - self.delta change = newDelta - self.delta
self.delta = newDelta self.delta = newDelta
return self.networkToLocalTime(self.localToNetworkTime(change), 0.0) return change
### Primary interface functions ### ### Primary interface functions ###
@ -120,21 +120,23 @@ class ClockDelta(DirectObject.DirectObject):
### Convenience functions ### ### Convenience functions ###
def getRealNetworkTime(self): def getRealNetworkTime(self, bits=16):
"""getRealNetworkTime(self) """getRealNetworkTime(self)
Returns the current getRealTime() expressed as a network time. Returns the current getRealTime() expressed as a network time.
""" """
return self.localToNetworkTime(self.globalClock.getRealTime()) return self.localToNetworkTime(self.globalClock.getRealTime(),
bits=bits)
def getFrameNetworkTime(self): def getFrameNetworkTime(self, bits=16):
"""getFrameNetworkTime(self) """getFrameNetworkTime(self)
Returns the current getFrameTime() expressed as a network time. Returns the current getFrameTime() expressed as a network time.
""" """
return self.localToNetworkTime(self.globalClock.getFrameTime()) return self.localToNetworkTime(self.globalClock.getFrameTime(),
bits=bits)
def localElapsedTime(self, networkTime): def localElapsedTime(self, networkTime, bits=16):
"""localElapsedTime(self, int networkTime) """localElapsedTime(self, int networkTime)
Returns the amount of time elapsed (in seconds) on the client Returns the amount of time elapsed (in seconds) on the client
@ -143,7 +145,7 @@ class ClockDelta(DirectObject.DirectObject):
""" """
now = self.globalClock.getFrameTime() now = self.globalClock.getFrameTime()
dt = now - self.networkToLocalTime(networkTime, now) dt = now - self.networkToLocalTime(networkTime, now, bits=bits)
if (dt >= 0.0): if (dt >= 0.0):
return dt return dt