krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Shorter Vector3 initialisation

Browse source
This commit is contained in:
scrawl 2014-01-01 22:46:10 +01:00
parent 5729672262
commit 531bef6193
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -252,7 +252,7 @@ namespace MWSound
float basevol = volumeFromType(Play_TypeVoice); float basevol = volumeFromType(Play_TypeVoice);
std::string filePath = "Sound/"+filename; std::string filePath = "Sound/"+filename;
const ESM::Position &pos = ptr.getRefData().getPosition(); const ESM::Position &pos = ptr.getRefData().getPosition();
const Ogre::Vector3 objpos(pos.pos[0], pos.pos[1], pos.pos[2]); const Ogre::Vector3 objpos(pos.pos);
MWBase::SoundPtr sound = mOutput->playSound3D(filePath, objpos, 1.0f, basevol, 1.0f, MWBase::SoundPtr sound = mOutput->playSound3D(filePath, objpos, 1.0f, basevol, 1.0f,
20.0f, 12750.0f, Play_Normal|Play_TypeVoice, 0); 20.0f, 12750.0f, Play_Normal|Play_TypeVoice, 0);
@ -354,7 +354,7 @@ namespace MWSound
float min, max; float min, max;
std::string file = lookup(soundId, volume, min, max); std::string file = lookup(soundId, volume, min, max);
const ESM::Position &pos = ptr.getRefData().getPosition(); const ESM::Position &pos = ptr.getRefData().getPosition();
const Ogre::Vector3 objpos(pos.pos[0], pos.pos[1], pos.pos[2]); const Ogre::Vector3 objpos(pos.pos);
sound = mOutput->playSound3D(file, objpos, volume, basevol, pitch, min, max, mode|type, offset); sound = mOutput->playSound3D(file, objpos, volume, basevol, pitch, min, max, mode|type, offset);
if((mode&Play_NoTrack)) if((mode&Play_NoTrack))
@ -584,7 +584,7 @@ namespace MWSound
if(!ptr.isEmpty()) if(!ptr.isEmpty())
{ {
const ESM::Position &pos = ptr.getRefData().getPosition(); const ESM::Position &pos = ptr.getRefData().getPosition();
const Ogre::Vector3 objpos(pos.pos[0], pos.pos[1], pos.pos[2]); const Ogre::Vector3 objpos(pos.pos);
snditer->first->setPosition(objpos); snditer->first->setPosition(objpos);
} }
//update fade out //update fade out

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

@ -1063,7 +1063,7 @@ namespace MWWorld
void World::adjustPosition(const Ptr &ptr) void World::adjustPosition(const Ptr &ptr)
{ {
Ogre::Vector3 pos (ptr.getRefData().getPosition().pos[0], ptr.getRefData().getPosition().pos[1], ptr.getRefData().getPosition().pos[2]); Ogre::Vector3 pos (ptr.getRefData().getPosition().pos);
if(!ptr.getRefData().getBaseNode()) if(!ptr.getRefData().getBaseNode())
{ {
@ -1304,7 +1304,7 @@ namespace MWWorld
if (mPlayer->getPlayer().getCell()->isExterior()) if (mPlayer->getPlayer().getCell()->isExterior())
{ {
ESM::Position pos = mPlayer->getPlayer().getRefData().getPosition(); ESM::Position pos = mPlayer->getPlayer().getRefData().getPosition();
mPlayer->setLastKnownExteriorPosition(Ogre::Vector3(pos.pos[0], pos.pos[1], pos.pos[2])); mPlayer->setLastKnownExteriorPosition(Ogre::Vector3(pos.pos));
} }
} }
@ -1584,7 +1584,7 @@ namespace MWWorld
pos.rot[1] = 0; pos.rot[1] = 0;
Ogre::Vector3 orig = Ogre::Vector3 orig =
Ogre::Vector3(pos.pos[0], pos.pos[1], pos.pos[2]); Ogre::Vector3(pos.pos);
Ogre::Vector3 dir = Ogre::Vector3(0, 0, -1); Ogre::Vector3 dir = Ogre::Vector3(0, 0, -1);
float len = (pos.pos[2] >= 0) ? pos.pos[2] : -pos.pos[2]; float len = (pos.pos[2] >= 0) ? pos.pos[2] : -pos.pos[2];
@ -2299,7 +2299,7 @@ namespace MWWorld
if (ref.mRef.mTeleport && ref.mRef.mDestCell.empty()) if (ref.mRef.mTeleport && ref.mRef.mDestCell.empty())
{ {
ESM::Position pos = ref.mRef.mDoorDest; ESM::Position pos = ref.mRef.mDoorDest;
result = Ogre::Vector3(pos.pos[0], pos.pos[1], pos.pos[2]); result = Ogre::Vector3(pos.pos);
return true; return true;
} }
} }
@ -2320,7 +2320,7 @@ namespace MWWorld
for (std::vector<MWWorld::Ptr>::iterator it = markers.begin(); it != markers.end(); ++it) for (std::vector<MWWorld::Ptr>::iterator it = markers.begin(); it != markers.end(); ++it)
{ {
ESM::Position pos = it->getRefData().getPosition(); ESM::Position pos = it->getRefData().getPosition();
Ogre::Vector3 markerPos = Ogre::Vector3(pos.pos[0], pos.pos[1], pos.pos[2]); Ogre::Vector3 markerPos = Ogre::Vector3(pos.pos);
float distance = worldPos.squaredDistance(markerPos); float distance = worldPos.squaredDistance(markerPos);
if (distance < closestDistance) if (distance < closestDistance)
{ {