godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/okamstudio/godot

Browse Source
This commit is contained in:
Juan Linietsky
2015-09-24 18:07:13 -03:00
parent 82a3304458 f6957eb154
commit 9962518ffd
131 changed files with 7749 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/javascript/os_javascript.h
View File

@@ -66,6 +66,9 @@ private:
bool use_gl2;
int64_t time_to_save_sync;
int64_t last_sync_time;
Rasterizer *rasterizer;
VisualServer *visual_server;
AudioServerJavascript *audio_server;
@@ -85,6 +88,8 @@ private:
GetDataDirFunc get_data_dir_func;
GetLocaleFunc get_locale_func;
static void _close_notification_funcs(const String& p_file,int p_flags);
public:
// functions used by main to initialize/deintialize the OS
@@ -107,7 +112,7 @@ public:
typedef int64_t ProcessID;
static OS* get_singleton();
//static OS* get_singleton();
virtual void vprint(const char* p_format, va_list p_list, bool p_stderr=false);
virtual void print(const char *p_format, ... );