mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 18:31:55 -04:00
Send a message when music has been enabled so that the game can appropriately choose what music to play
This commit is contained in:
parent
3627e9ff2c
commit
f859cf502d
@ -1495,6 +1495,9 @@ class ShowBase(DirectObject.DirectObject):
|
|||||||
self.musicManager.setActive(bEnableMusic)
|
self.musicManager.setActive(bEnableMusic)
|
||||||
self.musicActive = bEnableMusic
|
self.musicActive = bEnableMusic
|
||||||
if bEnableMusic:
|
if bEnableMusic:
|
||||||
|
# This is useful when we want to play different music
|
||||||
|
# from what the manager has queued
|
||||||
|
messenger.send("MusicEnabled")
|
||||||
self.notify.debug("Enabling music")
|
self.notify.debug("Enabling music")
|
||||||
else:
|
else:
|
||||||
self.notify.debug("Disabling music")
|
self.notify.debug("Disabling music")
|
||||||
@ -1597,7 +1600,7 @@ class ShowBase(DirectObject.DirectObject):
|
|||||||
# run the collision traversal if we have a
|
# run the collision traversal if we have a
|
||||||
# CollisionTraverser set.
|
# CollisionTraverser set.
|
||||||
if self.shadowTrav:
|
if self.shadowTrav:
|
||||||
self.shadowTrav.traverse(self.render)
|
self.shadowTrav.traverse(self.render)
|
||||||
return Task.cont
|
return Task.cont
|
||||||
|
|
||||||
def __collisionLoop(self, state):
|
def __collisionLoop(self, state):
|
||||||
@ -1608,7 +1611,7 @@ class ShowBase(DirectObject.DirectObject):
|
|||||||
if self.appTrav:
|
if self.appTrav:
|
||||||
self.appTrav.traverse(self.render)
|
self.appTrav.traverse(self.render)
|
||||||
if self.shadowTrav:
|
if self.shadowTrav:
|
||||||
self.shadowTrav.traverse(self.render)
|
self.shadowTrav.traverse(self.render)
|
||||||
messenger.send("collisionLoopFinished")
|
messenger.send("collisionLoopFinished")
|
||||||
return Task.cont
|
return Task.cont
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user