mirror of https://github.com/mosra/magnum.git
Browse Source
* De-inlined most of the code * Reduced includes in headers * Formatting * Global variables don't need to be exposed publiclypull/255/head
Vladimír Vondruš
8 years ago
10 changed files with 284 additions and 199 deletions
@ -0,0 +1,84 @@
|
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 |
||||
Vladimír Vondruš <mosra@centrum.cz> |
||||
Copyright © 2015 Jonathan Hale <squareys@googlemail.com> |
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a |
||||
copy of this software and associated documentation files (the "Software"), |
||||
to deal in the Software without restriction, including without limitation |
||||
the rights to use, copy, modify, merge, publish, distribute, sublicense, |
||||
and/or sell copies of the Software, and to permit persons to whom the |
||||
Software is furnished to do so, subject to the following conditions: |
||||
|
||||
The above copyright notice and this permission notice shall be included |
||||
in all copies or substantial portions of the Software. |
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
||||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
||||
DEALINGS IN THE SOFTWARE. |
||||
*/ |
||||
|
||||
#include "Playable.h" |
||||
|
||||
#include "Magnum/Audio/PlayableGroup.h" |
||||
#include "Magnum/Math/Matrix3.h" |
||||
#include "Magnum/Math/Matrix4.h" |
||||
|
||||
namespace Magnum { namespace Audio { |
||||
|
||||
template<UnsignedInt dimensions> Playable<dimensions>::Playable(SceneGraph::AbstractObject<dimensions, Float>& object, PlayableGroup<dimensions>* group): SceneGraph::AbstractGroupedFeature<dimensions, Playable<dimensions>, Float>(object, group), _fwd{}, _gain{1.0f} { |
||||
SceneGraph::AbstractFeature<dimensions, Float>::setCachedTransformations(SceneGraph::CachedTransformation::Absolute); |
||||
_fwd[dimensions - 1] = -1; |
||||
} |
||||
|
||||
template<UnsignedInt dimensions> Playable<dimensions>::~Playable() = default; |
||||
|
||||
template<UnsignedInt dimensions> Playable<dimensions>& Playable<dimensions>::setGain(const Float gain) { |
||||
_gain = gain; |
||||
cleanGain(); |
||||
return *this; |
||||
} |
||||
|
||||
template<UnsignedInt dimensions> void Playable<dimensions>::clean(const MatrixTypeFor<dimensions, Float>& absoluteTransformationMatrix) { |
||||
Vector3 position = Vector3::pad(absoluteTransformationMatrix.translation()); |
||||
if(playables()) |
||||
position = playables()->soundTransformation().transformVector(position); |
||||
|
||||
_source.setPosition(position); |
||||
_source.setDirection(Vector3::pad(absoluteTransformationMatrix.rotation()*_fwd)); |
||||
|
||||
/** @todo velocity */ |
||||
} |
||||
|
||||
template<UnsignedInt dimensions> PlayableGroup<dimensions>* Playable<dimensions>::playables() { |
||||
return static_cast<PlayableGroup<dimensions>*>(this->group()); |
||||
} |
||||
|
||||
template<UnsignedInt dimensions> const PlayableGroup<dimensions>* Playable<dimensions>::playables() const { |
||||
return static_cast<const PlayableGroup<dimensions>*>(this->group()); |
||||
} |
||||
|
||||
template<UnsignedInt dimensions> void Playable<dimensions>::cleanGain() { |
||||
_source.setGain(playables() ? _gain*playables()->gain() : _gain); |
||||
} |
||||
|
||||
/* On non-MinGW Windows the instantiations are already marked with extern
|
||||
template */ |
||||
#if !defined(CORRADE_TARGET_WINDOWS) || defined(__MINGW32__) |
||||
#define MAGNUM_AUDIO_EXPORT_HPP MAGNUM_AUDIO_EXPORT |
||||
#else |
||||
#define MAGNUM_AUDIO_EXPORT_HPP |
||||
#endif |
||||
|
||||
#ifndef DOXYGEN_GENERATING_OUTPUT |
||||
template class MAGNUM_AUDIO_EXPORT_HPP Playable<2>; |
||||
template class MAGNUM_AUDIO_EXPORT_HPP Playable<3>; |
||||
#endif |
||||
|
||||
}} |
||||
@ -0,0 +1,109 @@
|
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 |
||||
Vladimír Vondruš <mosra@centrum.cz> |
||||
Copyright © 2015 Jonathan Hale <squareys@googlemail.com> |
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a |
||||
copy of this software and associated documentation files (the "Software"), |
||||
to deal in the Software without restriction, including without limitation |
||||
the rights to use, copy, modify, merge, publish, distribute, sublicense, |
||||
and/or sell copies of the Software, and to permit persons to whom the |
||||
Software is furnished to do so, subject to the following conditions: |
||||
|
||||
The above copyright notice and this permission notice shall be included |
||||
in all copies or substantial portions of the Software. |
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
||||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
||||
DEALINGS IN THE SOFTWARE. |
||||
*/ |
||||
|
||||
#include "PlayableGroup.h" |
||||
|
||||
#include "Magnum/Audio/Playable.h" |
||||
#include "Magnum/Audio/Source.h" |
||||
#include "Magnum/SceneGraph/AbstractObject.h" |
||||
|
||||
namespace Magnum { namespace Audio { |
||||
|
||||
namespace { |
||||
|
||||
template<UnsignedInt dimensions> std::vector<std::reference_wrapper<Source>> sources(PlayableGroup<dimensions>& group) { |
||||
std::vector<std::reference_wrapper<Source>> srcs; |
||||
srcs.reserve(group.size()); |
||||
for(std::size_t i = 0; i != group.size(); ++i) |
||||
srcs.push_back(group[i].source()); |
||||
return srcs; |
||||
} |
||||
|
||||
} |
||||
|
||||
template<UnsignedInt dimensions> PlayableGroup<dimensions>::PlayableGroup(): SceneGraph::FeatureGroup<dimensions, Playable<dimensions>, Float>(), _gain{1.0f} {} |
||||
|
||||
template<UnsignedInt dimensions> PlayableGroup<dimensions>::~PlayableGroup() = default; |
||||
|
||||
template<UnsignedInt dimensions> PlayableGroup<dimensions>& PlayableGroup<dimensions>::play() { |
||||
Source::play(sources(*this)); |
||||
return *this; |
||||
} |
||||
|
||||
template<UnsignedInt dimensions> PlayableGroup<dimensions>& PlayableGroup<dimensions>::pause() { |
||||
Source::pause(sources(*this)); |
||||
return *this; |
||||
} |
||||
|
||||
template<UnsignedInt dimensions> PlayableGroup<dimensions>& PlayableGroup<dimensions>::stop() { |
||||
Source::stop(sources(*this)); |
||||
return *this; |
||||
} |
||||
|
||||
template<UnsignedInt dimensions> PlayableGroup<dimensions>& PlayableGroup<dimensions>::setGain(const Float gain) { |
||||
_gain = gain; |
||||
for(UnsignedInt i = 0; i < this->size(); ++i) |
||||
(*this)[i].cleanGain(); |
||||
|
||||
return *this; |
||||
} |
||||
|
||||
template<UnsignedInt dimensions> PlayableGroup<dimensions>& PlayableGroup<dimensions>::setSoundTransformation(const Matrix4& matrix) { |
||||
_soundTransform = matrix; |
||||
|
||||
/* I cannot come up with a use case for which the sound transformation
|
||||
would be set frequently, so we are setting objects dirty whether the |
||||
matrix changed or not. */ |
||||
for(UnsignedInt i = 0; i < this->size(); ++i) |
||||
(*this)[i].object().setDirty(); |
||||
|
||||
return *this; |
||||
} |
||||
|
||||
template<UnsignedInt dimensions> void PlayableGroup<dimensions>::setClean() { |
||||
std::vector<std::reference_wrapper<SceneGraph::AbstractObject<dimensions, Float>>> objects; |
||||
objects.reserve(this->size()); |
||||
|
||||
for(UnsignedInt i = 0; i < this->size(); ++i) |
||||
objects.push_back((*this)[i].object()); |
||||
|
||||
SceneGraph::AbstractObject<dimensions, Float>::setClean(objects); |
||||
} |
||||
|
||||
/* On non-MinGW Windows the instantiations are already marked with extern
|
||||
template */ |
||||
#if !defined(CORRADE_TARGET_WINDOWS) || defined(__MINGW32__) |
||||
#define MAGNUM_AUDIO_EXPORT_HPP MAGNUM_AUDIO_EXPORT |
||||
#else |
||||
#define MAGNUM_AUDIO_EXPORT_HPP |
||||
#endif |
||||
|
||||
#ifndef DOXYGEN_GENERATING_OUTPUT |
||||
template class MAGNUM_AUDIO_EXPORT_HPP PlayableGroup<2>; |
||||
template class MAGNUM_AUDIO_EXPORT_HPP PlayableGroup<3>; |
||||
#endif |
||||
|
||||
}} |
||||
Loading…
Reference in new issue