salmon-engine-projects/space-game001
14
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added sounds by clicking on button and changed script to compile

Browse Source
This commit is contained in:
Альберт Гадиев 2025-03-01 18:01:24 +06:00
parent 3fa844ddb9
commit bed5ae7a40
4 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Readme.md
View File

@ -38,6 +38,10 @@ https://github.com/gametutorials/tutorials/blob/master/OpenGL/MD3%20Animation/Ma
linux: linux:
``` ```
g++ Game.cpp main.cpp Math.cpp OpenGlExtensions.cpp Physics.cpp Renderer.cpp ShaderManager.cpp TextureManager.cpp Utils.cpp BoneAnimatedModel.cpp ObjLoader.cpp -o sdl_app -O2 -std=c++14 $(pkg-config --cflags --libs sdl2 gl) g++ Game.cpp main.cpp Math.cpp OpenGlExtensions.cpp Physics.cpp Renderer.cpp ShaderManager.cpp TextureManager.cpp Utils.cpp BoneAnimatedModel.cpp ObjLoader.cpp cmakeaudioplayer/src/AudioPlayer.cpp TextModel.cpp Inventory.cpp -o sdl_app -O2 -std=c++17 \
-I cmakeaudioplayer/include \
$(pkg-config --cflags --libs sdl2 gl) \
$(pkg-config --cflags --libs vorbis vorbisfile ogg) \
-lopenal
``` ```

1
cmakeaudioplayer/CMakeLists.txt
View File

@ -33,3 +33,4 @@ target_link_libraries(audioplayer
# Test executable # Test executable
add_executable(test_audio examples/test_audio.cpp) add_executable(test_audio examples/test_audio.cpp)
target_link_libraries(test_audio PRIVATE audioplayer stdc++fs) target_link_libraries(test_audio PRIVATE audioplayer stdc++fs)
git add ../../sounds

21
cmakeaudioplayer/src/AudioPlayer.cpp
View File

@ -44,22 +44,29 @@ bool AudioPlayer::isOggFile(const std::string& filename) const {
} }
std::string AudioPlayer::findFileInSounds(const std::string& filename) { std::string AudioPlayer::findFileInSounds(const std::string& filename) {
// Check relative to executable location first (../../sounds) // Primary search path - "sounds" directory next to executable
std::filesystem::path soundsDir = std::filesystem::current_path() / ".." / ".." / "sounds"; std::filesystem::path soundsDir = std::filesystem::current_path() / "sounds";
// Fallback to ../sounds if not found // Alternative search paths
std::filesystem::path altSoundsDir = std::filesystem::current_path() / ".." / "sounds"; std::vector<std::filesystem::path> altPaths = {
std::filesystem::current_path() / ".." / "sounds", // One level up
std::filesystem::current_path() / ".." / ".." / "sounds", // Two levels up
"/home/albert/gay-jam/ZeptoLabTest1/sounds" // Absolute path
};
std::cout << "🔍 Searching for \"" << filename << "\" in:\n"; std::cout << "🔍 Searching for \"" << filename << "\" in:\n";
std::cout << " " << soundsDir << "\n"; std::cout << " " << soundsDir << "\n";
std::cout << " " << altSoundsDir << "\n";
if (std::filesystem::exists(soundsDir / filename)) { if (std::filesystem::exists(soundsDir / filename)) {
return (soundsDir / filename).string(); return (soundsDir / filename).string();
} }
if (std::filesystem::exists(altSoundsDir / filename)) { // Try alternative paths
return (altSoundsDir / filename).string(); for (const auto& path : altPaths) {
std::cout << " " << path << "\n";
if (std::filesystem::exists(path / filename)) {
return (path / filename).string();
}
} }
throw std::runtime_error("❌ File not found: " + filename); throw std::runtime_error("❌ File not found: " + filename);

19
main.cpp
View File

@ -18,6 +18,7 @@
#include "TextModel.h" #include "TextModel.h"
#include "Inventory.h" #include "Inventory.h"
#include "cmakeaudioplayer/include/AudioPlayer.hpp"
#include <memory> #include <memory>
namespace ZL namespace ZL
@ -32,11 +33,11 @@ namespace ZL
Vector4f clipCoords = MultMatrixVector(projectionModelView, inx); Vector4f clipCoords = MultMatrixVector(projectionModelView, inx);
// Перспективное деление // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
float ndcX = clipCoords.v[0] / clipCoords.v[3]; float ndcX = clipCoords.v[0] / clipCoords.v[3];
float ndcY = clipCoords.v[1] / clipCoords.v[3]; float ndcY = clipCoords.v[1] / clipCoords.v[3];
// Преобразуем NDC в экранные координаты // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NDC <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
screenX = (int)((ndcX + 1.0f) * 0.5f * screenWidth); screenX = (int)((ndcX + 1.0f) * 0.5f * screenWidth);
//screenY = (int)((1.0f - ndcY) * 0.5f * screenHeight); //screenY = (int)((1.0f - ndcY) * 0.5f * screenHeight);
screenY = (int)((1.0f + ndcY) * 0.5f * screenHeight); screenY = (int)((1.0f + ndcY) * 0.5f * screenHeight);
@ -108,6 +109,9 @@ namespace ZL
VertexRenderStruct coneMeshMutable; VertexRenderStruct coneMeshMutable;
std::vector<ActiveObject> activeObjects; std::vector<ActiveObject> activeObjects;
// Add AudioPlayer instance
std::unique_ptr<AudioPlayer> audioPlayer;
} }
static SDL_Window* window = NULL; static SDL_Window* window = NULL;
@ -397,6 +401,11 @@ namespace ZL
std::cout << "\nAfter removal:\n"; std::cout << "\nAfter removal:\n";
ZL::PrintInventory(); ZL::PrintInventory();
// Initialize audio player
GameObjects::audioPlayer = std::make_unique<AudioPlayer>();
///
} }
void render() { void render() {
@ -461,6 +470,12 @@ namespace ZL
case SDLK_s: case SDLK_s:
Env::downPressed = true; Env::downPressed = true;
break; break;
case SDLK_SPACE:
// Play the symphony when space is pressed
if (GameObjects::audioPlayer) {
GameObjects::audioPlayer->playFromSoundsDir("Symphony No.6 (1st movement).ogg");
}
break;
} }
} }