asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove GridMap's "Lock View" option and a related method.

Browse source 
Apparently this feature utilized a completely commented out 7+ years old
method, effectively doing nothing. Since it was designed with a completely
different editor design in mind it is pretty much incompatible and as such
it's best to remove it for now.
This commit is contained in:
Riteo Siuga 2021-06-16 04:11:58 +02:00
parent 69553166ea
commit 7cb3476a1c
No known key found for this signature in database
GPG key ID: 7197807748BF1236
4 changed files with 0 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
editor/plugins/node_3d_editor_plugin.cpp
View file

@ -7245,10 +7245,6 @@ void Node3DEditorPlugin::set_state(const Dictionary &p_state) {
spatial_editor->set_state(p_state); spatial_editor->set_state(p_state);
} }
void Node3DEditor::snap_cursor_to_plane(const Plane &p_plane) {
//cursor.pos=p_plane.project(cursor.pos);
}
Vector3 Node3DEditor::snap_point(Vector3 p_target, Vector3 p_start) const { Vector3 Node3DEditor::snap_point(Vector3 p_target, Vector3 p_start) const {
if (is_snap_enabled()) { if (is_snap_enabled()) {
p_target.x = Math::snap_scalar(0.0, get_translate_snap(), p_target.x); p_target.x = Math::snap_scalar(0.0, get_translate_snap(), p_target.x);
@ -7291,14 +7287,6 @@ float Node3DEditor::get_scale_snap() const {
return snap_value; return snap_value;
} }
void Node3DEditorPlugin::_bind_methods() {
ClassDB::bind_method("snap_cursor_to_plane", &Node3DEditorPlugin::snap_cursor_to_plane);
}
void Node3DEditorPlugin::snap_cursor_to_plane(const Plane &p_plane) {
spatial_editor->snap_cursor_to_plane(p_plane);
}
struct _GizmoPluginPriorityComparator { struct _GizmoPluginPriorityComparator {
bool operator()(const Ref<EditorNode3DGizmoPlugin> &p_a, const Ref<EditorNode3DGizmoPlugin> &p_b) const { bool operator()(const Ref<EditorNode3DGizmoPlugin> &p_a, const Ref<EditorNode3DGizmoPlugin> &p_b) const {
if (p_a->get_priority() == p_b->get_priority()) { if (p_a->get_priority() == p_b->get_priority()) {

6
editor/plugins/node_3d_editor_plugin.h
View file

@ -817,7 +817,6 @@ protected:
public: public:
static Node3DEditor *get_singleton() { return singleton; } static Node3DEditor *get_singleton() { return singleton; }
void snap_cursor_to_plane(const Plane &p_plane);
Vector3 snap_point(Vector3 p_target, Vector3 p_start = Vector3(0, 0, 0)) const; Vector3 snap_point(Vector3 p_target, Vector3 p_start = Vector3(0, 0, 0)) const;
@ -890,12 +889,7 @@ class Node3DEditorPlugin : public EditorPlugin {
Node3DEditor *spatial_editor; Node3DEditor *spatial_editor;
EditorNode *editor; EditorNode *editor;
protected:
static void _bind_methods();
public: public:
void snap_cursor_to_plane(const Plane &p_plane);
Node3DEditor *get_spatial_editor() { return spatial_editor; } Node3DEditor *get_spatial_editor() { return spatial_editor; }
virtual String get_name() const override { return "3D"; } virtual String get_name() const override { return "3D"; }
bool has_main_screen() const override { return true; } bool has_main_screen() const override { return true; }

22
modules/gridmap/grid_map_editor_plugin.cpp
View file

@ -62,12 +62,6 @@ void GridMapEditor::_menu_option(int p_option) {
floor->set_value(floor->get_value() + 1); floor->set_value(floor->get_value() + 1);
} break; } break;
case MENU_OPTION_LOCK_VIEW: {
int index = options->get_popup()->get_item_index(MENU_OPTION_LOCK_VIEW);
lock_view = !options->get_popup()->is_item_checked(index);
options->get_popup()->set_item_checked(index, lock_view);
} break;
case MENU_OPTION_CLIP_DISABLED: case MENU_OPTION_CLIP_DISABLED:
case MENU_OPTION_CLIP_ABOVE: case MENU_OPTION_CLIP_ABOVE:
case MENU_OPTION_CLIP_BELOW: { case MENU_OPTION_CLIP_BELOW: {
@ -1080,20 +1074,6 @@ void GridMapEditor::_notification(int p_what) {
if (cgmt.operator->() != last_mesh_library) { if (cgmt.operator->() != last_mesh_library) {
update_palette(); update_palette();
} }
if (lock_view) {
EditorNode *editor = Object::cast_to<EditorNode>(get_tree()->get_root()->get_child(0));
Plane p;
p.normal[edit_axis] = 1.0;
p.d = edit_floor[edit_axis] * node->get_cell_size()[edit_axis];
p = node->get_transform().xform(p); // plane to snap
Node3DEditorPlugin *sep = Object::cast_to<Node3DEditorPlugin>(editor->get_editor_plugin_screen());
if (sep) {
sep->snap_cursor_to_plane(p);
}
}
} break; } break;
case NOTIFICATION_THEME_CHANGED: { case NOTIFICATION_THEME_CHANGED: {
@ -1187,8 +1167,6 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) {
spatial_editor_hb->hide(); spatial_editor_hb->hide();
options->set_text(TTR("Grid Map")); options->set_text(TTR("Grid Map"));
options->get_popup()->add_check_item(TTR("Snap View"), MENU_OPTION_LOCK_VIEW);
options->get_popup()->add_separator();
options->get_popup()->add_item(TTR("Previous Floor"), MENU_OPTION_PREV_LEVEL, KEY_Q); options->get_popup()->add_item(TTR("Previous Floor"), MENU_OPTION_PREV_LEVEL, KEY_Q);
options->get_popup()->add_item(TTR("Next Floor"), MENU_OPTION_NEXT_LEVEL, KEY_E); options->get_popup()->add_item(TTR("Next Floor"), MENU_OPTION_NEXT_LEVEL, KEY_E);
options->get_popup()->add_separator(); options->get_popup()->add_separator();

1
modules/gridmap/grid_map_editor_plugin.h
View file

@ -94,7 +94,6 @@ class GridMapEditor : public VBoxContainer {
MeshLibrary *last_mesh_library; MeshLibrary *last_mesh_library;
ClipMode clip_mode = CLIP_DISABLED; ClipMode clip_mode = CLIP_DISABLED;
bool lock_view = false;
Transform3D grid_xform; Transform3D grid_xform;
Transform3D edit_grid_xform; Transform3D edit_grid_xform;
Vector3::Axis edit_axis; Vector3::Axis edit_axis;