mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-20 22:53:54 +00:00
Code Issues Releases Wiki Activity

Support optional volume and pitch arguments for soundgen events (e.g. moan 0.5 1.0) as required for some actors

Browse source
This commit is contained in:
scrawl 2014-01-22 15:25:03 +01:00
parent 2e6e0fd0a0
commit cf378ec31e
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
apps/openmw/mwrender/animation.cpp
View file

@ -616,6 +616,13 @@ bool Animation::reset(AnimState &state, const NifOgre::TextKeyMap &keys, const s
return true; return true;
} }
void split(const std::string &s, char delim, std::vector<std::string> &elems) {
std::stringstream ss(s);
std::string item;
while (std::getline(ss, item, delim)) {
elems.push_back(item);
}
}
void Animation::handleTextKey(AnimState &state, const std::string &groupname, const NifOgre::TextKeyMap::const_iterator &key) void Animation::handleTextKey(AnimState &state, const std::string &groupname, const NifOgre::TextKeyMap::const_iterator &key)
{ {
@ -630,14 +637,29 @@ void Animation::handleTextKey(AnimState &state, const std::string &groupname, co
} }
if(evt.compare(0, 10, "soundgen: ") == 0) if(evt.compare(0, 10, "soundgen: ") == 0)
{ {
std::string sound = MWWorld::Class::get(mPtr).getSoundIdFromSndGen(mPtr, evt.substr(10)); std::string soundgen = evt.substr(10);
// The event can optionally contain volume and pitch modifiers
float volume=1.f, pitch=1.f;
if (soundgen.find(" ") != std::string::npos)
{
std::vector<std::string> tokens;
split(soundgen, ' ', tokens);
soundgen = tokens[0];
if (tokens.size() >= 2)
volume = Ogre::StringConverter::parseReal(tokens[1]);
if (tokens.size() >= 3)
pitch = Ogre::StringConverter::parseReal(tokens[2]);
}
std::string sound = mPtr.getClass().getSoundIdFromSndGen(mPtr, soundgen);
if(!sound.empty()) if(!sound.empty())
{ {
MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager(); MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
MWBase::SoundManager::PlayType type = MWBase::SoundManager::Play_TypeSfx; MWBase::SoundManager::PlayType type = MWBase::SoundManager::Play_TypeSfx;
if(evt.compare(10, evt.size()-10, "left") == 0 || evt.compare(10, evt.size()-10, "right") == 0) if(evt.compare(10, evt.size()-10, "left") == 0 || evt.compare(10, evt.size()-10, "right") == 0)
type = MWBase::SoundManager::Play_TypeFoot; type = MWBase::SoundManager::Play_TypeFoot;
sndMgr->playSound3D(mPtr, sound, 1.0f, 1.0f, type); sndMgr->playSound3D(mPtr, sound, volume, pitch, type);
} }
return; return;
} }