diff --git a/CMakeLists.txt b/CMakeLists.txt index b57efead..7c5b7ab7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,11 +9,12 @@ if(EMSCRIPTEN) "-s USE_FREETYPE=1 " "-s USE_GLFW=3 " "-s USE_WEBGL2=1 " + "-s GL_PREINITIALIZED_CONTEXT=1 " "-s USE_ZLIB=1 " "-s FULL_ES3=1 " "-s FORCE_FILESYSTEM=1 " "-s ALLOW_MEMORY_GROWTH=1 " - "-s \"EXPORTED_FUNCTIONS=['_main','_mat4_rotateQuat','_mat4_set','_mat4_transform','_mat4_transformDirection','_quat_fromMat4','_quat_getAngleAxis']\" " + "-s \"EXPORTED_FUNCTIONS=['_main','_lovrRun','_lovrQuit','_lovrDestroy','_mat4_rotateQuat','_mat4_set','_mat4_transform','_mat4_transformDirection','_quat_fromMat4','_quat_getAngleAxis']\" " "-s \"EXTRA_EXPORTED_RUNTIME_METHODS=['getValue','setValue']\" " "--js-library \"${CMAKE_CURRENT_SOURCE_DIR}/src/resources/lovr.js\"" ) diff --git a/src/lovr.c b/src/lovr.c index c5f371cb..e2a111f4 100644 --- a/src/lovr.c +++ b/src/lovr.c @@ -126,6 +126,13 @@ bool lovrRun(int argc, char** argv, int* status) { #endif } +void lovrQuit(int status) { + EventType type = EVENT_QUIT; + EventData data = { .quit = { false, status } }; + Event event = { .type = type, .data = data }; + lovrEventPush(event); +} + const char* lovrGetOS() { #ifdef _WIN32 return "Windows"; diff --git a/src/lovr.h b/src/lovr.h index 9c796f0d..37ef6eed 100644 --- a/src/lovr.h +++ b/src/lovr.h @@ -7,5 +7,6 @@ void lovrDestroy(); bool lovrRun(int argc, char** argv, int* status); +void lovrQuit(int status); const char* lovrGetOS(); void lovrGetVersion(int* major, int* minor, int* patch); diff --git a/src/resources/lovr.js b/src/resources/lovr.js index 4f27b63e..cf6c1701 100644 --- a/src/resources/lovr.js +++ b/src/resources/lovr.js @@ -65,9 +65,6 @@ var LibraryLOVR = { lovr.WebVR.height = eyeParams.renderHeight; canvas.width = lovr.WebVR.width * 2; canvas.height = lovr.WebVR.height; - } else { - canvas.width = lovr.WebVR.width = canvas.parentElement.offsetWidth * window.devicePixelRatio; - canvas.height = lovr.WebVR.height = canvas.parentElement.offsetHeight * window.devicePixelRatio; } }