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,8 +30,47 @@
|
|||
|
||||
#include "texture_3d_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 *texture_3d_shader = R"(
|
||||
// Texture3DEditor preview shader.
|
||||
|
||||
shader_type canvas_item;
|
||||
|
||||
uniform sampler3D 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);
|
||||
}
|
||||
)";
|
||||
|
||||
void Texture3DEditor::_texture_rect_draw() {
|
||||
texture_rect->draw_rect(Rect2(Point2(), texture_rect->get_size()), Color(1, 1, 1, 1));
|
||||
}
|
||||
|
|
@ -48,6 +87,13 @@ void Texture3DEditor::_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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -55,35 +101,29 @@ void Texture3DEditor::_texture_changed() {
|
|||
if (!is_visible()) {
|
||||
return;
|
||||
}
|
||||
|
||||
setting = true;
|
||||
_update_gui();
|
||||
setting = false;
|
||||
|
||||
_update_material(true);
|
||||
queue_redraw();
|
||||
}
|
||||
|
||||
void Texture3DEditor::_update_material() {
|
||||
void Texture3DEditor::_update_material(bool p_texture_changed) {
|
||||
material->set_shader_parameter("layer", (layer->get_value() + 0.5) / texture->get_depth());
|
||||
material->set_shader_parameter("tex", texture->get_rid());
|
||||
|
||||
String format = Image::get_format_name(texture->get_format());
|
||||
if (p_texture_changed) {
|
||||
material->set_shader_parameter("tex", texture->get_rid());
|
||||
}
|
||||
|
||||
String text;
|
||||
text = itos(texture->get_width()) + "x" + itos(texture->get_height()) + "x" + itos(texture->get_depth()) + " " + format;
|
||||
|
||||
info->set_text(text);
|
||||
material->set_shader_parameter("u_channel_factors", channel_selector->get_selected_channel_factors());
|
||||
}
|
||||
|
||||
void Texture3DEditor::_make_shaders() {
|
||||
shader.instantiate();
|
||||
shader->set_code(R"(
|
||||
// Texture3DEditor preview shader.
|
||||
shader->set_code(texture_3d_shader);
|
||||
|
||||
shader_type canvas_item;
|
||||
|
||||
uniform sampler3D tex;
|
||||
uniform float layer;
|
||||
|
||||
void fragment() {
|
||||
COLOR = textureLod(tex, vec3(UV, layer), 0.0);
|
||||
}
|
||||
)");
|
||||
material.instantiate();
|
||||
material->set_shader(shader);
|
||||
}
|
||||
|
|
@ -113,28 +153,79 @@ void Texture3DEditor::_texture_rect_update_area() {
|
|||
texture_rect->set_size(Vector2(tex_width, tex_height));
|
||||
}
|
||||
|
||||
void Texture3DEditor::_update_gui() {
|
||||
if (texture.is_null()) {
|
||||
return;
|
||||
}
|
||||
|
||||
_texture_rect_update_area();
|
||||
|
||||
layer->set_max(texture->get_depth() - 1);
|
||||
|
||||
const Image::Format format = texture->get_format();
|
||||
const String format_name = Image::get_format_name(format);
|
||||
|
||||
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_depth();
|
||||
|
||||
info->set_text(vformat(String::utf8("%d×%d×%d %s\n") + TTR("%s Mipmaps") + "\n" + TTR("Memory: %s"),
|
||||
texture->get_width(),
|
||||
texture->get_height(),
|
||||
texture->get_depth(),
|
||||
format_name,
|
||||
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_depth();
|
||||
|
||||
info->set_text(vformat(String::utf8("%d×%d×%d %s\n") + TTR("No Mipmaps") + "\n" + TTR("Memory: %s"),
|
||||
texture->get_width(),
|
||||
texture->get_height(),
|
||||
texture->get_depth(),
|
||||
format_name,
|
||||
String::humanize_size(memory)));
|
||||
}
|
||||
|
||||
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 Texture3DEditor::on_selected_channels_changed() {
|
||||
_update_material(false);
|
||||
}
|
||||
|
||||
void Texture3DEditor::edit(Ref<Texture3D> p_texture) {
|
||||
if (!texture.is_null()) {
|
||||
if (texture.is_valid()) {
|
||||
texture->disconnect_changed(callable_mp(this, &Texture3DEditor::_texture_changed));
|
||||
}
|
||||
|
||||
texture = p_texture;
|
||||
|
||||
if (!texture.is_null()) {
|
||||
if (texture.is_valid()) {
|
||||
if (shader.is_null()) {
|
||||
_make_shaders();
|
||||
}
|
||||
|
||||
texture->connect_changed(callable_mp(this, &Texture3DEditor::_texture_changed));
|
||||
queue_redraw();
|
||||
texture_rect->set_material(material);
|
||||
|
||||
setting = true;
|
||||
layer->set_max(texture->get_depth() - 1);
|
||||
layer->set_value(0);
|
||||
layer->show();
|
||||
_update_material();
|
||||
_update_gui();
|
||||
setting = false;
|
||||
_texture_rect_update_area();
|
||||
|
||||
_update_material(true);
|
||||
queue_redraw();
|
||||
|
||||
} else {
|
||||
hide();
|
||||
}
|
||||
|
|
@ -142,45 +233,56 @@ void Texture3DEditor::edit(Ref<Texture3D> p_texture) {
|
|||
|
||||
Texture3DEditor::Texture3DEditor() {
|
||||
set_texture_repeat(TextureRepeat::TEXTURE_REPEAT_ENABLED);
|
||||
set_custom_minimum_size(Size2(1, 150));
|
||||
set_custom_minimum_size(Size2(1, 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, &Texture3DEditor::_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, &Texture3DEditor::_layer_changed));
|
||||
|
||||
add_child(layer);
|
||||
|
||||
channel_selector = memnew(ColorChannelSelector);
|
||||
channel_selector->connect("selected_channels_changed", callable_mp(this, &Texture3DEditor::on_selected_channels_changed));
|
||||
channel_selector->set_anchors_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);
|
||||
}
|
||||
|
||||
Texture3DEditor::~Texture3DEditor() {
|
||||
if (!texture.is_null()) {
|
||||
if (texture.is_valid()) {
|
||||
texture->disconnect_changed(callable_mp(this, &Texture3DEditor::_texture_changed));
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
bool EditorInspectorPlugin3DTexture::can_handle(Object *p_object) {
|
||||
return Object::cast_to<Texture3D>(p_object) != nullptr;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue