godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #8191 from eska014/webgl2-export

Browse Source 
WebGL 2 export per WebAssembly or asm.js
This commit is contained in:
Juan Linietsky
2017-03-29 15:21:52 +02:00
committed by GitHub
parent d4740a9853 7df7e9cc8b
commit 000e873008
11 changed files with 282 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platform/javascript/os_javascript.cpp
View File

@@ -750,7 +750,7 @@ String OS_JavaScript::get_data_dir() const {
String OS_JavaScript::get_executable_path() const {
return String();
return OS::get_executable_path();
}
void OS_JavaScript::_close_notification_funcs(const String &p_file, int p_flags) {
@@ -828,7 +828,8 @@ int OS_JavaScript::get_power_percent_left() {
return power_manager->get_power_percent_left();
}
OS_JavaScript::OS_JavaScript(GFXInitFunc p_gfx_init_func, void *p_gfx_init_ud, GetDataDirFunc p_get_data_dir_func) {
OS_JavaScript::OS_JavaScript(const char *p_execpath, GFXInitFunc p_gfx_init_func, void *p_gfx_init_ud, GetDataDirFunc p_get_data_dir_func) {
set_cmdline(p_execpath, get_cmdline_args());
gfx_init_func = p_gfx_init_func;
gfx_init_ud = p_gfx_init_ud;
last_button_mask = 0;