diff options
| author | Juan Linietsky | 2016-10-05 01:26:35 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2016-10-05 01:26:35 -0300 |
| commit | cf5778e51a883936ffc896231da8259e5ebabc0a (patch) | |
| tree | 286f7eb7956a5c2c275276bbc9e3db5e3ff0730f /tools/editor/plugins | |
| parent | a6e9dc615346f44b68b418483dd218d11ba4a674 (diff) | |
| download | godot-cf5778e51a883936ffc896231da8259e5ebabc0a.tar.gz godot-cf5778e51a883936ffc896231da8259e5ebabc0a.tar.zst godot-cf5778e51a883936ffc896231da8259e5ebabc0a.zip | |
-Added ViewportContainer, this is the only way to make viewports show up in GUI now
-2D editing now seems to work
-Added some functions and refactoring to Viewport
Diffstat (limited to '')
| -rw-r--r-- | tools/editor/plugins/canvas_item_editor_plugin.cpp | 3 | ||||
| -rw-r--r-- | tools/editor/plugins/spatial_editor_plugin.cpp | 4 | ||||
| -rw-r--r-- | tools/editor/plugins/spatial_editor_plugin.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index b0e002ba4..2025fe825 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -3320,7 +3320,8 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) { vp_base->set_v_size_flags(SIZE_EXPAND_FILL); palette_split->add_child(vp_base); - Control *vp = memnew (Control); + ViewportContainer *vp = memnew (ViewportContainer); + vp->set_stretch(true); vp_base->add_child(vp); vp->set_area_as_parent_rect(); vp->add_child(p_editor->get_scene_root()); diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index afea6f93d..55a4c6c93 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -2348,7 +2348,7 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed message_time=0; spatial_editor=p_spatial_editor; - Control *c=memnew(Control); + ViewportContainer *c=memnew(ViewportContainer); add_child(c); c->set_area_as_parent_rect(); viewport = memnew( Viewport ); @@ -3973,7 +3973,7 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) { - settings_light_base = memnew( Control ); + settings_light_base = memnew( ViewportContainer ); settings_light_base->set_custom_minimum_size(Size2(128,128)); settings_light_base->connect("input_event",this,"_default_light_angle_input"); settings_vbc->add_margin_child(TTR("Default Light Normal:"),settings_light_base); diff --git a/tools/editor/plugins/spatial_editor_plugin.h b/tools/editor/plugins/spatial_editor_plugin.h index 2a52eab77..4751cf707 100644 --- a/tools/editor/plugins/spatial_editor_plugin.h +++ b/tools/editor/plugins/spatial_editor_plugin.h @@ -430,7 +430,7 @@ private: float settings_default_light_rot_x; float settings_default_light_rot_y; - Control *settings_light_base; + ViewportContainer *settings_light_base; Viewport *settings_light_vp; ColorPickerButton *settings_ambient_color; Image settings_light_dir_image; |