From 0fb7b5aa0c023d60880d259e70f7641152460aa6 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 10 Sep 2015 00:10:54 -0300 Subject: HTML5 exporter Improvements -Better template handling -Voice support -Stream support --- platform/javascript/os_javascript.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'platform/javascript/os_javascript.h') diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index 81bb474401..d52c465c71 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -38,7 +38,7 @@ #include "servers/audio/audio_server_sw.h" #include "servers/physics_2d/physics_2d_server_sw.h" #include "servers/visual/rasterizer.h" - +#include "audio_server_javascript.h" #include "audio_driver_javascript.h" typedef void (*GFXInitFunc)(void *ud,bool gl2,int w, int h, bool fs); @@ -67,8 +67,8 @@ private: Rasterizer *rasterizer; VisualServer *visual_server; - AudioServerSW *audio_server; - SampleManagerMallocSW *sample_manager; + AudioServerJavascript *audio_server; + //SampleManagerMallocSW *sample_manager; SpatialSoundServerSW *spatial_sound_server; SpatialSound2DServerSW *spatial_sound_2d_server; PhysicsServer *physics_server; -- cgit v1.2.3 From a88f67821ca828d9b4d3453b19de60e27ab24efc Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 12 Sep 2015 10:54:47 -0300 Subject: HTML5 exporter seems to be fully functional -user:// filesystem implemented -default template page could look prettier, help appreciated --- platform/javascript/os_javascript.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'platform/javascript/os_javascript.h') diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index d52c465c71..55ac7cdae4 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -65,6 +65,9 @@ private: bool use_gl2; + int64_t time_to_save_sync; + int64_t last_sync_time; + Rasterizer *rasterizer; VisualServer *visual_server; AudioServerJavascript *audio_server; @@ -84,6 +87,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 @@ -106,7 +111,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, ... ); -- cgit v1.2.3 From 82a3304458738b410a5aff8994ce587413aeb464 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 24 Sep 2015 18:06:15 -0300 Subject: Added ability to set custom mouse cursors. Not hardware accelerated yet. --- platform/javascript/os_javascript.h | 1 + 1 file changed, 1 insertion(+) (limited to 'platform/javascript/os_javascript.h') diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index d52c465c71..5f671d45c7 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -40,6 +40,7 @@ #include "servers/visual/rasterizer.h" #include "audio_server_javascript.h" #include "audio_driver_javascript.h" +#include "main/input_default.h" typedef void (*GFXInitFunc)(void *ud,bool gl2,int w, int h, bool fs); typedef int (*OpenURIFunc)(const String&); -- cgit v1.2.3