Add static methods for creating Image and ImageTexture
This commit is contained in:
@@ -3118,13 +3118,8 @@ void EditorExportPlatformAndroid::resolve_platform_feature_priorities(const Ref<
|
||||
}
|
||||
|
||||
EditorExportPlatformAndroid::EditorExportPlatformAndroid() {
|
||||
Ref<Image> img = memnew(Image(_android_logo));
|
||||
logo.instantiate();
|
||||
logo->create_from_image(img);
|
||||
|
||||
img = Ref<Image>(memnew(Image(_android_run_icon)));
|
||||
run_icon.instantiate();
|
||||
run_icon->create_from_image(img);
|
||||
logo = ImageTexture::create_from_image(memnew(Image(_android_logo)));
|
||||
run_icon = ImageTexture::create_from_image(memnew(Image(_android_run_icon)));
|
||||
|
||||
devices_changed.set();
|
||||
plugins_changed.set();
|
||||
|
||||
@@ -1838,12 +1838,8 @@ bool EditorExportPlatformIOS::can_export(const Ref<EditorExportPreset> &p_preset
|
||||
}
|
||||
|
||||
EditorExportPlatformIOS::EditorExportPlatformIOS() {
|
||||
Ref<Image> img = memnew(Image(_iphone_logo));
|
||||
logo.instantiate();
|
||||
logo->create_from_image(img);
|
||||
|
||||
logo = ImageTexture::create_from_image(memnew(Image(_iphone_logo)));
|
||||
plugins_changed.set();
|
||||
|
||||
check_for_changes_thread.start(_check_for_changes_poll_thread, this);
|
||||
}
|
||||
|
||||
|
||||
@@ -661,13 +661,8 @@ EditorExportPlatformJavaScript::EditorExportPlatformJavaScript() {
|
||||
server.instantiate();
|
||||
server_thread.start(_server_thread_poll, this);
|
||||
|
||||
Ref<Image> img = memnew(Image(_javascript_logo));
|
||||
logo.instantiate();
|
||||
logo->create_from_image(img);
|
||||
|
||||
img = Ref<Image>(memnew(Image(_javascript_run_icon)));
|
||||
run_icon.instantiate();
|
||||
run_icon->create_from_image(img);
|
||||
logo = ImageTexture::create_from_image(memnew(Image(_javascript_logo)));
|
||||
run_icon = ImageTexture::create_from_image(memnew(Image(_javascript_run_icon)));
|
||||
|
||||
Ref<Theme> theme = EditorNode::get_singleton()->get_editor_theme();
|
||||
if (theme.is_valid()) {
|
||||
|
||||
@@ -35,12 +35,7 @@
|
||||
void register_linuxbsd_exporter() {
|
||||
Ref<EditorExportPlatformLinuxBSD> platform;
|
||||
platform.instantiate();
|
||||
|
||||
Ref<Image> img = memnew(Image(_linuxbsd_logo));
|
||||
Ref<ImageTexture> logo;
|
||||
logo.instantiate();
|
||||
logo->create_from_image(img);
|
||||
platform->set_logo(logo);
|
||||
platform->set_logo(ImageTexture::create_from_image(memnew(Image(_linuxbsd_logo))));
|
||||
platform->set_name("Linux/X11");
|
||||
platform->set_extension("x86_32");
|
||||
platform->set_extension("x86_64", "binary_format/64_bits");
|
||||
|
||||
@@ -1178,10 +1178,7 @@ Ref<Texture2D> DisplayServerOSX::global_menu_get_item_icon(const String &p_menu_
|
||||
GodotMenuItem *obj = [menu_item representedObject];
|
||||
if (obj) {
|
||||
if (obj->img.is_valid()) {
|
||||
Ref<ImageTexture> txt;
|
||||
txt.instantiate();
|
||||
txt->create_from_image(obj->img);
|
||||
return txt;
|
||||
return ImageTexture::create_from_image(obj->img);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -252,7 +252,7 @@ void EditorExportPlatformOSX::_make_icon(const Ref<Image> &p_icon, Vector<uint8_
|
||||
|
||||
if (icon_infos[i].is_png) {
|
||||
// Encode PNG icon.
|
||||
it->create_from_image(copy);
|
||||
it->set_image(copy);
|
||||
String path = EditorPaths::get_singleton()->get_cache_dir().plus_file("icon.png");
|
||||
ResourceSaver::save(path, it);
|
||||
|
||||
@@ -1666,9 +1666,7 @@ bool EditorExportPlatformOSX::can_export(const Ref<EditorExportPreset> &p_preset
|
||||
}
|
||||
|
||||
EditorExportPlatformOSX::EditorExportPlatformOSX() {
|
||||
Ref<Image> img = memnew(Image(_osx_logo));
|
||||
logo.instantiate();
|
||||
logo->create_from_image(img);
|
||||
logo = ImageTexture::create_from_image(memnew(Image(_osx_logo)));
|
||||
}
|
||||
|
||||
EditorExportPlatformOSX::~EditorExportPlatformOSX() {
|
||||
|
||||
@@ -503,7 +503,5 @@ void EditorExportPlatformUWP::resolve_platform_feature_priorities(const Ref<Edit
|
||||
}
|
||||
|
||||
EditorExportPlatformUWP::EditorExportPlatformUWP() {
|
||||
Ref<Image> img = memnew(Image(_uwp_logo));
|
||||
logo.instantiate();
|
||||
logo->create_from_image(img);
|
||||
logo = ImageTexture::create_from_image(memnew(Image(_uwp_logo)));
|
||||
}
|
||||
|
||||
@@ -48,12 +48,7 @@ void register_windows_exporter() {
|
||||
|
||||
Ref<EditorExportPlatformWindows> platform;
|
||||
platform.instantiate();
|
||||
|
||||
Ref<Image> img = memnew(Image(_windows_logo));
|
||||
Ref<ImageTexture> logo;
|
||||
logo.instantiate();
|
||||
logo->create_from_image(img);
|
||||
platform->set_logo(logo);
|
||||
platform->set_logo(ImageTexture::create_from_image(memnew(Image(_windows_logo))));
|
||||
platform->set_name("Windows Desktop");
|
||||
platform->set_os_name("Windows");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user