mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 19:08:55 -04:00
*** empty log message ***
This commit is contained in:
parent
6c22ca83d0
commit
aa3c6cf01a
@ -8,5 +8,5 @@ from PosHprInterval import *
|
|||||||
from SoundInterval import *
|
from SoundInterval import *
|
||||||
from WaitInterval import *
|
from WaitInterval import *
|
||||||
|
|
||||||
import Track
|
from Track import *
|
||||||
import MultiTrack
|
from MultiTrack import *
|
||||||
|
@ -17,7 +17,7 @@ mp.loadFile(Filename('phase_6/paths/dd-e-w'))
|
|||||||
|
|
||||||
# Set up the boat
|
# Set up the boat
|
||||||
boatMopath = MopathInterval('boatpath', mp, boat)
|
boatMopath = MopathInterval('boatpath', mp, boat)
|
||||||
boatTrack = Track.Track([boatMopath], 'boattrack')
|
boatTrack = Track([boatMopath], 'boattrack')
|
||||||
BOAT_START = boatTrack.getIntervalStartTime('boatpath')
|
BOAT_START = boatTrack.getIntervalStartTime('boatpath')
|
||||||
BOAT_END = boatTrack.getIntervalEndTime('boatpath')
|
BOAT_END = boatTrack.getIntervalEndTime('boatpath')
|
||||||
|
|
||||||
@ -31,15 +31,15 @@ dockPos = PosHprInterval('dockpos', dock, dock.getPos(), dock.getHpr(), 1.0)
|
|||||||
dockUpTime = BOAT_END - dockLerp.getDuration()
|
dockUpTime = BOAT_END - dockLerp.getDuration()
|
||||||
hpr2 = Vec3(90.0, 90.0, 90.0)
|
hpr2 = Vec3(90.0, 90.0, 90.0)
|
||||||
dockLerp2 = LerpHprInterval('hpr-lerp', dock, hpr2, 3.0)
|
dockLerp2 = LerpHprInterval('hpr-lerp', dock, hpr2, 3.0)
|
||||||
dockTrack = Track.Track([dockLerp2, dockPos, dockLerp], 'docktrack')
|
dockTrack = Track([dockLerp2, dockPos, dockLerp], 'docktrack')
|
||||||
dockTrack.setIntervalStartTime('lerp', dockUpTime)
|
dockTrack.setIntervalStartTime('lerp', dockUpTime)
|
||||||
dockTrack.setIntervalStartTime('hpr-lerp', BOAT_START)
|
dockTrack.setIntervalStartTime('hpr-lerp', BOAT_START)
|
||||||
|
|
||||||
# Start the water sound 5 seconds after the boat starts moving
|
# Start the water sound 5 seconds after the boat starts moving
|
||||||
waterStartTime = BOAT_START + 5.0
|
waterStartTime = BOAT_START + 5.0
|
||||||
waterSound = SoundInterval('watersound', sound)
|
waterSound = SoundInterval('watersound', sound)
|
||||||
soundTrack = Track.Track([waterSound], 'soundtrack')
|
soundTrack = Track([waterSound], 'soundtrack')
|
||||||
soundTrack.setIntervalStartTime('watersound', waterStartTime)
|
soundTrack.setIntervalStartTime('watersound', waterStartTime)
|
||||||
|
|
||||||
mtrack = MultiTrack.MultiTrack([boatTrack, dockTrack, soundTrack])
|
mtrack = MultiTrack([boatTrack, dockTrack, soundTrack])
|
||||||
mtrack.printParams()
|
mtrack.printParams()
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
"""MultiTrack module: contains the MultiTrack class"""
|
"""MultiTrack module: contains the MultiTrack class"""
|
||||||
|
|
||||||
import Interval
|
from Interval import *
|
||||||
import Track
|
from Track import *
|
||||||
import ClockObject
|
import ClockObject
|
||||||
import Task
|
import Task
|
||||||
|
|
||||||
class MultiTrack(Interval.Interval):
|
class MultiTrack(Interval):
|
||||||
|
|
||||||
multiTrackNum = 1
|
multiTrackNum = 1
|
||||||
|
|
||||||
@ -73,6 +73,6 @@ class MultiTrack(Interval.Interval):
|
|||||||
def printParams(self, indent=0):
|
def printParams(self, indent=0):
|
||||||
""" printParams(indent)
|
""" printParams(indent)
|
||||||
"""
|
"""
|
||||||
Interval.Interval.printParams(self, indent)
|
Interval.printParams(self, indent)
|
||||||
for t in self.tlist:
|
for t in self.tlist:
|
||||||
t.printParams(indent+1)
|
t.printParams(indent+1)
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
"""Track module: contains the Track class"""
|
"""Track module: contains the Track class"""
|
||||||
|
|
||||||
import Interval
|
from Interval import *
|
||||||
import types
|
import types
|
||||||
|
|
||||||
PREVIOUS_END = 1
|
PREVIOUS_END = 1
|
||||||
PREVIOUS_START = 2
|
PREVIOUS_START = 2
|
||||||
TRACK_START = 3
|
TRACK_START = 3
|
||||||
|
|
||||||
class Track(Interval.Interval):
|
class Track(Interval):
|
||||||
|
|
||||||
trackNum = 1
|
trackNum = 1
|
||||||
|
|
||||||
@ -141,7 +141,7 @@ class Track(Interval.Interval):
|
|||||||
prev.setT(t)
|
prev.setT(t)
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
#Interval.Interval.notify.warning(
|
#Interval.notify.warning(
|
||||||
# 'Track.setT(): state undefined at t: %f' % t)
|
# 'Track.setT(): state undefined at t: %f' % t)
|
||||||
return
|
return
|
||||||
elif (t0 <= t) and (t <= t0 + ival.getDuration()):
|
elif (t0 <= t) and (t <= t0 + ival.getDuration()):
|
||||||
@ -156,6 +156,6 @@ class Track(Interval.Interval):
|
|||||||
def printParams(self, indent=0):
|
def printParams(self, indent=0):
|
||||||
""" printParams(indent)
|
""" printParams(indent)
|
||||||
"""
|
"""
|
||||||
Interval.Interval.printParams(self, indent)
|
Interval.printParams(self, indent)
|
||||||
for i in self.ilist:
|
for i in self.ilist:
|
||||||
i[0].printParams(indent+1)
|
i[0].printParams(indent+1)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user