Added 3 New Sound Effects

- elevator chime arrive sound
- button release "beep" sound
- ball catcher activate sound
- updated TODO in readme

README.md

@@ -116,12 +116,12 @@ Where `/home/james/Blender/blender-2.93.1-linux-x64` is the folder where Blender
 - [x] Portal gun movement with player movement/shooting #19
 
 ## Current New Sounds TODO List
-- [ ] Button release beep-beep sound
 - [ ] Box collision sounds
-- [ ] Elevator arrived chime sound
-- [ ] Ball catcher activated sound
 - [ ] Unstationary scaffolding moving sound
 - [ ] Ambient background loop
+- [x] Button release beep-beep sound
+- [x] Elevator arrived chime sound
+- [x] Ball catcher activated sound
 - [x] Fast flying air whoosh sound
 
 ## Current Bug TODO List (Hardware Verified) (High->Low priority)

assets/sound/ambient/alarms/portal_elevator_chime.sox

@@ -0,0 +1 @@
+-c 1

assets/sound/buttons/button10.sox

@@ -0,0 +1 @@
+-c 1 -r 22050 -b 16

assets/sound/weapons/stunstick/alyx_stunner1.sox

@@ -0,0 +1 @@
+-c 1

src/audio/clips.c

@@ -37,18 +37,22 @@ unsigned short soundsIntercom[2] = {
     SOUNDS_DING_OFF,
 };
 unsigned short soundsButton = SOUNDS_BUTTON3;
+unsigned short soundsButtonRelease = SOUNDS_BUTTON10;
 unsigned short soundsReleaseCube = SOUNDS_DOORMOVE2;
 unsigned short soundsPedestalShooting = SOUNDS_CHARGING;
 unsigned short soundsDoor= SOUNDS_DOOR_METAL_THIN_CLOSE2;
-unsigned short soundsElevatorMoving = SOUNDS_WALL_MOVE5;
+
 unsigned short soundsPedestalMoving = SOUNDS_PORTALGUN_ROTATE1;
 unsigned short soundsFastFalling = SOUNDS_FAST_WINDLOOP1;
+unsigned short soundsBallCatcher = SOUNDS_ALYX_STUNNER1;
 
 unsigned short soundsPortalOpen2 = SOUNDS_PORTAL_OPEN2;
 
 unsigned short soundsPortalFizzle = SOUNDS_PORTAL_FIZZLE2;
 
+unsigned short soundsElevatorMoving = SOUNDS_WALL_MOVE5;
 unsigned short soundsElevatorDoor = SOUNDS_DOORMOVE1;
+unsigned short soundsElevatorChime = SOUNDS_PORTAL_ELEVATOR_CHIME;
 
 unsigned short soundsBallLoop = SOUNDS_ENERGY_SING_LOOP4;
 unsigned short soundsBallLaunch = SOUNDS_ENERGY_SING_FLYBY1;

src/audio/clips.h

@@ -9,21 +9,21 @@ extern unsigned short soundsConcreteFootstep[4];
 extern unsigned short soundsSelecting[3];
 extern unsigned short soundsIntercom[2];
 extern unsigned short soundsButton;
+extern unsigned short soundsButtonRelease;
 extern unsigned short soundsReleaseCube;
 extern unsigned short soundsPedestalShooting;
 extern unsigned short soundsPedestalMoving;
 extern unsigned short soundsDoor;
-extern unsigned short soundsElevatorMoving;
 extern unsigned short soundsFastFalling;
-
-
-
-
+extern unsigned short soundsBallCatcher;
 extern unsigned short soundsPortalOpen2;
 
 extern unsigned short soundsPortalFizzle;
 
 extern unsigned short soundsElevatorDoor;
+extern unsigned short soundsElevatorChime;
+extern unsigned short soundsElevatorMoving;
+
 
 extern unsigned short soundsBallLoop;
 extern unsigned short soundsBallLaunch;

src/scene/ball_catcher.c

@@ -103,6 +103,7 @@ void ballCatcherCheckBalls(struct BallCatcher* catcher, struct BallLauncher* bal
         }
 
         catcher->caughtBall = &launcher->currentBall;
+        soundPlayerPlay(soundsBallCatcher, 5.0f, 1.0f, &catcher->rigidBody.transform.position, &catcher->rigidBody.velocity);
         ballMarkCaught(catcher->caughtBall);
         skAnimatorRunClip(&catcher->animator, &props_combine_ball_catcher_Armature_catch_clip, 0.0f, 0);
     }

src/scene/ball_catcher.h

@@ -9,6 +9,8 @@
 #include "../levels/level_definition.h"
 
 #include "./ball_launcher.h"
+#include "../audio/clips.h"
+#include "../audio/soundplayer.h"
 
 struct BallCatcher {
     struct CollisionObject collisionObject;

src/scene/button.c

@@ -141,6 +141,9 @@ void buttonUpdate(struct Button* button) {
         }
         // actively going up
         else{
+            if ((button->flags & ButtonFlagsBeingPressed)){
+                soundPlayerPlay(soundsButtonRelease, 2.5f, 0.4f, &button->rigidBody.transform.position, &gZeroVec);
+            }
             button->flags &= ~ButtonFlagsBeingPressed;
         }
 

src/scene/elevator.c

@@ -173,14 +173,18 @@ int elevatorUpdate(struct Elevator* elevator, struct Player* player) {
 
     if ((elevator->openAmount == 0.0f && shouldBeOpen) || (elevator->openAmount == 1.0f && !shouldBeOpen)) {
         soundPlayerPlay(soundsElevatorDoor, 1.0f, 0.5f, &elevator->rigidBody.transform.position, &gZeroVec);
+        if ((elevator->openAmount == 0.0f && shouldBeOpen) && (elevator->flags & ElevatorFlagsHasHadPlayer)){
+            soundPlayerPlay(soundsElevatorChime, 1.5f, 0.5f, &elevator->rigidBody.transform.position, &gZeroVec);
+        }
     }
+    
 
     if ((elevator->flags & ElevatorFlagsIsLocked) && (elevator->openAmount == 0.0f) && (elevator->movingTimer > 0.0f)){
         elevator->movingTimer -= FIXED_DELTA_TIME;
     }
 
     if ((elevator->flags & ElevatorFlagsIsLocked) && (elevator->openAmount == 0.0f) && !(elevator->flags & ElevatorFlagsMovingSoundPlayed) && (elevator->movingTimer <= 0.0f)){
-            soundPlayerPlay(soundsElevatorMoving, 1.5f, 0.5f, &elevator->rigidBody.transform.position, &gZeroVec);
+            soundPlayerPlay(soundsElevatorMoving, 1.25f, 0.5f, &elevator->rigidBody.transform.position, &gZeroVec);
             elevator->flags |= ElevatorFlagsMovingSoundPlayed;
     }