summaryrefslogtreecommitdiffstats
path: root/editor
diff options
context:
space:
mode:
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_interface.cpp156
-rw-r--r--editor/editor_interface.h2
-rw-r--r--editor/editor_resource_preview.cpp23
-rw-r--r--editor/import/3d/resource_importer_scene.cpp11
-rw-r--r--editor/import/3d/resource_importer_scene.h1
-rw-r--r--editor/plugins/animation_player_editor_plugin.cpp2
-rw-r--r--editor/plugins/camera_3d_editor_plugin.cpp51
-rw-r--r--editor/plugins/camera_3d_editor_plugin.h27
-rw-r--r--editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp20
-rw-r--r--editor/plugins/gizmos/camera_3d_gizmo_plugin.h1
-rw-r--r--editor/plugins/node_3d_editor_plugin.cpp18
-rw-r--r--editor/plugins/node_3d_editor_plugin.h2
-rw-r--r--editor/plugins/plugin_config_dialog.cpp2
13 files changed, 273 insertions, 43 deletions
diff --git a/editor/editor_interface.cpp b/editor/editor_interface.cpp
index e85258df50..3cdcc91ae9 100644
--- a/editor/editor_interface.cpp
+++ b/editor/editor_interface.cpp
@@ -31,6 +31,7 @@
#include "editor_interface.h"
#include "editor_interface.compat.inc"
+#include "core/config/project_settings.h"
#include "editor/editor_command_palette.h"
#include "editor/editor_feature_profile.h"
#include "editor/editor_main_screen.h"
@@ -50,6 +51,10 @@
#include "editor/property_selector.h"
#include "editor/themes/editor_scale.h"
#include "main/main.h"
+#include "plugins/editor_preview_plugins.h"
+#include "scene/3d/light_3d.h"
+#include "scene/3d/mesh_instance_3d.h"
+#include "scene/3d/world_environment.h"
#include "scene/gui/box_container.h"
#include "scene/gui/control.h"
#include "scene/main/window.h"
@@ -98,6 +103,27 @@ EditorUndoRedoManager *EditorInterface::get_editor_undo_redo() const {
return EditorUndoRedoManager::get_singleton();
}
+AABB EditorInterface::_calculate_aabb_for_scene(Node *p_node, AABB &p_scene_aabb) {
+ MeshInstance3D *mesh_node = Object::cast_to<MeshInstance3D>(p_node);
+ if (mesh_node && mesh_node->get_mesh().is_valid()) {
+ Transform3D accum_xform;
+ Node3D *base = mesh_node;
+ while (base) {
+ accum_xform = base->get_transform() * accum_xform;
+ base = Object::cast_to<Node3D>(base->get_parent());
+ }
+
+ AABB aabb = accum_xform.xform(mesh_node->get_mesh()->get_aabb());
+ p_scene_aabb.merge_with(aabb);
+ }
+
+ for (int i = 0; i < p_node->get_child_count(); i++) {
+ p_scene_aabb = _calculate_aabb_for_scene(p_node->get_child(i), p_scene_aabb);
+ }
+
+ return p_scene_aabb;
+}
+
TypedArray<Texture2D> EditorInterface::_make_mesh_previews(const TypedArray<Mesh> &p_meshes, int p_preview_size) {
Vector<Ref<Mesh>> meshes;
@@ -203,6 +229,136 @@ Vector<Ref<Texture2D>> EditorInterface::make_mesh_previews(const Vector<Ref<Mesh
return textures;
}
+void EditorInterface::make_scene_preview(const String &p_path, Node *p_scene, int p_preview_size) {
+ ERR_FAIL_NULL_MSG(p_scene, "The provided scene is null.");
+ ERR_FAIL_COND_MSG(p_scene->is_inside_tree(), "The scene must not be inside the tree.");
+ ERR_FAIL_COND_MSG(!Engine::get_singleton()->is_editor_hint(), "This function can only be called from the editor.");
+
+ SubViewport *sub_viewport_node = memnew(SubViewport);
+ AABB scene_aabb;
+ scene_aabb = _calculate_aabb_for_scene(p_scene, scene_aabb);
+
+ sub_viewport_node->set_update_mode(SubViewport::UPDATE_ALWAYS);
+ sub_viewport_node->set_size(Vector2i(p_preview_size, p_preview_size));
+ sub_viewport_node->set_transparent_background(false);
+ Ref<World3D> world;
+ world.instantiate();
+ sub_viewport_node->set_world_3d(world);
+
+ EditorNode::get_singleton()->add_child(sub_viewport_node);
+ Ref<Environment> env;
+ env.instantiate();
+ env->set_background(Environment::BG_CLEAR_COLOR);
+
+ Ref<CameraAttributesPractical> camera_attributes;
+ camera_attributes.instantiate();
+
+ Node3D *root = memnew(Node3D);
+ root->set_name("Root");
+ sub_viewport_node->add_child(root);
+
+ Camera3D *camera = memnew(Camera3D);
+ camera->set_environment(env);
+ camera->set_attributes(camera_attributes);
+ camera->set_name("Camera3D");
+ root->add_child(camera);
+ camera->set_current(true);
+
+ camera->set_position(Vector3(0.0, 0.0, 3.0));
+
+ DirectionalLight3D *light = memnew(DirectionalLight3D);
+ light->set_name("Light");
+ DirectionalLight3D *light2 = memnew(DirectionalLight3D);
+ light2->set_name("Light2");
+ light2->set_color(Color(0.7, 0.7, 0.7, 1.0));
+
+ root->add_child(light);
+ root->add_child(light2);
+
+ sub_viewport_node->add_child(p_scene);
+
+ // Calculate the camera and lighting position based on the size of the scene.
+ Vector3 center = scene_aabb.get_center();
+ float camera_size = scene_aabb.get_longest_axis_size();
+
+ const float cam_rot_x = -Math_PI / 4;
+ const float cam_rot_y = -Math_PI / 4;
+
+ camera->set_orthogonal(camera_size * 2.0, 0.0001, camera_size * 2.0);
+
+ Transform3D xf;
+ xf.basis = Basis(Vector3(0, 1, 0), cam_rot_y) * Basis(Vector3(1, 0, 0), cam_rot_x);
+ xf.origin = center;
+ xf.translate_local(0, 0, camera_size);
+
+ camera->set_transform(xf);
+
+ Transform3D xform;
+ xform.basis = Basis().rotated(Vector3(0, 1, 0), -Math_PI / 6);
+ xform.basis = Basis().rotated(Vector3(1, 0, 0), Math_PI / 6) * xform.basis;
+
+ light->set_transform(xform * Transform3D().looking_at(Vector3(-2, -1, -1), Vector3(0, 1, 0)));
+ light2->set_transform(xform * Transform3D().looking_at(Vector3(+1, -1, -2), Vector3(0, 1, 0)));
+
+ // Update the renderer to get the screenshot.
+ DisplayServer::get_singleton()->process_events();
+ Main::iteration();
+ Main::iteration();
+
+ // Get the texture.
+ Ref<Texture2D> texture = sub_viewport_node->get_texture();
+ ERR_FAIL_COND_MSG(texture.is_null(), "Failed to get texture from sub_viewport_node.");
+
+ // Remove the initial scene node.
+ sub_viewport_node->remove_child(p_scene);
+
+ // Cleanup the viewport.
+ if (sub_viewport_node) {
+ if (sub_viewport_node->get_parent()) {
+ sub_viewport_node->get_parent()->remove_child(sub_viewport_node);
+ }
+ sub_viewport_node->queue_free();
+ sub_viewport_node = nullptr;
+ }
+
+ // Now generate the cache image.
+ Ref<Image> img = texture->get_image();
+ if (img.is_valid() && img->get_width() > 0 && img->get_height() > 0) {
+ img = img->duplicate();
+
+ int preview_size = EDITOR_GET("filesystem/file_dialog/thumbnail_size");
+ preview_size *= EDSCALE;
+
+ int vp_size = MIN(img->get_width(), img->get_height());
+ int x = (img->get_width() - vp_size) / 2;
+ int y = (img->get_height() - vp_size) / 2;
+
+ if (vp_size < preview_size) {
+ img->crop_from_point(x, y, vp_size, vp_size);
+ } else {
+ int ratio = vp_size / preview_size;
+ int size = preview_size * MAX(1, ratio / 2);
+
+ x = (img->get_width() - size) / 2;
+ y = (img->get_height() - size) / 2;
+
+ img->crop_from_point(x, y, size, size);
+ img->resize(preview_size, preview_size, Image::INTERPOLATE_LANCZOS);
+ }
+ img->convert(Image::FORMAT_RGB8);
+
+ String temp_path = EditorPaths::get_singleton()->get_cache_dir();
+ String cache_base = ProjectSettings::get_singleton()->globalize_path(p_path).md5_text();
+ cache_base = temp_path.path_join("resthumb-" + cache_base);
+
+ post_process_preview(img);
+ img->save_png(cache_base + ".png");
+ }
+
+ EditorResourcePreview::get_singleton()->check_for_invalidation(p_path);
+ EditorFileSystem::get_singleton()->emit_signal(SNAME("filesystem_changed"));
+}
+
void EditorInterface::set_plugin_enabled(const String &p_plugin, bool p_enabled) {
EditorNode::get_singleton()->set_addon_plugin_enabled(p_plugin, p_enabled, true);
}
diff --git a/editor/editor_interface.h b/editor/editor_interface.h
index 2ae77331b1..92d9812003 100644
--- a/editor/editor_interface.h
+++ b/editor/editor_interface.h
@@ -79,6 +79,7 @@ class EditorInterface : public Object {
// Editor tools.
TypedArray<Texture2D> _make_mesh_previews(const TypedArray<Mesh> &p_meshes, int p_preview_size);
+ AABB _calculate_aabb_for_scene(Node *p_node, AABB &p_scene_aabb);
protected:
static void _bind_methods();
@@ -107,6 +108,7 @@ public:
EditorUndoRedoManager *get_editor_undo_redo() const;
Vector<Ref<Texture2D>> make_mesh_previews(const Vector<Ref<Mesh>> &p_meshes, Vector<Transform3D> *p_transforms, int p_preview_size);
+ void make_scene_preview(const String &p_path, Node *p_scene, int p_preview_size);
void set_plugin_enabled(const String &p_plugin, bool p_enabled);
bool is_plugin_enabled(const String &p_plugin) const;
diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp
index 4dca3b33af..32c44133e0 100644
--- a/editor/editor_resource_preview.cpp
+++ b/editor/editor_resource_preview.cpp
@@ -147,6 +147,10 @@ void EditorResourcePreview::_preview_ready(const String &p_path, int p_hash, con
if (!p_path.begins_with("ID:")) {
modified_time = FileAccess::get_modified_time(p_path);
+ String import_path = p_path + ".import";
+ if (FileAccess::exists(import_path)) {
+ modified_time = MAX(modified_time, FileAccess::get_modified_time(import_path));
+ }
}
Item item;
@@ -237,7 +241,14 @@ void EditorResourcePreview::_generate_preview(Ref<ImageTexture> &r_texture, Ref<
}
Ref<FileAccess> f = FileAccess::open(cache_base + ".txt", FileAccess::WRITE);
ERR_FAIL_COND_MSG(f.is_null(), "Cannot create file '" + cache_base + ".txt'. Check user write permissions.");
- _write_preview_cache(f, thumbnail_size, has_small_texture, FileAccess::get_modified_time(p_item.path), FileAccess::get_md5(p_item.path), p_metadata);
+
+ uint64_t modtime = FileAccess::get_modified_time(p_item.path);
+ String import_path = p_item.path + ".import";
+ if (FileAccess::exists(import_path)) {
+ modtime = MAX(modtime, FileAccess::get_modified_time(import_path));
+ }
+
+ _write_preview_cache(f, thumbnail_size, has_small_texture, modtime, FileAccess::get_md5(p_item.path), p_metadata);
}
}
@@ -298,6 +309,11 @@ void EditorResourcePreview::_iterate() {
_generate_preview(texture, small_texture, item, cache_base, preview_metadata);
} else {
uint64_t modtime = FileAccess::get_modified_time(item.path);
+ String import_path = item.path + ".import";
+ if (FileAccess::exists(import_path)) {
+ modtime = MAX(modtime, FileAccess::get_modified_time(import_path));
+ }
+
int tsize;
bool has_small_texture;
uint64_t last_modtime;
@@ -513,6 +529,11 @@ void EditorResourcePreview::check_for_invalidation(const String &p_path) {
if (cache.has(p_path)) {
uint64_t modified_time = FileAccess::get_modified_time(p_path);
+ String import_path = p_path + ".import";
+ if (FileAccess::exists(import_path)) {
+ modified_time = MAX(modified_time, FileAccess::get_modified_time(import_path));
+ }
+
if (modified_time != cache[p_path].modified_time) {
cache.erase(p_path);
call_invalidated = true;
diff --git a/editor/import/3d/resource_importer_scene.cpp b/editor/import/3d/resource_importer_scene.cpp
index 75f7d35b1c..9ab97abd56 100644
--- a/editor/import/3d/resource_importer_scene.cpp
+++ b/editor/import/3d/resource_importer_scene.cpp
@@ -34,6 +34,7 @@
#include "core/io/dir_access.h"
#include "core/io/resource_saver.h"
#include "core/object/script_language.h"
+#include "editor/editor_interface.h"
#include "editor/editor_node.h"
#include "editor/editor_settings.h"
#include "editor/import/3d/scene_import_settings.h"
@@ -2815,6 +2816,15 @@ void ResourceImporterScene::_optimize_track_usage(AnimationPlayer *p_player, Ani
}
}
+void ResourceImporterScene::_generate_editor_preview_for_scene(const String &p_path, Node *p_scene) {
+ if (!Engine::get_singleton()->is_editor_hint()) {
+ return;
+ }
+ ERR_FAIL_COND_MSG(p_path.is_empty(), "Path is empty, cannot generate preview.");
+ ERR_FAIL_NULL_MSG(p_scene, "Scene is null, cannot generate preview.");
+ EditorInterface::get_singleton()->make_scene_preview(p_path, p_scene, 1024);
+}
+
Node *ResourceImporterScene::pre_import(const String &p_source_file, const HashMap<StringName, Variant> &p_options) {
Ref<EditorSceneFormatImporter> importer;
String ext = p_source_file.get_extension().to_lower();
@@ -3165,6 +3175,7 @@ Error ResourceImporterScene::import(ResourceUID::ID p_source_id, const String &p
print_verbose("Saving scene to: " + p_save_path + ".scn");
err = ResourceSaver::save(packer, p_save_path + ".scn", flags); //do not take over, let the changed files reload themselves
ERR_FAIL_COND_V_MSG(err != OK, err, "Cannot save scene to file '" + p_save_path + ".scn'.");
+ _generate_editor_preview_for_scene(p_source_file, scene);
} else {
ERR_FAIL_V_MSG(ERR_FILE_UNRECOGNIZED, "Unknown scene import type: " + _scene_import_type);
}
diff --git a/editor/import/3d/resource_importer_scene.h b/editor/import/3d/resource_importer_scene.h
index b2f5fab0eb..6868baf023 100644
--- a/editor/import/3d/resource_importer_scene.h
+++ b/editor/import/3d/resource_importer_scene.h
@@ -236,6 +236,7 @@ class ResourceImporterScene : public ResourceImporter {
};
void _optimize_track_usage(AnimationPlayer *p_player, AnimationImportTracks *p_track_actions);
+ void _generate_editor_preview_for_scene(const String &p_path, Node *p_scene);
String _scene_import_type = "PackedScene";
diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
index 4edd021b4d..818ac34105 100644
--- a/editor/plugins/animation_player_editor_plugin.cpp
+++ b/editor/plugins/animation_player_editor_plugin.cpp
@@ -901,7 +901,7 @@ void AnimationPlayerEditor::set_state(const Dictionary &p_state) {
player->connect(SNAME("animation_list_changed"), callable_mp(this, &AnimationPlayerEditor::_animation_libraries_updated), CONNECT_DEFERRED);
}
if (!player->is_connected(SNAME("current_animation_changed"), callable_mp(this, &AnimationPlayerEditor::_current_animation_changed))) {
- player->connect(SNAME("current_animation_changed"), callable_mp(this, &AnimationPlayerEditor::_current_animation_changed), CONNECT_DEFERRED);
+ player->connect(SNAME("current_animation_changed"), callable_mp(this, &AnimationPlayerEditor::_current_animation_changed));
}
}
diff --git a/editor/plugins/camera_3d_editor_plugin.cpp b/editor/plugins/camera_3d_editor_plugin.cpp
index f4116ed364..10ed7d1902 100644
--- a/editor/plugins/camera_3d_editor_plugin.cpp
+++ b/editor/plugins/camera_3d_editor_plugin.cpp
@@ -30,8 +30,11 @@
#include "camera_3d_editor_plugin.h"
+#include "core/config/project_settings.h"
#include "editor/editor_node.h"
#include "node_3d_editor_plugin.h"
+#include "scene/gui/texture_rect.h"
+#include "scene/main/viewport.h"
void Camera3DEditor::_node_removed(Node *p_node) {
if (p_node == node) {
@@ -76,9 +79,35 @@ Camera3DEditor::Camera3DEditor() {
preview->connect(SceneStringName(pressed), callable_mp(this, &Camera3DEditor::_pressed));
}
+void Camera3DPreview::_update_sub_viewport_size() {
+ sub_viewport->set_size(Node3DEditor::get_camera_viewport_size(camera));
+}
+
+Camera3DPreview::Camera3DPreview(Camera3D *p_camera) :
+ TexturePreview(nullptr, false), camera(p_camera), sub_viewport(memnew(SubViewport)) {
+ RenderingServer::get_singleton()->viewport_attach_camera(sub_viewport->get_viewport_rid(), camera->get_camera());
+ add_child(sub_viewport);
+
+ TextureRect *display = get_texture_display();
+ display->set_texture(sub_viewport->get_texture());
+ sub_viewport->connect("size_changed", callable_mp((CanvasItem *)display, &CanvasItem::queue_redraw));
+
+ ProjectSettings::get_singleton()->connect("settings_changed", callable_mp(this, &Camera3DPreview::_update_sub_viewport_size));
+ _update_sub_viewport_size();
+}
+
+bool EditorInspectorPluginCamera3DPreview::can_handle(Object *p_object) {
+ return Object::cast_to<Camera3D>(p_object) != nullptr;
+}
+
+void EditorInspectorPluginCamera3DPreview::parse_begin(Object *p_object) {
+ Camera3D *camera = Object::cast_to<Camera3D>(p_object);
+ Camera3DPreview *preview = memnew(Camera3DPreview(camera));
+ add_custom_control(preview);
+}
+
void Camera3DEditorPlugin::edit(Object *p_object) {
Node3DEditor::get_singleton()->set_can_preview(Object::cast_to<Camera3D>(p_object));
- //camera_editor->edit(Object::cast_to<Node>(p_object));
}
bool Camera3DEditorPlugin::handles(Object *p_object) const {
@@ -86,27 +115,15 @@ bool Camera3DEditorPlugin::handles(Object *p_object) const {
}
void Camera3DEditorPlugin::make_visible(bool p_visible) {
- if (p_visible) {
- //Node3DEditor::get_singleton()->set_can_preview(Object::cast_to<Camera3D>(p_object));
- } else {
+ if (!p_visible) {
Node3DEditor::get_singleton()->set_can_preview(nullptr);
}
}
Camera3DEditorPlugin::Camera3DEditorPlugin() {
- /* camera_editor = memnew( CameraEditor );
- EditorNode::get_singleton()->get_main_screen_control()->add_child(camera_editor);
-
- camera_editor->set_anchor(SIDE_LEFT,Control::ANCHOR_END);
- camera_editor->set_anchor(SIDE_RIGHT,Control::ANCHOR_END);
- camera_editor->set_offset(SIDE_LEFT,60);
- camera_editor->set_offset(SIDE_RIGHT,0);
- camera_editor->set_offset(SIDE_TOP,0);
- camera_editor->set_offset(SIDE_BOTTOM,10);
-
-
- camera_editor->hide();
-*/
+ Ref<EditorInspectorPluginCamera3DPreview> plugin;
+ plugin.instantiate();
+ add_inspector_plugin(plugin);
}
Camera3DEditorPlugin::~Camera3DEditorPlugin() {
diff --git a/editor/plugins/camera_3d_editor_plugin.h b/editor/plugins/camera_3d_editor_plugin.h
index 1c6838aa02..98d0bcc40c 100644
--- a/editor/plugins/camera_3d_editor_plugin.h
+++ b/editor/plugins/camera_3d_editor_plugin.h
@@ -32,7 +32,10 @@
#define CAMERA_3D_EDITOR_PLUGIN_H
#include "editor/plugins/editor_plugin.h"
-#include "scene/3d/camera_3d.h"
+#include "editor/plugins/texture_editor_plugin.h"
+
+class Camera3D;
+class SubViewport;
class Camera3DEditor : public Control {
GDCLASS(Camera3DEditor, Control);
@@ -51,11 +54,29 @@ public:
Camera3DEditor();
};
+class Camera3DPreview : public TexturePreview {
+ GDCLASS(Camera3DPreview, TexturePreview);
+
+ Camera3D *camera = nullptr;
+ SubViewport *sub_viewport = nullptr;
+
+ void _update_sub_viewport_size();
+
+public:
+ Camera3DPreview(Camera3D *p_camera);
+};
+
+class EditorInspectorPluginCamera3DPreview : public EditorInspectorPluginTexture {
+ GDCLASS(EditorInspectorPluginCamera3DPreview, EditorInspectorPluginTexture);
+
+public:
+ virtual bool can_handle(Object *p_object) override;
+ virtual void parse_begin(Object *p_object) override;
+};
+
class Camera3DEditorPlugin : public EditorPlugin {
GDCLASS(Camera3DEditorPlugin, EditorPlugin);
- //CameraEditor *camera_editor;
-
public:
virtual String get_name() const override { return "Camera3D"; }
bool has_main_screen() const override { return false; }
diff --git a/editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp b/editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp
index 63a48d4165..359bb59098 100644
--- a/editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp
+++ b/editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp
@@ -46,24 +46,6 @@ Camera3DGizmoPlugin::Camera3DGizmoPlugin() {
create_handle_material("handles");
}
-Size2i Camera3DGizmoPlugin::_get_viewport_size(Camera3D *p_camera) {
- Viewport *viewport = p_camera->get_viewport();
-
- Window *window = Object::cast_to<Window>(viewport);
- if (window) {
- return window->get_size();
- }
-
- SubViewport *sub_viewport = Object::cast_to<SubViewport>(viewport);
- ERR_FAIL_NULL_V(sub_viewport, Size2i());
-
- if (sub_viewport == EditorNode::get_singleton()->get_scene_root()) {
- return Size2(GLOBAL_GET("display/window/size/viewport_width"), GLOBAL_GET("display/window/size/viewport_height"));
- }
-
- return sub_viewport->get_size();
-}
-
bool Camera3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
return Object::cast_to<Camera3D>(p_spatial) != nullptr;
}
@@ -166,7 +148,7 @@ void Camera3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
Ref<Material> material = get_material("camera_material", p_gizmo);
Ref<Material> icon = get_material("camera_icon", p_gizmo);
- const Size2i viewport_size = _get_viewport_size(camera);
+ const Size2i viewport_size = Node3DEditor::get_camera_viewport_size(camera);
const real_t viewport_aspect = viewport_size.x > 0 && viewport_size.y > 0 ? viewport_size.aspect() : 1.0;
const Size2 size_factor = viewport_aspect > 1.0 ? Size2(1.0, 1.0 / viewport_aspect) : Size2(viewport_aspect, 1.0);
diff --git a/editor/plugins/gizmos/camera_3d_gizmo_plugin.h b/editor/plugins/gizmos/camera_3d_gizmo_plugin.h
index ba65ebb8de..94238704c1 100644
--- a/editor/plugins/gizmos/camera_3d_gizmo_plugin.h
+++ b/editor/plugins/gizmos/camera_3d_gizmo_plugin.h
@@ -37,7 +37,6 @@ class Camera3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(Camera3DGizmoPlugin, EditorNode3DGizmoPlugin);
private:
- static Size2i _get_viewport_size(Camera3D *p_camera);
static float _find_closest_angle_to_half_pi_arc(const Vector3 &p_from, const Vector3 &p_to, float p_arc_radius, const Transform3D &p_arc_xform);
public:
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp
index fed04a3754..c321ff1db5 100644
--- a/editor/plugins/node_3d_editor_plugin.cpp
+++ b/editor/plugins/node_3d_editor_plugin.cpp
@@ -9308,6 +9308,24 @@ void Node3DEditorPlugin::set_state(const Dictionary &p_state) {
spatial_editor->set_state(p_state);
}
+Size2i Node3DEditor::get_camera_viewport_size(Camera3D *p_camera) {
+ Viewport *viewport = p_camera->get_viewport();
+
+ Window *window = Object::cast_to<Window>(viewport);
+ if (window) {
+ return window->get_size();
+ }
+
+ SubViewport *sub_viewport = Object::cast_to<SubViewport>(viewport);
+ ERR_FAIL_NULL_V(sub_viewport, Size2i());
+
+ if (sub_viewport == EditorNode::get_singleton()->get_scene_root()) {
+ return Size2(GLOBAL_GET("display/window/size/viewport_width"), GLOBAL_GET("display/window/size/viewport_height"));
+ }
+
+ return sub_viewport->get_size();
+}
+
Vector3 Node3DEditor::snap_point(Vector3 p_target, Vector3 p_start) const {
if (is_snap_enabled()) {
real_t snap = get_translate_snap();
diff --git a/editor/plugins/node_3d_editor_plugin.h b/editor/plugins/node_3d_editor_plugin.h
index d35fcb7653..27db7f27f3 100644
--- a/editor/plugins/node_3d_editor_plugin.h
+++ b/editor/plugins/node_3d_editor_plugin.h
@@ -880,6 +880,8 @@ protected:
public:
static Node3DEditor *get_singleton() { return singleton; }
+ static Size2i get_camera_viewport_size(Camera3D *p_camera);
+
Vector3 snap_point(Vector3 p_target, Vector3 p_start = Vector3(0, 0, 0)) const;
float get_znear() const { return settings_znear->get_value(); }
diff --git a/editor/plugins/plugin_config_dialog.cpp b/editor/plugins/plugin_config_dialog.cpp
index af9efda939..c3e87c508e 100644
--- a/editor/plugins/plugin_config_dialog.cpp
+++ b/editor/plugins/plugin_config_dialog.cpp
@@ -305,7 +305,7 @@ PluginConfigDialog::PluginConfigDialog() {
grid->add_child(script_name_label);
script_edit = memnew(LineEdit);
- script_edit->set_tooltip_text(TTR("Optional. The path to the script (relative to the add-on folder). If left empty, will default to \"plugin.gd\"."));
+ script_edit->set_tooltip_text(TTR("Optional. The name of the script file. If left empty, will default to the subfolder name."));
script_edit->set_placeholder("\"plugin.gd\" -> res://addons/my_plugin/plugin.gd");
script_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
grid->add_child(script_edit);