From dee5bea96d6a7e399bc340ce2ad276df37c39682 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sun, 23 Jul 2023 20:10:40 +1000 Subject: [PATCH] Sounds are working --- Box | 2 +- assets/audio/{sounds => sound}/attack.ogg | Bin assets/audio/{sounds => sound}/explosion.ogg | Bin assets/scripts/entities/player.toy | 9 +++++++++ source/main.c | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) rename assets/audio/{sounds => sound}/attack.ogg (100%) rename assets/audio/{sounds => sound}/explosion.ogg (100%) diff --git a/Box b/Box index aded9f5..a2382c1 160000 --- a/Box +++ b/Box @@ -1 +1 @@ -Subproject commit aded9f54be5efac9ab833b09bb2a8c04a91ea23f +Subproject commit a2382c19b4caf5750cdf27422749c37b66d5c582 diff --git a/assets/audio/sounds/attack.ogg b/assets/audio/sound/attack.ogg similarity index 100% rename from assets/audio/sounds/attack.ogg rename to assets/audio/sound/attack.ogg diff --git a/assets/audio/sounds/explosion.ogg b/assets/audio/sound/explosion.ogg similarity index 100% rename from assets/audio/sounds/explosion.ogg rename to assets/audio/sound/explosion.ogg diff --git a/assets/scripts/entities/player.toy b/assets/scripts/entities/player.toy index 85c3fe3..5c4c9bd 100644 --- a/assets/scripts/entities/player.toy +++ b/assets/scripts/entities/player.toy @@ -1,5 +1,6 @@ import standard; import node; +import sound; //constants @@ -29,6 +30,9 @@ var attackPositionY: int = null; var walkAnimationCounter: int = 0; var attackAnimationCounter: int = 0; +//audio utils +var kickSound: opaque = null; + //accessors & mutators fn setGridPosition(node: opaque, x: int, y: int) { @@ -65,6 +69,8 @@ fn getAttackPositionY(node: opaque) { fn onLoad(node: opaque) { node.loadNodeTexture("sprites:/parvati.png"); //NOTE: all of this script is mapped to this sprite sheet node.faceDirection(DIRECTION_DOWN); + + kickSound = loadSound("sound:/attack.ogg"); } //fn onUpdate(node: opaque, delta: int) { @@ -159,6 +165,7 @@ fn onStep(node: opaque) { fn onFree(node: opaque) { node.freeNodeTexture(); + kickSound.freeSound(); } fn onDraw(node: opaque) { @@ -203,6 +210,8 @@ fn onKeyDown(node: opaque, event: string) { node.setAttackPosition(gridPositionX - 1, gridPositionY); } + kickSound.playSound(); + return; } diff --git a/source/main.c b/source/main.c index f34e811..9d0e3fe 100644 --- a/source/main.c +++ b/source/main.c @@ -15,7 +15,7 @@ int main(int argc, char* argv[]) { Toy_setDrivePath("sprites", "assets/sprites"); Toy_setDrivePath("audio", "assets/audio"); Toy_setDrivePath("music", "assets/audio/music"); - Toy_setDrivePath("sounds", "assets/audio/sounds"); + Toy_setDrivePath("sound", "assets/audio/sound"); Toy_setDrivePath("fonts", "assets/fonts"); Box_initEngine("scripts:/init.toy");