Browse Source

*** empty log message ***

Mike Goslin 25 years ago
parent
commit
8824dd1c8b

+ 17 - 1
direct/src/interval/Interval.py

@@ -43,7 +43,7 @@ class Interval(DirectObject):
 	"""
 	"""
 	return self.startTime
 	return self.startTime
 
 
-    def setStartTime(self, t, rel=PrevEndRelative):
+    def setStartTime(self, t, rel=PREVIOUS_END):
 	""" setStartTime()
 	""" setStartTime()
 	"""
 	"""
 	assert(t >= 0.0)
 	assert(t >= 0.0)
@@ -60,3 +60,19 @@ class Interval(DirectObject):
 	    Go to time t
 	    Go to time t
 	"""
 	"""
 	pass
 	pass
+
+    def printParams(self, indent=0):
+	""" printParams(indent)
+	"""
+	space = ''
+	for l in range(indent):
+	    space = space + ' '
+	t = 'UNKNOWN'
+	if (self.type == PREVIOUS_END):
+	    t = 'PREVIOUS_END'
+	elif (self.type == PREVIOUS_START):
+	    t = 'PREVIOUS_START'
+	elif (self.type == TRACK_START):
+	    t = 'TRACK_START'
+	print (space + self.name + ' t0: %.2f dur: %.2f %s' % (
+				self.startTime, self.duration, t))

+ 1 - 4
direct/src/interval/IntervalTest.py

@@ -3,7 +3,6 @@ from DirectSessionGlobal import *
 from IntervalGlobal import *
 from IntervalGlobal import *
 
 
 import Mopath
 import Mopath
-import IntervalPlayer
 
 
 boat = loader.loadModel('models/directmodels/smiley')
 boat = loader.loadModel('models/directmodels/smiley')
 boat.reparentTo(render)
 boat.reparentTo(render)
@@ -43,6 +42,4 @@ waterSound.setStartTime(waterStartTime, TRACK_START)
 soundTrack = Track.Track([waterSound], 'soundtrack')
 soundTrack = Track.Track([waterSound], 'soundtrack')
 
 
 mtrack = MultiTrack.MultiTrack([boatTrack, dockTrack, soundTrack])
 mtrack = MultiTrack.MultiTrack([boatTrack, dockTrack, soundTrack])
-
-player = IntervalPlayer.IntervalPlayer(globalClock)
-player.addInterval(mtrack)
+mtrack.printParams()

+ 7 - 0
direct/src/interval/MultiTrack.py

@@ -71,3 +71,10 @@ class MultiTrack(Interval.Interval):
 	    return Task.cont
 	    return Task.cont
 	else:
 	else:
 	    return Task.done
 	    return Task.done
+
+    def printParams(self, indent=0):
+	""" printParams(indent)
+	"""
+	Interval.Interval.printParams(self, indent)
+	for t in self.tlist:
+	    t.printParams(indent+1)

+ 7 - 0
direct/src/interval/Track.py

@@ -110,3 +110,10 @@ class Track(Interval.Interval):
 		    i.setT(t - t0)
 		    i.setT(t - t0)
 		    return
 		    return
 		prev = i
 		prev = i
+
+    def printParams(self, indent=0):
+	""" printParams(indent)
+	"""
+	Interval.Interval.printParams(self, indent)
+	for i in self.ilist:	
+	    i.printParams(indent+1)