From 92367968e7f1416f33eebfa06c60cacf5c757f65 Mon Sep 17 00:00:00 2001 From: "L. Krause" Date: Thu, 25 May 2017 20:57:13 +0200 Subject: Use custom native-run icons for Android and HTML5 --- platform/android/export/export.cpp | 12 +++++++++++- platform/android/run_icon.png | Bin 0 -> 636 bytes platform/javascript/export/export.cpp | 12 ++++++++++++ platform/javascript/run_icon.png | Bin 0 -> 471 bytes 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 platform/android/run_icon.png create mode 100644 platform/javascript/run_icon.png (limited to 'platform') diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index d6ed234669..a72e8aa90e 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -37,6 +37,7 @@ #include "os/file_access.h" #include "os/os.h" #include "platform/android/logo.gen.h" +#include "platform/android/run_icon.gen.h" #include "version.h" #include #if 0 @@ -2042,6 +2043,7 @@ class EditorExportAndroid : public EditorExportPlatform { GDCLASS(EditorExportAndroid, EditorExportPlatform) Ref logo; + Ref run_icon; struct Device { @@ -3036,6 +3038,10 @@ public: return OK; } + virtual Ref get_run_icon() const { + return run_icon; + } + virtual bool can_export(const Ref &p_preset, String &r_error, bool &r_missing_templates) const { r_missing_templates = find_export_template("android_debug.apk") == String() || find_export_template("android_release.apk") == String(); @@ -3524,9 +3530,13 @@ public: EditorExportAndroid() { Ref img = memnew(Image(_android_logo)); - logo = Ref(memnew(ImageTexture)); + logo.instance(); logo->create_from_image(img); + img = Ref(memnew(Image(_android_run_icon))); + run_icon.instance(); + run_icon->create_from_image(img); + device_lock = Mutex::create(); device_thread = Thread::create(_device_poll_thread, this); devices_changed = true; diff --git a/platform/android/run_icon.png b/platform/android/run_icon.png new file mode 100644 index 0000000000..e53f8e9da5 Binary files /dev/null and b/platform/android/run_icon.png differ diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp index 8b04deabd7..a8e87e8b44 100644 --- a/platform/javascript/export/export.cpp +++ b/platform/javascript/export/export.cpp @@ -31,6 +31,7 @@ #include "editor_export.h" #include "io/zip_io.h" #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" @@ -42,6 +43,7 @@ class EditorExportPlatformJavaScript : public EditorExportPlatform { GDCLASS(EditorExportPlatformJavaScript, EditorExportPlatform) Ref logo; + Ref run_icon; void _fix_html(Vector &p_html, const Ref &p_preset, const String &p_name, bool p_debug); void _fix_fsloader_js(Vector &p_js, const String &p_pack_name, uint64_t p_pack_size); @@ -68,6 +70,7 @@ public: virtual String get_device_name(int p_device) const { return TTR("Run in Browser"); } virtual String get_device_info(int p_device) const { return TTR("Run exported HTML in the system's default browser."); } virtual Error run(const Ref &p_preset, int p_device, int p_debug_flags); + virtual Ref get_run_icon() const; EditorExportPlatformJavaScript(); }; @@ -314,11 +317,20 @@ Error EditorExportPlatformJavaScript::run(const Ref &p_prese return OK; } +Ref EditorExportPlatformJavaScript::get_run_icon() const { + + return run_icon; +} + EditorExportPlatformJavaScript::EditorExportPlatformJavaScript() { Ref img = memnew(Image(_javascript_logo)); logo.instance(); logo->create_from_image(img); + + img = Ref(memnew(Image(_javascript_run_icon))); + run_icon.instance(); + run_icon->create_from_image(img); } void register_javascript_exporter() { diff --git a/platform/javascript/run_icon.png b/platform/javascript/run_icon.png new file mode 100644 index 0000000000..dedee6f479 Binary files /dev/null and b/platform/javascript/run_icon.png differ -- cgit v1.2.3 From a2fd89bbe20d95bffe57c331bd43aff947c55d5e Mon Sep 17 00:00:00 2001 From: "L. Krause" Date: Tue, 27 Jun 2017 03:13:36 +0200 Subject: Hide HTML5 native-run icon without runnable preset --- platform/javascript/export/export.cpp | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'platform') diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp index a8e87e8b44..4bdfdae39e 100644 --- a/platform/javascript/export/export.cpp +++ b/platform/javascript/export/export.cpp @@ -44,6 +44,7 @@ class EditorExportPlatformJavaScript : public EditorExportPlatform { Ref logo; Ref run_icon; + bool runnable_when_last_polled; void _fix_html(Vector &p_html, const Ref &p_preset, const String &p_name, bool p_debug); void _fix_fsloader_js(Vector &p_js, const String &p_pack_name, uint64_t p_pack_size); @@ -66,7 +67,8 @@ public: virtual String get_binary_extension() const; virtual Error export_project(const Ref &p_preset, bool p_debug, const String &p_path, int p_flags = 0); - virtual int get_device_count() const { return 1; } + virtual bool poll_devices(); + virtual int get_device_count() const; virtual String get_device_name(int p_device) const { return TTR("Run in Browser"); } virtual String get_device_info(int p_device) const { return TTR("Run exported HTML in the system's default browser."); } virtual Error run(const Ref &p_preset, int p_device, int p_debug_flags); @@ -306,6 +308,29 @@ Error EditorExportPlatformJavaScript::export_project(const Ref preset; + + for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); i++) { + + Ref ep = EditorExport::get_singleton()->get_export_preset(i); + if (ep->is_runnable() && ep->get_platform() == this) { + preset = ep; + break; + } + } + + bool prev = runnable_when_last_polled; + runnable_when_last_polled = preset.is_valid(); + return runnable_when_last_polled != prev; +} + +int EditorExportPlatformJavaScript::get_device_count() const { + + return runnable_when_last_polled; +} + Error EditorExportPlatformJavaScript::run(const Ref &p_preset, int p_device, int p_debug_flags) { String path = EditorSettings::get_singleton()->get_settings_path() + "/tmp/tmp_export.html"; @@ -331,6 +356,8 @@ EditorExportPlatformJavaScript::EditorExportPlatformJavaScript() { img = Ref(memnew(Image(_javascript_run_icon))); run_icon.instance(); run_icon->create_from_image(img); + + runnable_when_last_polled = false; } void register_javascript_exporter() { -- cgit v1.2.3