mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-24 10:41:34 +00:00
Code Issues Releases Wiki Activity

Move current music from MechanicsManager to SoundManager

Browse source
This commit is contained in:
Andrei Kortunov 2024-06-02 09:29:28 +04:00
parent a2e83d9a21
commit e762ae9703
5 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwbase/mechanicsmanager.hpp
View file

@ -27,11 +27,6 @@ namespace ESM
class ESMWriter; class ESMWriter;
} }
namespace MWSound
{
enum class MusicType;
}
namespace MWWorld namespace MWWorld
{ {
class Ptr; class Ptr;
@ -312,9 +307,6 @@ namespace MWBase
virtual float getAngleToPlayer(const MWWorld::Ptr& ptr) const = 0; virtual float getAngleToPlayer(const MWWorld::Ptr& ptr) const = 0;
virtual MWMechanics::GreetingState getGreetingState(const MWWorld::Ptr& ptr) const = 0; virtual MWMechanics::GreetingState getGreetingState(const MWWorld::Ptr& ptr) const = 0;
virtual bool isTurningToPlayer(const MWWorld::Ptr& ptr) const = 0; virtual bool isTurningToPlayer(const MWWorld::Ptr& ptr) const = 0;
virtual MWSound::MusicType getMusicType() const = 0;
virtual void setMusicType(MWSound::MusicType type) = 0;
}; };
} }

1
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View file

@ -250,7 +250,6 @@ namespace MWMechanics
, mClassSelected(false) , mClassSelected(false)
, mRaceSelected(false) , mRaceSelected(false)
, mAI(true) , mAI(true)
, mMusicType(MWSound::MusicType::Normal)
{ {
// buildPlayer no longer here, needs to be done explicitly after all subsystems are up and running // buildPlayer no longer here, needs to be done explicitly after all subsystems are up and running
} }

5
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
View file

@ -38,8 +38,6 @@ namespace MWMechanics
typedef std::map<ESM::RefId, OwnerMap> StolenItemsMap; typedef std::map<ESM::RefId, OwnerMap> StolenItemsMap;
StolenItemsMap mStolenItems; StolenItemsMap mStolenItems;
MWSound::MusicType mMusicType;
public: public:
void buildPlayer(); void buildPlayer();
///< build player according to stored class/race/birthsign information. Will ///< build player according to stored class/race/birthsign information. Will
@ -245,9 +243,6 @@ namespace MWMechanics
GreetingState getGreetingState(const MWWorld::Ptr& ptr) const override; GreetingState getGreetingState(const MWWorld::Ptr& ptr) const override;
bool isTurningToPlayer(const MWWorld::Ptr& ptr) const override; bool isTurningToPlayer(const MWWorld::Ptr& ptr) const override;
MWSound::MusicType getMusicType() const override { return mMusicType; }
void setMusicType(MWSound::MusicType type) override { mMusicType = type; }
private: private:
bool canCommitCrimeAgainst(const MWWorld::Ptr& victim, const MWWorld::Ptr& attacker); bool canCommitCrimeAgainst(const MWWorld::Ptr& victim, const MWWorld::Ptr& attacker);
bool canReportCrime( bool canReportCrime(

5
apps/openmw/mwsound/soundmanagerimp.cpp
View file

@ -115,6 +115,7 @@ namespace MWSound
, mOutput(std::make_unique<OpenAL_Output>(*this)) , mOutput(std::make_unique<OpenAL_Output>(*this))
, mWaterSoundUpdater(makeWaterSoundUpdaterSettings()) , mWaterSoundUpdater(makeWaterSoundUpdaterSettings())
, mSoundBuffers(*mOutput) , mSoundBuffers(*mOutput)
, mMusicType(MWSound::MusicType::Normal)
, mListenerUnderwater(false) , mListenerUnderwater(false)
, mListenerPos(0, 0, 0) , mListenerPos(0, 0, 0)
, mListenerDir(1, 0, 0) , mListenerDir(1, 0, 0)
@ -307,10 +308,10 @@ namespace MWSound
const auto mechanicsManager = MWBase::Environment::get().getMechanicsManager(); const auto mechanicsManager = MWBase::Environment::get().getMechanicsManager();
// Can not interrupt scripted music by built-in playlists // Can not interrupt scripted music by built-in playlists
if (mechanicsManager->getMusicType() == MusicType::MWScript && type != MusicType::MWScript) if (mMusicType == MusicType::MWScript && type != MusicType::MWScript)
return; return;
mechanicsManager->setMusicType(type); mMusicType = type;
advanceMusic(filename, fade); advanceMusic(filename, fade);
} }

2
apps/openmw/mwsound/soundmanagerimp.hpp
View file

@ -86,7 +86,7 @@ namespace MWSound
TrackList mActiveTracks; TrackList mActiveTracks;
StreamPtr mMusic; StreamPtr mMusic;
VFS::Path::Normalized mCurrentPlaylist; MusicType mMusicType;
bool mListenerUnderwater; bool mListenerUnderwater;
osg::Vec3f mListenerPos; osg::Vec3f mListenerPos;