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
This commit is contained in:
@@ -212,7 +212,7 @@ public:
|
||||
|
||||
virtual String get_name() const;
|
||||
virtual String get_os_name() const;
|
||||
virtual Ref<Texture> get_logo() const;
|
||||
virtual Ref<Texture2D> get_logo() const;
|
||||
|
||||
virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const;
|
||||
virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &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<ImageTexture> get_option_icon(int p_index) const;
|
||||
virtual Error run(const Ref<EditorExportPreset> &p_preset, int p_option, int p_debug_flags);
|
||||
virtual Ref<Texture> get_run_icon() const;
|
||||
virtual Ref<Texture2D> get_run_icon() const;
|
||||
|
||||
virtual void get_platform_features(List<String> *r_features) {
|
||||
|
||||
@@ -300,7 +300,7 @@ String EditorExportPlatformJavaScript::get_os_name() const {
|
||||
return "HTML5";
|
||||
}
|
||||
|
||||
Ref<Texture> EditorExportPlatformJavaScript::get_logo() const {
|
||||
Ref<Texture2D> EditorExportPlatformJavaScript::get_logo() const {
|
||||
|
||||
return logo;
|
||||
}
|
||||
@@ -598,7 +598,7 @@ Error EditorExportPlatformJavaScript::run(const Ref<EditorExportPreset> &p_prese
|
||||
return OK;
|
||||
}
|
||||
|
||||
Ref<Texture> EditorExportPlatformJavaScript::get_run_icon() const {
|
||||
Ref<Texture2D> EditorExportPlatformJavaScript::get_run_icon() const {
|
||||
|
||||
return run_icon;
|
||||
}
|
||||
|
||||
@@ -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> texture = p_cursor;
|
||||
Ref<Texture2D> texture = p_cursor;
|
||||
Ref<AtlasTexture> atlas_texture = p_cursor;
|
||||
Ref<Image> image;
|
||||
Size2 texture_size;
|
||||
|
||||
@@ -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 <emscripten/html5.h>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user