Merge pull request #69939 from timothyqiu/open-packed-scene-3.x

[3.x] Add open scene button in Inspector for PackedScene resource
This commit is contained in:
Rémi Verschelde 2022-12-22 08:57:30 +01:00
commit ac589edb36
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 156 additions and 0 deletions

View File

@ -140,6 +140,7 @@
#include "editor/plugins/mesh_library_editor_plugin.h" #include "editor/plugins/mesh_library_editor_plugin.h"
#include "editor/plugins/multimesh_editor_plugin.h" #include "editor/plugins/multimesh_editor_plugin.h"
#include "editor/plugins/navigation_polygon_editor_plugin.h" #include "editor/plugins/navigation_polygon_editor_plugin.h"
#include "editor/plugins/packed_scene_editor_plugin.h"
#include "editor/plugins/particles_2d_editor_plugin.h" #include "editor/plugins/particles_2d_editor_plugin.h"
#include "editor/plugins/particles_editor_plugin.h" #include "editor/plugins/particles_editor_plugin.h"
#include "editor/plugins/path_2d_editor_plugin.h" #include "editor/plugins/path_2d_editor_plugin.h"
@ -7035,6 +7036,7 @@ EditorNode::EditorNode() {
add_editor_plugin(memnew(RoomEditorPlugin(this))); add_editor_plugin(memnew(RoomEditorPlugin(this)));
add_editor_plugin(memnew(OccluderEditorPlugin(this))); add_editor_plugin(memnew(OccluderEditorPlugin(this)));
add_editor_plugin(memnew(PortalEditorPlugin(this))); add_editor_plugin(memnew(PortalEditorPlugin(this)));
add_editor_plugin(memnew(PackedSceneEditorPlugin(this)));
add_editor_plugin(memnew(Path2DEditorPlugin(this))); add_editor_plugin(memnew(Path2DEditorPlugin(this)));
add_editor_plugin(memnew(PathEditorPlugin(this))); add_editor_plugin(memnew(PathEditorPlugin(this)));
add_editor_plugin(memnew(Line2DEditorPlugin(this))); add_editor_plugin(memnew(Line2DEditorPlugin(this)));

View File

@ -0,0 +1,85 @@
/*************************************************************************/
/* packed_scene_editor_plugin.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "packed_scene_editor_plugin.h"
#include "editor/editor_node.h"
#include "scene/gui/button.h"
#include "scene/resources/packed_scene.h"
#include "scene/scene_string_names.h"
void PackedSceneEditor::_on_open_scene_pressed() {
// Using deferred call because changing scene updates the Inspector and thus destroys this plugin.
EditorNode::get_singleton()->call_deferred("open_request", packed_scene->get_path());
}
void PackedSceneEditor::_bind_methods() {
ClassDB::bind_method("_on_open_scene_pressed", &PackedSceneEditor::_on_open_scene_pressed);
}
void PackedSceneEditor::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_ENTER_TREE:
case NOTIFICATION_THEME_CHANGED: {
open_scene_button->set_icon(get_icon("PackedScene", "EditorIcons"));
} break;
}
}
PackedSceneEditor::PackedSceneEditor(Ref<PackedScene> &p_packed_scene) {
packed_scene = p_packed_scene;
open_scene_button = memnew(Button(TTR("Open Scene")));
open_scene_button->connect("pressed", this, "_on_open_scene_pressed");
open_scene_button->set_disabled(!packed_scene->get_path().get_file().is_valid_filename());
add_child(open_scene_button);
add_child(memnew(Control)); // Add padding before the regular properties.
}
///////////////////////
bool EditorInspectorPluginPackedScene::can_handle(Object *p_object) {
return Object::cast_to<PackedScene>(p_object) != nullptr;
}
void EditorInspectorPluginPackedScene::parse_begin(Object *p_object) {
Ref<PackedScene> packed_scene(p_object);
PackedSceneEditor *editor = memnew(PackedSceneEditor(packed_scene));
add_custom_control(editor);
}
///////////////////////
PackedSceneEditorPlugin::PackedSceneEditorPlugin(EditorNode *p_editor) {
Ref<EditorInspectorPluginPackedScene> plugin;
plugin.instance();
add_inspector_plugin(plugin);
}

View File

@ -0,0 +1,69 @@
/*************************************************************************/
/* packed_scene_editor_plugin.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef PACKED_SCENE_EDITOR_PLUGIN_H
#define PACKED_SCENE_EDITOR_PLUGIN_H
#include "editor/editor_inspector.h"
#include "editor/editor_plugin.h"
#include "scene/gui/box_container.h"
class PackedSceneEditor : public VBoxContainer {
GDCLASS(PackedSceneEditor, VBoxContainer);
Ref<PackedScene> packed_scene;
Button *open_scene_button;
void _on_open_scene_pressed();
protected:
static void _bind_methods();
void _notification(int p_what);
public:
PackedSceneEditor(Ref<PackedScene> &p_packed_scene);
};
class EditorInspectorPluginPackedScene : public EditorInspectorPlugin {
GDCLASS(EditorInspectorPluginPackedScene, EditorInspectorPlugin);
public:
virtual bool can_handle(Object *p_object);
virtual void parse_begin(Object *p_object);
};
class PackedSceneEditorPlugin : public EditorPlugin {
GDCLASS(PackedSceneEditorPlugin, EditorPlugin);
public:
PackedSceneEditorPlugin(EditorNode *p_editor);
};
#endif // PACKED_SCENE_EDITOR_PLUGIN_H