RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

This commit is contained in:
Mike Goslin 2001-06-07 00:39:59 +00:00
parent b3cfab9a7e
commit 1a38f9b5e0
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
direct/src/interval/ActorInterval.py
View File

@ -53,8 +53,13 @@ class ActorInterval(Interval):
return
# Update animation based upon current time
# Pose or stop anim
if (t >= self.getDuration()):
if (t >= (self.startTime + self.getDuration())):
self.actor.stop()
currT = (self.actor.getFrameRate(self.animName) *
(self.startTime + self.getDuration()))
frame = int(round(currT)) % self.numFrames
# Pose anim
self.actor.pose(self.animName, frame)
if self.loop:
self.ignore(self.stopEvent)
elif self.loop == 1:
@ -62,9 +67,7 @@ class ActorInterval(Interval):
# Determine the current frame
currT = (self.actor.getFrameRate(self.animName) *
(self.startTime + t))
print t, currT
frame = int(currT) % self.numFrames
print frame
frame = int(round(currT)) % self.numFrames
# Pose anim
self.actor.pose(self.animName, frame)
# And start loop, restart flag says continue from current frame
@ -74,7 +77,7 @@ class ActorInterval(Interval):
# Determine the current frame
currT = (self.actor.getFrameRate(self.animName) *
(self.startTime + t))
frame = int(currT) % self.numFrames
frame = int(round(currT)) % self.numFrames
# Pose anim
self.actor.pose(self.animName, frame)

2
direct/src/interval/SoundInterval.py
View File

@ -25,7 +25,7 @@ class SoundInterval(Interval):
# Record instance variables
self.sound = sound
self.loop = loop
self.wantSound = base.config.GetBool('want-sound', 0)
self.wantSound = base.wantAnySound
# If no duration given use sound's duration as interval's duration
if duration == 0.0:
if self.wantSound: