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

Merge pull request #14847 from YeldhamDev/3d_viewport_save

Browse source 
Fixes for the Spatial Editor's Perspective options and dead code cleaning
This commit is contained in:
Noshyaar 2017-12-25 08:40:43 +07:00 committed by GitHub
commit aecffd71d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 60 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

148
editor/plugins/spatial_editor_plugin.cpp
View file

@ -51,7 +51,6 @@
#define GIZMO_ARROW_SIZE 0.35 #define GIZMO_ARROW_SIZE 0.35
#define GIZMO_RING_HALF_WIDTH 0.1 #define GIZMO_RING_HALF_WIDTH 0.1
//#define GIZMO_SCALE_DEFAULT 0.28
#define GIZMO_SCALE_DEFAULT 0.15 #define GIZMO_SCALE_DEFAULT 0.15
#define GIZMO_PLANE_SIZE 0.2 #define GIZMO_PLANE_SIZE 0.2
#define GIZMO_PLANE_DST 0.3 #define GIZMO_PLANE_DST 0.3
@ -94,7 +93,6 @@ void SpatialEditorViewport::_update_camera(float p_interp_delta) {
// We interpolate a different point here, because in freelook mode the focus point (cursor.pos) orbits around eye_pos // We interpolate a different point here, because in freelook mode the focus point (cursor.pos) orbits around eye_pos
camera_cursor.eye_pos = old_camera_cursor.eye_pos.linear_interpolate(cursor.eye_pos, CLAMP(factor, 0, 1)); camera_cursor.eye_pos = old_camera_cursor.eye_pos.linear_interpolate(cursor.eye_pos, CLAMP(factor, 0, 1));
//camera_cursor.pos = camera_cursor.eye_pos + (cursor.pos - cursor.eye_pos);
float orbit_inertia = EDITOR_GET("editors/3d/navigation_feel/orbit_inertia"); float orbit_inertia = EDITOR_GET("editors/3d/navigation_feel/orbit_inertia");
orbit_inertia = MAX(0.0001, orbit_inertia); orbit_inertia = MAX(0.0001, orbit_inertia);
@ -154,10 +152,9 @@ void SpatialEditorViewport::_update_camera(float p_interp_delta) {
camera->set_global_transform(to_camera_transform(camera_cursor)); camera->set_global_transform(to_camera_transform(camera_cursor));
if (orthogonal) { if (orthogonal)
//camera->set_orthogonal(size.width*cursor.distance,get_znear(),get_zfar());
camera->set_orthogonal(2 * cursor.distance, 0.1, 8192); camera->set_orthogonal(2 * cursor.distance, 0.1, 8192);
} else else
camera->set_perspective(get_fov(), get_znear(), get_zfar()); camera->set_perspective(get_fov(), get_znear(), get_zfar());
update_transform_gizmo_view(); update_transform_gizmo_view();
@ -393,9 +390,6 @@ ObjectID SpatialEditorViewport::_select_ray(const Point2 &p_pos, bool p_append,
ERR_PRINT("Bug?"); ERR_PRINT("Bug?");
} }
} }
// if (editor_selection->is_selected(spat))
// r_includes_current=true;
} }
if (!item) if (!item)
@ -562,6 +556,8 @@ void SpatialEditorViewport::_update_name() {
view_menu->set_text("[ " + name + " " + ortho + " ]"); view_menu->set_text("[ " + name + " " + ortho + " ]");
else else
view_menu->set_text("[ " + ortho + " ]"); view_menu->set_text("[ " + ortho + " ]");
view_menu->set_size(Vector2(0, 0)); // resets the button size
} }
void SpatialEditorViewport::_compute_edit(const Point2 &p_point) { void SpatialEditorViewport::_compute_edit(const Point2 &p_point) {
@ -950,7 +946,6 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
if (_edit.mode != TRANSFORM_NONE && b->is_pressed()) { if (_edit.mode != TRANSFORM_NONE && b->is_pressed()) {
//cancel motion //cancel motion
_edit.mode = TRANSFORM_NONE; _edit.mode = TRANSFORM_NONE;
//_validate_selection();
List<Node *> &selection = editor_selection->get_selected_node_list(); List<Node *> &selection = editor_selection->get_selected_node_list();
@ -967,7 +962,6 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
sp->set_global_transform(se->original); sp->set_global_transform(se->original);
} }
surface->update(); surface->update();
//VisualServer::get_singleton()->poly_clear(indicators);
set_message(TTR("Transform Aborted."), 3); set_message(TTR("Transform Aborted."), 3);
} }
@ -1060,7 +1054,6 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
_edit.gizmo = seg; _edit.gizmo = seg;
_edit.gizmo_handle = handle; _edit.gizmo_handle = handle;
//_edit.gizmo_initial_pos=seg->get_handle_pos(gizmo_handle);
_edit.gizmo_initial_value = seg->get_handle_value(handle); _edit.gizmo_initial_value = seg->get_handle_value(handle);
break; break;
} }
@ -1135,13 +1128,10 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
_edit.gizmo = seg; _edit.gizmo = seg;
_edit.gizmo_handle = gizmo_handle; _edit.gizmo_handle = gizmo_handle;
//_edit.gizmo_initial_pos=seg->get_handle_pos(gizmo_handle);
_edit.gizmo_initial_value = seg->get_handle_value(gizmo_handle); _edit.gizmo_initial_value = seg->get_handle_value(gizmo_handle);
//print_line("GIZMO: "+itos(gizmo_handle)+" FROMPOS: "+_edit.orig_gizmo_pos);
break; break;
} }
} }
//_compute_edit(Point2(b.x,b.y)); //in case a motion happens..
} }
surface->update(); surface->update();
@ -1187,7 +1177,6 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
} }
undo_redo->commit_action(); undo_redo->commit_action();
_edit.mode = TRANSFORM_NONE; _edit.mode = TRANSFORM_NONE;
//VisualServer::get_singleton()->poly_clear(indicators);
set_message(""); set_message("");
} }
@ -2115,15 +2104,6 @@ void SpatialEditorViewport::_notification(int p_what) {
if (p_what == NOTIFICATION_PROCESS) { if (p_what == NOTIFICATION_PROCESS) {
//force editr camera
/*
current_camera=get_root_node()->get_current_camera();
if (current_camera!=camera) {
}
*/
real_t delta = get_process_delta_time(); real_t delta = get_process_delta_time();
if (zoom_indicator_delay > 0) { if (zoom_indicator_delay > 0) {
@ -2591,6 +2571,11 @@ void SpatialEditorViewport::_menu_option(int p_option) {
bool current = view_menu->get_popup()->is_item_checked(idx); bool current = view_menu->get_popup()->is_item_checked(idx);
view_menu->get_popup()->set_item_checked(idx, !current); view_menu->get_popup()->set_item_checked(idx, !current);
if (current)
preview_camera->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, 10 * EDSCALE);
else
preview_camera->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, 15 * EDSCALE + fps_label->get_size().height);
} break; } break;
case VIEW_DISPLAY_NORMAL: { case VIEW_DISPLAY_NORMAL: {
@ -2642,14 +2627,13 @@ void SpatialEditorViewport::_preview_exited_scene() {
void SpatialEditorViewport::_init_gizmo_instance(int p_idx) { void SpatialEditorViewport::_init_gizmo_instance(int p_idx) {
uint32_t layer = 1 << (GIZMO_BASE_LAYER + p_idx); //|(1<<GIZMO_GRID_LAYER); uint32_t layer = 1 << (GIZMO_BASE_LAYER + p_idx);
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
move_gizmo_instance[i] = VS::get_singleton()->instance_create(); move_gizmo_instance[i] = VS::get_singleton()->instance_create();
VS::get_singleton()->instance_set_base(move_gizmo_instance[i], spatial_editor->get_move_gizmo(i)->get_rid()); VS::get_singleton()->instance_set_base(move_gizmo_instance[i], spatial_editor->get_move_gizmo(i)->get_rid());
VS::get_singleton()->instance_set_scenario(move_gizmo_instance[i], get_tree()->get_root()->get_world()->get_scenario()); VS::get_singleton()->instance_set_scenario(move_gizmo_instance[i], get_tree()->get_root()->get_world()->get_scenario());
VS::get_singleton()->instance_set_visible(move_gizmo_instance[i], false); VS::get_singleton()->instance_set_visible(move_gizmo_instance[i], false);
//VS::get_singleton()->instance_geometry_set_flag(move_gizmo_instance[i],VS::INSTANCE_FLAG_DEPH_SCALE,true);
VS::get_singleton()->instance_geometry_set_cast_shadows_setting(move_gizmo_instance[i], VS::SHADOW_CASTING_SETTING_OFF); VS::get_singleton()->instance_geometry_set_cast_shadows_setting(move_gizmo_instance[i], VS::SHADOW_CASTING_SETTING_OFF);
VS::get_singleton()->instance_set_layer_mask(move_gizmo_instance[i], layer); VS::get_singleton()->instance_set_layer_mask(move_gizmo_instance[i], layer);
@ -2657,7 +2641,6 @@ void SpatialEditorViewport::_init_gizmo_instance(int p_idx) {
VS::get_singleton()->instance_set_base(move_plane_gizmo_instance[i], spatial_editor->get_move_plane_gizmo(i)->get_rid()); VS::get_singleton()->instance_set_base(move_plane_gizmo_instance[i], spatial_editor->get_move_plane_gizmo(i)->get_rid());
VS::get_singleton()->instance_set_scenario(move_plane_gizmo_instance[i], get_tree()->get_root()->get_world()->get_scenario()); VS::get_singleton()->instance_set_scenario(move_plane_gizmo_instance[i], get_tree()->get_root()->get_world()->get_scenario());
VS::get_singleton()->instance_set_visible(move_plane_gizmo_instance[i], false); VS::get_singleton()->instance_set_visible(move_plane_gizmo_instance[i], false);
//VS::get_singleton()->instance_geometry_set_flag(move_plane_gizmo_instance[i],VS::INSTANCE_FLAG_DEPH_SCALE,true);
VS::get_singleton()->instance_geometry_set_cast_shadows_setting(move_plane_gizmo_instance[i], VS::SHADOW_CASTING_SETTING_OFF); VS::get_singleton()->instance_geometry_set_cast_shadows_setting(move_plane_gizmo_instance[i], VS::SHADOW_CASTING_SETTING_OFF);
VS::get_singleton()->instance_set_layer_mask(move_plane_gizmo_instance[i], layer); VS::get_singleton()->instance_set_layer_mask(move_plane_gizmo_instance[i], layer);
@ -2665,7 +2648,6 @@ void SpatialEditorViewport::_init_gizmo_instance(int p_idx) {
VS::get_singleton()->instance_set_base(rotate_gizmo_instance[i], spatial_editor->get_rotate_gizmo(i)->get_rid()); VS::get_singleton()->instance_set_base(rotate_gizmo_instance[i], spatial_editor->get_rotate_gizmo(i)->get_rid());
VS::get_singleton()->instance_set_scenario(rotate_gizmo_instance[i], get_tree()->get_root()->get_world()->get_scenario()); VS::get_singleton()->instance_set_scenario(rotate_gizmo_instance[i], get_tree()->get_root()->get_world()->get_scenario());
VS::get_singleton()->instance_set_visible(rotate_gizmo_instance[i], false); VS::get_singleton()->instance_set_visible(rotate_gizmo_instance[i], false);
//VS::get_singleton()->instance_geometry_set_flag(rotate_gizmo_instance[i],VS::INSTANCE_FLAG_DEPH_SCALE,true);
VS::get_singleton()->instance_geometry_set_cast_shadows_setting(rotate_gizmo_instance[i], VS::SHADOW_CASTING_SETTING_OFF); VS::get_singleton()->instance_geometry_set_cast_shadows_setting(rotate_gizmo_instance[i], VS::SHADOW_CASTING_SETTING_OFF);
VS::get_singleton()->instance_set_layer_mask(rotate_gizmo_instance[i], layer); VS::get_singleton()->instance_set_layer_mask(rotate_gizmo_instance[i], layer);
@ -2673,7 +2655,6 @@ void SpatialEditorViewport::_init_gizmo_instance(int p_idx) {
VS::get_singleton()->instance_set_base(scale_gizmo_instance[i], spatial_editor->get_scale_gizmo(i)->get_rid()); VS::get_singleton()->instance_set_base(scale_gizmo_instance[i], spatial_editor->get_scale_gizmo(i)->get_rid());
VS::get_singleton()->instance_set_scenario(scale_gizmo_instance[i], get_tree()->get_root()->get_world()->get_scenario()); VS::get_singleton()->instance_set_scenario(scale_gizmo_instance[i], get_tree()->get_root()->get_world()->get_scenario());
VS::get_singleton()->instance_set_visible(scale_gizmo_instance[i], false); VS::get_singleton()->instance_set_visible(scale_gizmo_instance[i], false);
//VS::get_singleton()->instance_geometry_set_flag(scale_gizmo_instance[i],VS::INSTANCE_FLAG_DEPH_SCALE,true);
VS::get_singleton()->instance_geometry_set_cast_shadows_setting(scale_gizmo_instance[i], VS::SHADOW_CASTING_SETTING_OFF); VS::get_singleton()->instance_geometry_set_cast_shadows_setting(scale_gizmo_instance[i], VS::SHADOW_CASTING_SETTING_OFF);
VS::get_singleton()->instance_set_layer_mask(scale_gizmo_instance[i], layer); VS::get_singleton()->instance_set_layer_mask(scale_gizmo_instance[i], layer);
@ -2681,7 +2662,6 @@ void SpatialEditorViewport::_init_gizmo_instance(int p_idx) {
VS::get_singleton()->instance_set_base(scale_plane_gizmo_instance[i], spatial_editor->get_scale_plane_gizmo(i)->get_rid()); VS::get_singleton()->instance_set_base(scale_plane_gizmo_instance[i], spatial_editor->get_scale_plane_gizmo(i)->get_rid());
VS::get_singleton()->instance_set_scenario(scale_plane_gizmo_instance[i], get_tree()->get_root()->get_world()->get_scenario()); VS::get_singleton()->instance_set_scenario(scale_plane_gizmo_instance[i], get_tree()->get_root()->get_world()->get_scenario());
VS::get_singleton()->instance_set_visible(scale_plane_gizmo_instance[i], false); VS::get_singleton()->instance_set_visible(scale_plane_gizmo_instance[i], false);
//VS::get_singleton()->instance_geometry_set_flag(scale_plane_gizmo_instance[i],VS::INSTANCE_FLAG_DEPH_SCALE,true);
VS::get_singleton()->instance_geometry_set_cast_shadows_setting(scale_plane_gizmo_instance[i], VS::SHADOW_CASTING_SETTING_OFF); VS::get_singleton()->instance_geometry_set_cast_shadows_setting(scale_plane_gizmo_instance[i], VS::SHADOW_CASTING_SETTING_OFF);
VS::get_singleton()->instance_set_layer_mask(scale_plane_gizmo_instance[i], layer); VS::get_singleton()->instance_set_layer_mask(scale_plane_gizmo_instance[i], layer);
} }
@ -2746,16 +2726,8 @@ void SpatialEditorViewport::set_can_preview(Camera *p_preview) {
preview = p_preview; preview = p_preview;
if (!preview_camera->is_pressed()) { if (!preview_camera->is_pressed())
preview_camera->set_visible(p_preview);
if (p_preview) {
fps_label->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, 15 * EDSCALE + preview_camera->get_size().height);
preview_camera->show();
} else {
fps_label->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, 10 * EDSCALE);
preview_camera->hide();
}
}
} }
void SpatialEditorViewport::update_transform_gizmo_view() { void SpatialEditorViewport::update_transform_gizmo_view() {
@ -2782,8 +2754,6 @@ void SpatialEditorViewport::update_transform_gizmo_view() {
xform.basis.scale(scale); xform.basis.scale(scale);
//xform.basis.scale(GIZMO_SCALE_DEFAULT*Vector3(1,1,1));
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
VisualServer::get_singleton()->instance_set_transform(move_gizmo_instance[i], xform); VisualServer::get_singleton()->instance_set_transform(move_gizmo_instance[i], xform);
VisualServer::get_singleton()->instance_set_visible(move_gizmo_instance[i], spatial_editor->is_gizmo_visible() && (spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_SELECT || spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_MOVE)); VisualServer::get_singleton()->instance_set_visible(move_gizmo_instance[i], spatial_editor->is_gizmo_visible() && (spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_SELECT || spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_MOVE));
@ -2800,18 +2770,36 @@ void SpatialEditorViewport::update_transform_gizmo_view() {
void SpatialEditorViewport::set_state(const Dictionary &p_state) { void SpatialEditorViewport::set_state(const Dictionary &p_state) {
cursor.pos = p_state["position"]; if (p_state.has("position"))
cursor.x_rot = p_state["x_rotation"]; cursor.pos = p_state["position"];
cursor.y_rot = p_state["y_rotation"]; if (p_state.has("x_rotation"))
cursor.distance = p_state["distance"]; cursor.x_rot = p_state["x_rotation"];
bool env = p_state["use_environment"]; if (p_state.has("y_rotation"))
bool orth = p_state["use_orthogonal"]; cursor.y_rot = p_state["y_rotation"];
if (orth) if (p_state.has("distance"))
_menu_option(VIEW_ORTHOGONAL); cursor.distance = p_state["distance"];
else
_menu_option(VIEW_PERSPECTIVE); if (p_state.has("use_orthogonal")) {
if (env != camera->get_environment().is_valid()) bool orth = p_state["use_orthogonal"];
_menu_option(VIEW_ENVIRONMENT);
if (orth)
_menu_option(VIEW_ORTHOGONAL);
else
_menu_option(VIEW_PERSPECTIVE);
}
if (p_state.has("display_mode")) {
int display = p_state["display_mode"];
int idx = view_menu->get_popup()->get_item_index(display);
if (!view_menu->get_popup()->is_item_checked(idx))
_menu_option(display);
}
if (p_state.has("use_environment")) {
bool env = p_state["use_environment"];
if (env != camera->get_environment().is_valid())
_menu_option(VIEW_ENVIRONMENT);
}
if (p_state.has("listener")) { if (p_state.has("listener")) {
bool listener = p_state["listener"]; bool listener = p_state["listener"];
@ -2840,6 +2828,13 @@ void SpatialEditorViewport::set_state(const Dictionary &p_state) {
if (view_menu->get_popup()->is_item_checked(idx) != information) if (view_menu->get_popup()->is_item_checked(idx) != information)
_menu_option(VIEW_INFORMATION); _menu_option(VIEW_INFORMATION);
} }
if (p_state.has("fps")) {
bool fps = p_state["fps"];
int idx = view_menu->get_popup()->get_item_index(VIEW_FPS);
if (view_menu->get_popup()->is_item_checked(idx) != fps)
_menu_option(VIEW_FPS);
}
if (p_state.has("half_res")) { if (p_state.has("half_res")) {
bool half_res = p_state["half_res"]; bool half_res = p_state["half_res"];
@ -2870,14 +2865,22 @@ Dictionary SpatialEditorViewport::get_state() const {
d["distance"] = cursor.distance; d["distance"] = cursor.distance;
d["use_environment"] = camera->get_environment().is_valid(); d["use_environment"] = camera->get_environment().is_valid();
d["use_orthogonal"] = camera->get_projection() == Camera::PROJECTION_ORTHOGONAL; d["use_orthogonal"] = camera->get_projection() == Camera::PROJECTION_ORTHOGONAL;
if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_NORMAL)))
d["display_mode"] = VIEW_DISPLAY_NORMAL;
else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_WIREFRAME)))
d["display_mode"] = VIEW_DISPLAY_WIREFRAME;
else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_OVERDRAW)))
d["display_mode"] = VIEW_DISPLAY_OVERDRAW;
else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_SHADELESS)))
d["display_mode"] = VIEW_DISPLAY_SHADELESS;
d["listener"] = viewport->is_audio_listener(); d["listener"] = viewport->is_audio_listener();
d["doppler"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_AUDIO_DOPPLER)); d["doppler"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_AUDIO_DOPPLER));
d["gizmos"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_GIZMOS)); d["gizmos"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_GIZMOS));
d["information"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_INFORMATION)); d["information"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_INFORMATION));
d["fps"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_FPS));
d["half_res"] = viewport_container->get_stretch_shrink() > 1; d["half_res"] = viewport_container->get_stretch_shrink() > 1;
if (previewing) { if (previewing)
d["previewing"] = EditorNode::get_singleton()->get_edited_scene()->get_path_to(previewing); d["previewing"] = EditorNode::get_singleton()->get_edited_scene()->get_path_to(previewing);
}
return d; return d;
} }
@ -3310,7 +3313,6 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed
camera = memnew(Camera); camera = memnew(Camera);
camera->set_disable_gizmo(true); camera->set_disable_gizmo(true);
camera->set_cull_mask(((1 << 20) - 1) | (1 << (GIZMO_BASE_LAYER + p_index)) | (1 << GIZMO_EDIT_LAYER) | (1 << GIZMO_GRID_LAYER)); camera->set_cull_mask(((1 << 20) - 1) | (1 << (GIZMO_BASE_LAYER + p_index)) | (1 << GIZMO_EDIT_LAYER) | (1 << GIZMO_GRID_LAYER));
//camera->set_environment(SpatialEditor::get_singleton()->get_viewport_environment());
viewport->add_child(camera); viewport->add_child(camera);
camera->make_current(); camera->make_current();
surface->set_focus_mode(FOCUS_ALL); surface->set_focus_mode(FOCUS_ALL);
@ -3368,7 +3370,7 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed
preview_camera->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, 10 * EDSCALE); preview_camera->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, 10 * EDSCALE);
preview_camera->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, -10 * EDSCALE); preview_camera->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, -10 * EDSCALE);
preview_camera->set_h_grow_direction(GROW_DIRECTION_BEGIN); preview_camera->set_h_grow_direction(GROW_DIRECTION_BEGIN);
preview_camera->set_text(TTR("preview")); preview_camera->set_text(TTR("Preview"));
surface->add_child(preview_camera); surface->add_child(preview_camera);
preview_camera->hide(); preview_camera->hide();
preview_camera->connect("toggled", this, "_toggle_camera_preview"); preview_camera->connect("toggled", this, "_toggle_camera_preview");
@ -3772,7 +3774,6 @@ void SpatialEditor::update_transform_gizmo() {
center.expand_to(xf.origin); center.expand_to(xf.origin);
gizmo_basis = Basis(); gizmo_basis = Basis();
} }
//count++;
} }
Vector3 pcenter = center.position + center.size * 0.5; Vector3 pcenter = center.position + center.size * 0.5;
@ -3995,17 +3996,6 @@ void SpatialEditor::edit(Spatial *p_spatial) {
} }
} }
} }
/*
if (p_spatial) {
_validate_selection();
if (selected.has(p_spatial->get_instance_id()) && selected.size()==1)
return;
_select(p_spatial->get_instance_id(),false,true);
// should become the selection
}
*/
} }
void SpatialEditor::_xform_dialog_action() { void SpatialEditor::_xform_dialog_action() {
@ -4349,9 +4339,6 @@ void SpatialEditor::_init_indicators() {
VisualServer::get_singleton()->mesh_add_surface_from_arrays(origin, VisualServer::PRIMITIVE_LINES, d); VisualServer::get_singleton()->mesh_add_surface_from_arrays(origin, VisualServer::PRIMITIVE_LINES, d);
VisualServer::get_singleton()->mesh_surface_set_material(origin, 0, indicator_mat->get_rid()); VisualServer::get_singleton()->mesh_surface_set_material(origin, 0, indicator_mat->get_rid());
//origin = VisualServer::get_singleton()->poly_create();
//VisualServer::get_singleton()->poly_add_primitive(origin,origin_points,Vector<Vector3>(),origin_colors,Vector<Vector3>());
//VisualServer::get_singleton()->poly_set_material(origin,indicator_mat,true);
origin_instance = VisualServer::get_singleton()->instance_create2(origin, get_tree()->get_root()->get_world()->get_scenario()); origin_instance = VisualServer::get_singleton()->instance_create2(origin, get_tree()->get_root()->get_world()->get_scenario());
VS::get_singleton()->instance_set_layer_mask(origin_instance, 1 << SpatialEditorViewport::GIZMO_GRID_LAYER); VS::get_singleton()->instance_set_layer_mask(origin_instance, 1 << SpatialEditorViewport::GIZMO_GRID_LAYER);
@ -4636,9 +4623,6 @@ void SpatialEditor::_finish_indicators() {
VisualServer::get_singleton()->free(grid_instance[i]); VisualServer::get_singleton()->free(grid_instance[i]);
VisualServer::get_singleton()->free(grid[i]); VisualServer::get_singleton()->free(grid[i]);
} }
//VisualServer::get_singleton()->free(poly);
//VisualServer::get_singleton()->free(indicators_instance);
//VisualServer::get_singleton()->free(indicators);
} }
bool SpatialEditor::is_any_freelook_active() const { bool SpatialEditor::is_any_freelook_active() const {
@ -4880,7 +4864,6 @@ void SpatialEditor::_node_removed(Node *p_node) {
void SpatialEditor::_bind_methods() { void SpatialEditor::_bind_methods() {
//ClassDB::bind_method("_gui_input",&SpatialEditor::_gui_input);
ClassDB::bind_method("_unhandled_key_input", &SpatialEditor::_unhandled_key_input); ClassDB::bind_method("_unhandled_key_input", &SpatialEditor::_unhandled_key_input);
ClassDB::bind_method("_node_removed", &SpatialEditor::_node_removed); ClassDB::bind_method("_node_removed", &SpatialEditor::_node_removed);
ClassDB::bind_method("_menu_item_pressed", &SpatialEditor::_menu_item_pressed); ClassDB::bind_method("_menu_item_pressed", &SpatialEditor::_menu_item_pressed);
@ -4941,8 +4924,6 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) {
snap_enabled = false; snap_enabled = false;
tool_mode = TOOL_MODE_SELECT; tool_mode = TOOL_MODE_SELECT;
//set_focus_mode(FOCUS_ALL);
hbc_menu = memnew(HBoxContainer); hbc_menu = memnew(HBoxContainer);
vbc->add_child(hbc_menu); vbc->add_child(hbc_menu);
@ -5117,7 +5098,6 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) {
viewports[i]->assign_pending_data_pointers(preview_node, &preview_bounds, accept); viewports[i]->assign_pending_data_pointers(preview_node, &preview_bounds, accept);
viewport_base->add_child(viewports[i]); viewport_base->add_child(viewports[i]);
} }
//vbc->add_child(viewport_base);
/* SNAP DIALOG */ /* SNAP DIALOG */
@ -5127,7 +5107,6 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) {
VBoxContainer *snap_dialog_vbc = memnew(VBoxContainer); VBoxContainer *snap_dialog_vbc = memnew(VBoxContainer);
snap_dialog->add_child(snap_dialog_vbc); snap_dialog->add_child(snap_dialog_vbc);
//snap_dialog->set_child_rect(snap_dialog_vbc);
snap_translate = memnew(LineEdit); snap_translate = memnew(LineEdit);
snap_translate->set_text("1"); snap_translate->set_text("1");
@ -5149,7 +5128,6 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) {
settings_vbc = memnew(VBoxContainer); settings_vbc = memnew(VBoxContainer);
settings_vbc->set_custom_minimum_size(Size2(200, 0) * EDSCALE); settings_vbc->set_custom_minimum_size(Size2(200, 0) * EDSCALE);
settings_dialog->add_child(settings_vbc); settings_dialog->add_child(settings_vbc);
//settings_dialog->set_child_rect(settings_vbc);
settings_fov = memnew(SpinBox); settings_fov = memnew(SpinBox);
settings_fov->set_max(MAX_FOV); settings_fov->set_max(MAX_FOV);
@ -5172,7 +5150,6 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) {
settings_zfar->set_value(EDITOR_DEF("editors/3d/default_z_far", 1500)); settings_zfar->set_value(EDITOR_DEF("editors/3d/default_z_far", 1500));
settings_vbc->add_margin_child(TTR("View Z-Far:"), settings_zfar); settings_vbc->add_margin_child(TTR("View Z-Far:"), settings_zfar);
//settings_dialog->get_cancel()->hide();
/* XFORM DIALOG */ /* XFORM DIALOG */
xform_dialog = memnew(ConfirmationDialog); xform_dialog = memnew(ConfirmationDialog);
@ -5258,14 +5235,12 @@ void SpatialEditorPlugin::make_visible(bool p_visible) {
spatial_editor->show(); spatial_editor->show();
spatial_editor->set_process(true); spatial_editor->set_process(true);
//VisualServer::get_singleton()->viewport_set_hide_scenario(editor->get_scene_root()->get_viewport(),false);
spatial_editor->grab_focus(); spatial_editor->grab_focus();
} else { } else {
spatial_editor->hide(); spatial_editor->hide();
spatial_editor->set_process(false); spatial_editor->set_process(false);
//VisualServer::get_singleton()->viewport_set_hide_scenario(editor->get_scene_root()->get_viewport(),true);
} }
} }
void SpatialEditorPlugin::edit(Object *p_object) { void SpatialEditorPlugin::edit(Object *p_object) {
@ -5318,11 +5293,8 @@ SpatialEditorPlugin::SpatialEditorPlugin(EditorNode *p_node) {
spatial_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL); spatial_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
editor->get_viewport()->add_child(spatial_editor); editor->get_viewport()->add_child(spatial_editor);
//spatial_editor->set_anchors_and_margins_preset(Control::PRESET_WIDE);
spatial_editor->hide(); spatial_editor->hide();
spatial_editor->connect("transform_key_request", editor, "_transform_keyed"); spatial_editor->connect("transform_key_request", editor, "_transform_keyed");
//spatial_editor->set_process(true);
} }
SpatialEditorPlugin::~SpatialEditorPlugin() { SpatialEditorPlugin::~SpatialEditorPlugin() {