Skip to content

Commit

Permalink
Sounds: add "indoor" and "night" fields for sound effects
Browse files Browse the repository at this point in the history
  • Loading branch information
@dseguin
dseguin committed Feb 24, 2022
1 parent 8f8e2b4 commit 4dc1908
Show file tree
Hide file tree
Showing 3 changed files with 317 additions and 131 deletions.
153 changes: 124 additions & 29 deletions src/sdlsound.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,20 @@

#define dbg(x) DebugLog((x),D_SDL) << __FILE__ << ":" << __LINE__ << ": "

struct id_variant_season {
struct sfx_args {
std::string id;
std::string variant;
std::string season;
cata::optional<bool> indoors;
cata::optional<bool> night;

bool operator<( const id_variant_season &rhs ) const {
return std::tie( id, variant, season ) < std::tie( rhs.id, rhs.variant, rhs.season );
bool operator<( const sfx_args &rhs ) const {
int r_ind = rhs.indoors.value_or( -1 );
int r_nit = rhs.night.value_or( -1 );
int l_ind = indoors.value_or( -1 );
int l_nit = night.value_or( -1 );
return std::tie( id, variant, season, l_ind, l_nit ) <
std::tie( rhs.id, rhs.variant, rhs.season, r_ind, r_nit );
}
};
struct sound_effect_resource {
Expand All @@ -60,7 +67,7 @@ struct sound_effect {
};
struct sfx_resources_t {
std::vector<sound_effect_resource> resource;
std::map<id_variant_season, std::vector<sound_effect>> sound_effects;
std::map<sfx_args, std::vector<sound_effect>> sound_effects;
};
struct music_playlist {
// list of filenames relative to the soundpack location
Expand All @@ -87,7 +94,7 @@ static std::string current_soundpack_path;

static std::unordered_map<std::string, int> unique_paths;
static sfx_resources_t sfx_resources;
static std::vector<id_variant_season> sfx_preload;
static std::vector<sfx_args> sfx_preload;

bool sounds::sound_enabled = false;

Expand Down Expand Up @@ -340,9 +347,19 @@ void sfx::load_sound_effects( const JsonObject &jsobj )
if( !sound_init_success ) {
return;
}
const id_variant_season key = { jsobj.get_string( "id" ),
jsobj.get_string( "variant", "default" ), jsobj.get_string( "season", "" )
};
sfx_args key = {
jsobj.get_string( "id" ),
jsobj.get_string( "variant", "default" ),
jsobj.get_string( "season", "" ),
cata::optional<bool>(),
cata::optional<bool>()
};
if( jsobj.has_bool( "is_indoors" ) ) {
key.indoors = jsobj.get_bool( "is_indoors" );
}
if( jsobj.has_bool( "is_night" ) ) {
key.indoors = jsobj.get_bool( "is_night" );
}
const int volume = jsobj.get_int( "volume", 100 );
auto &effects = sfx_resources.sound_effects[ key ];

Expand All @@ -361,9 +378,19 @@ void sfx::load_sound_effect_preload( const JsonObject &jsobj )
}

for( JsonObject aobj : jsobj.get_array( "preload" ) ) {
const id_variant_season preload_key = { aobj.get_string( "id" ),
aobj.get_string( "variant", "default" ), aobj.get_string( "season", "" )
};
sfx_args preload_key = {
jsobj.get_string( "id" ),
jsobj.get_string( "variant", "default" ),
jsobj.get_string( "season", "" ),
cata::optional<bool>(),
cata::optional<bool>()
};
if( jsobj.has_bool( "is_indoors" ) ) {
preload_key.indoors = jsobj.get_bool( "is_indoors" );
}
if( jsobj.has_bool( "is_night" ) ) {
preload_key.indoors = jsobj.get_bool( "is_night" );
}
sfx_preload.push_back( preload_key );
}
}
Expand All @@ -390,7 +417,7 @@ void sfx::load_playlist( const JsonObject &jsobj )

// Returns a random sound effect matching given id and variant or `nullptr` if there is no
// matching sound effect.
static const sound_effect *find_random_effect( const id_variant_season &id_var_seas )
static const sound_effect *find_random_effect( const sfx_args &id_var_seas )
{
const auto iter = sfx_resources.sound_effects.find( id_var_seas );
if( iter == sfx_resources.sound_effects.end() ) {
Expand All @@ -401,27 +428,92 @@ static const sound_effect *find_random_effect( const id_variant_season &id_var_s

// Same as above, but with fallback to "default" variant. May still return `nullptr`
static const sound_effect *find_random_effect( const std::string &id, const std::string &variant,
const std::string &season )
const std::string &season, const cata::optional<bool> &is_indoors,
const cata::optional<bool> &is_night )
{
const sound_effect *eff1 = find_random_effect( { id, variant, season } );
const sound_effect *eff1 =
find_random_effect( { id, variant, season, is_indoors, is_night } );
if( eff1 != nullptr ) {
return eff1;
}
const sound_effect *eff2 = find_random_effect( { id, variant, "" } );
const sound_effect *eff2 =
find_random_effect( { id, variant, "", is_indoors, is_night } );
if( eff2 != nullptr ) {
return eff2;
}
const sound_effect *eff3 = find_random_effect( { id, "default", season } );
const sound_effect *eff3 =
find_random_effect( { id, "default", season, is_indoors, is_night } );
if( eff3 != nullptr ) {
return eff3;
}
return find_random_effect( { id, "default", "" } );
const sound_effect *eff4 =
find_random_effect( { id, "default", "", is_indoors, is_night } );
if( eff4 != nullptr ) {
return eff4;
}
const sound_effect *eff5 =
find_random_effect( { id, variant, season, cata::optional<bool>(), is_night } );
if( eff5 != nullptr ) {
return eff5;
}
const sound_effect *eff6 =
find_random_effect( { id, variant, "", cata::optional<bool>(), is_night } );
if( eff6 != nullptr ) {
return eff6;
}
const sound_effect *eff7 =
find_random_effect( { id, "default", season, cata::optional<bool>(), is_night } );
if( eff7 != nullptr ) {
return eff7;
}
const sound_effect *eff8 =
find_random_effect( { id, "default", "", cata::optional<bool>(), is_night } );
if( eff8 != nullptr ) {
return eff8;
}
const sound_effect *eff9 =
find_random_effect( { id, variant, season, is_indoors, cata::optional<bool>() } );
if( eff9 != nullptr ) {
return eff9;
}
const sound_effect *effA =
find_random_effect( { id, variant, "", is_indoors, cata::optional<bool>() } );
if( effA != nullptr ) {
return effA;
}
const sound_effect *effB =
find_random_effect( { id, "default", season, is_indoors, cata::optional<bool>() } );
if( effB != nullptr ) {
return effB;
}
const sound_effect *effC =
find_random_effect( { id, "default", "", is_indoors, cata::optional<bool>() } );
if( effC != nullptr ) {
return effC;
}
const sound_effect *effD =
find_random_effect( { id, variant, season, cata::optional<bool>(), cata::optional<bool>() } );
if( effD != nullptr ) {
return effD;
}
const sound_effect *effE =
find_random_effect( { id, variant, "", cata::optional<bool>(), cata::optional<bool>() } );
if( effE != nullptr ) {
return effE;
}
const sound_effect *effF =
find_random_effect( { id, "default", season, cata::optional<bool>(), cata::optional<bool>() } );
if( effF != nullptr ) {
return effF;
}
return find_random_effect( { id, "default", "", cata::optional<bool>(), cata::optional<bool>() } );
}

bool sfx::has_variant_sound( const std::string &id, const std::string &variant,
const std::string &season )
const std::string &season, const cata::optional<bool> &is_indoors,
const cata::optional<bool> &is_night )
{
return find_random_effect( id, variant, season ) != nullptr;
return find_random_effect( id, variant, season, is_indoors, is_night ) != nullptr;
}

// Deletes the dynamically created chunk (if such a chunk had been played).
Expand Down Expand Up @@ -482,7 +574,8 @@ static Mix_Chunk *do_pitch_shift( Mix_Chunk *s, float pitch )
}

void sfx::play_variant_sound( const std::string &id, const std::string &variant,
const std::string &season, int volume )
const std::string &season, const cata::optional<bool> &is_indoors,
const cata::optional<bool> &is_night, int volume )
{
if( test_mode ) {
return;
Expand All @@ -493,9 +586,9 @@ void sfx::play_variant_sound( const std::string &id, const std::string &variant,
if( !check_sound( volume ) ) {
return;
}
const sound_effect *eff = find_random_effect( id, variant, season );
const sound_effect *eff = find_random_effect( id, variant, season, is_indoors, is_night );
if( eff == nullptr ) {
eff = find_random_effect( id, "default", "" );
eff = find_random_effect( id, "default", "", cata::optional<bool>(), cata::optional<bool>() );
if( eff == nullptr ) {
return;
}
Expand All @@ -513,8 +606,9 @@ void sfx::play_variant_sound( const std::string &id, const std::string &variant,
}

void sfx::play_variant_sound( const std::string &id, const std::string &variant,
const std::string &season,
int volume, units::angle angle, double pitch_min, double pitch_max )
const std::string &season, const cata::optional<bool> &is_indoors,
const cata::optional<bool> &is_night, int volume, units::angle angle,
double pitch_min, double pitch_max )
{
if( test_mode ) {
return;
Expand All @@ -525,7 +619,7 @@ void sfx::play_variant_sound( const std::string &id, const std::string &variant,
if( !check_sound( volume ) ) {
return;
}
const sound_effect *eff = find_random_effect( id, variant, season );
const sound_effect *eff = find_random_effect( id, variant, season, is_indoors, is_night );
if( eff == nullptr ) {
return;
}
Expand Down Expand Up @@ -566,7 +660,8 @@ void sfx::play_variant_sound( const std::string &id, const std::string &variant,
}

void sfx::play_ambient_variant_sound( const std::string &id, const std::string &variant,
const std::string &season, int volume,
const std::string &season, const cata::optional<bool> &is_indoors,
const cata::optional<bool> &is_night, int volume,
channel channel, int fade_in_duration, double pitch, int loops )
{
if( test_mode ) {
Expand All @@ -578,7 +673,7 @@ void sfx::play_ambient_variant_sound( const std::string &id, const std::string &
if( is_channel_playing( channel ) ) {
return;
}
const sound_effect *eff = find_random_effect( id, variant, season );
const sound_effect *eff = find_random_effect( id, variant, season, is_indoors, is_night );
if( eff == nullptr ) {
return;
}
Expand Down Expand Up @@ -649,7 +744,7 @@ void load_soundset()
}

// Preload sound effects
for( const id_variant_season &preload : sfx_preload ) {
for( const sfx_args &preload : sfx_preload ) {
const auto find_result = sfx_resources.sound_effects.find( preload );
if( find_result != sfx_resources.sound_effects.end() ) {
for( const auto &sfx : find_result->second ) {
Expand All @@ -669,7 +764,7 @@ void load_soundset()
// to force deallocation of resources.
{
sfx_preload.clear();
std::vector<id_variant_season> t_swap;
std::vector<sfx_args> t_swap;
sfx_preload.swap( t_swap );
}
}
Expand Down
Loading

0 comments on commit 4dc1908

Please sign in to comment.