FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make position properties work for relative positions too

Browse Source
This commit is contained in:
Erik Hofman
2017-05-09 10:57:31 +02:00
parent d6b57d0937
commit 7512bc0fb2
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
simgear/sound/sample.cxx
View File

@@ -167,15 +167,13 @@ SGSoundSample::~SGSoundSample() {
void SGSoundSample::update_pos_and_orientation() {
if (_use_pos_props) {
if (_pos_prop[0]) _absolute_pos[0] = _pos_prop[0]->getDoubleValue();
if (_pos_prop[1]) _absolute_pos[1] = _pos_prop[1]->getDoubleValue();
if (_pos_prop[2]) _absolute_pos[2] = _pos_prop[2]->getDoubleValue();
if (_pos_prop[0]) _relative_pos[0] = _pos_prop[0]->getDoubleValue();
if (_pos_prop[1]) _relative_pos[1] = _pos_prop[1]->getDoubleValue();
if (_pos_prop[2]) _relative_pos[2] = _pos_prop[2]->getDoubleValue();
}
else {
_absolute_pos = _base_pos;
if (_relative_pos[0] || _relative_pos[1] || _relative_pos[2] ) {
_absolute_pos += _rotation.rotate( _relative_pos );
}
_absolute_pos = _base_pos;
if (_relative_pos[0] || _relative_pos[1] || _relative_pos[2] ) {
_absolute_pos += _rotation.rotate( _relative_pos );
}
_orivec = SGVec3f::zeros();