TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Audio3DManager: remove sounds when attached object is deleted

Browse Source 
This now uses WeakNodePaths in order to prevent holding a reference to the corresponding nodes.

Closes #145
This commit is contained in:
rdb 2018-05-20 18:46:27 +02:00
parent 941fda6ec3
commit 8c80ff1681
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
direct/src/showbase/Audio3DManager.py
View File

@ -2,8 +2,8 @@
__all__ = ['Audio3DManager'] __all__ = ['Audio3DManager']
from panda3d.core import Vec3, VBase3 from panda3d.core import Vec3, VBase3, WeakNodePath
from direct.task import Task from direct.task.TaskManagerGlobal import Task, taskMgr
# #
class Audio3DManager: class Audio3DManager:
@ -181,7 +181,8 @@ class Audio3DManager:
def attachSoundToObject(self, sound, object): def attachSoundToObject(self, sound, object):
""" """
Sound will come from the location of the object it is attached to Sound will come from the location of the object it is attached to.
If the object is deleted, the sound will automatically be removed.
""" """
# sound is an AudioSound # sound is an AudioSound
# object is any Panda object with coordinates # object is any Panda object with coordinates
@ -197,7 +198,7 @@ class Audio3DManager:
del self.sound_dict[known_object] del self.sound_dict[known_object]
if object not in self.sound_dict: if object not in self.sound_dict:
self.sound_dict[object] = [] self.sound_dict[WeakNodePath(object)] = []
self.sound_dict[object].append(sound) self.sound_dict[object].append(sound)
return 1 return 1
@ -258,14 +259,18 @@ class Audio3DManager:
if self.audio_manager.getActive()==0: if self.audio_manager.getActive()==0:
return Task.cont return Task.cont
for known_object in list(self.sound_dict.keys()): for known_object, sounds in list(self.sound_dict.items()):
tracked_sound = 0 node_path = known_object.getNodePath()
while tracked_sound < len(self.sound_dict[known_object]): if not node_path:
sound = self.sound_dict[known_object][tracked_sound] # The node has been deleted.
pos = known_object.getPos(self.root) del self.sound_dict[known_object]
continue
pos = node_path.getPos(self.root)
for sound in sounds:
vel = self.getSoundVelocity(sound) vel = self.getSoundVelocity(sound)
sound.set3dAttributes(pos[0], pos[1], pos[2], vel[0], vel[1], vel[2]) sound.set3dAttributes(pos[0], pos[1], pos[2], vel[0], vel[1], vel[2])
tracked_sound += 1
# Update the position of the listener based on the object # Update the position of the listener based on the object
# to which it is attached # to which it is attached