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

Merge pull request #854 from kcat/master

Browse source 
Play NPC voices from the head position
This commit is contained in:
scrawl 2015-12-11 16:21:06 +01:00
commit ed27f0da25
5 changed files with 33 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwbase/world.hpp
View file

@ -14,6 +14,7 @@
namespace osg
{
class Vec3f;
class Matrixf;
class Quat;
class Image;
}
@ -373,6 +374,8 @@ namespace MWBase
virtual bool isUnderwater(const MWWorld::CellStore* cell, const osg::Vec3f &pos) const = 0;
virtual bool isOnGround(const MWWorld::Ptr &ptr) const = 0;
virtual osg::Matrixf getActorHeadTransform(const MWWorld::Ptr& actor) const = 0;
virtual void togglePOV() = 0;
virtual bool isFirstPerson() const = 0;
virtual void togglePreviewMode(bool enable) = 0;

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

@ -4,6 +4,8 @@
#include <algorithm>
#include <map>
#include <osg/Matrixf>
#include <components/misc/rng.hpp>
#include <components/vfs/manager.hpp>
@ -221,7 +223,7 @@ namespace MWSound
{
DecoderPtr decoder = getDecoder();
// Workaround: Bethesda at some point converted some of the files to mp3, but the references were kept as .wav.
if(decoder->mResourceMgr->exists(voicefile))
if(mVFS->exists(voicefile))
decoder->open(voicefile);
else
{
@ -397,8 +399,6 @@ namespace MWSound
try
{
std::string voicefile = "Sound/"+filename;
const ESM::Position &pos = ptr.getRefData().getPosition();
const osg::Vec3f objpos(pos.asVec3());
Sound_Loudness *loudness;
mVFS->normalizeFilename(voicefile);
@ -408,7 +408,9 @@ namespace MWSound
mPendingSaySounds[ptr] = std::make_pair(decoder, loudness);
else
{
MWBase::SoundStreamPtr sound = playVoice(decoder, objpos, (ptr == MWMechanics::getPlayer()));
MWBase::World *world = MWBase::Environment::get().getWorld();
const osg::Vec3f pos = world->getActorHeadTransform(ptr).getTrans();
MWBase::SoundStreamPtr sound = playVoice(decoder, pos, (ptr == MWMechanics::getPlayer()));
mActiveSaySounds[ptr] = std::make_pair(sound, loudness);
}
}
@ -906,10 +908,10 @@ namespace MWSound
sound = playVoice(decoder, osg::Vec3f(), true);
else
{
const ESM::Position &pos = ptr.getRefData().getPosition();
const osg::Vec3f objpos(pos.asVec3());
MWBase::World *world = MWBase::Environment::get().getWorld();
const osg::Vec3f pos = world->getActorHeadTransform(ptr).getTrans();
sound = playVoice(decoder, objpos, (ptr == MWMechanics::getPlayer()));
sound = playVoice(decoder, pos, (ptr == MWMechanics::getPlayer()));
}
mActiveSaySounds[ptr] = std::make_pair(sound, loudness);
}
@ -930,13 +932,13 @@ namespace MWSound
MWBase::SoundStreamPtr sound = sayiter->second.first;
if(!ptr.isEmpty() && sound->getIs3D())
{
const ESM::Position &pos = ptr.getRefData().getPosition();
const osg::Vec3f objpos(pos.asVec3());
sound->setPosition(objpos);
MWBase::World *world = MWBase::Environment::get().getWorld();
const osg::Vec3f pos = world->getActorHeadTransform(ptr).getTrans();
sound->setPosition(pos);
if(sound->getDistanceCull())
{
if((mListenerPos - objpos).length2() > 2000*2000)
if((mListenerPos - pos).length2() > 2000*2000)
mOutput->stopStream(sound);
}
}

3
apps/openmw/mwworld/cellstore.hpp
View file

@ -35,6 +35,7 @@
#include "../mwmechanics/pathgrid.hpp" // TODO: maybe belongs in mwworld
#include "timestamp.hpp"
#include "ptr.hpp"
namespace ESM
{
@ -45,10 +46,8 @@ namespace ESM
namespace MWWorld
{
class Ptr;
class ESMStore;
/// \brief Mutable state of a cell
class CellStore
{

30
apps/openmw/mwworld/worldimp.cpp
View file

@ -1038,32 +1038,30 @@ namespace MWWorld
return facedObject;
}
osg::Vec3f getActorHeadPosition(const MWWorld::Ptr& actor, MWRender::RenderingManager* rendering)
osg::Matrixf World::getActorHeadTransform(const MWWorld::Ptr& actor) const
{
osg::Vec3f origin(actor.getRefData().getPosition().asVec3());
MWRender::Animation* anim = rendering->getAnimation(actor);
if (anim != NULL)
MWRender::Animation *anim = mRendering->getAnimation(actor);
if(anim)
{
const osg::Node* node = anim->getNode("Head");
if (node == NULL)
node = anim->getNode("Bip01 Head");
if (node != NULL)
const osg::Node *node = anim->getNode("Head");
if(!node) node = anim->getNode("Bip01 Head");
if(node)
{
osg::MatrixList mats = node->getWorldMatrices();
if (mats.size())
origin = mats[0].getTrans();
if(!mats.empty())
return mats[0];
}
}
return origin;
return osg::Matrixf::translate(actor.getRefData().getPosition().asVec3());
}
std::pair<MWWorld::Ptr,osg::Vec3f> World::getHitContact(const MWWorld::Ptr &ptr, float distance)
{
const ESM::Position &posdata = ptr.getRefData().getPosition();
osg::Quat rot = osg::Quat(posdata.rot[0], osg::Vec3f(-1,0,0)) * osg::Quat(posdata.rot[2], osg::Vec3f(0,0,-1));
osg::Vec3f pos = getActorHeadPosition(ptr, mRendering);
osg::Vec3f pos = getActorHeadTransform(ptr).getTrans();
std::pair<MWWorld::Ptr,osg::Vec3f> result = mPhysics->getHitContact(ptr, pos, rot, distance);
if(result.first.isEmpty())
@ -2659,7 +2657,7 @@ namespace MWWorld
MWWorld::Ptr target;
float distance = 192.f; // ??
osg::Vec3f hitPosition = actor.getRefData().getPosition().asVec3();
osg::Vec3f origin = getActorHeadPosition(actor, mRendering);
osg::Vec3f origin = getActorHeadTransform(actor).getTrans();
osg::Quat orient = osg::Quat(actor.getRefData().getPosition().rot[0], osg::Vec3f(-1,0,0))
* osg::Quat(actor.getRefData().getPosition().rot[2], osg::Vec3f(0,0,-1));
@ -3297,14 +3295,14 @@ namespace MWWorld
osg::Vec3f World::aimToTarget(const Ptr &actor, const MWWorld::Ptr& target)
{
osg::Vec3f weaponPos = getActorHeadPosition(actor, mRendering);
osg::Vec3f weaponPos = getActorHeadTransform(actor).getTrans();
osg::Vec3f targetPos = mPhysics->getPosition(target);
return (targetPos - weaponPos);
}
float World::getHitDistance(const Ptr &actor, const Ptr &target)
{
osg::Vec3f weaponPos = getActorHeadPosition(actor, mRendering);
osg::Vec3f weaponPos = getActorHeadTransform(actor).getTrans();
return mPhysics->getHitDistance(weaponPos, target);
}

2
apps/openmw/mwworld/worldimp.hpp
View file

@ -469,6 +469,8 @@ namespace MWWorld
virtual bool isWading(const MWWorld::Ptr &object) const;
virtual bool isOnGround(const MWWorld::Ptr &ptr) const;
virtual osg::Matrixf getActorHeadTransform(const MWWorld::Ptr& actor) const;
virtual void togglePOV();
virtual bool isFirstPerson() const;