Merge branch 'master' of https://gitea.deadfish.cz/tovjemam/fekalnigtacko

CMakeLists.txt

@@ -175,6 +175,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL Emscripten)
 
     target_link_options(${MAIN_NAME} PRIVATE 
         "-lwebsocket.js"
+        "-lopenal"
         "-sUSE_SDL=2"
         "-sASYNCIFY"
         "-sUSE_WEBGL2=1"

src/audio/master.cpp

@@ -2,9 +2,6 @@
 
 #include <iostream>
 
-#include <AL/al.h>
-#include <AL/alc.h>
-
 #include "defs.hpp"
 #include "sound_source.hpp"
 #include "source.hpp"

src/audio/master.hpp

@@ -4,11 +4,12 @@
 #include <string>
 #include <vector>
 
-#include "utils/defs.hpp"
+#include <AL/al.h>
+#include <AL/alc.h>
+
 #include <glm/glm.hpp>
 
-class ALCdevice;
-class ALCcontext;
+#include "utils/defs.hpp"
 
 namespace audio
 {

src/client/app.cpp

@@ -11,7 +11,11 @@ App::App()
 {
 	std::cout << "Initializing App..." << std::endl;
 
+#ifndef EMSCRIPTEN
 	audiomaster_.SetMasterVolume(0.2f);
+#else
+	audiomaster_.SetMasterVolume(2.0f);
+#endif
 
 	font_ = assets::CacheManager::GetFont("data/comic32.font");