Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-27 03:34:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

-Added ViewportContainer, this is the only way to make viewports show up in GUI now

Browse source 
-2D editing now seems to work
-Added some functions and refactoring to Viewport
This commit is contained in:
Juan Linietsky 2016-10-05 01:26:35 -03:00
parent a6e9dc6153
commit cf5778e51a
20 changed files with 340 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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);