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

*** empty log message ***

Browse Source
This commit is contained in:
Jesse Schell 2001-03-08 23:53:33 +00:00
parent 1752901444
commit d44511975a
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ class ClientRepository(DirectObject.DirectObject):
def parseDcFile(self, dcFileName):
self.dcFile = DCFile()
self.dcFile.read(dcFileName)
assert(self.dcFile.read(dcFileName))
return self.parseDcClasses(self.dcFile)
def parseDcClasses(self, dcFile):

6
direct/src/interval/IntervalTest.py
View File

@ -23,16 +23,10 @@ BOAT_END = boatTrack.getIntervalEndTime('boatpath')
# Make the dock lerp up so that it's up when the boat reaches the end of
# its mopath
<<<<<<< IntervalTest.py
dockLerp = LerpPosHprInterval('lerp', dock,
Point3(0, 0, -5),
hpr = Vec3(0, 0, 0),
5.0)
=======
pos = Point3(0, 0, -5)
hpr = Vec3(0, 0, 0)
dockLerp = LerpPosHprInterval(dock, 5.0, pos, hpr, name='dock-lerp')
>>>>>>> 1.12
# We need the dock's state to be defined before the lerp
dockPos = PosHprInterval(dock, dock.getPos(), dock.getHpr(), 1.0, 'dockpos')
dockUpTime = BOAT_END - dockLerp.getDuration()