From 3f335ce3d446372eeb9ed87f7e117099c4d2dd6a Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Tue, 11 Jun 2019 15:43:37 -0300 Subject: Texture refactor -Texture renamed to Texture2D -TextureLayered as base now inherits 2Darray, cubemap and cubemap array -Removed all references to flags in textures (they will go in the shader) -Texture3D gone for now (will come back later done properly) -Create base rasterizer for RenderDevice, RasterizerRD --- platform/javascript/export/export.cpp | 8 ++++---- platform/javascript/os_javascript.cpp | 2 +- platform/javascript/os_javascript.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'platform/javascript') diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp index c1cb8bcb58..6e1f7d749b 100644 --- a/platform/javascript/export/export.cpp +++ b/platform/javascript/export/export.cpp @@ -212,7 +212,7 @@ public: virtual String get_name() const; virtual String get_os_name() const; - virtual Ref get_logo() const; + virtual Ref get_logo() const; virtual bool can_export(const Ref &p_preset, String &r_error, bool &r_missing_templates) const; virtual List get_binary_extensions(const Ref &p_preset) const; @@ -224,7 +224,7 @@ public: virtual String get_option_tooltip(int p_index) const { return p_index ? TTR("Stop HTTP Server") : TTR("Run exported HTML in the system's default browser."); } virtual Ref get_option_icon(int p_index) const; virtual Error run(const Ref &p_preset, int p_option, int p_debug_flags); - virtual Ref get_run_icon() const; + virtual Ref get_run_icon() const; virtual void get_platform_features(List *r_features) { @@ -300,7 +300,7 @@ String EditorExportPlatformJavaScript::get_os_name() const { return "HTML5"; } -Ref EditorExportPlatformJavaScript::get_logo() const { +Ref EditorExportPlatformJavaScript::get_logo() const { return logo; } @@ -598,7 +598,7 @@ Error EditorExportPlatformJavaScript::run(const Ref &p_prese return OK; } -Ref EditorExportPlatformJavaScript::get_run_icon() const { +Ref EditorExportPlatformJavaScript::get_run_icon() const { return run_icon; } diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index 13615de65b..f657ef483e 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -480,7 +480,7 @@ void OS_JavaScript::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_s cursors_cache.erase(p_shape); } - Ref texture = p_cursor; + Ref texture = p_cursor; Ref atlas_texture = p_cursor; Ref image; Size2 texture_size; diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index 65a18830ed..96ec7e8541 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -35,7 +35,7 @@ #include "drivers/unix/os_unix.h" #include "main/input_default.h" #include "servers/audio_server.h" -#include "servers/visual/rasterizer.h" +#include "servers/visual/rasterizer/rasterizer.h" #include -- cgit v1.2.3 From 0586e184490fd132f99acb1a67c788959cfdbade Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 27 Jul 2019 10:23:24 -0300 Subject: Custom material support seems complete. --- platform/javascript/os_javascript.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'platform/javascript') diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index 96ec7e8541..65a18830ed 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -35,7 +35,7 @@ #include "drivers/unix/os_unix.h" #include "main/input_default.h" #include "servers/audio_server.h" -#include "servers/visual/rasterizer/rasterizer.h" +#include "servers/visual/rasterizer.h" #include -- cgit v1.2.3