Rename remaining "Spatial" in Plugins to "Node3D"
For EditorNode3DGizmo: - `get_spatial_node` -> `get_node_3d` - `set_spatial_node` -> `set_node_3d` For EditorPlugin: - `add_spatial_gizmo_plugin` -> `add_node_3d_gizmo_plugin` - `remove_spatial_gizmo_plugin` -> `remove_node_3d_gizmo_plugin` Also renames some internal methods for consistency (`forward_3d_draw_over_viewport` & `forward_3d_force_draw_over_viewport` ...). Basically, Spatial has been completely eradicated.
This commit is contained in:
Micky
parent
e5aa5eb806
commit
ae5771e1b1
|
|
@ -168,18 +168,18 @@
|
|||
Removes everything in the gizmo including meshes, collisions and handles.
|
||||
</description>
|
||||
</method>
|
||||
<method name="get_node_3d" qualifiers="const">
|
||||
<return type="Node3D" />
|
||||
<description>
|
||||
Returns the [Node3D] node associated with this gizmo.
|
||||
</description>
|
||||
</method>
|
||||
<method name="get_plugin" qualifiers="const">
|
||||
<return type="EditorNode3DGizmoPlugin" />
|
||||
<description>
|
||||
Returns the [EditorNode3DGizmoPlugin] that owns this gizmo. It's useful to retrieve materials using [method EditorNode3DGizmoPlugin.get_material].
|
||||
</description>
|
||||
</method>
|
||||
<method name="get_spatial_node" qualifiers="const">
|
||||
<return type="Node3D" />
|
||||
<description>
|
||||
Returns the Node3D node associated with this gizmo.
|
||||
</description>
|
||||
</method>
|
||||
<method name="get_subgizmo_selection" qualifiers="const">
|
||||
<return type="PackedInt32Array" />
|
||||
<description>
|
||||
|
|
@ -200,7 +200,7 @@
|
|||
Sets the gizmo's hidden state. If [code]true[/code], the gizmo will be hidden. If [code]false[/code], it will be shown.
|
||||
</description>
|
||||
</method>
|
||||
<method name="set_spatial_node">
|
||||
<method name="set_node_3d">
|
||||
<return type="void" />
|
||||
<param index="0" name="node" type="Node" />
|
||||
<description>
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
</brief_description>
|
||||
<description>
|
||||
[EditorNode3DGizmoPlugin] allows you to define a new type of Gizmo. There are two main ways to do so: extending [EditorNode3DGizmoPlugin] for the simpler gizmos, or creating a new [EditorNode3DGizmo] type. See the tutorial in the documentation for more info.
|
||||
To use [EditorNode3DGizmoPlugin], register it using the [method EditorPlugin.add_spatial_gizmo_plugin] method first.
|
||||
To use [EditorNode3DGizmoPlugin], register it using the [method EditorPlugin.add_node_3d_gizmo_plugin] method first.
|
||||
</description>
|
||||
<tutorials>
|
||||
<link title="Spatial gizmo plugins">$DOCS_URL/tutorials/plugins/editor/spatial_gizmos.html</link>
|
||||
<link title="Node3D gizmo plugins">$DOCS_URL/tutorials/plugins/editor/spatial_gizmos.html</link>
|
||||
</tutorials>
|
||||
<methods>
|
||||
<method name="_can_be_hidden" qualifiers="virtual const">
|
||||
|
|
|
|||
|
|
@ -455,6 +455,14 @@
|
|||
[/codeblocks]
|
||||
</description>
|
||||
</method>
|
||||
<method name="add_node_3d_gizmo_plugin">
|
||||
<return type="void" />
|
||||
<param index="0" name="plugin" type="EditorNode3DGizmoPlugin" />
|
||||
<description>
|
||||
Registers a new [EditorNode3DGizmoPlugin]. Gizmo plugins are used to add custom gizmos to the 3D preview viewport for a [Node3D].
|
||||
See [method add_inspector_plugin] for an example of how to register a plugin.
|
||||
</description>
|
||||
</method>
|
||||
<method name="add_scene_format_importer_plugin">
|
||||
<return type="void" />
|
||||
<param index="0" name="scene_format_importer" type="EditorSceneFormatImporter" />
|
||||
|
|
@ -473,14 +481,6 @@
|
|||
If [param first_priority] is [code]true[/code], the new import plugin is inserted first in the list and takes precedence over pre-existing plugins.
|
||||
</description>
|
||||
</method>
|
||||
<method name="add_spatial_gizmo_plugin">
|
||||
<return type="void" />
|
||||
<param index="0" name="plugin" type="EditorNode3DGizmoPlugin" />
|
||||
<description>
|
||||
Registers a new [EditorNode3DGizmoPlugin]. Gizmo plugins are used to add custom gizmos to the 3D preview viewport for a [Node3D].
|
||||
See [method add_inspector_plugin] for an example of how to register a plugin.
|
||||
</description>
|
||||
</method>
|
||||
<method name="add_tool_menu_item">
|
||||
<return type="void" />
|
||||
<param index="0" name="name" type="String" />
|
||||
|
|
@ -621,6 +621,13 @@
|
|||
Removes an inspector plugin registered by [method add_import_plugin]
|
||||
</description>
|
||||
</method>
|
||||
<method name="remove_node_3d_gizmo_plugin">
|
||||
<return type="void" />
|
||||
<param index="0" name="plugin" type="EditorNode3DGizmoPlugin" />
|
||||
<description>
|
||||
Removes a gizmo plugin registered by [method add_node_3d_gizmo_plugin].
|
||||
</description>
|
||||
</method>
|
||||
<method name="remove_scene_format_importer_plugin">
|
||||
<return type="void" />
|
||||
<param index="0" name="scene_format_importer" type="EditorSceneFormatImporter" />
|
||||
|
|
@ -635,13 +642,6 @@
|
|||
Remove the [EditorScenePostImportPlugin], added with [method add_scene_post_import_plugin].
|
||||
</description>
|
||||
</method>
|
||||
<method name="remove_spatial_gizmo_plugin">
|
||||
<return type="void" />
|
||||
<param index="0" name="plugin" type="EditorNode3DGizmoPlugin" />
|
||||
<description>
|
||||
Removes a gizmo plugin registered by [method add_spatial_gizmo_plugin].
|
||||
</description>
|
||||
</method>
|
||||
<method name="remove_tool_menu_item">
|
||||
<return type="void" />
|
||||
<param index="0" name="name" type="String" />
|
||||
|
|
|
|||
|
|
@ -7618,7 +7618,7 @@ bool EditorPluginList::forward_gui_input(const Ref<InputEvent> &p_event) {
|
|||
return discard;
|
||||
}
|
||||
|
||||
EditorPlugin::AfterGUIInput EditorPluginList::forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event, bool serve_when_force_input_enabled) {
|
||||
EditorPlugin::AfterGUIInput EditorPluginList::forward_3d_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event, bool serve_when_force_input_enabled) {
|
||||
EditorPlugin::AfterGUIInput after = EditorPlugin::AFTER_GUI_INPUT_PASS;
|
||||
|
||||
for (int i = 0; i < plugins_list.size(); i++) {
|
||||
|
|
@ -7626,7 +7626,7 @@ EditorPlugin::AfterGUIInput EditorPluginList::forward_spatial_gui_input(Camera3D
|
|||
continue;
|
||||
}
|
||||
|
||||
EditorPlugin::AfterGUIInput current_after = plugins_list[i]->forward_spatial_gui_input(p_camera, p_event);
|
||||
EditorPlugin::AfterGUIInput current_after = plugins_list[i]->forward_3d_gui_input(p_camera, p_event);
|
||||
if (current_after == EditorPlugin::AFTER_GUI_INPUT_STOP) {
|
||||
after = EditorPlugin::AFTER_GUI_INPUT_STOP;
|
||||
}
|
||||
|
|
@ -7650,15 +7650,15 @@ void EditorPluginList::forward_canvas_force_draw_over_viewport(Control *p_overla
|
|||
}
|
||||
}
|
||||
|
||||
void EditorPluginList::forward_spatial_draw_over_viewport(Control *p_overlay) {
|
||||
void EditorPluginList::forward_3d_draw_over_viewport(Control *p_overlay) {
|
||||
for (int i = 0; i < plugins_list.size(); i++) {
|
||||
plugins_list[i]->forward_spatial_draw_over_viewport(p_overlay);
|
||||
plugins_list[i]->forward_3d_draw_over_viewport(p_overlay);
|
||||
}
|
||||
}
|
||||
|
||||
void EditorPluginList::forward_spatial_force_draw_over_viewport(Control *p_overlay) {
|
||||
void EditorPluginList::forward_3d_force_draw_over_viewport(Control *p_overlay) {
|
||||
for (int i = 0; i < plugins_list.size(); i++) {
|
||||
plugins_list[i]->forward_spatial_force_draw_over_viewport(p_overlay);
|
||||
plugins_list[i]->forward_3d_force_draw_over_viewport(p_overlay);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -935,9 +935,9 @@ public:
|
|||
bool forward_gui_input(const Ref<InputEvent> &p_event);
|
||||
void forward_canvas_draw_over_viewport(Control *p_overlay);
|
||||
void forward_canvas_force_draw_over_viewport(Control *p_overlay);
|
||||
EditorPlugin::AfterGUIInput forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event, bool serve_when_force_input_enabled);
|
||||
void forward_spatial_draw_over_viewport(Control *p_overlay);
|
||||
void forward_spatial_force_draw_over_viewport(Control *p_overlay);
|
||||
EditorPlugin::AfterGUIInput forward_3d_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event, bool serve_when_force_input_enabled);
|
||||
void forward_3d_draw_over_viewport(Control *p_overlay);
|
||||
void forward_3d_force_draw_over_viewport(Control *p_overlay);
|
||||
void add_plugin(EditorPlugin *p_plugin);
|
||||
void remove_plugin(EditorPlugin *p_plugin);
|
||||
void clear();
|
||||
|
|
|
|||
|
|
@ -604,7 +604,7 @@ int EditorPlugin::update_overlays() const {
|
|||
}
|
||||
}
|
||||
|
||||
EditorPlugin::AfterGUIInput EditorPlugin::forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) {
|
||||
EditorPlugin::AfterGUIInput EditorPlugin::forward_3d_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) {
|
||||
int success;
|
||||
|
||||
if (GDVIRTUAL_CALL(_forward_3d_gui_input, p_camera, p_event, success)) {
|
||||
|
|
@ -614,11 +614,11 @@ EditorPlugin::AfterGUIInput EditorPlugin::forward_spatial_gui_input(Camera3D *p_
|
|||
return EditorPlugin::AFTER_GUI_INPUT_PASS;
|
||||
}
|
||||
|
||||
void EditorPlugin::forward_spatial_draw_over_viewport(Control *p_overlay) {
|
||||
void EditorPlugin::forward_3d_draw_over_viewport(Control *p_overlay) {
|
||||
GDVIRTUAL_CALL(_forward_3d_draw_over_viewport, p_overlay);
|
||||
}
|
||||
|
||||
void EditorPlugin::forward_spatial_force_draw_over_viewport(Control *p_overlay) {
|
||||
void EditorPlugin::forward_3d_force_draw_over_viewport(Control *p_overlay) {
|
||||
GDVIRTUAL_CALL(_forward_3d_force_draw_over_viewport, p_overlay);
|
||||
}
|
||||
|
||||
|
|
@ -753,12 +753,12 @@ void EditorPlugin::remove_export_plugin(const Ref<EditorExportPlugin> &p_exporte
|
|||
EditorExport::get_singleton()->remove_export_plugin(p_exporter);
|
||||
}
|
||||
|
||||
void EditorPlugin::add_spatial_gizmo_plugin(const Ref<EditorNode3DGizmoPlugin> &p_gizmo_plugin) {
|
||||
void EditorPlugin::add_node_3d_gizmo_plugin(const Ref<EditorNode3DGizmoPlugin> &p_gizmo_plugin) {
|
||||
ERR_FAIL_COND(!p_gizmo_plugin.is_valid());
|
||||
Node3DEditor::get_singleton()->add_gizmo_plugin(p_gizmo_plugin);
|
||||
}
|
||||
|
||||
void EditorPlugin::remove_spatial_gizmo_plugin(const Ref<EditorNode3DGizmoPlugin> &p_gizmo_plugin) {
|
||||
void EditorPlugin::remove_node_3d_gizmo_plugin(const Ref<EditorNode3DGizmoPlugin> &p_gizmo_plugin) {
|
||||
ERR_FAIL_COND(!p_gizmo_plugin.is_valid());
|
||||
Node3DEditor::get_singleton()->remove_gizmo_plugin(p_gizmo_plugin);
|
||||
}
|
||||
|
|
@ -908,8 +908,8 @@ void EditorPlugin::_bind_methods() {
|
|||
ClassDB::bind_method(D_METHOD("remove_scene_post_import_plugin", "scene_import_plugin"), &EditorPlugin::remove_scene_post_import_plugin);
|
||||
ClassDB::bind_method(D_METHOD("add_export_plugin", "plugin"), &EditorPlugin::add_export_plugin);
|
||||
ClassDB::bind_method(D_METHOD("remove_export_plugin", "plugin"), &EditorPlugin::remove_export_plugin);
|
||||
ClassDB::bind_method(D_METHOD("add_spatial_gizmo_plugin", "plugin"), &EditorPlugin::add_spatial_gizmo_plugin);
|
||||
ClassDB::bind_method(D_METHOD("remove_spatial_gizmo_plugin", "plugin"), &EditorPlugin::remove_spatial_gizmo_plugin);
|
||||
ClassDB::bind_method(D_METHOD("add_node_3d_gizmo_plugin", "plugin"), &EditorPlugin::add_node_3d_gizmo_plugin);
|
||||
ClassDB::bind_method(D_METHOD("remove_node_3d_gizmo_plugin", "plugin"), &EditorPlugin::remove_node_3d_gizmo_plugin);
|
||||
ClassDB::bind_method(D_METHOD("add_inspector_plugin", "plugin"), &EditorPlugin::add_inspector_plugin);
|
||||
ClassDB::bind_method(D_METHOD("remove_inspector_plugin", "plugin"), &EditorPlugin::remove_inspector_plugin);
|
||||
ClassDB::bind_method(D_METHOD("set_input_event_forwarding_always_enabled"), &EditorPlugin::set_input_event_forwarding_always_enabled);
|
||||
|
|
|
|||
|
|
@ -237,9 +237,9 @@ public:
|
|||
virtual void forward_canvas_draw_over_viewport(Control *p_overlay);
|
||||
virtual void forward_canvas_force_draw_over_viewport(Control *p_overlay);
|
||||
|
||||
virtual EditorPlugin::AfterGUIInput forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event);
|
||||
virtual void forward_spatial_draw_over_viewport(Control *p_overlay);
|
||||
virtual void forward_spatial_force_draw_over_viewport(Control *p_overlay);
|
||||
virtual EditorPlugin::AfterGUIInput forward_3d_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event);
|
||||
virtual void forward_3d_draw_over_viewport(Control *p_overlay);
|
||||
virtual void forward_3d_force_draw_over_viewport(Control *p_overlay);
|
||||
|
||||
virtual String get_name() const;
|
||||
virtual const Ref<Texture2D> get_icon() const;
|
||||
|
|
@ -285,8 +285,8 @@ public:
|
|||
void add_export_plugin(const Ref<EditorExportPlugin> &p_exporter);
|
||||
void remove_export_plugin(const Ref<EditorExportPlugin> &p_exporter);
|
||||
|
||||
void add_spatial_gizmo_plugin(const Ref<EditorNode3DGizmoPlugin> &p_gizmo_plugin);
|
||||
void remove_spatial_gizmo_plugin(const Ref<EditorNode3DGizmoPlugin> &p_gizmo_plugin);
|
||||
void add_node_3d_gizmo_plugin(const Ref<EditorNode3DGizmoPlugin> &p_gizmo_plugin);
|
||||
void remove_node_3d_gizmo_plugin(const Ref<EditorNode3DGizmoPlugin> &p_gizmo_plugin);
|
||||
|
||||
void add_inspector_plugin(const Ref<EditorInspectorPlugin> &p_plugin);
|
||||
void remove_inspector_plugin(const Ref<EditorInspectorPlugin> &p_plugin);
|
||||
|
|
|
|||
|
|
@ -266,7 +266,7 @@ public:
|
|||
virtual void make_visible(bool p_visible) override;
|
||||
|
||||
virtual void forward_canvas_force_draw_over_viewport(Control *p_overlay) override { anim_editor->forward_force_draw_over_viewport(p_overlay); }
|
||||
virtual void forward_spatial_force_draw_over_viewport(Control *p_overlay) override { anim_editor->forward_force_draw_over_viewport(p_overlay); }
|
||||
virtual void forward_3d_force_draw_over_viewport(Control *p_overlay) override { anim_editor->forward_force_draw_over_viewport(p_overlay); }
|
||||
|
||||
AnimationPlayerEditorPlugin();
|
||||
~AnimationPlayerEditorPlugin();
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ void EditorNode3DGizmo::commit_subgizmos(const Vector<int> &p_ids, const Vector<
|
|||
gizmo_plugin->commit_subgizmos(this, p_ids, p_restore, p_cancel);
|
||||
}
|
||||
|
||||
void EditorNode3DGizmo::set_spatial_node(Node3D *p_node) {
|
||||
void EditorNode3DGizmo::set_node_3d(Node3D *p_node) {
|
||||
ERR_FAIL_NULL(p_node);
|
||||
spatial_node = p_node;
|
||||
}
|
||||
|
|
@ -839,8 +839,8 @@ void EditorNode3DGizmo::_bind_methods() {
|
|||
ClassDB::bind_method(D_METHOD("add_collision_triangles", "triangles"), &EditorNode3DGizmo::add_collision_triangles);
|
||||
ClassDB::bind_method(D_METHOD("add_unscaled_billboard", "material", "default_scale", "modulate"), &EditorNode3DGizmo::add_unscaled_billboard, DEFVAL(1), DEFVAL(Color(1, 1, 1)));
|
||||
ClassDB::bind_method(D_METHOD("add_handles", "handles", "material", "ids", "billboard", "secondary"), &EditorNode3DGizmo::add_handles, DEFVAL(false), DEFVAL(false));
|
||||
ClassDB::bind_method(D_METHOD("set_spatial_node", "node"), &EditorNode3DGizmo::_set_spatial_node);
|
||||
ClassDB::bind_method(D_METHOD("get_spatial_node"), &EditorNode3DGizmo::get_spatial_node);
|
||||
ClassDB::bind_method(D_METHOD("set_node_3d", "node"), &EditorNode3DGizmo::_set_node_3d);
|
||||
ClassDB::bind_method(D_METHOD("get_node_3d"), &EditorNode3DGizmo::get_node_3d);
|
||||
ClassDB::bind_method(D_METHOD("get_plugin"), &EditorNode3DGizmo::get_plugin);
|
||||
ClassDB::bind_method(D_METHOD("clear"), &EditorNode3DGizmo::clear);
|
||||
ClassDB::bind_method(D_METHOD("set_hidden", "hidden"), &EditorNode3DGizmo::set_hidden);
|
||||
|
|
@ -1039,7 +1039,7 @@ Ref<EditorNode3DGizmo> EditorNode3DGizmoPlugin::get_gizmo(Node3D *p_spatial) {
|
|||
}
|
||||
|
||||
ref->set_plugin(this);
|
||||
ref->set_spatial_node(p_spatial);
|
||||
ref->set_node_3d(p_spatial);
|
||||
ref->set_hidden(current_state == HIDDEN);
|
||||
|
||||
current_gizmos.push_back(ref.ptr());
|
||||
|
|
@ -1217,7 +1217,7 @@ EditorNode3DGizmoPlugin::EditorNode3DGizmoPlugin() {
|
|||
EditorNode3DGizmoPlugin::~EditorNode3DGizmoPlugin() {
|
||||
for (int i = 0; i < current_gizmos.size(); ++i) {
|
||||
current_gizmos[i]->set_plugin(nullptr);
|
||||
current_gizmos[i]->get_spatial_node()->remove_gizmo(current_gizmos[i]);
|
||||
current_gizmos[i]->get_node_3d()->remove_gizmo(current_gizmos[i]);
|
||||
}
|
||||
if (Node3DEditor::get_singleton()) {
|
||||
Node3DEditor::get_singleton()->update_all_gizmos();
|
||||
|
|
@ -1261,7 +1261,7 @@ String Light3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, int
|
|||
}
|
||||
|
||||
Variant Light3DGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
Light3D *light = Object::cast_to<Light3D>(p_gizmo->get_spatial_node());
|
||||
Light3D *light = Object::cast_to<Light3D>(p_gizmo->get_node_3d());
|
||||
if (p_id == 0) {
|
||||
return light->get_param(Light3D::PARAM_RANGE);
|
||||
}
|
||||
|
|
@ -1300,7 +1300,7 @@ static float _find_closest_angle_to_half_pi_arc(const Vector3 &p_from, const Vec
|
|||
}
|
||||
|
||||
void Light3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, Camera3D *p_camera, const Point2 &p_point) {
|
||||
Light3D *light = Object::cast_to<Light3D>(p_gizmo->get_spatial_node());
|
||||
Light3D *light = Object::cast_to<Light3D>(p_gizmo->get_node_3d());
|
||||
Transform3D gt = light->get_global_transform();
|
||||
Transform3D gi = gt.affine_inverse();
|
||||
|
||||
|
|
@ -1344,7 +1344,7 @@ void Light3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id,
|
|||
}
|
||||
|
||||
void Light3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel) {
|
||||
Light3D *light = Object::cast_to<Light3D>(p_gizmo->get_spatial_node());
|
||||
Light3D *light = Object::cast_to<Light3D>(p_gizmo->get_node_3d());
|
||||
if (p_cancel) {
|
||||
light->set_param(p_id == 0 ? Light3D::PARAM_RANGE : Light3D::PARAM_SPOT_ANGLE, p_restore);
|
||||
|
||||
|
|
@ -1364,7 +1364,7 @@ void Light3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_i
|
|||
}
|
||||
|
||||
void Light3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
Light3D *light = Object::cast_to<Light3D>(p_gizmo->get_spatial_node());
|
||||
Light3D *light = Object::cast_to<Light3D>(p_gizmo->get_node_3d());
|
||||
|
||||
Color color = light->get_color().srgb_to_linear() * light->get_correlated_color().srgb_to_linear();
|
||||
color = color.linear_to_srgb();
|
||||
|
|
@ -1526,12 +1526,12 @@ String AudioStreamPlayer3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *
|
|||
}
|
||||
|
||||
Variant AudioStreamPlayer3DGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
AudioStreamPlayer3D *player = Object::cast_to<AudioStreamPlayer3D>(p_gizmo->get_spatial_node());
|
||||
AudioStreamPlayer3D *player = Object::cast_to<AudioStreamPlayer3D>(p_gizmo->get_node_3d());
|
||||
return player->get_emission_angle();
|
||||
}
|
||||
|
||||
void AudioStreamPlayer3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, Camera3D *p_camera, const Point2 &p_point) {
|
||||
AudioStreamPlayer3D *player = Object::cast_to<AudioStreamPlayer3D>(p_gizmo->get_spatial_node());
|
||||
AudioStreamPlayer3D *player = Object::cast_to<AudioStreamPlayer3D>(p_gizmo->get_node_3d());
|
||||
|
||||
Transform3D gt = player->get_global_transform();
|
||||
Transform3D gi = gt.affine_inverse();
|
||||
|
|
@ -1568,7 +1568,7 @@ void AudioStreamPlayer3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo
|
|||
}
|
||||
|
||||
void AudioStreamPlayer3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel) {
|
||||
AudioStreamPlayer3D *player = Object::cast_to<AudioStreamPlayer3D>(p_gizmo->get_spatial_node());
|
||||
AudioStreamPlayer3D *player = Object::cast_to<AudioStreamPlayer3D>(p_gizmo->get_node_3d());
|
||||
|
||||
if (p_cancel) {
|
||||
player->set_emission_angle(p_restore);
|
||||
|
|
@ -1583,7 +1583,7 @@ void AudioStreamPlayer3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gi
|
|||
}
|
||||
|
||||
void AudioStreamPlayer3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
const AudioStreamPlayer3D *player = Object::cast_to<AudioStreamPlayer3D>(p_gizmo->get_spatial_node());
|
||||
const AudioStreamPlayer3D *player = Object::cast_to<AudioStreamPlayer3D>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -1762,7 +1762,7 @@ int Camera3DGizmoPlugin::get_priority() const {
|
|||
}
|
||||
|
||||
String Camera3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
Camera3D *camera = Object::cast_to<Camera3D>(p_gizmo->get_spatial_node());
|
||||
Camera3D *camera = Object::cast_to<Camera3D>(p_gizmo->get_node_3d());
|
||||
|
||||
if (camera->get_projection() == Camera3D::PROJECTION_PERSPECTIVE) {
|
||||
return "FOV";
|
||||
|
|
@ -1772,7 +1772,7 @@ String Camera3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, in
|
|||
}
|
||||
|
||||
Variant Camera3DGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
Camera3D *camera = Object::cast_to<Camera3D>(p_gizmo->get_spatial_node());
|
||||
Camera3D *camera = Object::cast_to<Camera3D>(p_gizmo->get_node_3d());
|
||||
|
||||
if (camera->get_projection() == Camera3D::PROJECTION_PERSPECTIVE) {
|
||||
return camera->get_fov();
|
||||
|
|
@ -1782,7 +1782,7 @@ Variant Camera3DGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo,
|
|||
}
|
||||
|
||||
void Camera3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, Camera3D *p_camera, const Point2 &p_point) {
|
||||
Camera3D *camera = Object::cast_to<Camera3D>(p_gizmo->get_spatial_node());
|
||||
Camera3D *camera = Object::cast_to<Camera3D>(p_gizmo->get_node_3d());
|
||||
|
||||
Transform3D gt = camera->get_global_transform();
|
||||
Transform3D gi = gt.affine_inverse();
|
||||
|
|
@ -1811,7 +1811,7 @@ void Camera3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id,
|
|||
}
|
||||
|
||||
void Camera3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel) {
|
||||
Camera3D *camera = Object::cast_to<Camera3D>(p_gizmo->get_spatial_node());
|
||||
Camera3D *camera = Object::cast_to<Camera3D>(p_gizmo->get_node_3d());
|
||||
|
||||
if (camera->get_projection() == Camera3D::PROJECTION_PERSPECTIVE) {
|
||||
if (p_cancel) {
|
||||
|
|
@ -1838,7 +1838,7 @@ void Camera3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_
|
|||
}
|
||||
|
||||
void Camera3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
Camera3D *camera = Object::cast_to<Camera3D>(p_gizmo->get_spatial_node());
|
||||
Camera3D *camera = Object::cast_to<Camera3D>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -1962,7 +1962,7 @@ bool MeshInstance3DGizmoPlugin::can_be_hidden() const {
|
|||
}
|
||||
|
||||
void MeshInstance3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
MeshInstance3D *mesh = Object::cast_to<MeshInstance3D>(p_gizmo->get_spatial_node());
|
||||
MeshInstance3D *mesh = Object::cast_to<MeshInstance3D>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -1998,7 +1998,7 @@ int OccluderInstance3DGizmoPlugin::get_priority() const {
|
|||
}
|
||||
|
||||
String OccluderInstance3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
const OccluderInstance3D *cs = Object::cast_to<OccluderInstance3D>(p_gizmo->get_spatial_node());
|
||||
const OccluderInstance3D *cs = Object::cast_to<OccluderInstance3D>(p_gizmo->get_node_3d());
|
||||
|
||||
Ref<Occluder3D> o = cs->get_occluder();
|
||||
if (o.is_null()) {
|
||||
|
|
@ -2017,7 +2017,7 @@ String OccluderInstance3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p
|
|||
}
|
||||
|
||||
Variant OccluderInstance3DGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
OccluderInstance3D *oi = Object::cast_to<OccluderInstance3D>(p_gizmo->get_spatial_node());
|
||||
OccluderInstance3D *oi = Object::cast_to<OccluderInstance3D>(p_gizmo->get_node_3d());
|
||||
|
||||
Ref<Occluder3D> o = oi->get_occluder();
|
||||
if (o.is_null()) {
|
||||
|
|
@ -2043,7 +2043,7 @@ Variant OccluderInstance3DGizmoPlugin::get_handle_value(const EditorNode3DGizmo
|
|||
}
|
||||
|
||||
void OccluderInstance3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, Camera3D *p_camera, const Point2 &p_point) {
|
||||
OccluderInstance3D *oi = Object::cast_to<OccluderInstance3D>(p_gizmo->get_spatial_node());
|
||||
OccluderInstance3D *oi = Object::cast_to<OccluderInstance3D>(p_gizmo->get_node_3d());
|
||||
|
||||
Ref<Occluder3D> o = oi->get_occluder();
|
||||
if (o.is_null()) {
|
||||
|
|
@ -2130,7 +2130,7 @@ void OccluderInstance3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo,
|
|||
}
|
||||
|
||||
void OccluderInstance3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel) {
|
||||
OccluderInstance3D *oi = Object::cast_to<OccluderInstance3D>(p_gizmo->get_spatial_node());
|
||||
OccluderInstance3D *oi = Object::cast_to<OccluderInstance3D>(p_gizmo->get_node_3d());
|
||||
|
||||
Ref<Occluder3D> o = oi->get_occluder();
|
||||
if (o.is_null()) {
|
||||
|
|
@ -2181,7 +2181,7 @@ void OccluderInstance3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_giz
|
|||
}
|
||||
|
||||
void OccluderInstance3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
OccluderInstance3D *occluder_instance = Object::cast_to<OccluderInstance3D>(p_gizmo->get_spatial_node());
|
||||
OccluderInstance3D *occluder_instance = Object::cast_to<OccluderInstance3D>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -2250,7 +2250,7 @@ bool Sprite3DGizmoPlugin::can_be_hidden() const {
|
|||
}
|
||||
|
||||
void Sprite3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
Sprite3D *sprite = Object::cast_to<Sprite3D>(p_gizmo->get_spatial_node());
|
||||
Sprite3D *sprite = Object::cast_to<Sprite3D>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -2282,7 +2282,7 @@ bool Label3DGizmoPlugin::can_be_hidden() const {
|
|||
}
|
||||
|
||||
void Label3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
Label3D *label = Object::cast_to<Label3D>(p_gizmo->get_spatial_node());
|
||||
Label3D *label = Object::cast_to<Label3D>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -2393,7 +2393,7 @@ int PhysicalBone3DGizmoPlugin::get_priority() const {
|
|||
void PhysicalBone3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
p_gizmo->clear();
|
||||
|
||||
PhysicalBone3D *physical_bone = Object::cast_to<PhysicalBone3D>(p_gizmo->get_spatial_node());
|
||||
PhysicalBone3D *physical_bone = Object::cast_to<PhysicalBone3D>(p_gizmo->get_node_3d());
|
||||
|
||||
if (!physical_bone) {
|
||||
return;
|
||||
|
|
@ -2528,7 +2528,7 @@ int RayCast3DGizmoPlugin::get_priority() const {
|
|||
}
|
||||
|
||||
void RayCast3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
RayCast3D *raycast = Object::cast_to<RayCast3D>(p_gizmo->get_spatial_node());
|
||||
RayCast3D *raycast = Object::cast_to<RayCast3D>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -2566,7 +2566,7 @@ int ShapeCast3DGizmoPlugin::get_priority() const {
|
|||
}
|
||||
|
||||
void ShapeCast3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
ShapeCast3D *shapecast = Object::cast_to<ShapeCast3D>(p_gizmo->get_spatial_node());
|
||||
ShapeCast3D *shapecast = Object::cast_to<ShapeCast3D>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -2584,7 +2584,7 @@ void ShapeCast3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
|||
/////
|
||||
|
||||
void SpringArm3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
SpringArm3D *spring_arm = Object::cast_to<SpringArm3D>(p_gizmo->get_spatial_node());
|
||||
SpringArm3D *spring_arm = Object::cast_to<SpringArm3D>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -2636,7 +2636,7 @@ int VehicleWheel3DGizmoPlugin::get_priority() const {
|
|||
}
|
||||
|
||||
void VehicleWheel3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
VehicleWheel3D *car_wheel = Object::cast_to<VehicleWheel3D>(p_gizmo->get_spatial_node());
|
||||
VehicleWheel3D *car_wheel = Object::cast_to<VehicleWheel3D>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -2712,7 +2712,7 @@ bool SoftBody3DGizmoPlugin::is_selectable_when_hidden() const {
|
|||
}
|
||||
|
||||
void SoftBody3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
SoftBody3D *soft_body = Object::cast_to<SoftBody3D>(p_gizmo->get_spatial_node());
|
||||
SoftBody3D *soft_body = Object::cast_to<SoftBody3D>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -2753,17 +2753,17 @@ String SoftBody3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo,
|
|||
}
|
||||
|
||||
Variant SoftBody3DGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
SoftBody3D *soft_body = Object::cast_to<SoftBody3D>(p_gizmo->get_spatial_node());
|
||||
SoftBody3D *soft_body = Object::cast_to<SoftBody3D>(p_gizmo->get_node_3d());
|
||||
return Variant(soft_body->is_point_pinned(p_id));
|
||||
}
|
||||
|
||||
void SoftBody3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel) {
|
||||
SoftBody3D *soft_body = Object::cast_to<SoftBody3D>(p_gizmo->get_spatial_node());
|
||||
SoftBody3D *soft_body = Object::cast_to<SoftBody3D>(p_gizmo->get_node_3d());
|
||||
soft_body->pin_point_toggle(p_id);
|
||||
}
|
||||
|
||||
bool SoftBody3DGizmoPlugin::is_handle_highlighted(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
SoftBody3D *soft_body = Object::cast_to<SoftBody3D>(p_gizmo->get_spatial_node());
|
||||
SoftBody3D *soft_body = Object::cast_to<SoftBody3D>(p_gizmo->get_node_3d());
|
||||
return soft_body->is_point_pinned(p_id);
|
||||
}
|
||||
|
||||
|
|
@ -2809,12 +2809,12 @@ String VisibleOnScreenNotifier3DGizmoPlugin::get_handle_name(const EditorNode3DG
|
|||
}
|
||||
|
||||
Variant VisibleOnScreenNotifier3DGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
VisibleOnScreenNotifier3D *notifier = Object::cast_to<VisibleOnScreenNotifier3D>(p_gizmo->get_spatial_node());
|
||||
VisibleOnScreenNotifier3D *notifier = Object::cast_to<VisibleOnScreenNotifier3D>(p_gizmo->get_node_3d());
|
||||
return notifier->get_aabb();
|
||||
}
|
||||
|
||||
void VisibleOnScreenNotifier3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, Camera3D *p_camera, const Point2 &p_point) {
|
||||
VisibleOnScreenNotifier3D *notifier = Object::cast_to<VisibleOnScreenNotifier3D>(p_gizmo->get_spatial_node());
|
||||
VisibleOnScreenNotifier3D *notifier = Object::cast_to<VisibleOnScreenNotifier3D>(p_gizmo->get_node_3d());
|
||||
|
||||
Transform3D gt = notifier->get_global_transform();
|
||||
|
||||
|
|
@ -2866,7 +2866,7 @@ void VisibleOnScreenNotifier3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p
|
|||
}
|
||||
|
||||
void VisibleOnScreenNotifier3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel) {
|
||||
VisibleOnScreenNotifier3D *notifier = Object::cast_to<VisibleOnScreenNotifier3D>(p_gizmo->get_spatial_node());
|
||||
VisibleOnScreenNotifier3D *notifier = Object::cast_to<VisibleOnScreenNotifier3D>(p_gizmo->get_node_3d());
|
||||
|
||||
if (p_cancel) {
|
||||
notifier->set_aabb(p_restore);
|
||||
|
|
@ -2881,7 +2881,7 @@ void VisibleOnScreenNotifier3DGizmoPlugin::commit_handle(const EditorNode3DGizmo
|
|||
}
|
||||
|
||||
void VisibleOnScreenNotifier3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
VisibleOnScreenNotifier3D *notifier = Object::cast_to<VisibleOnScreenNotifier3D>(p_gizmo->get_spatial_node());
|
||||
VisibleOnScreenNotifier3D *notifier = Object::cast_to<VisibleOnScreenNotifier3D>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -3001,12 +3001,12 @@ String GPUParticles3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_giz
|
|||
}
|
||||
|
||||
Variant GPUParticles3DGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
GPUParticles3D *particles = Object::cast_to<GPUParticles3D>(p_gizmo->get_spatial_node());
|
||||
GPUParticles3D *particles = Object::cast_to<GPUParticles3D>(p_gizmo->get_node_3d());
|
||||
return particles->get_visibility_aabb();
|
||||
}
|
||||
|
||||
void GPUParticles3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, Camera3D *p_camera, const Point2 &p_point) {
|
||||
GPUParticles3D *particles = Object::cast_to<GPUParticles3D>(p_gizmo->get_spatial_node());
|
||||
GPUParticles3D *particles = Object::cast_to<GPUParticles3D>(p_gizmo->get_node_3d());
|
||||
|
||||
Transform3D gt = particles->get_global_transform();
|
||||
Transform3D gi = gt.affine_inverse();
|
||||
|
|
@ -3057,7 +3057,7 @@ void GPUParticles3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int
|
|||
}
|
||||
|
||||
void GPUParticles3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel) {
|
||||
GPUParticles3D *particles = Object::cast_to<GPUParticles3D>(p_gizmo->get_spatial_node());
|
||||
GPUParticles3D *particles = Object::cast_to<GPUParticles3D>(p_gizmo->get_node_3d());
|
||||
|
||||
if (p_cancel) {
|
||||
particles->set_visibility_aabb(p_restore);
|
||||
|
|
@ -3072,7 +3072,7 @@ void GPUParticles3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo,
|
|||
}
|
||||
|
||||
void GPUParticles3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
GPUParticles3D *particles = Object::cast_to<GPUParticles3D>(p_gizmo->get_spatial_node());
|
||||
GPUParticles3D *particles = Object::cast_to<GPUParticles3D>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -3148,7 +3148,7 @@ int GPUParticlesCollision3DGizmoPlugin::get_priority() const {
|
|||
}
|
||||
|
||||
String GPUParticlesCollision3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
const Node3D *cs = p_gizmo->get_spatial_node();
|
||||
const Node3D *cs = p_gizmo->get_node_3d();
|
||||
|
||||
if (Object::cast_to<GPUParticlesCollisionSphere3D>(cs) || Object::cast_to<GPUParticlesAttractorSphere3D>(cs)) {
|
||||
return "Radius";
|
||||
|
|
@ -3162,21 +3162,21 @@ String GPUParticlesCollision3DGizmoPlugin::get_handle_name(const EditorNode3DGiz
|
|||
}
|
||||
|
||||
Variant GPUParticlesCollision3DGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
const Node3D *cs = p_gizmo->get_spatial_node();
|
||||
const Node3D *cs = p_gizmo->get_node_3d();
|
||||
|
||||
if (Object::cast_to<GPUParticlesCollisionSphere3D>(cs) || Object::cast_to<GPUParticlesAttractorSphere3D>(cs)) {
|
||||
return p_gizmo->get_spatial_node()->call("get_radius");
|
||||
return p_gizmo->get_node_3d()->call("get_radius");
|
||||
}
|
||||
|
||||
if (Object::cast_to<GPUParticlesCollisionBox3D>(cs) || Object::cast_to<GPUParticlesAttractorBox3D>(cs) || Object::cast_to<GPUParticlesAttractorVectorField3D>(cs) || Object::cast_to<GPUParticlesCollisionSDF3D>(cs) || Object::cast_to<GPUParticlesCollisionHeightField3D>(cs)) {
|
||||
return Vector3(p_gizmo->get_spatial_node()->call("get_extents"));
|
||||
return Vector3(p_gizmo->get_node_3d()->call("get_extents"));
|
||||
}
|
||||
|
||||
return Variant();
|
||||
}
|
||||
|
||||
void GPUParticlesCollision3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, Camera3D *p_camera, const Point2 &p_point) {
|
||||
Node3D *sn = p_gizmo->get_spatial_node();
|
||||
Node3D *sn = p_gizmo->get_node_3d();
|
||||
|
||||
Transform3D gt = sn->get_global_transform();
|
||||
Transform3D gi = gt.affine_inverse();
|
||||
|
|
@ -3222,7 +3222,7 @@ void GPUParticlesCollision3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_g
|
|||
}
|
||||
|
||||
void GPUParticlesCollision3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel) {
|
||||
Node3D *sn = p_gizmo->get_spatial_node();
|
||||
Node3D *sn = p_gizmo->get_node_3d();
|
||||
|
||||
if (Object::cast_to<GPUParticlesCollisionSphere3D>(sn) || Object::cast_to<GPUParticlesAttractorSphere3D>(sn)) {
|
||||
if (p_cancel) {
|
||||
|
|
@ -3252,7 +3252,7 @@ void GPUParticlesCollision3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *
|
|||
}
|
||||
|
||||
void GPUParticlesCollision3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
Node3D *cs = p_gizmo->get_spatial_node();
|
||||
Node3D *cs = p_gizmo->get_node_3d();
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -3430,12 +3430,12 @@ String ReflectionProbeGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gi
|
|||
}
|
||||
|
||||
Variant ReflectionProbeGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
ReflectionProbe *probe = Object::cast_to<ReflectionProbe>(p_gizmo->get_spatial_node());
|
||||
ReflectionProbe *probe = Object::cast_to<ReflectionProbe>(p_gizmo->get_node_3d());
|
||||
return AABB(probe->get_extents(), probe->get_origin_offset());
|
||||
}
|
||||
|
||||
void ReflectionProbeGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, Camera3D *p_camera, const Point2 &p_point) {
|
||||
ReflectionProbe *probe = Object::cast_to<ReflectionProbe>(p_gizmo->get_spatial_node());
|
||||
ReflectionProbe *probe = Object::cast_to<ReflectionProbe>(p_gizmo->get_node_3d());
|
||||
Transform3D gt = probe->get_global_transform();
|
||||
|
||||
Transform3D gi = gt.affine_inverse();
|
||||
|
|
@ -3492,7 +3492,7 @@ void ReflectionProbeGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, in
|
|||
}
|
||||
|
||||
void ReflectionProbeGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel) {
|
||||
ReflectionProbe *probe = Object::cast_to<ReflectionProbe>(p_gizmo->get_spatial_node());
|
||||
ReflectionProbe *probe = Object::cast_to<ReflectionProbe>(p_gizmo->get_node_3d());
|
||||
|
||||
AABB restore = p_restore;
|
||||
|
||||
|
|
@ -3512,7 +3512,7 @@ void ReflectionProbeGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo,
|
|||
}
|
||||
|
||||
void ReflectionProbeGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
ReflectionProbe *probe = Object::cast_to<ReflectionProbe>(p_gizmo->get_spatial_node());
|
||||
ReflectionProbe *probe = Object::cast_to<ReflectionProbe>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -3609,12 +3609,12 @@ String DecalGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p
|
|||
}
|
||||
|
||||
Variant DecalGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
Decal *decal = Object::cast_to<Decal>(p_gizmo->get_spatial_node());
|
||||
Decal *decal = Object::cast_to<Decal>(p_gizmo->get_node_3d());
|
||||
return decal->get_extents();
|
||||
}
|
||||
|
||||
void DecalGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, Camera3D *p_camera, const Point2 &p_point) {
|
||||
Decal *decal = Object::cast_to<Decal>(p_gizmo->get_spatial_node());
|
||||
Decal *decal = Object::cast_to<Decal>(p_gizmo->get_node_3d());
|
||||
Transform3D gt = decal->get_global_transform();
|
||||
|
||||
Transform3D gi = gt.affine_inverse();
|
||||
|
|
@ -3645,7 +3645,7 @@ void DecalGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bo
|
|||
}
|
||||
|
||||
void DecalGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel) {
|
||||
Decal *decal = Object::cast_to<Decal>(p_gizmo->get_spatial_node());
|
||||
Decal *decal = Object::cast_to<Decal>(p_gizmo->get_node_3d());
|
||||
|
||||
Vector3 restore = p_restore;
|
||||
|
||||
|
|
@ -3662,7 +3662,7 @@ void DecalGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id,
|
|||
}
|
||||
|
||||
void DecalGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
Decal *decal = Object::cast_to<Decal>(p_gizmo->get_spatial_node());
|
||||
Decal *decal = Object::cast_to<Decal>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -3749,12 +3749,12 @@ String VoxelGIGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, int
|
|||
}
|
||||
|
||||
Variant VoxelGIGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
VoxelGI *probe = Object::cast_to<VoxelGI>(p_gizmo->get_spatial_node());
|
||||
VoxelGI *probe = Object::cast_to<VoxelGI>(p_gizmo->get_node_3d());
|
||||
return probe->get_extents();
|
||||
}
|
||||
|
||||
void VoxelGIGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, Camera3D *p_camera, const Point2 &p_point) {
|
||||
VoxelGI *probe = Object::cast_to<VoxelGI>(p_gizmo->get_spatial_node());
|
||||
VoxelGI *probe = Object::cast_to<VoxelGI>(p_gizmo->get_node_3d());
|
||||
|
||||
Transform3D gt = probe->get_global_transform();
|
||||
Transform3D gi = gt.affine_inverse();
|
||||
|
|
@ -3785,7 +3785,7 @@ void VoxelGIGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id,
|
|||
}
|
||||
|
||||
void VoxelGIGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel) {
|
||||
VoxelGI *probe = Object::cast_to<VoxelGI>(p_gizmo->get_spatial_node());
|
||||
VoxelGI *probe = Object::cast_to<VoxelGI>(p_gizmo->get_node_3d());
|
||||
|
||||
Vector3 restore = p_restore;
|
||||
|
||||
|
|
@ -3802,7 +3802,7 @@ void VoxelGIGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_i
|
|||
}
|
||||
|
||||
void VoxelGIGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
VoxelGI *probe = Object::cast_to<VoxelGI>(p_gizmo->get_spatial_node());
|
||||
VoxelGI *probe = Object::cast_to<VoxelGI>(p_gizmo->get_node_3d());
|
||||
|
||||
Ref<Material> material = get_material("voxel_gi_material", p_gizmo);
|
||||
Ref<Material> icon = get_material("voxel_gi_icon", p_gizmo);
|
||||
|
|
@ -3913,7 +3913,7 @@ int LightmapGIGizmoPlugin::get_priority() const {
|
|||
|
||||
void LightmapGIGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
Ref<Material> icon = get_material("baked_indirect_light_icon", p_gizmo);
|
||||
LightmapGI *baker = Object::cast_to<LightmapGI>(p_gizmo->get_spatial_node());
|
||||
LightmapGI *baker = Object::cast_to<LightmapGI>(p_gizmo->get_node_3d());
|
||||
Ref<LightmapGIData> data = baker->get_light_data();
|
||||
|
||||
p_gizmo->add_unscaled_billboard(icon, 0.05);
|
||||
|
|
@ -4163,7 +4163,7 @@ int CollisionObject3DGizmoPlugin::get_priority() const {
|
|||
}
|
||||
|
||||
void CollisionObject3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
CollisionObject3D *co = Object::cast_to<CollisionObject3D>(p_gizmo->get_spatial_node());
|
||||
CollisionObject3D *co = Object::cast_to<CollisionObject3D>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -4214,7 +4214,7 @@ int CollisionShape3DGizmoPlugin::get_priority() const {
|
|||
}
|
||||
|
||||
String CollisionShape3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
const CollisionShape3D *cs = Object::cast_to<CollisionShape3D>(p_gizmo->get_spatial_node());
|
||||
const CollisionShape3D *cs = Object::cast_to<CollisionShape3D>(p_gizmo->get_node_3d());
|
||||
|
||||
Ref<Shape3D> s = cs->get_shape();
|
||||
if (s.is_null()) {
|
||||
|
|
@ -4245,7 +4245,7 @@ String CollisionShape3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_g
|
|||
}
|
||||
|
||||
Variant CollisionShape3DGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
CollisionShape3D *cs = Object::cast_to<CollisionShape3D>(p_gizmo->get_spatial_node());
|
||||
CollisionShape3D *cs = Object::cast_to<CollisionShape3D>(p_gizmo->get_node_3d());
|
||||
|
||||
Ref<Shape3D> s = cs->get_shape();
|
||||
if (s.is_null()) {
|
||||
|
|
@ -4281,7 +4281,7 @@ Variant CollisionShape3DGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p
|
|||
}
|
||||
|
||||
void CollisionShape3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, Camera3D *p_camera, const Point2 &p_point) {
|
||||
CollisionShape3D *cs = Object::cast_to<CollisionShape3D>(p_gizmo->get_spatial_node());
|
||||
CollisionShape3D *cs = Object::cast_to<CollisionShape3D>(p_gizmo->get_node_3d());
|
||||
|
||||
Ref<Shape3D> s = cs->get_shape();
|
||||
if (s.is_null()) {
|
||||
|
|
@ -4395,7 +4395,7 @@ void CollisionShape3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, i
|
|||
}
|
||||
|
||||
void CollisionShape3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel) {
|
||||
CollisionShape3D *cs = Object::cast_to<CollisionShape3D>(p_gizmo->get_spatial_node());
|
||||
CollisionShape3D *cs = Object::cast_to<CollisionShape3D>(p_gizmo->get_node_3d());
|
||||
|
||||
Ref<Shape3D> s = cs->get_shape();
|
||||
if (s.is_null()) {
|
||||
|
|
@ -4499,7 +4499,7 @@ void CollisionShape3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo
|
|||
}
|
||||
|
||||
void CollisionShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
CollisionShape3D *cs = Object::cast_to<CollisionShape3D>(p_gizmo->get_spatial_node());
|
||||
CollisionShape3D *cs = Object::cast_to<CollisionShape3D>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -4814,7 +4814,7 @@ int CollisionPolygon3DGizmoPlugin::get_priority() const {
|
|||
}
|
||||
|
||||
void CollisionPolygon3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
CollisionPolygon3D *polygon = Object::cast_to<CollisionPolygon3D>(p_gizmo->get_spatial_node());
|
||||
CollisionPolygon3D *polygon = Object::cast_to<CollisionPolygon3D>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -4861,7 +4861,7 @@ int NavigationRegion3DGizmoPlugin::get_priority() const {
|
|||
}
|
||||
|
||||
void NavigationRegion3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
NavigationRegion3D *navigationregion = Object::cast_to<NavigationRegion3D>(p_gizmo->get_spatial_node());
|
||||
NavigationRegion3D *navigationregion = Object::cast_to<NavigationRegion3D>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
Ref<NavigationMesh> navigationmesh = navigationregion->get_navigation_mesh();
|
||||
|
|
@ -5021,7 +5021,7 @@ int NavigationLink3DGizmoPlugin::get_priority() const {
|
|||
}
|
||||
|
||||
void NavigationLink3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
NavigationLink3D *link = Object::cast_to<NavigationLink3D>(p_gizmo->get_spatial_node());
|
||||
NavigationLink3D *link = Object::cast_to<NavigationLink3D>(p_gizmo->get_node_3d());
|
||||
|
||||
RID nav_map = link->get_world_3d()->get_navigation_map();
|
||||
real_t search_radius = NavigationServer3D::get_singleton()->map_get_link_connection_radius(nav_map);
|
||||
|
|
@ -5106,12 +5106,12 @@ String NavigationLink3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_g
|
|||
}
|
||||
|
||||
Variant NavigationLink3DGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
NavigationLink3D *link = Object::cast_to<NavigationLink3D>(p_gizmo->get_spatial_node());
|
||||
NavigationLink3D *link = Object::cast_to<NavigationLink3D>(p_gizmo->get_node_3d());
|
||||
return p_id == 0 ? link->get_start_location() : link->get_end_location();
|
||||
}
|
||||
|
||||
void NavigationLink3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, Camera3D *p_camera, const Point2 &p_point) {
|
||||
NavigationLink3D *link = Object::cast_to<NavigationLink3D>(p_gizmo->get_spatial_node());
|
||||
NavigationLink3D *link = Object::cast_to<NavigationLink3D>(p_gizmo->get_node_3d());
|
||||
|
||||
Transform3D gt = link->get_global_transform();
|
||||
Transform3D gi = gt.affine_inverse();
|
||||
|
|
@ -5144,7 +5144,7 @@ void NavigationLink3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, i
|
|||
}
|
||||
|
||||
void NavigationLink3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel) {
|
||||
NavigationLink3D *link = Object::cast_to<NavigationLink3D>(p_gizmo->get_spatial_node());
|
||||
NavigationLink3D *link = Object::cast_to<NavigationLink3D>(p_gizmo->get_node_3d());
|
||||
|
||||
if (p_cancel) {
|
||||
if (p_id == 0) {
|
||||
|
|
@ -5444,7 +5444,7 @@ int Joint3DGizmoPlugin::get_priority() const {
|
|||
}
|
||||
|
||||
void Joint3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
Joint3D *joint = Object::cast_to<Joint3D>(p_gizmo->get_spatial_node());
|
||||
Joint3D *joint = Object::cast_to<Joint3D>(p_gizmo->get_node_3d());
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
|
|
@ -5877,11 +5877,11 @@ String FogVolumeGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, i
|
|||
}
|
||||
|
||||
Variant FogVolumeGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
return Vector3(p_gizmo->get_spatial_node()->call("get_extents"));
|
||||
return Vector3(p_gizmo->get_node_3d()->call("get_extents"));
|
||||
}
|
||||
|
||||
void FogVolumeGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, Camera3D *p_camera, const Point2 &p_point) {
|
||||
Node3D *sn = p_gizmo->get_spatial_node();
|
||||
Node3D *sn = p_gizmo->get_node_3d();
|
||||
|
||||
Transform3D gt = sn->get_global_transform();
|
||||
Transform3D gi = gt.affine_inverse();
|
||||
|
|
@ -5910,7 +5910,7 @@ void FogVolumeGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id
|
|||
}
|
||||
|
||||
void FogVolumeGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel) {
|
||||
Node3D *sn = p_gizmo->get_spatial_node();
|
||||
Node3D *sn = p_gizmo->get_node_3d();
|
||||
|
||||
if (p_cancel) {
|
||||
sn->call("set_extents", p_restore);
|
||||
|
|
@ -5925,11 +5925,11 @@ void FogVolumeGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p
|
|||
}
|
||||
|
||||
void FogVolumeGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
Node3D *cs = p_gizmo->get_spatial_node();
|
||||
Node3D *cs = p_gizmo->get_node_3d();
|
||||
|
||||
p_gizmo->clear();
|
||||
|
||||
if (RS::FogVolumeShape(int(p_gizmo->get_spatial_node()->call("get_shape"))) != RS::FOG_VOLUME_SHAPE_WORLD) {
|
||||
if (RS::FogVolumeShape(int(p_gizmo->get_node_3d()->call("get_shape"))) != RS::FOG_VOLUME_SHAPE_WORLD) {
|
||||
const Ref<Material> material =
|
||||
get_material("shape_material", p_gizmo);
|
||||
const Ref<Material> material_internal =
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ class EditorNode3DGizmo : public Node3DGizmo {
|
|||
Vector<Instance> instances;
|
||||
Node3D *spatial_node = nullptr;
|
||||
|
||||
void _set_spatial_node(Node *p_node) { set_spatial_node(Object::cast_to<Node3D>(p_node)); }
|
||||
void _set_node_3d(Node *p_node) { set_node_3d(Object::cast_to<Node3D>(p_node)); }
|
||||
|
||||
protected:
|
||||
static void _bind_methods();
|
||||
|
|
@ -116,8 +116,8 @@ public:
|
|||
void set_selected(bool p_selected) { selected = p_selected; }
|
||||
bool is_selected() const { return selected; }
|
||||
|
||||
void set_spatial_node(Node3D *p_node);
|
||||
Node3D *get_spatial_node() const { return spatial_node; }
|
||||
void set_node_3d(Node3D *p_node);
|
||||
Node3D *get_node_3d() const { return spatial_node; }
|
||||
Ref<EditorNode3DGizmoPlugin> get_plugin() const { return gizmo_plugin; }
|
||||
bool intersect_frustum(const Camera3D *p_camera, const Vector<Plane> &p_frustum);
|
||||
void handles_intersect_ray(Camera3D *p_camera, const Vector2 &p_point, bool p_shift_pressed, int &r_id, bool &r_secondary);
|
||||
|
|
|
|||
|
|
@ -1356,7 +1356,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
|
|||
EditorNode *en = EditorNode::get_singleton();
|
||||
EditorPluginList *force_input_forwarding_list = en->get_editor_plugins_force_input_forwarding();
|
||||
if (!force_input_forwarding_list->is_empty()) {
|
||||
EditorPlugin::AfterGUIInput discard = force_input_forwarding_list->forward_spatial_gui_input(camera, p_event, true);
|
||||
EditorPlugin::AfterGUIInput discard = force_input_forwarding_list->forward_3d_gui_input(camera, p_event, true);
|
||||
if (discard == EditorPlugin::AFTER_GUI_INPUT_STOP) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -1369,7 +1369,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
|
|||
EditorNode *en = EditorNode::get_singleton();
|
||||
EditorPluginList *over_plugin_list = en->get_editor_plugins_over();
|
||||
if (!over_plugin_list->is_empty()) {
|
||||
EditorPlugin::AfterGUIInput discard = over_plugin_list->forward_spatial_gui_input(camera, p_event, false);
|
||||
EditorPlugin::AfterGUIInput discard = over_plugin_list->forward_3d_gui_input(camera, p_event, false);
|
||||
if (discard == EditorPlugin::AFTER_GUI_INPUT_STOP) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -2735,12 +2735,12 @@ static void draw_indicator_bar(Control &p_surface, real_t p_fill, const Ref<Text
|
|||
void Node3DEditorViewport::_draw() {
|
||||
EditorPluginList *over_plugin_list = EditorNode::get_singleton()->get_editor_plugins_over();
|
||||
if (!over_plugin_list->is_empty()) {
|
||||
over_plugin_list->forward_spatial_draw_over_viewport(surface);
|
||||
over_plugin_list->forward_3d_draw_over_viewport(surface);
|
||||
}
|
||||
|
||||
EditorPluginList *force_over_plugin_list = EditorNode::get_singleton()->get_editor_plugins_force_over();
|
||||
if (!force_over_plugin_list->is_empty()) {
|
||||
force_over_plugin_list->forward_spatial_force_draw_over_viewport(surface);
|
||||
force_over_plugin_list->forward_3d_force_draw_over_viewport(surface);
|
||||
}
|
||||
|
||||
if (surface->has_focus()) {
|
||||
|
|
|
|||
|
|
@ -297,12 +297,12 @@ void Path3DGizmo::redraw() {
|
|||
|
||||
Path3DGizmo::Path3DGizmo(Path3D *p_path) {
|
||||
path = p_path;
|
||||
set_spatial_node(p_path);
|
||||
set_node_3d(p_path);
|
||||
orig_in_length = 0;
|
||||
orig_out_length = 0;
|
||||
}
|
||||
|
||||
EditorPlugin::AfterGUIInput Path3DEditorPlugin::forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) {
|
||||
EditorPlugin::AfterGUIInput Path3DEditorPlugin::forward_3d_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) {
|
||||
if (!path) {
|
||||
return EditorPlugin::AFTER_GUI_INPUT_PASS;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ public:
|
|||
Path3D *get_edited_path() { return path; }
|
||||
|
||||
static Path3DEditorPlugin *singleton;
|
||||
virtual EditorPlugin::AfterGUIInput forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) override;
|
||||
virtual EditorPlugin::AfterGUIInput forward_3d_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) override;
|
||||
|
||||
virtual String get_name() const override { return "Path3D"; }
|
||||
bool has_main_screen() const override { return false; }
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ void Polygon3DEditor::_wip_close() {
|
|||
undo_redo->commit_action();
|
||||
}
|
||||
|
||||
EditorPlugin::AfterGUIInput Polygon3DEditor::forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) {
|
||||
EditorPlugin::AfterGUIInput Polygon3DEditor::forward_3d_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) {
|
||||
if (!node) {
|
||||
return EditorPlugin::AFTER_GUI_INPUT_PASS;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ protected:
|
|||
static void _bind_methods();
|
||||
|
||||
public:
|
||||
virtual EditorPlugin::AfterGUIInput forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event);
|
||||
virtual EditorPlugin::AfterGUIInput forward_3d_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event);
|
||||
void edit(Node *p_node);
|
||||
Polygon3DEditor();
|
||||
~Polygon3DEditor();
|
||||
|
|
@ -102,7 +102,7 @@ class Polygon3DEditorPlugin : public EditorPlugin {
|
|||
Polygon3DEditor *polygon_editor = nullptr;
|
||||
|
||||
public:
|
||||
virtual EditorPlugin::AfterGUIInput forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) override { return polygon_editor->forward_spatial_gui_input(p_camera, p_event); }
|
||||
virtual EditorPlugin::AfterGUIInput forward_3d_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) override { return polygon_editor->forward_3d_gui_input(p_camera, p_event); }
|
||||
|
||||
virtual String get_name() const override { return "Polygon3DEditor"; }
|
||||
bool has_main_screen() const override { return false; }
|
||||
|
|
|
|||
|
|
@ -1128,7 +1128,7 @@ Skeleton3DEditorPlugin::Skeleton3DEditorPlugin() {
|
|||
Node3DEditor::get_singleton()->add_gizmo_plugin(gizmo_plugin);
|
||||
}
|
||||
|
||||
EditorPlugin::AfterGUIInput Skeleton3DEditorPlugin::forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) {
|
||||
EditorPlugin::AfterGUIInput Skeleton3DEditorPlugin::forward_3d_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) {
|
||||
Skeleton3DEditor *se = Skeleton3DEditor::get_singleton();
|
||||
Node3DEditor *ne = Node3DEditor::get_singleton();
|
||||
if (se && se->is_edit_mode()) {
|
||||
|
|
@ -1234,7 +1234,7 @@ int Skeleton3DGizmoPlugin::get_priority() const {
|
|||
}
|
||||
|
||||
int Skeleton3DGizmoPlugin::subgizmos_intersect_ray(const EditorNode3DGizmo *p_gizmo, Camera3D *p_camera, const Vector2 &p_point) const {
|
||||
Skeleton3D *skeleton = Object::cast_to<Skeleton3D>(p_gizmo->get_spatial_node());
|
||||
Skeleton3D *skeleton = Object::cast_to<Skeleton3D>(p_gizmo->get_node_3d());
|
||||
ERR_FAIL_COND_V(!skeleton, -1);
|
||||
|
||||
Skeleton3DEditor *se = Skeleton3DEditor::get_singleton();
|
||||
|
|
@ -1277,14 +1277,14 @@ int Skeleton3DGizmoPlugin::subgizmos_intersect_ray(const EditorNode3DGizmo *p_gi
|
|||
}
|
||||
|
||||
Transform3D Skeleton3DGizmoPlugin::get_subgizmo_transform(const EditorNode3DGizmo *p_gizmo, int p_id) const {
|
||||
Skeleton3D *skeleton = Object::cast_to<Skeleton3D>(p_gizmo->get_spatial_node());
|
||||
Skeleton3D *skeleton = Object::cast_to<Skeleton3D>(p_gizmo->get_node_3d());
|
||||
ERR_FAIL_COND_V(!skeleton, Transform3D());
|
||||
|
||||
return skeleton->get_bone_global_pose(p_id);
|
||||
}
|
||||
|
||||
void Skeleton3DGizmoPlugin::set_subgizmo_transform(const EditorNode3DGizmo *p_gizmo, int p_id, Transform3D p_transform) {
|
||||
Skeleton3D *skeleton = Object::cast_to<Skeleton3D>(p_gizmo->get_spatial_node());
|
||||
Skeleton3D *skeleton = Object::cast_to<Skeleton3D>(p_gizmo->get_node_3d());
|
||||
ERR_FAIL_COND(!skeleton);
|
||||
|
||||
// Prepare for global to local.
|
||||
|
|
@ -1313,7 +1313,7 @@ void Skeleton3DGizmoPlugin::set_subgizmo_transform(const EditorNode3DGizmo *p_gi
|
|||
}
|
||||
|
||||
void Skeleton3DGizmoPlugin::commit_subgizmos(const EditorNode3DGizmo *p_gizmo, const Vector<int> &p_ids, const Vector<Transform3D> &p_restore, bool p_cancel) {
|
||||
Skeleton3D *skeleton = Object::cast_to<Skeleton3D>(p_gizmo->get_spatial_node());
|
||||
Skeleton3D *skeleton = Object::cast_to<Skeleton3D>(p_gizmo->get_node_3d());
|
||||
ERR_FAIL_COND(!skeleton);
|
||||
|
||||
Skeleton3DEditor *se = Skeleton3DEditor::get_singleton();
|
||||
|
|
@ -1346,7 +1346,7 @@ void Skeleton3DGizmoPlugin::commit_subgizmos(const EditorNode3DGizmo *p_gizmo, c
|
|||
}
|
||||
|
||||
void Skeleton3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
Skeleton3D *skeleton = Object::cast_to<Skeleton3D>(p_gizmo->get_spatial_node());
|
||||
Skeleton3D *skeleton = Object::cast_to<Skeleton3D>(p_gizmo->get_node_3d());
|
||||
p_gizmo->clear();
|
||||
|
||||
int selected = -1;
|
||||
|
|
|
|||
|
|
@ -238,7 +238,7 @@ class Skeleton3DEditorPlugin : public EditorPlugin {
|
|||
EditorInspectorPluginSkeleton *skeleton_plugin = nullptr;
|
||||
|
||||
public:
|
||||
virtual EditorPlugin::AfterGUIInput forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) override;
|
||||
virtual EditorPlugin::AfterGUIInput forward_3d_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) override;
|
||||
|
||||
bool has_main_screen() const override { return false; }
|
||||
virtual bool handles(Object *p_object) const override;
|
||||
|
|
|
|||
|
|
@ -230,6 +230,7 @@ static const char *gdscript_function_renames[][2] = {
|
|||
{ "add_force", "apply_force" }, //RigidBody2D
|
||||
{ "add_icon_override", "add_theme_icon_override" }, // Control
|
||||
{ "add_scene_import_plugin", "add_scene_format_importer_plugin" }, //EditorPlugin
|
||||
{ "add_spatial_gizmo_plugin", "add_node_3d_gizmo_plugin" }, // EditorPlugin
|
||||
{ "add_stylebox_override", "add_theme_stylebox_override" }, // Control
|
||||
{ "add_torque", "apply_torque" }, //RigidBody2D
|
||||
{ "agent_set_neighbor_dist", "agent_set_neighbor_distance" }, // NavigationServer2D, NavigationServer3D
|
||||
|
|
@ -367,6 +368,7 @@ static const char *gdscript_function_renames[][2] = {
|
|||
{ "get_slide_count", "get_slide_collision_count" }, // CharacterBody2D, CharacterBody3D
|
||||
{ "get_slips_on_slope", "get_slide_on_slope" }, // SeparationRayShape2D, SeparationRayShape3D
|
||||
{ "get_space_override_mode", "get_gravity_space_override_mode" }, // Area2D
|
||||
{ "get_spatial_node", "get_node_3d" }, // EditorNode3DGizmo
|
||||
{ "get_speed", "get_velocity" }, // InputEventMouseMotion
|
||||
{ "get_stylebox_types", "get_stylebox_type_list" }, // Theme
|
||||
{ "get_surface_material", "get_surface_override_material" }, // MeshInstance3D broke ImporterMesh
|
||||
|
|
@ -466,6 +468,7 @@ static const char *gdscript_function_renames[][2] = {
|
|||
{ "remove_font_override", "remove_theme_font_override" }, // Control
|
||||
{ "remove_icon_override", "remove_theme_icon_override" }, // Control
|
||||
{ "remove_scene_import_plugin", "remove_scene_format_importer_plugin" }, //EditorPlugin
|
||||
{ "remove_spatial_gizmo_plugin", "remove_node_3d_gizmo_plugin" }, // EditorPlugin
|
||||
{ "remove_stylebox_override", "remove_theme_stylebox_override" }, // Control
|
||||
{ "rename_animation", "rename_animation_library" }, // AnimationPlayer
|
||||
{ "rename_dependencies", "_rename_dependencies" }, // ResourceFormatLoader
|
||||
|
|
@ -532,6 +535,7 @@ static const char *gdscript_function_renames[][2] = {
|
|||
{ "set_slips_on_slope", "set_slide_on_slope" }, // SeparationRayShape2D, SeparationRayShape3D
|
||||
{ "set_sort_enabled", "set_y_sort_enabled" }, // Node2D
|
||||
{ "set_space_override_mode", "set_gravity_space_override_mode" }, // Area2D
|
||||
{ "set_spatial_node", "set_node_3d" }, // EditorNode3DGizmo
|
||||
{ "set_speed", "set_velocity" }, // InputEventMouseMotion
|
||||
{ "set_ssao_edge_sharpness", "set_ssao_sharpness" }, // Environment
|
||||
{ "set_surface_material", "set_surface_override_material" }, // MeshInstance3D broke ImporterMesh
|
||||
|
|
@ -651,6 +655,7 @@ static const char *csharp_function_renames[][2] = {
|
|||
// { "SetVOffset", "SetDragVerticalOffset" }, // Camera2D broke Camera3D, PathFollow3D, PathFollow2D
|
||||
// {"GetPoints","GetPointsId"},// Astar, broke Line2D, Convexpolygonshape
|
||||
// {"GetVScroll","GetVScrollBar"},//ItemList, broke TextView
|
||||
{ "AddSpatialGizmoPlugin", "AddNode3dGizmoPlugin" }, // EditorPlugin
|
||||
{ "RenderingServer", "GetTabAlignment" }, // Tab
|
||||
{ "_AboutToShow", "_AboutToPopup" }, // ColorPickerButton
|
||||
{ "_GetConfigurationWarning", "_GetConfigurationWarnings" }, // Node
|
||||
|
|
@ -796,6 +801,7 @@ static const char *csharp_function_renames[][2] = {
|
|||
{ "GetSizeOverride", "GetSize2dOverride" }, // SubViewport
|
||||
{ "GetSlipsOnSlope", "GetSlideOnSlope" }, // SeparationRayShape2D, SeparationRayShape3D
|
||||
{ "GetSpaceOverrideMode", "GetGravitySpaceOverrideMode" }, // Area2D
|
||||
{ "GetSpatialNode", "GetNode3d" }, // EditorNode3DGizmo
|
||||
{ "GetSpeed", "GetVelocity" }, // InputEventMouseMotion
|
||||
{ "GetStyleboxTypes", "GetStyleboxTypeList" }, // Theme
|
||||
{ "GetSurfaceMaterial", "GetSurfaceOverrideMaterial" }, // MeshInstance3D broke ImporterMesh
|
||||
|
|
@ -890,6 +896,7 @@ static const char *csharp_function_renames[][2] = {
|
|||
{ "RemoveConstantOverride", "RemoveThemeConstantOverride" }, // Control
|
||||
{ "RemoveFontOverride", "RemoveThemeFontOverride" }, // Control
|
||||
{ "RemoveSceneImportPlugin", "RemoveSceneFormatImporterPlugin" }, //EditorPlugin
|
||||
{ "RemoveSpatialGizmoPlugin", "RemoveNode3dGizmoPlugin" }, // EditorPlugin
|
||||
{ "RemoveStyleboxOverride", "RemoveThemeStyleboxOverride" }, // Control
|
||||
{ "RenameAnimation", "RenameAnimationLibrary" }, // AnimationPlayer
|
||||
{ "RenameDependencies", "_RenameDependencies" }, // ResourceFormatLoader
|
||||
|
|
@ -952,6 +959,7 @@ static const char *csharp_function_renames[][2] = {
|
|||
{ "SetSlipsOnSlope", "SetSlideOnSlope" }, // SeparationRayShape2D, SeparationRayShape3D
|
||||
{ "SetSortEnabled", "SetYSortEnabled" }, // Node2D
|
||||
{ "SetSpaceOverrideMode", "SetGravitySpaceOverrideMode" }, // Area2D
|
||||
{ "SetSpatialNode", "SetNode3d" }, // EditorNode3DGizmo
|
||||
{ "SetSpeed", "SetVelocity" }, // InputEventMouseMotion
|
||||
{ "SetSsaoEdgeSharpness", "SetSsaoSharpness" }, // Environment
|
||||
{ "SetSurfaceMaterial", "SetSurfaceOverrideMaterial" }, // MeshInstance3D broke ImporterMesh
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ CSGShape3DGizmoPlugin::CSGShape3DGizmoPlugin() {
|
|||
}
|
||||
|
||||
String CSGShape3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_spatial_node());
|
||||
CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_node_3d());
|
||||
|
||||
if (Object::cast_to<CSGSphere3D>(cs)) {
|
||||
return "Radius";
|
||||
|
|
@ -79,7 +79,7 @@ String CSGShape3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo,
|
|||
}
|
||||
|
||||
Variant CSGShape3DGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
|
||||
CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_spatial_node());
|
||||
CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_node_3d());
|
||||
|
||||
if (Object::cast_to<CSGSphere3D>(cs)) {
|
||||
CSGSphere3D *s = Object::cast_to<CSGSphere3D>(cs);
|
||||
|
|
@ -105,7 +105,7 @@ Variant CSGShape3DGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo
|
|||
}
|
||||
|
||||
void CSGShape3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, Camera3D *p_camera, const Point2 &p_point) {
|
||||
CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_spatial_node());
|
||||
CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_node_3d());
|
||||
|
||||
Transform3D gt = cs->get_global_transform();
|
||||
//gt.orthonormalize();
|
||||
|
|
@ -208,7 +208,7 @@ void CSGShape3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_i
|
|||
}
|
||||
|
||||
void CSGShape3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel) {
|
||||
CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_spatial_node());
|
||||
CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_node_3d());
|
||||
|
||||
if (Object::cast_to<CSGSphere3D>(cs)) {
|
||||
CSGSphere3D *s = Object::cast_to<CSGSphere3D>(cs);
|
||||
|
|
@ -308,7 +308,7 @@ bool CSGShape3DGizmoPlugin::is_selectable_when_hidden() const {
|
|||
void CSGShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
|
||||
p_gizmo->clear();
|
||||
|
||||
CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_spatial_node());
|
||||
CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_node_3d());
|
||||
|
||||
Vector<Vector3> faces = cs->get_brush_faces();
|
||||
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@ protected:
|
|||
void _notification(int p_what);
|
||||
|
||||
public:
|
||||
virtual EditorPlugin::AfterGUIInput forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) override { return grid_map_editor->forward_spatial_input_event(p_camera, p_event); }
|
||||
virtual EditorPlugin::AfterGUIInput forward_3d_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) override { return grid_map_editor->forward_spatial_input_event(p_camera, p_event); }
|
||||
virtual String get_name() const override { return "GridMap"; }
|
||||
bool has_main_screen() const override { return false; }
|
||||
virtual void edit(Object *p_object) override;
|
||||
|
|
|
|||
Loading…
Reference in New Issue