Skip to content

Update sounds #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UrAvgCode merged 3 commits into from
May 14, 2025
Merged

Update sounds #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2772ca
update tracking scene sounds
UrAvgCode May 14, 2025
bdf585e
add transition sounds
UrAvgCode May 14, 2025
3ae542b
update sound volumes
UrAvgCode May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions core/core.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,19 @@ del "$(TargetDir)\*.lib"</Command>
<CopyFileToFolders Include="resources\gruen_ambient.wav">
<FileType>Document</FileType>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
</CopyFileToFolders>
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="resources\transition_to_intro.wav">
<FileType>Document</FileType>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\transition_to_tracking.wav">
<FileType>Document</FileType>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
</CopyFileToFolders>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
6 changes: 6 additions & 0 deletions core/core.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1633,5 +1633,11 @@
<CopyFileToFolders Include="resources\gruen_ambient.wav">
<Filter>resources\audio</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\transition_to_intro.wav">
<Filter>resources\audio</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\transition_to_tracking.wav">
<Filter>resources\audio</Filter>
</CopyFileToFolders>
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions core/include/core_app.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ class CoreApp : public ofBaseApp {
std::chrono::steady_clock::time_point transition_start_time;

ofSoundPlayer ambient_sound;
ofSoundPlayer transition_to_intro_sound;
ofSoundPlayer transition_to_tracking_sound;

bool show_debug_info = false;
};
Binary file added core/resources/transition_to_intro.wav
View file
Open in desktop
Binary file not shown.
Binary file added core/resources/transition_to_tracking.wav
View file
Open in desktop
Binary file not shown.
16 changes: 13 additions & 3 deletions core/src/core_app.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ void CoreApp::setup() {
ambient_sound.load("resources/audio/gruen_ambient.wav");
ambient_sound.play();
ambient_sound.setLoop(true);

transition_to_intro_sound.load("resources/audio/transition_to_intro.wav");
transition_to_intro_sound.setVolume(0.25f);

transition_to_tracking_sound.load("resources/audio/transition_to_tracking.wav");
transition_to_tracking_sound.setVolume(0.25f);
}

