asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HTML5: Code style cleanup for export code

Browse source 
(cherry picked from commit 8020515717)
This commit is contained in:
Rémi Verschelde 2020-12-10 13:57:27 +01:00
parent 31cd9e560c
commit 8bd5fa9556
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
platform/javascript/detect.py
View file

@ -23,12 +23,12 @@ def get_opts():
return [ return [
("initial_memory", "Initial WASM memory (in MiB)", 16), ("initial_memory", "Initial WASM memory (in MiB)", 16),
BoolVariable("use_assertions", "Use emscripten runtime assertions", False), BoolVariable("use_assertions", "Use Emscripten runtime assertions", False),
BoolVariable("use_thinlto", "Use ThinLTO", False), BoolVariable("use_thinlto", "Use ThinLTO", False),
BoolVariable("use_ubsan", "Use LLVM/GCC compiler undefined behavior sanitizer (UBSAN)", False), BoolVariable("use_ubsan", "Use Emscripten undefined behavior sanitizer (UBSAN)", False),
BoolVariable("use_asan", "Use LLVM/GCC compiler address sanitizer (ASAN)", False), BoolVariable("use_asan", "Use Emscripten address sanitizer (ASAN)", False),
BoolVariable("use_lsan", "Use LLVM/GCC compiler leak sanitizer (LSAN)", False), BoolVariable("use_lsan", "Use Emscripten leak sanitizer (LSAN)", False),
BoolVariable("use_safe_heap", "Use emscripten SAFE_HEAP sanitizer", False), BoolVariable("use_safe_heap", "Use Emscripten SAFE_HEAP sanitizer", False),
# eval() can be a security concern, so it can be disabled. # eval() can be a security concern, so it can be disabled.
BoolVariable("javascript_eval", "Enable JavaScript eval interface", True), BoolVariable("javascript_eval", "Enable JavaScript eval interface", True),
BoolVariable("threads_enabled", "Enable WebAssembly Threads support (limited browser support)", False), BoolVariable("threads_enabled", "Enable WebAssembly Threads support (limited browser support)", False),

23
platform/javascript/export/export.cpp
View file

@ -36,17 +36,14 @@
#include "platform/javascript/logo.gen.h" #include "platform/javascript/logo.gen.h"
#include "platform/javascript/run_icon.gen.h" #include "platform/javascript/run_icon.gen.h"
#define EXPORT_TEMPLATE_WEBASSEMBLY_RELEASE "webassembly_release.zip"
#define EXPORT_TEMPLATE_WEBASSEMBLY_DEBUG "webassembly_debug.zip"
class EditorHTTPServer : public Reference { class EditorHTTPServer : public Reference {
private: private:
Ref<TCP_Server> server; Ref<TCP_Server> server;
Ref<StreamPeerTCP> connection; Ref<StreamPeerTCP> connection;
uint64_t time; uint64_t time = 0;
uint8_t req_buf[4096]; uint8_t req_buf[4096];
int req_pos; int req_pos = 0;
void _clear_client() { void _clear_client() {
connection = Ref<StreamPeerTCP>(); connection = Ref<StreamPeerTCP>();
@ -210,7 +207,12 @@ class EditorExportPlatformJavaScript : public EditorExportPlatform {
Ref<ImageTexture> logo; Ref<ImageTexture> logo;
Ref<ImageTexture> run_icon; Ref<ImageTexture> run_icon;
Ref<ImageTexture> stop_icon; Ref<ImageTexture> stop_icon;
int menu_options; int menu_options = 0;
Ref<EditorHTTPServer> server;
bool server_quit = false;
Mutex *server_lock = NULL;
Thread *server_thread = NULL;
enum ExportMode { enum ExportMode {
EXPORT_MODE_NORMAL = 0, EXPORT_MODE_NORMAL = 0,
@ -240,12 +242,6 @@ class EditorExportPlatformJavaScript : public EditorExportPlatform {
void _fix_html(Vector<uint8_t> &p_html, const Ref<EditorExportPreset> &p_preset, const String &p_name, bool p_debug, const Vector<SharedObject> p_shared_objects); void _fix_html(Vector<uint8_t> &p_html, const Ref<EditorExportPreset> &p_preset, const String &p_name, bool p_debug, const Vector<SharedObject> p_shared_objects);
private:
Ref<EditorHTTPServer> server;
bool server_quit;
Mutex *server_lock;
Thread *server_thread;
static void _server_thread_poll(void *data); static void _server_thread_poll(void *data);
public: public:
@ -699,7 +695,6 @@ void EditorExportPlatformJavaScript::_server_thread_poll(void *data) {
EditorExportPlatformJavaScript::EditorExportPlatformJavaScript() { EditorExportPlatformJavaScript::EditorExportPlatformJavaScript() {
server.instance(); server.instance();
server_quit = false;
server_lock = Mutex::create(); server_lock = Mutex::create();
server_thread = Thread::create(_server_thread_poll, this); server_thread = Thread::create(_server_thread_poll, this);
@ -716,8 +711,6 @@ EditorExportPlatformJavaScript::EditorExportPlatformJavaScript() {
stop_icon = theme->get_icon("Stop", "EditorIcons"); stop_icon = theme->get_icon("Stop", "EditorIcons");
else else
stop_icon.instance(); stop_icon.instance();
menu_options = 0;
} }
EditorExportPlatformJavaScript::~EditorExportPlatformJavaScript() { EditorExportPlatformJavaScript::~EditorExportPlatformJavaScript() {