*** empty log message ***

direct/src/interval/IntervalGlobal.py

@@ -8,5 +8,5 @@ from PosHprInterval import *
 from SoundInterval import *
 from WaitInterval import *
 
-import Track
-import MultiTrack
+from Track import *
+from MultiTrack import *

direct/src/interval/IntervalTest.py

@@ -17,7 +17,7 @@ mp.loadFile(Filename('phase_6/paths/dd-e-w'))
 
 # Set up the boat
 boatMopath = MopathInterval('boatpath', mp, boat)
-boatTrack = Track.Track([boatMopath], 'boattrack')
+boatTrack = Track([boatMopath], 'boattrack')
 BOAT_START = boatTrack.getIntervalStartTime('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()
 hpr2 = Vec3(90.0, 90.0, 90.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('hpr-lerp', BOAT_START)
 
 # Start the water sound 5 seconds after the boat starts moving
 waterStartTime = BOAT_START + 5.0
 waterSound = SoundInterval('watersound', sound)
-soundTrack = Track.Track([waterSound], 'soundtrack')
+soundTrack = Track([waterSound], 'soundtrack')
 soundTrack.setIntervalStartTime('watersound', waterStartTime)
 
-mtrack = MultiTrack.MultiTrack([boatTrack, dockTrack, soundTrack])
+mtrack = MultiTrack([boatTrack, dockTrack, soundTrack])
 mtrack.printParams()

direct/src/interval/MultiTrack.py

@@ -1,11 +1,11 @@
 """MultiTrack module: contains the MultiTrack class"""
 
-import Interval
-import Track
+from Interval import *
+from Track import *
 import ClockObject
 import Task
 
-class MultiTrack(Interval.Interval):
+class MultiTrack(Interval):
 
     multiTrackNum = 1
 
@@ -73,6 +73,6 @@ class MultiTrack(Interval.Interval):
     def printParams(self, indent=0):
 	""" printParams(indent)
 	"""
-	Interval.Interval.printParams(self, indent)
+	Interval.printParams(self, indent)
 	for t in self.tlist:
 	    t.printParams(indent+1)

direct/src/interval/Track.py

@@ -1,13 +1,13 @@
 """Track module: contains the Track class"""
 
-import Interval
+from Interval import *
 import types
 
 PREVIOUS_END = 1
 PREVIOUS_START = 2
 TRACK_START = 3
 
-class Track(Interval.Interval):
+class Track(Interval):
 
     trackNum = 1
 
@@ -141,7 +141,7 @@ class Track(Interval.Interval):
 			    prev.setT(t)
 			return
 		    else:
-			#Interval.Interval.notify.warning(
+			#Interval.notify.warning(
 			#	'Track.setT(): state undefined at t: %f' % t)
 			return
 		elif (t0 <= t) and (t <= t0 + ival.getDuration()):
@@ -156,6 +156,6 @@ class Track(Interval.Interval):
     def printParams(self, indent=0):
 	""" printParams(indent)
 	"""
-	Interval.Interval.printParams(self, indent)
+	Interval.printParams(self, indent)
 	for i in self.ilist:	
 	    i[0].printParams(indent+1)