//--------------------------------------------------------------
Expand All @@ -55,10 +61,14 @@ void CoreApp::update() {

const auto &body_skeletons = kinect_device.getBodySkeletons();

if ((current_scene == &intro_scene && !body_skeletons.empty()) ||
(current_scene == &tracking_scene && body_skeletons.empty())) {
if (current_scene == &intro_scene && !body_skeletons.empty()) {
transition_to_tracking_sound.play();
transition_start_time = std::chrono::steady_clock::now();
current_scene = &tracking_scene;
} else if (current_scene == &tracking_scene && body_skeletons.empty()) {
transition_to_intro_sound.play();
transition_start_time = std::chrono::steady_clock::now();
std::swap(current_scene, inactive_scene);
current_scene = &intro_scene;
}

current_scene->update();
Expand Down
4 changes: 3 additions & 1 deletion tracking/include/collision_object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class CollisionObject {

protected:
void play_random_pluck();
void play_random_noise_hit();
std::pair<bool, glm::vec2> check_collision_with_bodies(std::vector<Player> &players, const ofEasyCam &camera);
std::pair<bool, glm::vec2> check_collision_with_objects(const std::vector<CollisionObject> &objects);

Expand All @@ -51,7 +52,8 @@ class CollisionObject {
ofImage _image;
std::shared_ptr<EffectShader> _effect_shader;

std::vector<ofSoundPlayer> puck_sounds;
std::vector<ofSoundPlayer> _pluck_sounds;
std::vector<ofSoundPlayer> _noise_sounds;

bool _can_collide_with_player;
bool _can_collide_with_object;
Expand Down
Binary file added tracking/resources/audio/global_effect.wav
View file
Open in desktop
Binary file not shown.
Binary file removed tracking/resources/audio/gruen_globalEffect.wav
View file
Open in desktop
Binary file not shown.
Binary file removed tracking/resources/audio/gruen_pluck_b.wav
View file
Open in desktop
Binary file not shown.
Binary file removed tracking/resources/audio/gruen_pluck_d.wav
View file
Open in desktop
Binary file not shown.
Binary file removed tracking/resources/audio/gruen_pluck_e.wav
View file
Open in desktop
Binary file not shown.
Binary file removed tracking/resources/audio/gruen_pluck_g.wav
View file
Open in desktop
Binary file not shown.
Binary file added tracking/resources/audio/noise_hit_1.wav
View file
Open in desktop
Binary file not shown.
Binary file added tracking/resources/audio/noise_hit_2.wav
View file
Open in desktop
Binary file not shown.
Binary file added tracking/resources/audio/noise_hit_3.wav
View file
Open in desktop
Binary file not shown.
Binary file added tracking/resources/audio/pluck_1.wav
View file
Open in desktop
Binary file not shown.
Binary file added tracking/resources/audio/pluck_2.wav
View file
Open in desktop
Binary file not shown.
Binary file added tracking/resources/audio/pluck_3.wav
View file
Open in desktop
Binary file not shown.
Binary file added tracking/resources/audio/pluck_4.wav
View file
Open in desktop
Binary file not shown.
30 changes: 23 additions & 7 deletions tracking/src/collision_object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,27 @@ CollisionObject::CollisionObject(glm::vec2 position, glm::vec2 velocity, const s
_image.draw(_fbo_padding, _fbo_padding);
_fbo.end();

auto audio_filenames = std::vector<std::string>(
{"gruen_pluck_b.wav", "gruen_pluck_d.wav", "gruen_pluck_e.wav", "gruen_pluck_g.wav"});
auto pluck_filenames = std::vector<std::string>({"pluck_1.wav", "pluck_2.wav", "pluck_3.wav", "pluck_4.wav"});
auto noise_filenames = std::vector<std::string>({"noise_hit_1.wav", "noise_hit_2.wav", "noise_hit_3.wav"});

for (const auto &filename: audio_filenames) {
for (const auto &filename: pluck_filenames) {
auto sound_player = ofSoundPlayer();

sound_player.load("resources/audio/" + filename);
sound_player.setVolume(0.075f);
sound_player.setMultiPlay(true);

_pluck_sounds.push_back(sound_player);
}

for (const auto &filename: noise_filenames) {
auto sound_player = ofSoundPlayer();

sound_player.load("resources/audio/" + filename);
sound_player.setVolume(0.15f);
sound_player.setMultiPlay(true);

puck_sounds.push_back(sound_player);
_noise_sounds.push_back(sound_player);
}
}

Expand All @@ -54,7 +64,7 @@ void CollisionObject::update(std::vector<Player> &players, const std::vector<Col

if (auto [collided, dir] = check_collision_with_bodies(players, camera); collided) {
if (_can_collide_with_player) {
play_random_pluck();
play_random_noise_hit();
_velocity = dir;
_can_collide_with_player = false;
}
Expand All @@ -64,6 +74,7 @@ void CollisionObject::update(std::vector<Player> &players, const std::vector<Col

if (auto [collided, dir] = check_collision_with_objects(objects); collided) {
if (_can_collide_with_object) {
play_random_pluck();
_velocity = dir;
_can_collide_with_object = false;
}
Expand Down Expand Up @@ -124,8 +135,13 @@ std::pair<bool, glm::vec2> CollisionObject::global_effect_triggered() {
void CollisionObject::set_effect_shader(std::shared_ptr<EffectShader> shader) { _effect_shader = shader; }

void CollisionObject::play_random_pluck() {
auto random = static_cast<std::size_t>(ofRandom(puck_sounds.size()));
puck_sounds[random].play();
auto random = static_cast<std::size_t>(ofRandom(_pluck_sounds.size()));
_pluck_sounds[random].play();
}

void CollisionObject::play_random_noise_hit() {
auto random = static_cast<std::size_t>(ofRandom(_noise_sounds.size()));
_noise_sounds[random].play();
}

std::pair<bool, glm::vec2> CollisionObject::check_collision_with_bodies(std::vector<Player> &players,
Expand Down
2 changes: 1 addition & 1 deletion tracking/src/tracking_scene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ TrackingScene::TrackingScene(ofxAzureKinect::Device *device) :
_global_effect_position = {0, 0};
_global_effect_trigger_time = 0;

_global_effect.load("resources/audio/gruen_globalEffect.wav");
_global_effect.load("resources/audio/global_effect.wav");
_global_effect.setMultiPlay(false);

_effect_shaders = {std::make_shared<CloudEffectShader>(), std::make_shared<MatrixEffectShader>(),
Expand Down
53 changes: 35 additions & 18 deletions tracking/tracking.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,48 +730,65 @@
</CopyFileToFolders>
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="resources\audio\gruen_globalEffect.wav">
<CopyFileToFolders Include="resources\me-logo.png">
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">data/resources/%(Filename)%(Extension)</DestinationFileName>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">data/resources/%(Filename)%(Extension)</DestinationFileName>
</CopyFileToFolders>
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="resources\matrix.png">
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">data/resources/%(Filename)%(Extension)</DestinationFileName>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">data/resources/%(Filename)%(Extension)</DestinationFileName>
</CopyFileToFolders>
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="resources\matrix_logo.png">
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">data/resources/%(Filename)%(Extension)</DestinationFileName>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">data/resources/%(Filename)%(Extension)</DestinationFileName>
</CopyFileToFolders>
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="resources\audio\global_effect.wav">
<FileType>Document</FileType>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\audio\gruen_pluck_b.wav">
<CopyFileToFolders Include="resources\audio\pluck_1.wav">
<FileType>Document</FileType>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\audio\gruen_pluck_d.wav">
<CopyFileToFolders Include="resources\audio\pluck_2.wav">
<FileType>Document</FileType>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\audio\gruen_pluck_e.wav">
<CopyFileToFolders Include="resources\audio\pluck_3.wav">
<FileType>Document</FileType>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\audio\gruen_pluck_g.wav">
<CopyFileToFolders Include="resources\audio\pluck_4.wav">
<FileType>Document</FileType>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
</CopyFileToFolders>
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="resources\me-logo.png">
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">data/resources/%(Filename)%(Extension)</DestinationFileName>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">data/resources/%(Filename)%(Extension)</DestinationFileName>
<CopyFileToFolders Include="resources\audio\noise_hit_1.wav">
<FileType>Document</FileType>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
</CopyFileToFolders>
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="resources\matrix.png">
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">data/resources/%(Filename)%(Extension)</DestinationFileName>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">data/resources/%(Filename)%(Extension)</DestinationFileName>
<CopyFileToFolders Include="resources\audio\noise_hit_2.wav">
<FileType>Document</FileType>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
</CopyFileToFolders>
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="resources\matrix_logo.png">
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">data/resources/%(Filename)%(Extension)</DestinationFileName>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">data/resources/%(Filename)%(Extension)</DestinationFileName>
<CopyFileToFolders Include="resources\audio\noise_hit_3.wav">
<FileType>Document</FileType>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
<DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">data/resources/audio/%(Filename)%(Extension)</DestinationFileName>
</CopyFileToFolders>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
39 changes: 24 additions & 15 deletions tracking/tracking.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1711,21 +1711,6 @@
<CopyFileToFolders Include="resources\me-logo-green.png">
<Filter>resources</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\audio\gruen_globalEffect.wav">
<Filter>resources\audio</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\audio\gruen_pluck_b.wav">
<Filter>resources\audio</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\audio\gruen_pluck_d.wav">
<Filter>resources\audio</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\audio\gruen_pluck_e.wav">
<Filter>resources\audio</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\audio\gruen_pluck_g.wav">
<Filter>resources\audio</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\me-logo.png">
<Filter>resources</Filter>
</CopyFileToFolders>
Expand Down Expand Up @@ -1801,5 +1786,29 @@
<CopyFileToFolders Include="shaders\render\cloud.vert">
<Filter>shaders\render</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\audio\pluck_4.wav">
<Filter>resources\audio</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\audio\global_effect.wav">
<Filter>resources\audio</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\audio\pluck_1.wav">
<Filter>resources\audio</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\audio\pluck_2.wav">
<Filter>resources\audio</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\audio\pluck_3.wav">
<Filter>resources\audio</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\audio\noise_hit_1.wav">
<Filter>resources\audio</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\audio\noise_hit_2.wav">
<Filter>resources\audio</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="resources\audio\noise_hit_3.wav">
<Filter>resources\audio</Filter>
</CopyFileToFolders>
</ItemGroup>
</Project>
Loading