diff --git a/.vscode/configurations/windows-docker/tasks.json b/.vscode/configurations/windows-docker/tasks.json index cb6dd5c..c6ca333 100644 --- a/.vscode/configurations/windows-docker/tasks.json +++ b/.vscode/configurations/windows-docker/tasks.json @@ -44,6 +44,14 @@ }, "command": "./run.ps1" }, + { + "type": "shell", + "label": "Convert WAV to ADPCM", + "dependsOn": [ + "1. Copy source code to docker volume" + ], + "command": "docker exec -t tyra-compiler sh -c 'adpenc ${input:wav2adpcmSource} ${input:wav2adpcmTarget} && rsync -zac /src/${input:wav2adpcmTarget} /host/${input:wav2adpcmTarget}'" + }, { "type": "shell", "label": "Cleanup", @@ -78,6 +86,18 @@ } ], "inputs": [ + { + "id": "wav2adpcmSource", + "description": "Source file path (ex. ):", + "default": "demo/res/sound.wav", + "type": "promptString" + }, + { + "id": "wav2adpcmTarget", + "description": "Target file path (ex. ):", + "default": "demo/res/sound.adpcm", + "type": "promptString" + }, { "id": "ps2Ip", "description": "PS2link ip address:", diff --git a/ROADMAP.txt b/ROADMAP.txt index ece3ef4..ae9a9cf 100644 --- a/ROADMAP.txt +++ b/ROADMAP.txt @@ -1,11 +1,7 @@ ------------ Tyra's v2.0 roadmap to publish on GitHub ------------ - [Demo] Game fadein -- [Demo] Larger map -- [Demo] Height map - [Demo] Ambient sound -- [Demo] Shoot sound -- [Demo] Shoot animation - [Demo] Running soldier - [Demo] Heightmap for soldier - [Demo] Running animation for soldier diff --git a/demo/inc/states/game/player/weapon.hpp b/demo/inc/states/game/player/weapon.hpp index ed6f830..f223938 100644 --- a/demo/inc/states/game/player/weapon.hpp +++ b/demo/inc/states/game/player/weapon.hpp @@ -13,28 +13,46 @@ #include #include #include +#include +#include +#include