Merge branch 'master' of https://gitea.deadfish.cz/tovjemam/fekalnigtacko
This commit is contained in:
commit
1831befb85
@ -175,6 +175,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL Emscripten)
|
|||||||
|
|
||||||
target_link_options(${MAIN_NAME} PRIVATE
|
target_link_options(${MAIN_NAME} PRIVATE
|
||||||
"-lwebsocket.js"
|
"-lwebsocket.js"
|
||||||
|
"-lopenal"
|
||||||
"-sUSE_SDL=2"
|
"-sUSE_SDL=2"
|
||||||
"-sASYNCIFY"
|
"-sASYNCIFY"
|
||||||
"-sUSE_WEBGL2=1"
|
"-sUSE_WEBGL2=1"
|
||||||
|
|||||||
@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
#include <AL/al.h>
|
|
||||||
#include <AL/alc.h>
|
|
||||||
|
|
||||||
#include "defs.hpp"
|
#include "defs.hpp"
|
||||||
#include "sound_source.hpp"
|
#include "sound_source.hpp"
|
||||||
#include "source.hpp"
|
#include "source.hpp"
|
||||||
|
|||||||
@ -4,11 +4,12 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "utils/defs.hpp"
|
#include <AL/al.h>
|
||||||
|
#include <AL/alc.h>
|
||||||
|
|
||||||
#include <glm/glm.hpp>
|
#include <glm/glm.hpp>
|
||||||
|
|
||||||
class ALCdevice;
|
#include "utils/defs.hpp"
|
||||||
class ALCcontext;
|
|
||||||
|
|
||||||
namespace audio
|
namespace audio
|
||||||
{
|
{
|
||||||
|
|||||||
@ -11,7 +11,11 @@ App::App()
|
|||||||
{
|
{
|
||||||
std::cout << "Initializing App..." << std::endl;
|
std::cout << "Initializing App..." << std::endl;
|
||||||
|
|
||||||
|
#ifndef EMSCRIPTEN
|
||||||
audiomaster_.SetMasterVolume(0.2f);
|
audiomaster_.SetMasterVolume(0.2f);
|
||||||
|
#else
|
||||||
|
audiomaster_.SetMasterVolume(2.0f);
|
||||||
|
#endif
|
||||||
|
|
||||||
font_ = assets::CacheManager::GetFont("data/comic32.font");
|
font_ = assets::CacheManager::GetFont("data/comic32.font");
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user