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

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
2 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,17 +36,14 @@
#include "platform/javascript/logo.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 {
private:
Ref<TCP_Server> server;
Ref<StreamPeerTCP> connection;
uint64_t time;
uint64_t time = 0;
uint8_t req_buf[4096];
int req_pos;
int req_pos = 0;
void _clear_client() {
connection = Ref<StreamPeerTCP>();
@@ -210,7 +207,12 @@ class EditorExportPlatformJavaScript : public EditorExportPlatform {
Ref<ImageTexture> logo;
Ref<ImageTexture> run_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 {
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);
private:
Ref<EditorHTTPServer> server;
bool server_quit;
Mutex *server_lock;
Thread *server_thread;
static void _server_thread_poll(void *data);
public:
@@ -699,7 +695,6 @@ void EditorExportPlatformJavaScript::_server_thread_poll(void *data) {
EditorExportPlatformJavaScript::EditorExportPlatformJavaScript() {
server.instance();
server_quit = false;
server_lock = Mutex::create();
server_thread = Thread::create(_server_thread_poll, this);
@@ -716,8 +711,6 @@ EditorExportPlatformJavaScript::EditorExportPlatformJavaScript() {
stop_icon = theme->get_icon("Stop", "EditorIcons");
else
stop_icon.instance();
menu_options = 0;
}
EditorExportPlatformJavaScript::~EditorExportPlatformJavaScript() {