Browse Source

Change loop paramter on particle and sound intervals which was stomping on loop function

Mark Mine 23 years ago
parent
commit
802d4549d9

+ 1 - 1
direct/src/interval/ParticleInterval.py

@@ -25,7 +25,7 @@ class ParticleInterval(Interval.Interval):
         self.particleEffect = particleEffect 
         self.particleEffect = particleEffect 
         self.parent = parent
         self.parent = parent
         self.worldRelative = worldRelative
         self.worldRelative = worldRelative
-        self.loop = loop
+        self.fLoop = loop
         assert(duration > 0.0 or loop == 1)
         assert(duration > 0.0 or loop == 1)
         # Initialize superclass
         # Initialize superclass
         Interval.Interval.__init__(self, name, duration)
         Interval.Interval.__init__(self, name, duration)

+ 3 - 3
direct/src/interval/SoundInterval.py

@@ -27,7 +27,7 @@ class SoundInterval(Interval.Interval):
         SoundInterval.soundNum += 1
         SoundInterval.soundNum += 1
         # Record instance variables
         # Record instance variables
         self.sound = sound
         self.sound = sound
-        self.loop = loop
+        self.fLoop = loop
         self.volume = volume
         self.volume = volume
         self.startTime = startTime
         self.startTime = startTime
         # If no duration given use sound's duration as interval's duration
         # If no duration given use sound's duration as interval's duration
@@ -55,7 +55,7 @@ class SoundInterval(Interval.Interval):
         if self.sound != None:
         if self.sound != None:
             self.sound.setVolume(self.volume)
             self.sound.setVolume(self.volume)
             self.sound.setTime(t1)
             self.sound.setTime(t1)
-            self.sound.setLoop(self.loop)
+            self.sound.setLoop(self.fLoop)
             self.sound.play()
             self.sound.play()
         self.state = CInterval.SStarted
         self.state = CInterval.SStarted
         self.currT = t1
         self.currT = t1
@@ -66,7 +66,7 @@ class SoundInterval(Interval.Interval):
             if self.sound != None:
             if self.sound != None:
                 self.sound.setVolume(self.volume)
                 self.sound.setVolume(self.volume)
                 self.sound.setTime(t)
                 self.sound.setTime(t)
-                self.sound.setLoop(self.loop)
+                self.sound.setLoop(self.fLoop)
                 self.sound.play()
                 self.sound.play()
         self.state = CInterval.SStarted
         self.state = CInterval.SStarted
         self.currT = t
         self.currT = t

+ 1 - 1
direct/src/tkwidgets/Slider.py

@@ -42,7 +42,7 @@ class Slider(Valuator):
             style = self['style'],
             style = self['style'],
             command = self.setEntry,
             command = self.setEntry,
             value = self['value'])
             value = self['value'])
-        self._valuator._widget.bind('<Double-ButtonPress-1>', self.mouseReset)
+        #self._valuator._widget.bind('<Double-ButtonPress-1>', self.mouseReset)
 
 
         # Add popup bindings to slider widget
         # Add popup bindings to slider widget
         try:
         try: