TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

sfxplayer: fixes bug when using the "node argument" in SoundInterval, also fixes Py3 TypeError exception

Browse Source 
Closes #640
This commit is contained in:
nate97 2019-04-30 21:46:16 -05:00 committed by rdb
parent 204cbe4464
commit d786709a49
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
direct/src/showbase/SfxPlayer.py
View File

@ -53,6 +53,8 @@ class SfxPlayer:
d = node.getDistance(listenerNode) d = node.getDistance(listenerNode)
else: else:
d = node.getDistance(base.cam) d = node.getDistance(base.cam)
if not cutoff:
cutoff = self.cutoffDistance
if d == None or d > cutoff: if d == None or d > cutoff:
volume = 0 volume = 0
else: else:
@ -70,9 +72,6 @@ class SfxPlayer:
self, sfx, looping = 0, interrupt = 1, volume = None, self, sfx, looping = 0, interrupt = 1, volume = None,
time = 0.0, node=None, listenerNode = None, cutoff = None): time = 0.0, node=None, listenerNode = None, cutoff = None):
if sfx: if sfx:
if not cutoff:
cutoff = self.cutoffDistance
self.setFinalVolume(sfx, node, volume, listenerNode, cutoff) self.setFinalVolume(sfx, node, volume, listenerNode, cutoff)
# don't start over if it's already playing, unless # don't start over if it's already playing, unless