feat: updated engine version to 4.4-rc1
This commit is contained in:
Sara
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
|
|
@ -30,16 +30,127 @@
|
|||
|
||||
#include "texture_layered_editor_plugin.h"
|
||||
|
||||
#include "editor/editor_string_names.h"
|
||||
#include "editor/plugins/color_channel_selector.h"
|
||||
#include "editor/themes/editor_scale.h"
|
||||
#include "scene/gui/label.h"
|
||||
|
||||
// Shader sources.
|
||||
|
||||
constexpr const char *array_2d_shader = R"(
|
||||
// TextureLayeredEditor preview shader (2D array).
|
||||
|
||||
shader_type canvas_item;
|
||||
|
||||
uniform sampler2DArray tex;
|
||||
uniform float layer;
|
||||
uniform vec4 u_channel_factors = vec4(1.0);
|
||||
|
||||
vec4 filter_preview_colors(vec4 input_color, vec4 factors) {
|
||||
// Filter RGB.
|
||||
vec4 output_color = input_color * vec4(factors.rgb, input_color.a);
|
||||
|
||||
// Remove transparency when alpha is not enabled.
|
||||
output_color.a = mix(1.0, output_color.a, factors.a);
|
||||
|
||||
// Switch to opaque grayscale when visualizing only one channel.
|
||||
float csum = factors.r + factors.g + factors.b + factors.a;
|
||||
float single = clamp(2.0 - csum, 0.0, 1.0);
|
||||
for (int i = 0; i < 4; i++) {
|
||||
float c = input_color[i];
|
||||
output_color = mix(output_color, vec4(c, c, c, 1.0), factors[i] * single);
|
||||
}
|
||||
|
||||
return output_color;
|
||||
}
|
||||
|
||||
void fragment() {
|
||||
COLOR = textureLod(tex, vec3(UV, layer), 0.0);
|
||||
COLOR = filter_preview_colors(COLOR, u_channel_factors);
|
||||
}
|
||||
)";
|
||||
|
||||
constexpr const char *cubemap_shader = R"(
|
||||
// TextureLayeredEditor preview shader (cubemap).
|
||||
|
||||
shader_type canvas_item;
|
||||
|
||||
uniform samplerCube tex;
|
||||
uniform vec3 normal;
|
||||
uniform mat3 rot;
|
||||
|
||||
uniform vec4 u_channel_factors = vec4(1.0);
|
||||
|
||||
vec4 filter_preview_colors(vec4 input_color, vec4 factors) {
|
||||
// Filter RGB.
|
||||
vec4 output_color = input_color * vec4(factors.rgb, input_color.a);
|
||||
|
||||
// Remove transparency when alpha is not enabled.
|
||||
output_color.a = mix(1.0, output_color.a, factors.a);
|
||||
|
||||
// Switch to opaque grayscale when visualizing only one channel.
|
||||
float csum = factors.r + factors.g + factors.b + factors.a;
|
||||
float single = clamp(2.0 - csum, 0.0, 1.0);
|
||||
for (int i = 0; i < 4; i++) {
|
||||
float c = input_color[i];
|
||||
output_color = mix(output_color, vec4(c, c, c, 1.0), factors[i] * single);
|
||||
}
|
||||
|
||||
return output_color;
|
||||
}
|
||||
|
||||
void fragment() {
|
||||
vec3 n = rot * normalize(vec3(normal.xy * (UV * 2.0 - 1.0), normal.z));
|
||||
COLOR = textureLod(tex, n, 0.0);
|
||||
COLOR = filter_preview_colors(COLOR, u_channel_factors);
|
||||
}
|
||||
)";
|
||||
|
||||
constexpr const char *cubemap_array_shader = R"(
|
||||
// TextureLayeredEditor preview shader (cubemap array).
|
||||
|
||||
shader_type canvas_item;
|
||||
uniform samplerCubeArray tex;
|
||||
uniform vec3 normal;
|
||||
uniform mat3 rot;
|
||||
uniform float layer;
|
||||
|
||||
uniform vec4 u_channel_factors = vec4(1.0);
|
||||
|
||||
vec4 filter_preview_colors(vec4 input_color, vec4 factors) {
|
||||
// Filter RGB.
|
||||
vec4 output_color = input_color * vec4(factors.rgb, input_color.a);
|
||||
|
||||
// Remove transparency when alpha is not enabled.
|
||||
output_color.a = mix(1.0, output_color.a, factors.a);
|
||||
|
||||
// Switch to opaque grayscale when visualizing only one channel.
|
||||
float csum = factors.r + factors.g + factors.b + factors.a;
|
||||
float single = clamp(2.0 - csum, 0.0, 1.0);
|
||||
for (int i = 0; i < 4; i++) {
|
||||
float c = input_color[i];
|
||||
output_color = mix(output_color, vec4(c, c, c, 1.0), factors[i] * single);
|
||||
}
|
||||
|
||||
return output_color;
|
||||
}
|
||||
|
||||
void fragment() {
|
||||
vec3 n = rot * normalize(vec3(normal.xy * (UV * 2.0 - 1.0), normal.z));
|
||||
COLOR = textureLod(tex, vec4(n, layer), 0.0);
|
||||
COLOR = filter_preview_colors(COLOR, u_channel_factors);
|
||||
}
|
||||
)";
|
||||
|
||||
void TextureLayeredEditor::gui_input(const Ref<InputEvent> &p_event) {
|
||||
ERR_FAIL_COND(p_event.is_null());
|
||||
|
||||
Ref<InputEventMouseMotion> mm = p_event;
|
||||
if (mm.is_valid() && (mm->get_button_mask().has_flag(MouseButtonMask::LEFT))) {
|
||||
y_rot += -mm->get_relative().x * 0.01;
|
||||
x_rot += mm->get_relative().y * 0.01;
|
||||
_update_material();
|
||||
x_rot += -mm->get_relative().y * 0.01;
|
||||
|
||||
_update_material(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -47,6 +158,79 @@ void TextureLayeredEditor::_texture_rect_draw() {
|
|||
texture_rect->draw_rect(Rect2(Point2(), texture_rect->get_size()), Color(1, 1, 1, 1));
|
||||
}
|
||||
|
||||
void TextureLayeredEditor::_update_gui() {
|
||||
if (texture.is_null()) {
|
||||
return;
|
||||
}
|
||||
|
||||
_texture_rect_update_area();
|
||||
|
||||
const Image::Format format = texture->get_format();
|
||||
const String format_name = Image::get_format_name(format);
|
||||
String texture_info;
|
||||
|
||||
switch (texture->get_layered_type()) {
|
||||
case TextureLayered::LAYERED_TYPE_2D_ARRAY: {
|
||||
layer->set_max(texture->get_layers() - 1);
|
||||
|
||||
texture_info = vformat(String::utf8("%d×%d (×%d) %s\n"),
|
||||
texture->get_width(),
|
||||
texture->get_height(),
|
||||
texture->get_layers(),
|
||||
format_name);
|
||||
|
||||
} break;
|
||||
case TextureLayered::LAYERED_TYPE_CUBEMAP: {
|
||||
layer->hide();
|
||||
|
||||
texture_info = vformat(String::utf8("%d×%d %s\n"),
|
||||
texture->get_width(),
|
||||
texture->get_height(),
|
||||
format_name);
|
||||
|
||||
} break;
|
||||
case TextureLayered::LAYERED_TYPE_CUBEMAP_ARRAY: {
|
||||
layer->set_max(texture->get_layers() / 6 - 1);
|
||||
|
||||
texture_info = vformat(String::utf8("%d×%d (×%d) %s\n"),
|
||||
texture->get_width(),
|
||||
texture->get_height(),
|
||||
texture->get_layers() / 6,
|
||||
format_name);
|
||||
|
||||
} break;
|
||||
|
||||
default: {
|
||||
}
|
||||
}
|
||||
|
||||
if (texture->has_mipmaps()) {
|
||||
const int mip_count = Image::get_image_required_mipmaps(texture->get_width(), texture->get_height(), format);
|
||||
const int memory = Image::get_image_data_size(texture->get_width(), texture->get_height(), format, true) * texture->get_layers();
|
||||
|
||||
texture_info += vformat(TTR("%s Mipmaps") + "\n" + TTR("Memory: %s"),
|
||||
mip_count,
|
||||
String::humanize_size(memory));
|
||||
|
||||
} else {
|
||||
const int memory = Image::get_image_data_size(texture->get_width(), texture->get_height(), format, false) * texture->get_layers();
|
||||
|
||||
texture_info += vformat(TTR("No Mipmaps") + "\n" + TTR("Memory: %s"),
|
||||
String::humanize_size(memory));
|
||||
}
|
||||
|
||||
info->set_text(texture_info);
|
||||
|
||||
const uint32_t components_mask = Image::get_format_component_mask(format);
|
||||
if (is_power_of_2(components_mask)) {
|
||||
// Only one channel available, no point in showing a channel selector.
|
||||
channel_selector->hide();
|
||||
} else {
|
||||
channel_selector->show();
|
||||
channel_selector->set_available_channels_mask(components_mask);
|
||||
}
|
||||
}
|
||||
|
||||
void TextureLayeredEditor::_notification(int p_what) {
|
||||
switch (p_what) {
|
||||
case NOTIFICATION_RESIZED: {
|
||||
|
|
@ -59,6 +243,13 @@ void TextureLayeredEditor::_notification(int p_what) {
|
|||
|
||||
draw_texture_rect(checkerboard, Rect2(Point2(), size), true);
|
||||
} break;
|
||||
|
||||
case NOTIFICATION_THEME_CHANGED: {
|
||||
if (info) {
|
||||
Ref<Font> metadata_label_font = get_theme_font(SNAME("expression"), EditorStringName(EditorFonts));
|
||||
info->add_theme_font_override(SceneStringName(font), metadata_label_font);
|
||||
}
|
||||
} break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -66,13 +257,18 @@ void TextureLayeredEditor::_texture_changed() {
|
|||
if (!is_visible()) {
|
||||
return;
|
||||
}
|
||||
|
||||
setting = true;
|
||||
_update_gui();
|
||||
setting = false;
|
||||
|
||||
_update_material(true);
|
||||
queue_redraw();
|
||||
}
|
||||
|
||||
void TextureLayeredEditor::_update_material() {
|
||||
void TextureLayeredEditor::_update_material(bool p_texture_changed) {
|
||||
materials[0]->set_shader_parameter("layer", layer->get_value());
|
||||
materials[2]->set_shader_parameter("layer", layer->get_value());
|
||||
materials[texture->get_layered_type()]->set_shader_parameter("tex", texture->get_rid());
|
||||
|
||||
Vector3 v(1, 1, 1);
|
||||
v.normalize();
|
||||
|
|
@ -86,67 +282,29 @@ void TextureLayeredEditor::_update_material() {
|
|||
materials[2]->set_shader_parameter("normal", v);
|
||||
materials[2]->set_shader_parameter("rot", b);
|
||||
|
||||
String format = Image::get_format_name(texture->get_format());
|
||||
|
||||
String text;
|
||||
if (texture->get_layered_type() == TextureLayered::LAYERED_TYPE_2D_ARRAY) {
|
||||
text = itos(texture->get_width()) + "x" + itos(texture->get_height()) + " (x " + itos(texture->get_layers()) + ")" + format;
|
||||
} else if (texture->get_layered_type() == TextureLayered::LAYERED_TYPE_CUBEMAP) {
|
||||
text = itos(texture->get_width()) + "x" + itos(texture->get_height()) + " " + format;
|
||||
} else if (texture->get_layered_type() == TextureLayered::LAYERED_TYPE_CUBEMAP_ARRAY) {
|
||||
text = itos(texture->get_width()) + "x" + itos(texture->get_height()) + " (x " + itos(texture->get_layers() / 6) + ")" + format;
|
||||
if (p_texture_changed) {
|
||||
materials[texture->get_layered_type()]->set_shader_parameter("tex", texture->get_rid());
|
||||
}
|
||||
|
||||
info->set_text(text);
|
||||
const Vector4 channel_factors = channel_selector->get_selected_channel_factors();
|
||||
for (unsigned int i = 0; i < 3; ++i) {
|
||||
materials[i]->set_shader_parameter("u_channel_factors", channel_factors);
|
||||
}
|
||||
}
|
||||
|
||||
void TextureLayeredEditor::on_selected_channels_changed() {
|
||||
_update_material(false);
|
||||
}
|
||||
|
||||
void TextureLayeredEditor::_make_shaders() {
|
||||
shaders[0].instantiate();
|
||||
shaders[0]->set_code(R"(
|
||||
// TextureLayeredEditor preview shader (2D array).
|
||||
|
||||
shader_type canvas_item;
|
||||
|
||||
uniform sampler2DArray tex;
|
||||
uniform float layer;
|
||||
|
||||
void fragment() {
|
||||
COLOR = textureLod(tex, vec3(UV, layer), 0.0);
|
||||
}
|
||||
)");
|
||||
shaders[0]->set_code(array_2d_shader);
|
||||
|
||||
shaders[1].instantiate();
|
||||
shaders[1]->set_code(R"(
|
||||
// TextureLayeredEditor preview shader (cubemap).
|
||||
|
||||
shader_type canvas_item;
|
||||
|
||||
uniform samplerCube tex;
|
||||
uniform vec3 normal;
|
||||
uniform mat3 rot;
|
||||
|
||||
void fragment() {
|
||||
vec3 n = rot * normalize(vec3(normal.xy * (UV * 2.0 - 1.0), normal.z));
|
||||
COLOR = textureLod(tex, n, 0.0);
|
||||
}
|
||||
)");
|
||||
shaders[1]->set_code(cubemap_shader);
|
||||
|
||||
shaders[2].instantiate();
|
||||
shaders[2]->set_code(R"(
|
||||
// TextureLayeredEditor preview shader (cubemap array).
|
||||
|
||||
shader_type canvas_item;
|
||||
|
||||
uniform samplerCubeArray tex;
|
||||
uniform vec3 normal;
|
||||
uniform mat3 rot;
|
||||
uniform float layer;
|
||||
|
||||
void fragment() {
|
||||
vec3 n = rot * normalize(vec3(normal.xy * (UV * 2.0 - 1.0), normal.z));
|
||||
COLOR = textureLod(tex, vec4(n, layer), 0.0);
|
||||
}
|
||||
)");
|
||||
shaders[2]->set_code(cubemap_array_shader);
|
||||
|
||||
for (int i = 0; i < 3; i++) {
|
||||
materials[i].instantiate();
|
||||
|
|
@ -180,37 +338,32 @@ void TextureLayeredEditor::_texture_rect_update_area() {
|
|||
}
|
||||
|
||||
void TextureLayeredEditor::edit(Ref<TextureLayered> p_texture) {
|
||||
if (!texture.is_null()) {
|
||||
if (texture.is_valid()) {
|
||||
texture->disconnect_changed(callable_mp(this, &TextureLayeredEditor::_texture_changed));
|
||||
}
|
||||
|
||||
texture = p_texture;
|
||||
|
||||
if (!texture.is_null()) {
|
||||
if (texture.is_valid()) {
|
||||
if (shaders[0].is_null()) {
|
||||
_make_shaders();
|
||||
}
|
||||
|
||||
texture->connect_changed(callable_mp(this, &TextureLayeredEditor::_texture_changed));
|
||||
queue_redraw();
|
||||
texture_rect->set_material(materials[texture->get_layered_type()]);
|
||||
|
||||
setting = true;
|
||||
if (texture->get_layered_type() == TextureLayered::LAYERED_TYPE_2D_ARRAY) {
|
||||
layer->set_max(texture->get_layers() - 1);
|
||||
layer->set_value(0);
|
||||
layer->show();
|
||||
} else if (texture->get_layered_type() == TextureLayered::LAYERED_TYPE_CUBEMAP_ARRAY) {
|
||||
layer->set_max(texture->get_layers() / 6 - 1);
|
||||
layer->set_value(0);
|
||||
layer->show();
|
||||
} else {
|
||||
layer->hide();
|
||||
}
|
||||
layer->set_value(0);
|
||||
layer->show();
|
||||
_update_gui();
|
||||
setting = false;
|
||||
|
||||
x_rot = 0;
|
||||
y_rot = 0;
|
||||
_update_material();
|
||||
setting = false;
|
||||
_texture_rect_update_area();
|
||||
|
||||
_update_material(true);
|
||||
queue_redraw();
|
||||
|
||||
} else {
|
||||
hide();
|
||||
}
|
||||
|
|
@ -218,42 +371,53 @@ void TextureLayeredEditor::edit(Ref<TextureLayered> p_texture) {
|
|||
|
||||
TextureLayeredEditor::TextureLayeredEditor() {
|
||||
set_texture_repeat(TextureRepeat::TEXTURE_REPEAT_ENABLED);
|
||||
set_custom_minimum_size(Size2(1, 150));
|
||||
set_custom_minimum_size(Size2(0, 256.0) * EDSCALE);
|
||||
|
||||
texture_rect = memnew(Control);
|
||||
texture_rect->set_mouse_filter(MOUSE_FILTER_IGNORE);
|
||||
add_child(texture_rect);
|
||||
texture_rect->connect(SceneStringName(draw), callable_mp(this, &TextureLayeredEditor::_texture_rect_draw));
|
||||
|
||||
add_child(texture_rect);
|
||||
|
||||
layer = memnew(SpinBox);
|
||||
layer->set_step(1);
|
||||
layer->set_max(100);
|
||||
layer->set_h_grow_direction(GROW_DIRECTION_BEGIN);
|
||||
|
||||
layer->set_modulate(Color(1, 1, 1, 0.8));
|
||||
add_child(layer);
|
||||
layer->set_h_grow_direction(GROW_DIRECTION_BEGIN);
|
||||
layer->set_anchor(SIDE_RIGHT, 1);
|
||||
layer->set_anchor(SIDE_LEFT, 1);
|
||||
layer->connect(SceneStringName(value_changed), callable_mp(this, &TextureLayeredEditor::_layer_changed));
|
||||
|
||||
add_child(layer);
|
||||
|
||||
channel_selector = memnew(ColorChannelSelector);
|
||||
channel_selector->connect("selected_channels_changed", callable_mp(this, &TextureLayeredEditor::on_selected_channels_changed));
|
||||
channel_selector->set_anchors_and_offsets_preset(Control::PRESET_TOP_LEFT);
|
||||
add_child(channel_selector);
|
||||
|
||||
info = memnew(Label);
|
||||
info->add_theme_color_override(SceneStringName(font_color), Color(1, 1, 1));
|
||||
info->add_theme_color_override("font_shadow_color", Color(0, 0, 0));
|
||||
info->add_theme_font_size_override(SceneStringName(font_size), 14 * EDSCALE);
|
||||
info->add_theme_color_override("font_outline_color", Color(0, 0, 0));
|
||||
info->add_theme_constant_override("outline_size", 8 * EDSCALE);
|
||||
|
||||
info->set_h_grow_direction(GROW_DIRECTION_BEGIN);
|
||||
info->set_v_grow_direction(GROW_DIRECTION_BEGIN);
|
||||
info->add_theme_color_override(SceneStringName(font_color), Color(1, 1, 1, 1));
|
||||
info->add_theme_color_override("font_shadow_color", Color(0, 0, 0, 0.5));
|
||||
info->add_theme_constant_override("shadow_outline_size", 1);
|
||||
info->add_theme_constant_override("shadow_offset_x", 2);
|
||||
info->add_theme_constant_override("shadow_offset_y", 2);
|
||||
add_child(info);
|
||||
info->set_h_size_flags(Control::SIZE_SHRINK_END);
|
||||
info->set_v_size_flags(Control::SIZE_SHRINK_END);
|
||||
info->set_anchor(SIDE_RIGHT, 1);
|
||||
info->set_anchor(SIDE_LEFT, 1);
|
||||
info->set_anchor(SIDE_BOTTOM, 1);
|
||||
info->set_anchor(SIDE_TOP, 1);
|
||||
|
||||
add_child(info);
|
||||
}
|
||||
|
||||
TextureLayeredEditor::~TextureLayeredEditor() {
|
||||
}
|
||||
|
||||
//
|
||||
bool EditorInspectorPluginLayeredTexture::can_handle(Object *p_object) {
|
||||
return Object::cast_to<TextureLayered>(p_object) != nullptr;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue