From c772a3e5d8d9507b898813cdfb597c14b07cdc61 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Tue, 2 Feb 2021 20:18:41 -0500 Subject: Added "bumping into something while running" sfx --- CMakeLists.txt | 3 ++ cmake/FindSDL2_Mixer.cmake | 100 +++++++++++++++++++++++++++++++++++++++++++++ res/bump.wav | Bin 0 -> 70868 bytes src/main.cpp | 8 ++-- src/mixer.cpp | 16 ++++++++ src/mixer.h | 67 ++++++++++++++++++++++++++++++ src/party.cpp | 5 ++- src/party.h | 4 +- src/renderer.h | 2 +- 9 files changed, 198 insertions(+), 7 deletions(-) create mode 100644 cmake/FindSDL2_Mixer.cmake create mode 100644 res/bump.wav create mode 100644 src/mixer.cpp create mode 100644 src/mixer.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 45c838c..6357cb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,10 +11,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${tanetane_SOURCE_DIR}/cmake") # Get dependencies. find_package(SDL2 REQUIRED) find_package(SDL2_Image REQUIRED) +find_package(SDL2_Mixer REQUIRED) set(ALL_LIBS ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} + ${SDL2_MIXER_LIBRARIES} tmxlite ) @@ -32,6 +34,7 @@ link_directories( add_executable(tanetane src/main.cpp src/renderer.cpp + src/mixer.cpp src/sprite.cpp src/party.cpp src/game.cpp diff --git a/cmake/FindSDL2_Mixer.cmake b/cmake/FindSDL2_Mixer.cmake new file mode 100644 index 0000000..1d9778c --- /dev/null +++ b/cmake/FindSDL2_Mixer.cmake @@ -0,0 +1,100 @@ +# Locate SDL_MIXER library +# +# This module defines: +# +# :: +# +# SDL2_MIXER_LIBRARIES, the name of the library to link against +# SDL2_MIXER_INCLUDE_DIRS, where to find the headers +# SDL2_MIXER_FOUND, if false, do not try to link against +# SDL2_MIXER_VERSION_STRING - human-readable string containing the version of SDL_MIXER +# +# +# +# For backward compatibility the following variables are also set: +# +# :: +# +# SDLMIXER_LIBRARY (same value as SDL2_MIXER_LIBRARIES) +# SDLMIXER_INCLUDE_DIR (same value as SDL2_MIXER_INCLUDE_DIRS) +# SDLMIXER_FOUND (same value as SDL2_MIXER_FOUND) +# +# +# +# $SDLDIR is an environment variable that would correspond to the +# ./configure --prefix=$SDLDIR used in building SDL. +# +# Created by Eric Wing. This was influenced by the FindSDL.cmake +# module, but with modifications to recognize OS X frameworks and +# additional Unix paths (FreeBSD, etc). + +#============================================================================= +# Copyright 2005-2009 Kitware, Inc. +# Copyright 2012 Benjamin Eikel +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# (To distribute this file outside of CMake, substitute the full +# License text for the above reference.) + +find_path(SDL2_MIXER_INCLUDE_DIR SDL_mixer.h + HINTS + ENV SDL2MIXERDIR + ENV SDL2DIR + PATH_SUFFIXES SDL2 + # path suffixes to search inside ENV{SDLDIR} + include/SDL2 include + PATHS ${SDL2_MIXER_PATH} + ) + +if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(VC_LIB_PATH_SUFFIX lib/x64) +else() + set(VC_LIB_PATH_SUFFIX lib/x86) +endif() + +find_library(SDL2_MIXER_LIBRARY + NAMES SDL2_mixer + HINTS + ENV SDL2MIXERDIR + ENV SDL2DIR + PATH_SUFFIXES lib bin ${VC_LIB_PATH_SUFFIX} + PATHS ${SDL2_MIXER_PATH} + ) + +if(SDL2_MIXER_INCLUDE_DIR AND EXISTS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h") + file(STRINGS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h" SDL2_MIXER_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MIXER_MAJOR_VERSION[ \t]+[0-9]+$") + file(STRINGS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h" SDL2_MIXER_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MIXER_MINOR_VERSION[ \t]+[0-9]+$") + file(STRINGS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h" SDL2_MIXER_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_MIXER_PATCHLEVEL[ \t]+[0-9]+$") + string(REGEX REPLACE "^#define[ \t]+SDL_MIXER_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_MIXER_VERSION_MAJOR "${SDL2_MIXER_VERSION_MAJOR_LINE}") + string(REGEX REPLACE "^#define[ \t]+SDL_MIXER_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_MIXER_VERSION_MINOR "${SDL2_MIXER_VERSION_MINOR_LINE}") + string(REGEX REPLACE "^#define[ \t]+SDL_MIXER_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_MIXER_VERSION_PATCH "${SDL2_MIXER_VERSION_PATCH_LINE}") + set(SDL2_MIXER_VERSION_STRING ${SDL2_MIXER_VERSION_MAJOR}.${SDL2_MIXER_VERSION_MINOR}.${SDL2_MIXER_VERSION_PATCH}) + unset(SDL2_MIXER_VERSION_MAJOR_LINE) + unset(SDL2_MIXER_VERSION_MINOR_LINE) + unset(SDL2_MIXER_VERSION_PATCH_LINE) + unset(SDL2_MIXER_VERSION_MAJOR) + unset(SDL2_MIXER_VERSION_MINOR) + unset(SDL2_MIXER_VERSION_PATCH) +endif() + +set(SDL2_MIXER_LIBRARIES ${SDL2_MIXER_LIBRARY}) +set(SDL2_MIXER_INCLUDE_DIRS ${SDL2_MIXER_INCLUDE_DIR}) + +include(FindPackageHandleStandardArgs) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_mixer + REQUIRED_VARS SDL2_MIXER_LIBRARIES SDL2_MIXER_INCLUDE_DIRS + VERSION_VAR SDL2_MIXER_VERSION_STRING) + +# for backward compatibility +set(SDLMIXER_LIBRARY ${SDL2_MIXER_LIBRARIES}) +set(SDLMIXER_INCLUDE_DIR ${SDL2_MIXER_INCLUDE_DIRS}) +set(SDLMIXER_FOUND ${SDL2_MIXER_FOUND}) + +mark_as_advanced(SDL2_MIXER_LIBRARY SDL2_MIXER_INCLUDE_DIR) diff --git a/res/bump.wav b/res/bump.wav new file mode 100644 index 0000000..81386a3 Binary files /dev/null and b/res/bump.wav differ diff --git a/src/main.cpp b/src/main.cpp index 5e5953b..1d1583f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,8 +5,9 @@ #include "party.h" #include "timer.h" #include "map.h" +#include "mixer.h" -void loop(Renderer& renderer) { +void loop(Renderer& renderer, Mixer& mixer) { Game game; Input keystate; @@ -61,7 +62,7 @@ void loop(Renderer& renderer) { inputTimer.accumulate(frameTime); while (inputTimer.step()) { - party.move(game, keystate); + party.move(game, mixer, keystate); } animTimer.accumulate(frameTime); @@ -79,8 +80,9 @@ int main(int, char**) { try { Renderer renderer; + Mixer mixer; - loop(renderer); + loop(renderer, mixer); } catch (const sdl_error& ex) { std::cout << "SDL error (" << ex.what() << ")" << std::endl; diff --git a/src/mixer.cpp b/src/mixer.cpp new file mode 100644 index 0000000..bfbedcd --- /dev/null +++ b/src/mixer.cpp @@ -0,0 +1,16 @@ +#include "mixer.h" + +void Mixer::playSound(std::string filename) { + if (!sounds_.count(filename)) { + Mix_Chunk* sample = Mix_LoadWAV(filename.c_str()); + if (!sample) { + throw mix_error(); + } + + sounds_[filename] = chunk_ptr(sample); + } + + if (Mix_PlayChannel(-1, sounds_[filename].get(), 0) == -1) { + throw mix_error(); + } +} diff --git a/src/mixer.h b/src/mixer.h new file mode 100644 index 0000000..010bb09 --- /dev/null +++ b/src/mixer.h @@ -0,0 +1,67 @@ +#ifndef MIXER_H_6DF82000 +#define MIXER_H_6DF82000 + +#include +#include +#include +#include +#include + +class mix_error : public std::logic_error { +public: + + mix_error() : std::logic_error(Mix_GetError()) + { + } +}; + +class mix_wrapper { +public: + + mix_wrapper() + { + if (Mix_Init(0) != 0) { + mix_error ex; + Mix_Quit(); + + throw ex; + } + + if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 2, 1024) != 0) { + mix_error ex; + Mix_Quit(); + + throw ex; + } + } + + ~mix_wrapper() + { + Mix_CloseAudio(); + Mix_Quit(); + } +}; + +class chunk_deleter { +public: + + void operator()(Mix_Chunk* chunk) { + Mix_FreeChunk(chunk); + } +}; + +using chunk_ptr = std::unique_ptr; + +// MUST create the Renderer first! +class Mixer { +public: + + void playSound(std::string filename); + +private: + + mix_wrapper mix_; + std::map sounds_; +}; + +#endif /* end of include guard: MIXER_H_6DF82000 */ diff --git a/src/party.cpp b/src/party.cpp index 307bca8..b7284c7 100644 --- a/src/party.cpp +++ b/src/party.cpp @@ -1,6 +1,6 @@ #include "party.h" #include "consts.h" -#include +#include "mixer.h" void Party::addMember(Game& game, int spriteId) { int index = members_.size(); @@ -19,7 +19,7 @@ void Party::addMember(Game& game, int spriteId) { game.setSpriteState(spriteId, "still"); } -void Party::move(Game& game, const Input& keystate) { +void Party::move(Game& game, Mixer& mixer, const Input& keystate) { if (members_.empty()) { return; } @@ -151,6 +151,7 @@ void Party::move(Game& game, const Input& keystate) { if (blocked && state_ == State::Running) { stopRunning(game); + mixer.playSound("../res/bump.wav"); } // Move everything diff --git a/src/party.h b/src/party.h index 2864073..59330c8 100644 --- a/src/party.h +++ b/src/party.h @@ -5,12 +5,14 @@ #include #include "game.h" +class Mixer; + class Party { public: void addMember(Game& game, int spriteId); - void move(Game& game, const Input& keystate); + void move(Game& game, Mixer& mixer, const Input& keystate); void beginCrouch(Game& game); diff --git a/src/renderer.h b/src/renderer.h index f952ab3..71c4ade 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -32,7 +32,7 @@ public: sdl_wrapper() { - if (SDL_Init(SDL_INIT_VIDEO) != 0) + if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) != 0) { sdl_error ex; SDL_Quit(); -- cgit 1.4.1