From e8e74eb506d734d09189dbdc9e897a96c58541f9 Mon Sep 17 00:00:00 2001 From: Stiffly Date: Wed, 23 Sep 2015 15:15:43 +0200 Subject: [PATCH] Added pitch --- include/Sound/EPlaySound.h | 21 ++------------------- src/game/Sound/SoundSystem.cpp | 1 + 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/include/Sound/EPlaySound.h b/include/Sound/EPlaySound.h index a5457f0..ee51df0 100644 --- a/include/Sound/EPlaySound.h +++ b/include/Sound/EPlaySound.h @@ -1,21 +1,3 @@ -/* - This file is part of Daydream Engine. - Copyright 2014 Adam Byléhn, Tobias Dahl, Simon Holmberg, Viktor Ljung - - Daydream Engine is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Daydream Engine is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with Daydream Engine. If not, see . -*/ - #ifndef Events_PlaySFX_h__ #define Events_PlaySFX_h__ @@ -31,6 +13,7 @@ struct PlaySound : Event { std::string path; float volume = 1.f; + float pitch = 1.f; bool loop = false; }; @@ -38,4 +21,4 @@ struct PlaySound : Event } -#endif // Events_PlaySFX_h__ \ No newline at end of file +#endif \ No newline at end of file diff --git a/src/game/Sound/SoundSystem.cpp b/src/game/Sound/SoundSystem.cpp index c471f07..aaca752 100644 --- a/src/game/Sound/SoundSystem.cpp +++ b/src/game/Sound/SoundSystem.cpp @@ -89,6 +89,7 @@ bool dd::Systems::SoundSystem::OnPlaySound(const dd::Events::PlaySound &event) //Sound settings alSourcef(source, AL_GAIN, event.volume); + alSourcef(source, AL_PITCH, event.pitch); if (event.loop) { alSourcei(source, AL_LOOPING, AL_TRUE); }