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

Merge pull request #510 from marynate/PR-align-with-view

Browse source 
Align selected node with current view (3d editor)
This commit is contained in:
reduz 2014-06-17 11:55:52 -03:00
commit a285708a0c
2 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
tools/editor/plugins/spatial_editor_plugin.cpp
View file

@ -1166,7 +1166,6 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
Transform r;
r.basis.scale(Vector3(scale,scale,scale));
List<Node*> &selection = editor_selection->get_selected_node_list();
for(List<Node*>::Element *E=selection.front();E;E=E->next()) {
@ -1519,7 +1518,13 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
} break;
case KEY_F: {
_menu_option(VIEW_CENTER_TO_SELECTION);
if (k.pressed && k.mod.shift && k.mod.control) {
_menu_option(VIEW_ALIGN_SELECTION_WITH_VIEW);
} else if (k.pressed) {
_menu_option(VIEW_CENTER_TO_SELECTION);
}
} break;
case KEY_SPACE: {
@ -1818,6 +1823,34 @@ void SpatialEditorViewport::_menu_option(int p_option) {
cursor.pos=center;
} break;
case VIEW_ALIGN_SELECTION_WITH_VIEW: {
if (!get_selected_count())
break;
Transform camera_transform = camera->get_global_transform();
List<Node*> &selection = editor_selection->get_selected_node_list();
undo_redo->create_action("Align with view");
for(List<Node*>::Element *E=selection.front();E;E=E->next()) {
Spatial *sp = E->get()->cast_to<Spatial>();
if (!sp)
continue;
SpatialEditorSelectedItem *se=editor_selection->get_node_editor_data<SpatialEditorSelectedItem>(sp);
if (!se)
continue;
Vector3 original_scale = sp->get_scale();
sp->set_global_transform(camera_transform);
sp->set_scale(original_scale);
undo_redo->add_do_method(sp,"set_global_transform",sp->get_global_transform());
undo_redo->add_undo_method(sp,"set_global_transform",se->original);
}
undo_redo->commit_action();
} break;
case VIEW_ENVIRONMENT: {
int idx = view_menu->get_popup()->get_item_index(VIEW_ENVIRONMENT);
@ -2060,7 +2093,8 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed
view_menu->get_popup()->add_check_item("Environment",VIEW_ENVIRONMENT);
view_menu->get_popup()->set_item_checked( view_menu->get_popup()->get_item_index(VIEW_ENVIRONMENT),true);
view_menu->get_popup()->add_separator();
view_menu->get_popup()->add_item("Selection",VIEW_CENTER_TO_SELECTION);
view_menu->get_popup()->add_item("Selection (F)",VIEW_CENTER_TO_SELECTION);
view_menu->get_popup()->add_item("Align with view (Ctrl+Shift+F)",VIEW_ALIGN_SELECTION_WITH_VIEW);
view_menu->get_popup()->connect("item_pressed",this,"_menu_option");
preview_camera = memnew( Button );

1
tools/editor/plugins/spatial_editor_plugin.h
View file

@ -75,6 +75,7 @@ class SpatialEditorViewport : public Control {
VIEW_FRONT,
VIEW_REAR,
VIEW_CENTER_TO_SELECTION,
VIEW_ALIGN_SELECTION_WITH_VIEW,
VIEW_PERSPECTIVE,
VIEW_ENVIRONMENT,
VIEW_ORTHOGONAL