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

6369 lines
192 KiB
C++
Raw Normal View History

GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
/*************************************************************************/
/* editor_node.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* http://www.godotengine.org */
/*************************************************************************/
Welcome in 2017, dear changelog reader! That year should bring the long-awaited OpenGL ES 3.0 compatible renderer with state-of-the-art rendering techniques tuned to work as low as middle end handheld devices - without compromising with the possibilities given for higher end desktop games of course. Great times ahead for the Godot community and the gamers that will play our games! (cherry picked from commit c7bc44d5ad9aae4902280012f7654e2318cd910e)
2017-01-01 22:01:57 +01:00
/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_node.h"
Clean up editor theme creation
2016-06-18 07:32:03 +02:00
#include "editor_themes.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "print_string.h"
#include "version.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "animation_editor.h"
#include "bind/core_bind.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#include "core/io/resource_loader.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "core/io/resource_saver.h"
#include "editor_file_system.h"
#include "editor_help.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#include "editor_settings.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "globals.h"
#include "io/config_file.h"
#include "io/stream_peer_ssl.h"
#include "io/zip_io.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#include "io_plugins/editor_import_collada.h"
Small Issues & Maintenance -=-=-=-=-=-=-=-=-=-=-=-=-= -Begin work on Navigation Meshes (simple pathfinding for now, will improve soon) -More doc on theme overriding -Upgraded OpenSSL to version without bugs -Misc bugfixes
2014-08-02 03:10:38 +02:00
#include "io_plugins/editor_scene_importer_fbxconv.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "message_queue.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#include "object_type_db.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "os/file_access.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#include "os/keyboard.h"
#include "os/os.h"
#include "path_remap.h"
#include "pvrtc_compress.h"
#include "register_exporters.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "scene/resources/packed_scene.h"
#include "servers/physics_2d_server.h"
#include "translation.h"
#include <stdio.h>
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
// plugins
Update asset library editor plugin - new functionality and fixes
2016-06-07 20:29:15 +02:00
#include "asset_library_editor_plugin.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "plugins/camera_editor_plugin.h"
#include "plugins/canvas_item_editor_plugin.h"
#include "plugins/item_list_editor_plugin.h"
-Improve resource previews -Also fixed draw_texture_rect() tile parameter
2016-05-23 22:10:26 +02:00
#include "plugins/material_editor_plugin.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "plugins/mesh_editor_plugin.h"
#include "plugins/mesh_instance_editor_plugin.h"
#include "plugins/multimesh_editor_plugin.h"
#include "plugins/resource_preloader_editor_plugin.h"
#include "plugins/sample_editor_plugin.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#include "plugins/sample_library_editor_plugin.h"
#include "plugins/sample_player_editor_plugin.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "plugins/spatial_editor_plugin.h"
#include "plugins/sprite_frames_editor_plugin.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#include "plugins/stream_editor_plugin.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "plugins/style_box_editor_plugin.h"
#include "plugins/texture_editor_plugin.h"
#include "plugins/texture_region_editor_plugin.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#include "plugins/theme_editor_plugin.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "main/input_default.h"
#include "plugins/animation_player_editor_plugin.h"
#include "plugins/animation_tree_editor_plugin.h"
#include "plugins/baked_light_editor_plugin.h"
#include "plugins/collision_polygon_2d_editor_plugin.h"
#include "plugins/collision_polygon_editor_plugin.h"
#include "plugins/collision_shape_2d_editor_plugin.h"
#include "plugins/color_ramp_editor_plugin.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#include "plugins/cube_grid_theme_editor_plugin.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "plugins/light_occluder_2d_editor_plugin.h"
#include "plugins/navigation_polygon_editor_plugin.h"
#include "plugins/particles_2d_editor_plugin.h"
#include "plugins/particles_editor_plugin.h"
#include "plugins/path_2d_editor_plugin.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#include "plugins/path_editor_plugin.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "plugins/polygon_2d_editor_plugin.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#include "plugins/rich_text_editor_plugin.h"
#include "plugins/script_editor_plugin.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "plugins/shader_editor_plugin.h"
#include "plugins/shader_graph_editor_plugin.h"
#include "plugins/tile_map_editor_plugin.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#include "plugins/tile_set_editor_plugin.h"
// end
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "editor/io_plugins/editor_bitmask_import_plugin.h"
#include "editor/io_plugins/editor_export_scene.h"
Refactoring: rename tools/editor/ to editor/ The other subfolders of tools/ had already been moved to either editor/, misc/ or thirdparty/, so the hiding the editor code that deep was no longer meaningful. (Manual redo of 49c065d29ca07040c3fd810026121164ad86b247)
2017-03-18 23:45:45 +01:00
#include "editor/io_plugins/editor_font_import_plugin.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "editor/io_plugins/editor_mesh_import_plugin.h"
Refactoring: rename tools/editor/ to editor/ The other subfolders of tools/ had already been moved to either editor/, misc/ or thirdparty/, so the hiding the editor code that deep was no longer meaningful. (Manual redo of 49c065d29ca07040c3fd810026121164ad86b247)
2017-03-18 23:45:45 +01:00
#include "editor/io_plugins/editor_sample_import_plugin.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "editor/io_plugins/editor_scene_import_plugin.h"
#include "editor/io_plugins/editor_texture_import_plugin.h"
Refactoring: rename tools/editor/ to editor/ The other subfolders of tools/ had already been moved to either editor/, misc/ or thirdparty/, so the hiding the editor code that deep was no longer meaningful. (Manual redo of 49c065d29ca07040c3fd810026121164ad86b247)
2017-03-18 23:45:45 +01:00
#include "editor/io_plugins/editor_translation_import_plugin.h"
A bit of everything: -IMA-ADPCM support for samples, this means that sound effects can be compressed and use 4 timess less RAM. -New 3D import workflow based on Wavefront OBJ. Import single objects as mesh resources instead of full scenes. Many people prefers to work this way. Just like the rest of the imported resources, these are updated in realtime if modified externally. -Mesh resources now support naming surfaces. This helps reimporting to identify which user-created materials must be kept. -Several fixes and improvements to SurfaceTool. -Anti Aliasing added to WorldEnvironment effects (using FXAA) -2D Physics bodies (RigidBody, KinematicBody, etc), Raycasts, Tilemap, etc support collision layers. This makes easy to group which objects collide against which. -2D Trigger shapes can now also trigger collision reporting in other 2D bodies (it used to be in Area2D before) -Viewport render target textures can now be filtered. -Few fixes in GDscript make it easier to work with static functions and class members. -Several and many bugfixes.
2014-05-14 06:22:15 +02:00
-Made editor support SSL certs by default (embedded them) -Made asset sharing support https -Many fixes to HTTPRequest -Added an asset installer dialog -Visual cleanups to asset sharing tab -Fixed some issues in ScrollContainer, hope it does not break things -Asset sharing tab is not visible (hidden on purpose) for now.
2016-03-12 14:44:12 +01:00
#include "editor_initialize_ssl.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
#include "plugins/editor_preview_plugins.h"
Live edit WORK IN PROGRESS 1) press the heart while the game is running 2) select a scene to live edit from the opened scenes 3) edit/add/remove nodes or resources, change their properties, etc. 4) watch changes reflected in running game, in all places this scene is edited 5) It's not perfect obviously, but the aim of it is to try to reflect your changes as best as possible in the running game.
2015-08-02 17:29:37 +02:00
#include "script_editor_debugger.h"
Able to open project manager inside editor (Scene->Project Manager) Remove unnecessary include of project_manager.h
2014-02-18 05:21:06 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
EditorNode *EditorNode::singleton = NULL;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
void EditorNode::_update_scene_tabs() {
-fixed tabs
2015-11-18 08:47:41 +01:00
bool show_rb = EditorSettings::get_singleton()->get("global/show_script_in_scene_tabs");
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
scene_tabs->clear_tabs();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Ref<Texture> script_icon = gui_base->get_icon("Script", "EditorIcons");
for (int i = 0; i < editor_data.get_edited_scene_count(); i++) {
-added icons for root node types on tabs
2015-07-24 19:18:02 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String type = editor_data.get_scene_type(i);
-added icons for root node types on tabs
2015-07-24 19:18:02 +02:00
Ref<Texture> icon;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (type != String()) {
-added icons for root node types on tabs
2015-07-24 19:18:02 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (!gui_base->has_icon(type, "EditorIcons")) {
type = "Node";
-added icons for root node types on tabs
2015-07-24 19:18:02 +02:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
icon = gui_base->get_icon(type, "EditorIcons");
-added icons for root node types on tabs
2015-07-24 19:18:02 +02:00
}
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
int current = editor_data.get_edited_scene();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool unsaved = (i == current) ? saved_version != editor_data.get_undo_redo().get_version() : editor_data.get_scene_version(i) != 0;
scene_tabs->add_tab(editor_data.get_scene_title(i) + (unsaved ? "(*)" : ""), icon);
-added icons for root node types on tabs
2015-07-24 19:18:02 +02:00
-fixed tabs
2015-11-18 08:47:41 +01:00
if (show_rb && editor_data.get_scene_root_script(i).is_valid()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
scene_tabs->set_tab_right_button(i, script_icon);
QOL, script buttons in scene tabs
2015-07-26 15:44:10 +02:00
}
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
}
scene_tabs->set_current_tab(editor_data.get_edited_scene());
Properly fix tab scrolling, fixes #3128, fixes #3314
2016-01-13 11:39:31 +01:00
scene_tabs->ensure_tab_visible(editor_data.get_edited_scene());
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
void EditorNode::_update_title() {
editor window title improvements Shows the project name in the window title (good to differentiate multiple instances of Godot with different projects loaded). Clears the previous scene name from the window title when creating a new scene.
2014-04-10 04:50:30 +02:00
String appname = Globals::get_singleton()->get("application/name");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String title = appname.empty() ? String(VERSION_FULL_NAME) : String(_MKSTR(VERSION_NAME) + String(" - ") + appname);
String edited = editor_data.get_edited_scene_root() ? editor_data.get_edited_scene_root()->get_filename() : String();
editor window title improvements Shows the project name in the window title (good to differentiate multiple instances of Godot with different projects loaded). Clears the previous scene name from the window title when creating a new scene.
2014-04-10 04:50:30 +02:00
if (!edited.empty())
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
title += " - " + String(edited.get_file());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (unsaved_cache)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
title += " (*)";
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::get_singleton()->set_window_title(title);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_unhandled_input(const InputEvent &p_event) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Figured out a way to fix event propagation for shortcuts and some other cases so they properly stop shortcuts if a modal window is open, closes #4848
2016-06-28 01:14:59 +02:00
if (Node::get_viewport()->get_modal_stack_top())
return; //ignore because of modal window
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_event.type == InputEvent::KEY && p_event.key.pressed && !p_event.key.echo && !gui_base->get_viewport()->gui_has_modal_stack()) {
Added fullscreen and distraction free mode shorcuts
2016-06-15 18:25:17 +02:00
if (ED_IS_SHORTCUT("editor/fullscreen_mode", p_event)) {
if (distraction_free_mode) {
distraction_free_mode = false;
_update_top_menu_visibility();
} else {
set_docks_visible(!get_docks_visible());
}
}
if (ED_IS_SHORTCUT("editor/distraction_free_mode", p_event)) {
set_distraction_free_mode(!get_distraction_free_mode());
}
Configurable shortcuts for tabs switching
2016-06-25 06:42:09 +02:00
if (ED_IS_SHORTCUT("editor/next_tab", p_event)) {
int next_tab = editor_data.get_edited_scene() + 1;
next_tab %= editor_data.get_edited_scene_count();
_scene_tab_changed(next_tab);
}
if (ED_IS_SHORTCUT("editor/prev_tab", p_event)) {
int next_tab = editor_data.get_edited_scene() - 1;
next_tab = next_tab >= 0 ? next_tab : editor_data.get_edited_scene_count() - 1;
_scene_tab_changed(next_tab);
}
Remove Quick Filter Files and fix FS search hotkey The new Quick Filter Files behaviour since 8b47e26 had not been implemented, so this implements it and makes it an editor hotkey instead of a menu entry. Fixes #7582. (cherry picked from commit c4d6e54e93431e94888c5594386bcd0aa22528ee)
2017-01-21 13:07:29 +01:00
if (ED_IS_SHORTCUT("editor/filter_files", p_event)) {
filesystem_dock->focus_on_filter();
}
Added fullscreen and distraction free mode shorcuts
2016-06-15 18:25:17 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
switch (p_event.key.scancode) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-Merged Script and Help tabs -Help tabs can be opened many at the same time -Color temperatures for opened scripts -Dominant script opening when switching scene tab
2015-11-17 13:46:08 +01:00
/*case KEY_F1:
EditorNode consume F1 key only when Shift or Command key not pressed at the same time
2014-05-06 11:38:00 +02:00
if (!p_event.key.mod.shift && !p_event.key.mod.command)
Put 2D, 3D and Script editor index in enum To avoid invalid index out of bounds mistakes.
2015-11-25 00:46:44 +01:00
_editor_select(EDITOR_SCRIPT);
-Merged Script and Help tabs -Help tabs can be opened many at the same time -Color temperatures for opened scripts -Dominant script opening when switching scene tab
2015-11-17 13:46:08 +01:00
break;*/
Fix switching between 2D/3D/Script
2015-11-25 00:07:32 +01:00
case KEY_F1:
if (!p_event.key.mod.shift && !p_event.key.mod.command)
Put 2D, 3D and Script editor index in enum To avoid invalid index out of bounds mistakes.
2015-11-25 00:46:44 +01:00
_editor_select(EDITOR_2D);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
break;
Fix switching between 2D/3D/Script
2015-11-25 00:07:32 +01:00
case KEY_F2:
if (!p_event.key.mod.shift && !p_event.key.mod.command)
Put 2D, 3D and Script editor index in enum To avoid invalid index out of bounds mistakes.
2015-11-25 00:46:44 +01:00
_editor_select(EDITOR_3D);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
break;
Fix switching between 2D/3D/Script
2015-11-25 00:07:32 +01:00
case KEY_F3:
if (!p_event.key.mod.shift && !p_event.key.mod.command)
Put 2D, 3D and Script editor index in enum To avoid invalid index out of bounds mistakes.
2015-11-25 00:46:44 +01:00
_editor_select(EDITOR_SCRIPT);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
break;
/* case KEY_F5: _menu_option_confirm((p_event.key.mod.control&&p_event.key.mod.shift)?RUN_PLAY_CUSTOM_SCENE:RUN_PLAY,true); break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case KEY_F6: _menu_option_confirm(RUN_PLAY_SCENE,true); break;
First version of Profiler It is now possible to profile GDScript as well as some parts of Godot internals.
2016-05-22 02:18:16 +02:00
//case KEY_F7: _menu_option_confirm(RUN_PAUSE,true); break;
-customizable shortcuts in editor -editor settings now save to .tres instead of .xml -buttons can now hold a shortcut
2016-06-05 02:31:29 +02:00
case KEY_F8: _menu_option_confirm(RUN_STOP,true); break;*/
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
}
void EditorNode::_notification(int p_what) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_what == NOTIFICATION_EXIT_TREE) {
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-21 00:38:02 +02:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
editor_data.save_editor_external_data();
-Add visible IO errors when closing a file fails due to it being locked (most likely on windows), closes #4760
2016-06-13 15:10:50 +02:00
FileAccess::set_file_close_fail_notify_callback(NULL);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
log->deinit(); // do not get messages anymore
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_what == NOTIFICATION_PROCESS) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
//force the whole tree viewport
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#if 0
{
Rect2 grect = scene_root_base->get_global_rect();
Rect2 grectsrp = scene_root_parent->get_global_rect();
if (grect!=grectsrp) {
scene_root_parent->set_pos(grect.pos);
scene_root_parent->set_size(grect.size);
}
}
#endif
if (opening_prev && confirmation->is_hidden())
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
opening_prev = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (unsaved_cache != (saved_version != editor_data.get_undo_redo().get_version())) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
unsaved_cache = (saved_version != editor_data.get_undo_redo().get_version());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
_update_title();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (last_checked_version != editor_data.get_undo_redo().get_version()) {
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
_update_scene_tabs();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
last_checked_version = editor_data.get_undo_redo().get_version();
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//get_root_node()->set_rect(viewport->get_global_rect());
//update the circle
uint64_t frame = OS::get_singleton()->get_frames_drawn();
uint32_t tick = OS::get_singleton()->get_ticks_msec();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (frame != circle_step_frame && (tick - circle_step_msec) > (1000 / 8)) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
circle_step++;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (circle_step >= 8)
circle_step = 0;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
circle_step_msec = tick;
circle_step_frame = frame + 1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// update the circle itself only when its enabled
if (!update_menu->get_popup()->is_item_checked(3)) {
update_menu->set_icon(gui_base->get_icon("Progress" + itos(circle_step + 1), "EditorIcons"));
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
scene_root->set_size_override(true, Size2(Globals::get_singleton()->get("display/width"), Globals::get_singleton()->get("display/height")));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
editor_selection->update();
{
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
uint32_t p32 = AudioServer::get_singleton()->read_output_peak() >> 8;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
float peak = p32 == 0 ? -80 : Math::linear2db(p32 / 65535.0);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (peak < -80)
peak = -80;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
float vu = audio_vu->get_val();
if (peak > vu) {
audio_vu->set_val(peak);
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
float new_vu = vu - get_process_delta_time() * 70.0;
if (new_vu < -80)
new_vu = -80;
if (new_vu != -80 && vu != -80)
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
audio_vu->set_val(new_vu);
}
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_what == NOTIFICATION_ENTER_TREE) {
New option to send canvas to render buffer allows to use 3D environment effects for post processing such as Glow, Bloom, HDR, etc. in 2D.
2015-03-16 04:47:37 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//MessageQueue::get_singleton()->push_call(this,"_get_scene_metadata");
remove trailing whitespace
2016-03-09 00:00:52 +01:00
get_tree()->set_editor_hint(true);
SceneMainLoop -> SceneTree -=-=-=-=-=-=-=-=-=-=-=-=-=- *YOUR SOURCE MIGHT NOT WORK* For mor information on fix: https://github.com/okamstudio/godot/wiki/devel_scene_tree Other stuff: -Shower of bullets demo -Fixes all around
2014-11-06 01:20:42 +01:00
get_tree()->get_root()->set_as_audio_listener(false);
get_tree()->get_root()->set_as_audio_listener_2d(false);
get_tree()->set_auto_accept_quit(false);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
get_tree()->connect("files_dropped", this, "_dropped_files");
//VisualServer::get_singleton()->viewport_set_hide_canvas(editor->get_scene_root()->get_viewport(),false);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//import_monitor->scan_changes();
}
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_what == NOTIFICATION_EXIT_TREE) {
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
editor_data.clear_edited_scenes();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_what == NOTIFICATION_READY) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
VisualServer::get_singleton()->viewport_set_hide_scenario(get_scene_root()->get_viewport(), true);
VisualServer::get_singleton()->viewport_set_hide_canvas(get_scene_root()->get_viewport(), true);
VisualServer::get_singleton()->viewport_set_disable_environment(get_viewport()->get_viewport_rid(), true);
New option to send canvas to render buffer allows to use 3D environment effects for post processing such as Glow, Bloom, HDR, etc. in 2D.
2015-03-16 04:47:37 +01:00
Put 2D, 3D and Script editor index in enum To avoid invalid index out of bounds mistakes.
2015-11-25 00:46:44 +01:00
_editor_select(EDITOR_3D);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (defer_load_scene != "") {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
load_scene(defer_load_scene);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
defer_load_scene = "";
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (defer_translatable != "") {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Error ok = save_translatable_strings(defer_translatable);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (ok != OK)
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::get_singleton()->set_exit_code(255);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
defer_translatable = "";
SceneMainLoop -> SceneTree -=-=-=-=-=-=-=-=-=-=-=-=-=- *YOUR SOURCE MIGHT NOT WORK* For mor information on fix: https://github.com/okamstudio/godot/wiki/devel_scene_tree Other stuff: -Shower of bullets demo -Fixes all around
2014-11-06 01:20:42 +01:00
get_tree()->quit();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
/*
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (defer_optimize!="") {
Error ok = save_optimized_copy(defer_optimize,defer_optimize_preset);
defer_optimize_preset="";
if (ok!=OK)
OS::get_singleton()->set_exit_code(255);
get_scene()->quit();
}
*/
export from command line
2016-02-10 07:41:48 +01:00
/* // moved to "_sources_changed"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (export_defer.platform!="") {
project_export_settings->export_platform(export_defer.platform,export_defer.path,export_defer.debug,export_defer.password,true);
export_defer.platform="";
}
export from command line
2016-02-10 07:41:48 +01:00
*/
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
if (p_what == MainLoop::NOTIFICATION_WM_FOCUS_IN) {
/*
List<Ref<Resource> > cached;
ResourceCache::get_cached_resources(&cached);
bool changes=false;
for(List<Ref<Resource> >::Element *E=cached.front();E;E=E->next()) {
if (!E->get()->can_reload_from_file())
continue;
if (E->get()->get_path().find("::")!=-1)
continue;
uint64_t mt = FileAccess::get_modified_time(E->get()->get_path());
if (mt!=E->get()->get_last_modified_time()) {
changes=true;
break;
}
}
sources_button->get_popup()->set_item_disabled(sources_button->get_popup()->get_item_index(DEPENDENCY_UPDATE_LOCAL),!changes);
if (changes && sources_button->get_popup()->is_item_disabled(sources_button->get_popup()->get_item_index(DEPENDENCY_UPDATE_IMPORTED))) {
sources_button->set_icon(gui_base->get_icon("DependencyLocalChanged","EditorIcons"));
}
*/
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (bool(EDITOR_DEF("resources/auto_reload_modified_images", true))) {
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 03:50:23 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_menu_option_confirm(DEPENDENCY_LOAD_CHANGED_IMAGES, true);
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 03:50:23 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
waiting_for_sources_changed = true;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
EditorFileSystem::get_singleton()->scan_sources();
}
if (p_what == MainLoop::NOTIFICATION_WM_QUIT_REQUEST) {
_menu_option_confirm(FILE_QUIT, false);
};
Added a setting in editor defining scene tabs close button policy. Fixes #3777 global/always_show_close_button_in_scene_tabs Default = OFF --> Close button only on active tab ON --> Close button on all tabs
2016-02-20 02:41:29 +01:00
if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
scene_tabs->set_tab_close_display_policy((bool(EDITOR_DEF("global/always_show_close_button_in_scene_tabs", false)) ? Tabs::CLOSE_BUTTON_SHOW_ALWAYS : Tabs::CLOSE_BUTTON_SHOW_ACTIVE_ONLY));
Added a setting in editor defining scene tabs close button policy. Fixes #3777 global/always_show_close_button_in_scene_tabs Default = OFF --> Close button only on active tab ON --> Close button on all tabs
2016-02-20 02:41:29 +01:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
void EditorNode::_fs_changed() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (Set<FileDialog *>::Element *E = file_dialogs.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
E->get()->invalidate();
}
work in progress, resource previews
2015-05-31 06:59:42 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (Set<EditorFileDialog *>::Element *E = editor_file_dialogs.front(); E; E = E->next()) {
work in progress, resource previews
2015-05-31 06:59:42 +02:00
E->get()->invalidate();
}
export from command line
2016-02-10 07:41:48 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (export_defer.platform != "") {
export from command line
2016-02-10 07:41:48 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
project_export_settings->export_platform(export_defer.platform, export_defer.path, export_defer.debug, export_defer.password, true);
export_defer.platform = "";
export from command line
2016-02-10 07:41:48 +01:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
void EditorNode::_sources_changed(bool p_exist) {
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 19:18:40 +02:00
if (p_exist && bool(EditorSettings::get_singleton()->get("import/automatic_reimport_on_sources_changed"))) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p_exist = false;
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 19:18:40 +02:00
List<String> changed_sources;
EditorFileSystem::get_singleton()->get_changed_sources(&changed_sources);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
EditorProgress ep("reimport", TTR("Re-Importing"), changed_sources.size());
int step_idx = 0;
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 19:18:40 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (List<String>::Element *E = changed_sources.front(); E; E = E->next()) {
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 19:18:40 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ep.step(TTR("Importing:") + " " + E->get(), step_idx++);
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 19:18:40 +02:00
Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(E->get());
ERR_CONTINUE(rimd.is_null());
String editor = rimd->get_editor();
if (editor.begins_with("texture_")) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor = "texture"; //compatibility fix for old versions
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 19:18:40 +02:00
}
Ref<EditorImportPlugin> eip = EditorImportExport::get_singleton()->get_import_plugin_by_name(editor);
ERR_CONTINUE(eip.is_null());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Error err = eip->import(E->get(), rimd);
if (err != OK) {
EditorNode::add_io_error("Error Re Importing:\n " + E->get());
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 19:18:40 +02:00
}
}
EditorFileSystem::get_singleton()->scan_sources();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
waiting_for_sources_changed = false;
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 19:18:40 +02:00
return;
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (p_exist) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
sources_button->set_icon(gui_base->get_icon("DependencyChanged", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
sources_button->set_disabled(false);
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
sources_button->set_icon(gui_base->get_icon("DependencyOk", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
sources_button->set_disabled(true);
}
export from command line
2016-02-10 07:41:48 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
waiting_for_sources_changed = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
void EditorNode::_vp_resized() {
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_rebuild_import_menu() {
PopupMenu *p = import_menu->get_popup();
Added the ability to add and remove editor import plugins.
2015-02-10 07:36:16 +01:00
p->clear();
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 19:18:40 +02:00
//p->add_item(TTR("Node From Scene"), FILE_IMPORT_SUBSCENE);
//p->add_separator();
Added the ability to add and remove editor import plugins.
2015-02-10 07:36:16 +01:00
for (int i = 0; i < editor_import_export->get_import_plugin_count(); i++) {
p->add_item(editor_import_export->get_import_plugin(i)->get_visible_name(), IMPORT_PLUGIN_BASE + i);
}
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
void EditorNode::_node_renamed() {
if (property_editor)
property_editor->update_tree();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Error EditorNode::load_resource(const String &p_scene) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
RES res = ResourceLoader::load(p_scene);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ERR_FAIL_COND_V(!res.is_valid(), ERR_CANT_OPEN);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
edit_resource(res);
return OK;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::edit_resource(const Ref<Resource> &p_resource) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_resource_selected(p_resource, "");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
void EditorNode::edit_node(Node *p_node) {
push_item(p_node);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::open_resource(const String &p_type) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
work in progress, resource previews
2015-05-31 06:59:42 +02:00
file->set_mode(EditorFileDialog::MODE_OPEN_FILE);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
List<String> extensions;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ResourceLoader::get_recognized_extensions_for_type(p_type, &extensions);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
file->clear_filters();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < extensions.size(); i++) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file->add_filter("*." + extensions[i] + " ; " + extensions[i].to_upper());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
//file->set_current_path(current_path);
file->popup_centered_ratio();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = RESOURCE_LOAD;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::save_resource_in_path(const Ref<Resource> &p_resource, const String &p_path) {
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
editor_data.apply_changes_in_editors();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
int flg = 0;
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
if (EditorSettings::get_singleton()->get("on_save/compress_binary_resources"))
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
flg |= ResourceSaver::FLAG_COMPRESS;
Removed support for saving paths as relative, closes #5728 Editor now has good refactoring tools, so this function is mostly obsolete
2016-07-22 15:39:46 +02:00
//if (EditorSettings::get_singleton()->get("on_save/save_paths_as_relative"))
// flg|=ResourceSaver::FLAG_RELATIVE_PATHS;
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
String path = Globals::get_singleton()->localize_path(p_path);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Error err = ResourceSaver::save(path, p_resource, flg | ResourceSaver::FLAG_REPLACE_SUBRESOURCE_PATHS);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (err != OK) {
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->set_text(TTR("Error saving resource!"));
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
accept->popup_centered_minsize();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
return;
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// EditorFileSystem::get_singleton()->update_file(path,p_resource->get_type());
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
((Resource *)p_resource.ptr())->set_path(path);
emit_signal("resource_saved", p_resource);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::save_resource(const Ref<Resource> &p_resource) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
if (p_resource->get_path().is_resource_file()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
save_resource_in_path(p_resource, p_resource->get_path());
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
} else {
save_resource_as(p_resource);
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::save_resource_as(const Ref<Resource> &p_resource, const String &p_at_path) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
file->set_mode(EditorFileDialog::MODE_SAVE_FILE);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = RESOURCE_SAVE_AS;
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
List<String> extensions;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Ref<PackedScene> sd = memnew(PackedScene);
ResourceSaver::get_recognized_extensions(p_resource, &extensions);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
file->clear_filters();
properly implement save as from script editor, fixes #2415
2015-12-31 17:12:27 +01:00
List<String> preferred;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < extensions.size(); i++) {
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_resource->is_type("Script") && (extensions[i] == "tres" || extensions[i] == "res" || extensions[i] == "xml")) {
properly implement save as from script editor, fixes #2415
2015-12-31 17:12:27 +01:00
//this serves no purpose and confused people
continue;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file->add_filter("*." + extensions[i] + " ; " + extensions[i].to_upper());
properly implement save as from script editor, fixes #2415
2015-12-31 17:12:27 +01:00
preferred.push_back(extensions[i]);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
}
//file->set_current_path(current_path);
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_at_path != String()) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
file->set_current_dir(p_at_path);
if (p_resource->get_path().is_resource_file()) {
file->set_current_file(p_resource->get_path().get_file());
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (extensions.size()) {
file->set_current_file("new_" + p_resource->get_type().to_lower() + "." + preferred.front()->get().to_lower());
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
} else {
file->set_current_file(String());
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
} else if (p_resource->get_path() != "") {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
file->set_current_path(p_resource->get_path());
if (extensions.size()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String ext = p_resource->get_path().extension().to_lower();
if (extensions.find(ext) == NULL) {
file->set_current_path(p_resource->get_path().replacen("." + ext, "." + extensions.front()->get()));
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
}
}
properly implement save as from script editor, fixes #2415
2015-12-31 17:12:27 +01:00
} else if (preferred.size()) {
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
String existing;
if (extensions.size()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
existing = "new_" + p_resource->get_type().to_lower() + "." + preferred.front()->get().to_lower();
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
}
file->set_current_path(existing);
}
file->popup_centered_ratio();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
file->set_title(TTR("Save Resource As.."));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
void EditorNode::_menu_option(int p_option) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_menu_option_confirm(p_option, false);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
void EditorNode::_menu_confirm_current() {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_menu_option_confirm(current_option, true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_dialog_display_file_error(String p_file, Error p_error) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (p_error) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//accept->"()->hide();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("I see.."));
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
switch (p_error) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case ERR_FILE_CANT_WRITE: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
accept->set_text(TTR("Can't open file for writing:") + " " + p_file.extension());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
case ERR_FILE_UNRECOGNIZED: {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
accept->set_text(TTR("Requested file format unknown:") + " " + p_file.extension());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
default: {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
accept->set_text(TTR("Error while saving."));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_get_scene_metadata(const String &p_file) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Node *scene = editor_data.get_edited_scene_root();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!scene)
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String path = EditorSettings::get_singleton()->get_project_settings_path().plus_file(p_file.get_file() + "-editstate-" + p_file.md5_text() + ".cfg");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-Ensure .tscn and .tres always save in a deterministic way, fixes #2495 -Scene edit state is saved outside the scene now, to avoid changes .tscn files when nothing really changed -Created a VariantWriter helper to unify all variant to text writing -Moved SceneFormatText writing to VariantWriter -Moved ConfigFile to use VariantWriter and VariantParser, added compatibility mode for old .cfg files that use engine.cfg format
2015-12-31 04:31:00 +01:00
Ref<ConfigFile> cf;
cf.instance();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-Ensure .tscn and .tres always save in a deterministic way, fixes #2495 -Scene edit state is saved outside the scene now, to avoid changes .tscn files when nothing really changed -Created a VariantWriter helper to unify all variant to text writing -Moved SceneFormatText writing to VariantWriter -Moved ConfigFile to use VariantWriter and VariantParser, added compatibility mode for old .cfg files that use engine.cfg format
2015-12-31 04:31:00 +01:00
Error err = cf->load(path);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (err != OK || !cf->has_section("editor_states"))
-Ensure .tscn and .tres always save in a deterministic way, fixes #2495 -Scene edit state is saved outside the scene now, to avoid changes .tscn files when nothing really changed -Created a VariantWriter helper to unify all variant to text writing -Moved SceneFormatText writing to VariantWriter -Moved ConfigFile to use VariantWriter and VariantParser, added compatibility mode for old .cfg files that use engine.cfg format
2015-12-31 04:31:00 +01:00
return; //must not exist
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-Ensure .tscn and .tres always save in a deterministic way, fixes #2495 -Scene edit state is saved outside the scene now, to avoid changes .tscn files when nothing really changed -Created a VariantWriter helper to unify all variant to text writing -Moved SceneFormatText writing to VariantWriter -Moved ConfigFile to use VariantWriter and VariantParser, added compatibility mode for old .cfg files that use engine.cfg format
2015-12-31 04:31:00 +01:00
List<String> esl;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
cf->get_section_keys("editor_states", &esl);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-Ensure .tscn and .tres always save in a deterministic way, fixes #2495 -Scene edit state is saved outside the scene now, to avoid changes .tscn files when nothing really changed -Created a VariantWriter helper to unify all variant to text writing -Moved SceneFormatText writing to VariantWriter -Moved ConfigFile to use VariantWriter and VariantParser, added compatibility mode for old .cfg files that use engine.cfg format
2015-12-31 04:31:00 +01:00
Dictionary md;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (List<String>::Element *E = esl.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Variant st = cf->get_value("editor_states", E->get());
-Ensure .tscn and .tres always save in a deterministic way, fixes #2495 -Scene edit state is saved outside the scene now, to avoid changes .tscn files when nothing really changed -Created a VariantWriter helper to unify all variant to text writing -Moved SceneFormatText writing to VariantWriter -Moved ConfigFile to use VariantWriter and VariantParser, added compatibility mode for old .cfg files that use engine.cfg format
2015-12-31 04:31:00 +01:00
if (st.get_type()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
md[E->get()] = st;
-Ensure .tscn and .tres always save in a deterministic way, fixes #2495 -Scene edit state is saved outside the scene now, to avoid changes .tscn files when nothing really changed -Created a VariantWriter helper to unify all variant to text writing -Moved SceneFormatText writing to VariantWriter -Moved ConfigFile to use VariantWriter and VariantParser, added compatibility mode for old .cfg files that use engine.cfg format
2015-12-31 04:31:00 +01:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
-Ensure .tscn and .tres always save in a deterministic way, fixes #2495 -Scene edit state is saved outside the scene now, to avoid changes .tscn files when nothing really changed -Created a VariantWriter helper to unify all variant to text writing -Moved SceneFormatText writing to VariantWriter -Moved ConfigFile to use VariantWriter and VariantParser, added compatibility mode for old .cfg files that use engine.cfg format
2015-12-31 04:31:00 +01:00
editor_data.set_editor_states(md);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_set_scene_metadata(const String &p_file, int p_idx) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Save all edited scenes when Runing (and auto-save is enabled). Fixes #4410
2016-06-26 05:54:17 +02:00
Node *scene = editor_data.get_edited_scene_root(p_idx);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!scene)
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
scene->set_meta("__editor_run_settings__", Variant()); //clear it (no point in keeping it)
scene->set_meta("__editor_plugin_states__", Variant());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String path = EditorSettings::get_singleton()->get_project_settings_path().plus_file(p_file.get_file() + "-editstate-" + p_file.md5_text() + ".cfg");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-Ensure .tscn and .tres always save in a deterministic way, fixes #2495 -Scene edit state is saved outside the scene now, to avoid changes .tscn files when nothing really changed -Created a VariantWriter helper to unify all variant to text writing -Moved SceneFormatText writing to VariantWriter -Moved ConfigFile to use VariantWriter and VariantParser, added compatibility mode for old .cfg files that use engine.cfg format
2015-12-31 04:31:00 +01:00
Ref<ConfigFile> cf;
cf.instance();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Fix editor states saving, and remove related error messages
2016-07-17 21:59:15 +02:00
Dictionary md;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_idx < 0 || editor_data.get_edited_scene() == p_idx) {
Fix editor states saving, and remove related error messages
2016-07-17 21:59:15 +02:00
md = editor_data.get_editor_states();
} else {
md = editor_data.get_scene_editor_states(p_idx);
}
-Ensure .tscn and .tres always save in a deterministic way, fixes #2495 -Scene edit state is saved outside the scene now, to avoid changes .tscn files when nothing really changed -Created a VariantWriter helper to unify all variant to text writing -Moved SceneFormatText writing to VariantWriter -Moved ConfigFile to use VariantWriter and VariantParser, added compatibility mode for old .cfg files that use engine.cfg format
2015-12-31 04:31:00 +01:00
List<Variant> keys;
md.get_key_list(&keys);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (List<Variant>::Element *E = keys.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
cf->set_value("editor_states", E->get(), md[E->get()]);
-Ensure .tscn and .tres always save in a deterministic way, fixes #2495 -Scene edit state is saved outside the scene now, to avoid changes .tscn files when nothing really changed -Created a VariantWriter helper to unify all variant to text writing -Moved SceneFormatText writing to VariantWriter -Moved ConfigFile to use VariantWriter and VariantParser, added compatibility mode for old .cfg files that use engine.cfg format
2015-12-31 04:31:00 +01:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-Ensure .tscn and .tres always save in a deterministic way, fixes #2495 -Scene edit state is saved outside the scene now, to avoid changes .tscn files when nothing really changed -Created a VariantWriter helper to unify all variant to text writing -Moved SceneFormatText writing to VariantWriter -Moved ConfigFile to use VariantWriter and VariantParser, added compatibility mode for old .cfg files that use engine.cfg format
2015-12-31 04:31:00 +01:00
Error err = cf->save(path);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ERR_FAIL_COND(err != OK);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool EditorNode::_find_and_save_resource(RES res, Map<RES, bool> &processed, int32_t flags) {
properly save external resources, fixes #1924 added API to get scancode names to OS
2015-05-17 18:11:55 +02:00
if (res.is_null())
return false;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (processed.has(res)) {
properly save external resources, fixes #1924 added API to get scancode names to OS
2015-05-17 18:11:55 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
return processed[res];
}
properly save external resources, fixes #1924 added API to get scancode names to OS
2015-05-17 18:11:55 +02:00
bool changed = res->is_edited();
res->set_edited(false);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool subchanged = _find_and_save_edited_subresources(res.ptr(), processed, flags);
properly save external resources, fixes #1924 added API to get scancode names to OS
2015-05-17 18:11:55 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// print_line("checking if edited: "+res->get_type()+" :: "+res->get_name()+" :: "+res->get_path()+" :: "+itos(changed)+" :: SR "+itos(subchanged));
properly save external resources, fixes #1924 added API to get scancode names to OS
2015-05-17 18:11:55 +02:00
if (res->get_path().is_resource_file()) {
if (changed || subchanged) {
//save
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
print_line("Also saving modified external resource: " + res->get_path());
Error err = ResourceSaver::save(res->get_path(), res, flags);
properly save external resources, fixes #1924 added API to get scancode names to OS
2015-05-17 18:11:55 +02:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
processed[res] = false; //because it's a file
properly save external resources, fixes #1924 added API to get scancode names to OS
2015-05-17 18:11:55 +02:00
return false;
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
processed[res] = changed;
properly save external resources, fixes #1924 added API to get scancode names to OS
2015-05-17 18:11:55 +02:00
return changed;
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool EditorNode::_find_and_save_edited_subresources(Object *obj, Map<RES, bool> &processed, int32_t flags) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool ret_changed = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
List<PropertyInfo> pi;
obj->get_property_list(&pi);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (List<PropertyInfo>::Element *E = pi.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (!(E->get().usage & PROPERTY_USAGE_STORAGE))
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
switch (E->get().type) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case Variant::OBJECT: {
RES res = obj->get(E->get().name);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (_find_and_save_resource(res, processed, flags))
ret_changed = true;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
case Variant::ARRAY: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Array varray = obj->get(E->get().name);
int len = varray.size();
for (int i = 0; i < len; i++) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Variant v = varray.get(i);
RES res = v;
if (_find_and_save_resource(res, processed, flags))
ret_changed = true;
properly save external resources, fixes #1924 added API to get scancode names to OS
2015-05-17 18:11:55 +02:00
//_find_resources(v);
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
case Variant::DICTIONARY: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Dictionary d = obj->get(E->get().name);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
List<Variant> keys;
d.get_key_list(&keys);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (List<Variant>::Element *E = keys.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Variant v = d[E->get()];
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
RES res = v;
if (_find_and_save_resource(res, processed, flags))
ret_changed = true;
properly save external resources, fixes #1924 added API to get scancode names to OS
2015-05-17 18:11:55 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
default: {}
}
}
return ret_changed;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_save_edited_subresources(Node *scene, Map<RES, bool> &processed, int32_t flags) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_find_and_save_edited_subresources(scene, processed, flags);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < scene->get_child_count(); i++) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Node *n = scene->get_child(i);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (n->get_owner() != editor_data.get_edited_scene_root())
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_save_edited_subresources(n, processed, flags);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_find_node_types(Node *p_node, int &count_2d, int &count_3d) {
work in progress, resource previews
2015-05-31 06:59:42 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_node->is_type("Viewport") || (p_node != editor_data.get_edited_scene_root() && p_node->get_owner() != editor_data.get_edited_scene_root()))
work in progress, resource previews
2015-05-31 06:59:42 +02:00
return;
if (p_node->is_type("CanvasItem"))
count_2d++;
else if (p_node->is_type("Spatial"))
count_3d++;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < p_node->get_child_count(); i++)
_find_node_types(p_node->get_child(i), count_2d, count_3d);
work in progress, resource previews
2015-05-31 06:59:42 +02:00
}
void EditorNode::_save_scene_with_preview(String p_file) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
int c2d = 0;
int c3d = 0;
work in progress, resource previews
2015-05-31 06:59:42 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
EditorProgress save("save", TTR("Saving Scene"), 4);
save.step(TTR("Analyzing"), 0);
_find_node_types(editor_data.get_edited_scene_root(), c2d, c3d);
work in progress, resource previews
2015-05-31 06:59:42 +02:00
RID viewport;
bool is2d;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (c3d < c2d) {
viewport = scene_root->get_viewport();
is2d = true;
work in progress, resource previews
2015-05-31 06:59:42 +02:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
viewport = SpatialEditor::get_singleton()->get_editor_viewport(0)->get_viewport_node()->get_viewport();
is2d = false;
work in progress, resource previews
2015-05-31 06:59:42 +02:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
save.step(TTR("Creating Thumbnail"), 1);
work in progress, resource previews
2015-05-31 06:59:42 +02:00
//current view?
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
int screen = -1;
for (int i = 0; i < editor_table.size(); i++) {
if (editor_plugin_screen == editor_table[i]) {
screen = i;
work in progress, resource previews
2015-05-31 06:59:42 +02:00
break;
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_editor_select(is2d ? EDITOR_2D : EDITOR_3D);
work in progress, resource previews
2015-05-31 06:59:42 +02:00
VS::get_singleton()->viewport_queue_screen_capture(viewport);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
save.step(TTR("Creating Thumbnail"), 2);
save.step(TTR("Creating Thumbnail"), 3);
work in progress, resource previews
2015-05-31 06:59:42 +02:00
Image img = VS::get_singleton()->viewport_get_screen_capture(viewport);
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
int preview_size = EditorSettings::get_singleton()->get("file_dialog/thumbnail_size");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
preview_size *= EDSCALE;
int width, height;
work in progress, resource previews
2015-05-31 06:59:42 +02:00
if (img.get_width() > preview_size && img.get_width() >= img.get_height()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
width = preview_size;
work in progress, resource previews
2015-05-31 06:59:42 +02:00
height = img.get_height() * preview_size / img.get_width();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
} else if (img.get_height() > preview_size && img.get_height() >= img.get_width()) {
work in progress, resource previews
2015-05-31 06:59:42 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
height = preview_size;
work in progress, resource previews
2015-05-31 06:59:42 +02:00
width = img.get_width() * preview_size / img.get_height();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
} else {
work in progress, resource previews
2015-05-31 06:59:42 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
width = img.get_width();
height = img.get_height();
work in progress, resource previews
2015-05-31 06:59:42 +02:00
}
img.convert(Image::FORMAT_RGB);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
img.resize(width, height);
work in progress, resource previews
2015-05-31 06:59:42 +02:00
String pfile = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp/last_scene_preview.png");
img.save_png(pfile);
Vector<uint8_t> imgdata = FileAccess::get_file_as_array(pfile);
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
//print_line("img data is "+itos(imgdata.size()));
work in progress, resource previews
2015-05-31 06:59:42 +02:00
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
if (editor_data.get_edited_scene_import_metadata().is_null())
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_data.set_edited_scene_import_metadata(Ref<ResourceImportMetadata>(memnew(ResourceImportMetadata)));
editor_data.get_edited_scene_import_metadata()->set_option("thumbnail", imgdata);
work in progress, resource previews
2015-05-31 06:59:42 +02:00
//tamanio tel thumbnail
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (screen != -1) {
work in progress, resource previews
2015-05-31 06:59:42 +02:00
_editor_select(screen);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
save.step(TTR("Saving Scene"), 4);
work in progress, resource previews
2015-05-31 06:59:42 +02:00
_save_scene(p_file);
}
Save all edited scenes when Runing (and auto-save is enabled). Fixes #4410
2016-06-26 05:54:17 +02:00
void EditorNode::_save_scene(String p_file, int idx) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Save all edited scenes when Runing (and auto-save is enabled). Fixes #4410
2016-06-26 05:54:17 +02:00
Node *scene = editor_data.get_edited_scene_root(idx);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!scene) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//accept->get_cancel()->hide();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("I see.."));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
accept->set_text("This operation can't be done without a tree root.");
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
editor_data.apply_changes_in_editors();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_set_scene_metadata(p_file, idx);
-scenes are properly reloaded when a dependency changes, fixes #2896 (it's clevery done so local changes to scenes are kept even if unsaved)
2015-12-14 00:39:01 +01:00
Ref<PackedScene> sdata;
if (ResourceCache::has(p_file)) {
// something may be referencing this resource and we are good with that.
// we must update it, but also let the previous scene state go, as
// old version still work for referencing changes in instanced or inherited scenes
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
sdata = Ref<PackedScene>(ResourceCache::get(p_file)->cast_to<PackedScene>());
-scenes are properly reloaded when a dependency changes, fixes #2896 (it's clevery done so local changes to scenes are kept even if unsaved)
2015-12-14 00:39:01 +01:00
if (sdata.is_valid())
sdata->recreate_state();
else
sdata.instance();
} else {
sdata.instance();
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Error err = sdata->pack(scene);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (err != OK) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//accept->get_cancel()->hide();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("I see.."));
accept->set_text(TTR("Couldn't save scene. Likely dependencies (instances) couldn't be satisfied."));
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
Fix node duplication in scene sub-inheritance
2017-03-08 19:58:59 +01:00
// force creation of node path cache
// (hacky but needed for the tree to update properly)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Node *dummy_scene = sdata->instance(true);
Fix node duplication in scene sub-inheritance
2017-03-08 19:58:59 +01:00
memdelete(dummy_scene);
Save all edited scenes when Runing (and auto-save is enabled). Fixes #4410
2016-06-26 05:54:17 +02:00
sdata->set_import_metadata(editor_data.get_edited_scene_import_metadata(idx));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
int flg = 0;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (EditorSettings::get_singleton()->get("on_save/compress_binary_resources"))
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
flg |= ResourceSaver::FLAG_COMPRESS;
Removed support for saving paths as relative, closes #5728 Editor now has good refactoring tools, so this function is mostly obsolete
2016-07-22 15:39:46 +02:00
//if (EditorSettings::get_singleton()->get("on_save/save_paths_as_relative"))
// flg|=ResourceSaver::FLAG_RELATIVE_PATHS;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
flg |= ResourceSaver::FLAG_REPLACE_SUBRESOURCE_PATHS;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
err = ResourceSaver::save(p_file, sdata, flg);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Map<RES, bool> processed;
_save_edited_subresources(scene, processed, flg);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
editor_data.save_editor_external_data();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (err == OK) {
scene->set_filename(Globals::get_singleton()->localize_path(p_file));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//EditorFileSystem::get_singleton()->update_file(p_file,sdata->get_type());
Save all edited scenes when Runing (and auto-save is enabled). Fixes #4410
2016-06-26 05:54:17 +02:00
if (idx < 0 || idx == editor_data.get_edited_scene())
set_current_version(editor_data.get_undo_redo().get_version());
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_data.set_edited_scene_version(0, idx);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
_update_title();
update scene tabs on save - fix
2015-08-12 22:35:37 +02:00
_update_scene_tabs();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_dialog_display_file_error(p_file, err);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
};
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_import_action(const String &p_action) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#if 0
import_confirmation->hide();
if (p_action=="re-import") {
_import(_tmp_import_path);
}
if (p_action=="update") {
Node *src = EditorImport::import_scene(_tmp_import_path);
if (!src) {
current_option=-1;
//accept->get_cancel()->hide();
i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated.
2016-05-21 01:18:35 +02:00
accept->get_ok()->set_text("Ugh");
accept->set_text("Error importing scene.");
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
accept->popup_centered(Size2(300,70));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
//as soon as the scene is imported, version hashes must be generated for comparison against saved scene
EditorImport::generate_version_hashes(src);
Node *dst = SceneLoader::load(editor_data.get_imported_scene(Globals::get_singleton()->localize_path(_tmp_import_path)));
if (!dst) {
memdelete(src);
//accept->get_cancel()->hide();
i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated.
2016-05-21 01:18:35 +02:00
accept->get_ok()->set_text("Ugh");
accept->set_text("Error load scene to update.");
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
accept->popup_centered(Size2(300,70));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
List<EditorImport::Conflict> conflicts;
EditorImport::check_conflicts(src,dst,&conflicts);
bool conflicted=false;
for (List<EditorImport::Conflict>::Element *E=conflicts.front();E;E=E->next()) {
if (E->get().status==EditorImport::Conflict::STATUS_CONFLICT) {
conflicted=true;
break;
}
}
if (conflicted) {
import_conflicts_dialog->popup(src,dst,conflicts);
return;
}
_import_with_conflicts(src,dst,conflicts);
//not conflicted, just reimport!
}
#endif
}
void EditorNode::_import(const String &p_file) {
#if 0
Node *new_scene = EditorImport::import_scene(p_file);
if (!new_scene) {
current_option=-1;
//accept->get_cancel()->hide();
i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated.
2016-05-21 01:18:35 +02:00
accept->get_ok()->set_text("Ugh");
accept->set_text("Error importing scene.");
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
accept->popup_centered(Size2(300,70));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
//as soon as the scene is imported, version hashes must be generated for comparison against saved scene
EditorImport::generate_version_hashes(new_scene);
Node *old_scene = edited_scene;
_hide_top_editors();
set_edited_scene(NULL);
editor_data.clear_editor_states();
if (old_scene) {
memdelete(old_scene);
}
set_edited_scene(new_scene);
scene_tree_dock->set_selected(new_scene);
//_get_scene_metadata();
editor_data.get_undo_redo().clear_history();
saved_version=editor_data.get_undo_redo().get_version();
_update_title();
#endif
}
void EditorNode::_dialog_action(String p_file) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
switch (current_option) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case RESOURCE_LOAD: {
RES res = ResourceLoader::load(p_file);
if (res.is_null()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//accept->get_cancel()->hide();
accept->get_ok()->set_text("ok :(");
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->set_text(TTR("Failed to load resource."));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
};
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
push_item(res.operator->());
remove trailing whitespace
2016-03-09 00:00:52 +01:00
} break;
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 14:09:09 +02:00
case FILE_NEW_INHERITED_SCENE: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
load_scene(p_file, false, true);
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 14:09:09 +02:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case FILE_OPEN_SCENE: {
load_scene(p_file);
} break;
Ask about selecting a main scene if one has not been selected.
2016-06-28 00:59:33 +02:00
case SETTINGS_PICK_MAIN_SCENE: {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Globals::get_singleton()->set("application/main_scene", p_file);
Globals::get_singleton()->set_persisting("application/main_scene", true);
Fix main scene not being saved when set via Play button Fixes #1134 for real. Also tweaked the engine.cfg template and the preference order when browsing for the main scene.
2016-07-19 21:35:14 +02:00
Globals::get_singleton()->save();
Ask about selecting a main scene if one has not been selected.
2016-06-28 00:59:33 +02:00
//would be nice to show the project manager opened with the hilighted field..
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case FILE_SAVE_OPTIMIZED: {
} break;
-run script in editor -add search docs dialog that returns places string was found -added flash
2014-02-21 03:01:44 +01:00
case FILE_RUN_SCRIPT: {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Ref<Script> scr = ResourceLoader::load(p_file, "Script", true);
-run script in editor -add search docs dialog that returns places string was found -added flash
2014-02-21 03:01:44 +01:00
if (scr.is_null()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
add_io_error("Script Failed to Load:\n" + p_file);
-run script in editor -add search docs dialog that returns places string was found -added flash
2014-02-21 03:01:44 +01:00
return;
}
if (!scr->is_tool()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
add_io_error("Script is not tool, will not be able to run:\n" + p_file);
-run script in editor -add search docs dialog that returns places string was found -added flash
2014-02-21 03:01:44 +01:00
return;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Ref<EditorScript> es = memnew(EditorScript);
-run script in editor -add search docs dialog that returns places string was found -added flash
2014-02-21 03:01:44 +01:00
es->set_script(scr.get_ref_ptr());
es->set_editor(this);
es->_run();
get_undo_redo()->clear_history();
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case FILE_DUMP_STRINGS: {
save_translatable_strings(p_file);
} break;
case FILE_SAVE_SCENE:
case FILE_SAVE_AS_SCENE: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (file->get_mode() == EditorFileDialog::MODE_SAVE_FILE) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
work in progress, resource previews
2015-05-31 06:59:42 +02:00
//_save_scene(p_file);
_save_scene_with_preview(p_file);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
} break;
Prompt save dialog if running a unsaved scene. Solution for #966
2015-01-06 23:28:25 +01:00
case FILE_SAVE_AND_RUN: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (file->get_mode() == EditorFileDialog::MODE_SAVE_FILE) {
Prompt save dialog if running a unsaved scene. Solution for #966
2015-01-06 23:28:25 +01:00
work in progress, resource previews
2015-05-31 06:59:42 +02:00
//_save_scene(p_file);
_save_scene_with_preview(p_file);
Prompt save dialog if running a unsaved scene. Solution for #966
2015-01-06 23:28:25 +01:00
_run(false);
}
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case FILE_EXPORT_MESH_LIBRARY: {
Ref<MeshLibrary> ml;
if (file_export_lib_merge->is_pressed() && FileAccess::exists(p_file)) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ml = ResourceLoader::load(p_file, "MeshLibrary");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (ml.is_null()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//accept->get_cancel()->hide();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("I see.."));
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
accept->set_text(TTR("Can't load MeshLibrary for merging!"));
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
}
if (ml.is_null()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ml = Ref<MeshLibrary>(memnew(MeshLibrary));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
MeshLibraryEditor::update_library_file(editor_data.get_edited_scene_root(), ml, true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Error err = ResourceSaver::save(p_file, ml);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (err) {
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("I see.."));
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
accept->set_text(TTR("Error saving MeshLibrary!"));
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
} break;
case FILE_EXPORT_TILESET: {
Ref<TileSet> ml;
Fix TileSet not refreshed after exporting without merge
2016-01-08 17:54:13 +01:00
if (FileAccess::exists(p_file)) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ml = ResourceLoader::load(p_file, "TileSet");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
TileSet Export: Avoid invalid error when merge is enabled but file does not exist
2016-03-11 01:20:01 +01:00
if (ml.is_null()) {
if (file_export_lib_merge->is_pressed()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
TileSet Export: Avoid invalid error when merge is enabled but file does not exist
2016-03-11 01:20:01 +01:00
//accept->get_cancel()->hide();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("I see.."));
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
accept->set_text(TTR("Can't load TileSet for merging!"));
TileSet Export: Avoid invalid error when merge is enabled but file does not exist
2016-03-11 01:20:01 +01:00
accept->popup_centered_minsize();
return;
}
} else if (!file_export_lib_merge->is_pressed()) {
Fix TileSet not refreshed after exporting without merge
2016-01-08 17:54:13 +01:00
ml->clear();
}
TileSet Export: Avoid invalid error when merge is enabled but file does not exist
2016-03-11 01:20:01 +01:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ml = Ref<TileSet>(memnew(TileSet));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
TileSetEditor::update_library_file(editor_data.get_edited_scene_root(), ml, true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Error err = ResourceSaver::save(p_file, ml);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (err) {
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("I see.."));
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
accept->set_text(TTR("Error saving TileSet!"));
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
} break;
case SETTINGS_LOAD_EXPORT_TEMPLATES: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
FileAccess *fa = NULL;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
zlib_filefunc_def io = zipio_create_io_from_file(&fa);
unzFile pkg = unzOpen2(p_file.utf8().get_data(), &io);
if (!pkg) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//confirmation->get_cancel()->hide();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("I see.."));
accept->set_text(TTR("Can't open export templates zip."));
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
int ret = unzGoToFirstFile(pkg);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
int fc = 0; //count them
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
while (ret == UNZ_OK) {
-fixed export templates not loading/exporting on Windows -fixed TouchScreenButton with stretch2d -fixed(?) OSX crash on startup (test!!) -compilation fixes on windows -CollisionPolygon editor works again -find buttons en find dialog -TileMap editor cleanup (removed "error", made nicer) -viewport flicker fixed -make .scn default extension for saving scenes -export the rest of the network classes to gdscript
2014-02-13 22:03:28 +01:00
fc++;
ret = unzGoToNextFile(pkg);
}
ret = unzGoToFirstFile(pkg);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
EditorProgress p("ltask", TTR("Loading Export Templates"), fc);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
fc = 0;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
while (ret == UNZ_OK) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//get filename
unz_file_info info;
char fname[16384];
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ret = unzGetCurrentFileInfo(pkg, &info, fname, 16384, NULL, 0, NULL, 0);
-fixed export templates not loading/exporting on Windows -fixed TouchScreenButton with stretch2d -fixed(?) OSX crash on startup (test!!) -compilation fixes on windows -CollisionPolygon editor works again -find buttons en find dialog -TileMap editor cleanup (removed "error", made nicer) -viewport flicker fixed -make .scn default extension for saving scenes -export the rest of the network classes to gdscript
2014-02-13 22:03:28 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String file = fname;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Vector<uint8_t> data;
data.resize(info.uncompressed_size);
//read
-fixed export templates not loading/exporting on Windows -fixed TouchScreenButton with stretch2d -fixed(?) OSX crash on startup (test!!) -compilation fixes on windows -CollisionPolygon editor works again -find buttons en find dialog -TileMap editor cleanup (removed "error", made nicer) -viewport flicker fixed -make .scn default extension for saving scenes -export the rest of the network classes to gdscript
2014-02-13 22:03:28 +01:00
ret = unzOpenCurrentFile(pkg);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ret = unzReadCurrentFile(pkg, data.ptr(), data.size());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
unzCloseCurrentFile(pkg);
-fixed export templates not loading/exporting on Windows -fixed TouchScreenButton with stretch2d -fixed(?) OSX crash on startup (test!!) -compilation fixes on windows -CollisionPolygon editor works again -find buttons en find dialog -TileMap editor cleanup (removed "error", made nicer) -viewport flicker fixed -make .scn default extension for saving scenes -export the rest of the network classes to gdscript
2014-02-13 22:03:28 +01:00
print_line(fname);
//for(int i=0;i<512;i++) {
// print_line(itos(data[i]));
//}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file = file.get_file();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p.step(TTR("Importing:") + " " + file, fc);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
FileAccess *f = FileAccess::open(EditorSettings::get_singleton()->get_settings_path() + "/templates/" + file, FileAccess::WRITE);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
ERR_CONTINUE(!f);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
f->store_buffer(data.ptr(), data.size());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
memdelete(f);
ret = unzGoToNextFile(pkg);
-fixed export templates not loading/exporting on Windows -fixed TouchScreenButton with stretch2d -fixed(?) OSX crash on startup (test!!) -compilation fixes on windows -CollisionPolygon editor works again -find buttons en find dialog -TileMap editor cleanup (removed "error", made nicer) -viewport flicker fixed -make .scn default extension for saving scenes -export the rest of the network classes to gdscript
2014-02-13 22:03:28 +01:00
fc++;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
unzClose(pkg);
} break;
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
case RESOURCE_SAVE:
case RESOURCE_SAVE_AS: {
uint32_t current = editor_history.get_current();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Object *current_obj = current > 0 ? ObjectDB::get_instance(current) : NULL;
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
ERR_FAIL_COND(!current_obj->cast_to<Resource>())
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
RES current_res = RES(current_obj->cast_to<Resource>());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
save_resource_in_path(current_res, p_file);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
Editor layouts menu
2015-11-22 19:11:17 +01:00
} break;
case SETTINGS_LAYOUT_SAVE: {
if (p_file.empty())
return;
Ref<ConfigFile> config;
config.instance();
Error err = config->load(EditorSettings::get_singleton()->get_settings_path().plus_file("editor_layouts.cfg"));
Fix editor layout saving
2016-01-01 18:48:14 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (err == ERR_CANT_OPEN) {
Fix editor layout saving
2016-01-01 18:48:14 +01:00
config.instance(); // new config
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
} else if (err != OK) {
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
show_warning(TTR("Error trying to save layout!"));
Fix editor layout saving
2016-01-01 18:48:14 +01:00
return;
Editor layouts menu
2015-11-22 19:11:17 +01:00
}
_save_docks_to_config(config, p_file);
config->save(EditorSettings::get_singleton()->get_settings_path().plus_file("editor_layouts.cfg"));
layout_dialog->hide();
_update_layouts_menu();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_file == "Default") {
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
show_warning(TTR("Default editor layout overridden."));
Allow to override the default editor layout
2016-01-11 22:23:45 +01:00
}
Editor layouts menu
2015-11-22 19:11:17 +01:00
} break;
case SETTINGS_LAYOUT_DELETE: {
if (p_file.empty())
return;
Ref<ConfigFile> config;
config.instance();
Error err = config->load(EditorSettings::get_singleton()->get_settings_path().plus_file("editor_layouts.cfg"));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (err != OK || !config->has_section(p_file)) {
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
show_warning(TTR("Layout name not found!"));
Editor layouts menu
2015-11-22 19:11:17 +01:00
return;
}
// erase
List<String> keys;
config->get_section_keys(p_file, &keys);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (List<String>::Element *E = keys.front(); E; E = E->next()) {
Editor layouts menu
2015-11-22 19:11:17 +01:00
config->set_value(p_file, E->get(), Variant());
}
config->save(EditorSettings::get_singleton()->get_settings_path().plus_file("editor_layouts.cfg"));
layout_dialog->hide();
_update_layouts_menu();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_file == "Default") {
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
show_warning(TTR("Restored default layout to base settings."));
Allow to override the default editor layout
2016-01-11 22:23:45 +01:00
}
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
default: { //save scene?
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (file->get_mode() == EditorFileDialog::MODE_SAVE_FILE) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
work in progress, resource previews
2015-05-31 06:59:42 +02:00
//_save_scene(p_file);
_save_scene_with_preview(p_file);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::push_item(Object *p_object, const String &p_property) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!p_object) {
property_editor->edit(NULL);
Created a NodeDock with signals and groups
2016-06-04 18:17:56 +02:00
node_dock->set_node(NULL);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
scene_tree_dock->set_selected(NULL);
return;
}
uint32_t id = p_object->get_instance_ID();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (id != editor_history.get_current()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_property == "")
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
editor_history.add_object(id);
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_history.add_object(id, p_property);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
_edit_current();
}
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
void EditorNode::_select_history(int p_idx) {
//push it to the top, it is not correct, but it's more useful
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ObjectID id = editor_history.get_history_obj(p_idx);
Object *obj = ObjectDB::get_instance(id);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
if (!obj)
return;
push_item(obj);
}
void EditorNode::_prepare_history() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
int history_to = MAX(0, editor_history.get_history_len() - 25);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
editor_history_menu->get_popup()->clear();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Ref<Texture> base_icon = gui_base->get_icon("Object", "EditorIcons");
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
Set<ObjectID> already;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = editor_history.get_history_len() - 1; i >= history_to; i--) {
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ObjectID id = editor_history.get_history_obj(i);
Object *obj = ObjectDB::get_instance(id);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
if (!obj || already.has(id)) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (history_to > 0) {
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
history_to--;
}
continue;
}
already.insert(id);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Ref<Texture> icon = gui_base->get_icon("Object", "EditorIcons");
if (gui_base->has_icon(obj->get_type(), "EditorIcons"))
icon = gui_base->get_icon(obj->get_type(), "EditorIcons");
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
icon = base_icon;
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
String text;
if (obj->cast_to<Resource>()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Resource *r = obj->cast_to<Resource>();
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
if (r->get_path().is_resource_file())
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
text = r->get_path().get_file();
else if (r->get_name() != String()) {
text = r->get_name();
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
text = r->get_type();
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
}
} else if (obj->cast_to<Node>()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
text = obj->cast_to<Node>()->get_name();
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
text = obj->get_type();
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (i == editor_history.get_history_pos()) {
text = "[" + text + "]";
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_history_menu->get_popup()->add_icon_item(icon, text, i);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
}
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
void EditorNode::_property_editor_forward() {
if (editor_history.next())
_edit_current();
}
void EditorNode::_property_editor_back() {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (editor_history.previous())
_edit_current();
}
void EditorNode::_imported(Node *p_node) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
/*
Removed unused variables (second pass) + dead code Fixes various gcc 5.4.0 warnings for -Wunused-variable and -Wunused-but-set-variable
2016-07-06 19:04:21 +02:00
Node *scene = editor_data.get_edited_scene_root();
add_edited_scene(p_node);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (scene) {
String path = scene->get_filename();
p_node->set_filename(path);
memdelete(scene);
}
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
*/
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
void EditorNode::_hide_top_editors() {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
_display_top_editors(false);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
editor_plugins_over->clear();
}
void EditorNode::_display_top_editors(bool p_display) {
editor_plugins_over->make_visible(p_display);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_set_top_editors(Vector<EditorPlugin *> p_editor_plugins_over) {
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
editor_plugins_over->set_plugins_list(p_editor_plugins_over);
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_set_editing_top_editors(Object *p_current_object) {
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
editor_plugins_over->edit(p_current_object);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
void EditorNode::_edit_current() {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
uint32_t current = editor_history.get_current();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Object *current_obj = current > 0 ? ObjectDB::get_instance(current) : NULL;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
property_back->set_disabled(editor_history.is_at_begining());
property_forward->set_disabled(editor_history.is_at_end());
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
this->current = current_obj;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
editor_path->update_path();
if (!current_obj) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
scene_tree_dock->set_selected(NULL);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
property_editor->edit(NULL);
Created a NodeDock with signals and groups
2016-06-04 18:17:56 +02:00
node_dock->set_node(NULL);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
object_menu->set_disabled(true);
Fix editor crash after closing scene with certain types of nodes
2015-12-03 16:30:55 +01:00
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
_display_top_editors(false);
Fix editor crash after closing scene with certain types of nodes
2015-12-03 16:30:55 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
object_menu->set_disabled(true);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
bool is_resource = current_obj->is_type("Resource");
do not show help on multi node selection, array editing, etc, closes #5550
2016-07-09 16:46:59 +02:00
bool is_node = current_obj->is_type("Node");
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
resource_save_button->set_disabled(!is_resource);
if (is_resource) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Resource *current_res = current_obj->cast_to<Resource>();
ERR_FAIL_COND(!current_res);
scene_tree_dock->set_selected(NULL);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
property_editor->edit(current_res);
Created a NodeDock with signals and groups
2016-06-04 18:17:56 +02:00
node_dock->set_node(NULL);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
object_menu->set_disabled(false);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
//resources_dock->add_resource(Ref<Resource>(current_res));
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
//top_pallete->set_current_tab(1);
do not show help on multi node selection, array editing, etc, closes #5550
2016-07-09 16:46:59 +02:00
} else if (is_node) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Node *current_node = current_obj->cast_to<Node>();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
ERR_FAIL_COND(!current_node);
SceneMainLoop -> SceneTree -=-=-=-=-=-=-=-=-=-=-=-=-=- *YOUR SOURCE MIGHT NOT WORK* For mor information on fix: https://github.com/okamstudio/godot/wiki/devel_scene_tree Other stuff: -Shower of bullets demo -Fixes all around
2014-11-06 01:20:42 +01:00
ERR_FAIL_COND(!current_node->is_inside_tree());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
property_editor->edit(current_node);
node_dock->set_node(current_node);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
scene_tree_dock->set_selected(current_node);
object_menu->get_popup()->clear();
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
//top_pallete->set_current_tab(0);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Multiple, simultaneous node editing spuport!! ..but will you be brave enough to try it? :)
2015-08-25 05:08:45 +02:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
property_editor->edit(current_obj);
Created a NodeDock with signals and groups
2016-06-04 18:17:56 +02:00
node_dock->set_node(NULL);
Multiple, simultaneous node editing spuport!! ..but will you be brave enough to try it? :)
2015-08-25 05:08:45 +02:00
//scene_tree_dock->set_selected(current_node);
//object_menu->get_popup()->clear();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
/* Take care of PLUGIN EDITOR */
EditorPlugin *main_plugin = editor_data.get_editor(current_obj);
if (main_plugin) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (main_plugin != editor_plugin_screen) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
// update screen main_plugin
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
if (!changing_scene) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
if (editor_plugin_screen)
editor_plugin_screen->make_visible(false);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_plugin_screen = main_plugin;
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
editor_plugin_screen->edit(current_obj);
editor_plugin_screen->make_visible(true);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < editor_table.size(); i++) {
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
main_editor_buttons[i]->set_pressed(editor_table[i] == main_plugin);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
} else {
editor_plugin_screen->edit(current_obj);
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Vector<EditorPlugin *> sub_plugins = editor_data.get_subeditors(current_obj);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
if (!sub_plugins.empty()) {
_display_top_editors(false);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
_set_top_editors(sub_plugins);
_set_editing_top_editors(current_obj);
_display_top_editors(true);
remove trailing whitespace
2016-05-21 15:29:25 +02:00
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
} else if (!editor_plugins_over->get_plugins_list().empty()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
_hide_top_editors();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
/*
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!plugin || plugin->has_main_screen()) {
// remove the OVER plugin if exists
if (editor_plugin_over)
editor_plugin_over->make_visible(false);
editor_plugin_over=NULL;
}
*/
/* Take care of OBJECT MENU */
object_menu->set_disabled(false);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
PopupMenu *p = object_menu->get_popup();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
p->clear();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_shortcut(ED_SHORTCUT("property_editor/copy_params", TTR("Copy Params")), OBJECT_COPY_PARAMS);
p->add_shortcut(ED_SHORTCUT("property_editor/paste_params", TTR("Paste Params")), OBJECT_PASTE_PARAMS);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
p->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_shortcut(ED_SHORTCUT("property_editor/paste_resource", TTR("Paste Resource")), RESOURCE_PASTE);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
if (is_resource) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_shortcut(ED_SHORTCUT("property_editor/copy_resource", TTR("Copy Resource")), RESOURCE_COPY);
p->add_shortcut(ED_SHORTCUT("property_editor/unref_resource", TTR("Make Built-In")), RESOURCE_UNREF);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
}
do not show help on multi node selection, array editing, etc, closes #5550
2016-07-09 16:46:59 +02:00
if (is_resource || is_node) {
p->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_shortcut(ED_SHORTCUT("property_editor/make_subresources_unique", TTR("Make Sub-Resources Unique")), OBJECT_UNIQUE_RESOURCES);
do not show help on multi node selection, array editing, etc, closes #5550
2016-07-09 16:46:59 +02:00
p->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_icon_shortcut(gui_base->get_icon("Help", "EditorIcons"), ED_SHORTCUT("property_editor/open_help", TTR("Open in Help")), OBJECT_REQUEST_HELP);
do not show help on multi node selection, array editing, etc, closes #5550
2016-07-09 16:46:59 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
List<MethodInfo> methods;
current_obj->get_method_list(&methods);
if (!methods.empty()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool found = false;
List<MethodInfo>::Element *I = methods.front();
int i = 0;
while (I) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (I->get().flags & METHOD_FLAG_EDITOR) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!found) {
p->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
found = true;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_item(I->get().name.capitalize(), OBJECT_METHOD_BASE + i);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
i++;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
I = I->next();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
//p->add_separator();
i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated.
2016-05-21 01:18:35 +02:00
//p->add_item("All Methods",OBJECT_CALL_METHOD);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
update_keying();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
void EditorNode::_resource_created() {
Object *c = create_dialog->instance_selected();
ERR_FAIL_COND(!c);
Resource *r = c->cast_to<Resource>();
ERR_FAIL_COND(!r);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
REF res(r);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
push_item(c);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_resource_selected(const RES &p_res, const String &p_property) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (p_res.is_null())
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
RES r = p_res;
push_item(r.operator->(), p_property);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_run(bool p_current, const String &p_custom) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (editor_run.get_status() == EditorRun::STATUS_PLAY) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
play_button->set_pressed(!_playing_edited);
play_scene_button->set_pressed(_playing_edited);
return;
}
play_button->set_pressed(false);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_button->set_icon(gui_base->get_icon("MainPlay", "EditorIcons"));
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-21 00:38:02 +02:00
//pause_button->set_pressed(false);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
play_scene_button->set_pressed(false);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_scene_button->set_icon(gui_base->get_icon("PlayScene", "EditorIcons"));
Added option to restart custom scene
2016-02-17 20:51:56 +01:00
play_custom_scene_button->set_pressed(false);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_custom_scene_button->set_icon(gui_base->get_icon("PlayCustom", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
String current_filename;
String run_filename;
String args;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_current || (editor_data.get_edited_scene_root() && p_custom == editor_data.get_edited_scene_root()->get_filename())) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Node *scene = editor_data.get_edited_scene_root();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!scene) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//accept->get_cancel()->hide();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("I see.."));
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
accept->set_text(TTR("There is no defined scene to run."));
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (scene->get_filename() == "") {
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//accept->get_cancel()->hide();
Prompt save dialog if running a unsaved scene. Solution for #966
2015-01-06 23:28:25 +01:00
/**/
_menu_option_confirm(FILE_SAVE_BEFORE_RUN, false);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (run_settings_dialog->get_run_mode() == RunSettingsDialog::RUN_LOCAL_SCENE) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
run_filename = scene->get_filename();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_filename = scene->get_filename();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
} else if (p_custom != "") {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
run_filename = p_custom;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (run_filename == "") {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//evidently, run the scene
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
run_filename = GLOBAL_DEF("application/main_scene", "");
if (run_filename == "") {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//accept->get_cancel()->hide();
Ask about selecting a main scene if one has not been selected.
2016-06-28 00:59:33 +02:00
pick_main_scene->set_text(TTR("No main scene has ever been defined, select one?\nYou can change it later in later in \"Project Settings\" under the 'application' category."));
pick_main_scene->popup_centered_minsize();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
Properly complain when a scene file has not be selected, closes #3811
2016-06-27 15:59:37 +02:00
if (!FileAccess::exists(run_filename)) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
Properly complain when a scene file has not be selected, closes #3811
2016-06-27 15:59:37 +02:00
//accept->get_cancel()->hide();
i18n: Fix malformed TTR call
2016-06-28 08:07:19 +02:00
pick_main_scene->set_text(vformat(TTR("Selected scene '%s' does not exist, select a valid one?\nYou can change it later in \"Project Settings\" under the 'application' category."), run_filename));
Ask about selecting a main scene if one has not been selected.
2016-06-28 00:59:33 +02:00
pick_main_scene->popup_centered_minsize();
Properly complain when a scene file has not be selected, closes #3811
2016-06-27 15:59:37 +02:00
return;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (ResourceLoader::get_resource_type(run_filename) != "PackedScene") {
Properly complain when a scene file has not be selected, closes #3811
2016-06-27 15:59:37 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
Properly complain when a scene file has not be selected, closes #3811
2016-06-27 15:59:37 +02:00
//accept->get_cancel()->hide();
i18n: Fix malformed TTR call
2016-06-28 08:07:19 +02:00
pick_main_scene->set_text(vformat(TTR("Selected scene '%s' is not a scene file, select a valid one?\nYou can change it later in \"Project Settings\" under the 'application' category."), run_filename));
Ask about selecting a main scene if one has not been selected.
2016-06-28 00:59:33 +02:00
pick_main_scene->popup_centered_minsize();
Properly complain when a scene file has not be selected, closes #3811
2016-06-27 15:59:37 +02:00
return;
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (bool(EDITOR_DEF("run/auto_save_before_running", true))) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (unsaved_cache) {
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Node *scene = editor_data.get_edited_scene_root();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (scene) { //only autosave if there is a scene obviously
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (scene->get_filename() == "") {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//accept->get_cancel()->hide();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("I see.."));
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
accept->set_text(TTR("Current scene was never saved, please save it prior to running."));
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
work in progress, resource previews
2015-05-31 06:59:42 +02:00
//_save_scene(scene->get_filename());
_save_scene_with_preview(scene->get_filename());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
Save all edited scenes when Runing (and auto-save is enabled). Fixes #4410
2016-06-26 05:54:17 +02:00
_menu_option(FILE_SAVE_ALL_SCENES);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
editor_data.save_editor_external_data();
}
Added automatic clear output on Play in Godot Settings
2015-07-30 00:03:25 +02:00
if (bool(EDITOR_DEF("run/always_clear_output_on_play", true))) {
log->clear();
}
Add new option to always open output on play (cherry picked from commit faf6f865ddefa129945491796edcc23133f7e5e1)
2016-12-24 23:39:16 +01:00
if (bool(EDITOR_DEF("run/always_open_output_on_play", true))) {
make_bottom_panel_item_visible(log);
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
List<String> breakpoints;
editor_data.get_editor_breakpoints(&breakpoints);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Allows to start the scene with custom arguments within the editor fixes #7346 Path from the current scene isn't added too the argumens anymore by default and needs to be added throug the custom arguments, with $scene. Matches the behaviour of the executable without any arguments. Custom Arguments are read from editor/main_run_args (cherry picked from commit abdedc35224ce499ea49dd996b44344432dbf510)
2016-12-21 15:32:52 +01:00
args = Globals::get_singleton()->get("editor/main_run_args");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Error error = editor_run.run(run_filename, args, breakpoints, current_filename);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (error != OK) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//confirmation->get_cancel()->hide();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("I see.."));
accept->set_text(TTR("Could not start subprocess!"));
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
emit_signal("play_pressed");
if (p_current) {
play_scene_button->set_pressed(true);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_scene_button->set_icon(gui_base->get_icon("Reload", "EditorIcons"));
} else if (p_custom != "") {
run_custom_filename = run_filename;
Added option to restart custom scene
2016-02-17 20:51:56 +01:00
play_custom_scene_button->set_pressed(true);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_custom_scene_button->set_icon(gui_base->get_icon("Reload", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
play_button->set_pressed(true);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_button->set_icon(gui_base->get_icon("Reload", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_playing_edited = p_current;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
void EditorNode::_cleanup_scene() {
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
#if 0
Node *scene = editor_data.get_edited_scene_root();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
editor_selection->clear();
editor_data.clear_editor_states();
editor_history.clear();
_hide_top_editors();
animation_editor->cleanup();
property_editor->edit(NULL);
Fix crash in editor when open new scene in editing resources_dock->cleanup(); // This will delete GDScript instance (if property_editor->obj is scene's GDScript instance, editor will crash)
2014-05-08 10:24:52 +02:00
resources_dock->cleanup();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
scene_import_metadata.unref();
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
//set_edited_scene(NULL);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (scene) {
if (scene->get_filename()!="") {
previous_scenes.push_back(scene->get_filename());
}
memdelete(scene);
}
editor_data.get_undo_redo().clear_history();
saved_version=editor_data.get_undo_redo().get_version();
run_settings_dialog->set_run_mode(0);
run_settings_dialog->set_custom_arguments("-l $scene");
List<Ref<Resource> > cached;
ResourceCache::get_cached_resources(&cached);
for(List<Ref<Resource> >::Element *E=cached.front();E;E=E->next()) {
String path = E->get()->get_path();
if (path.is_resource_file()) {
ERR_PRINT(("Stray resource not cleaned:"+path).utf8().get_data());
}
}
remove trailing whitespace
2016-03-09 00:00:52 +01:00
editor window title improvements Shows the project name in the window title (good to differentiate multiple instances of Godot with different projects loaded). Clears the previous scene name from the window title when creating a new scene.
2014-04-10 04:50:30 +02:00
_update_title();
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
#endif
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
fix quit bug on linux when using alt-f4, fixes #1677
2015-04-27 00:02:32 +02:00
//print_line("option "+itos(p_option)+" confirm "+itos(p_confirmed));
if (!p_confirmed) //this may be a hack..
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = (MenuOptions)p_option;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
switch (p_option) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case FILE_NEW_SCENE: {
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
// TODO: Drop such obsolete commented code
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
/*
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!p_confirmed) {
i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated.
2016-05-21 01:18:35 +02:00
confirmation->get_ok()->set_text("Yes");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//confirmation->get_cancel()->show();
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
confirmation->set_text("Start a New Scene? (Current will be lost)");
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
confirmation->popup_centered_minsize();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
break;
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
}*/
int idx = editor_data.add_edited_scene(-1);
_scene_tab_changed(idx);
-Properly keep animation editor and viewport state while switching scene tabs
2015-08-30 03:59:25 +02:00
editor_data.clear_editor_states();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
//_cleanup_scene();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 14:09:09 +02:00
case FILE_NEW_INHERITED_SCENE:
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case FILE_OPEN_SCENE: {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//print_tree();
work in progress, resource previews
2015-05-31 06:59:42 +02:00
file->set_mode(EditorFileDialog::MODE_OPEN_FILE);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//not for now?
List<String> extensions;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ResourceLoader::get_recognized_extensions_for_type("PackedScene", &extensions);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
file->clear_filters();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < extensions.size(); i++) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file->add_filter("*." + extensions[i] + " ; " + extensions[i].to_upper());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//file->set_current_path(current_path);
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Node *scene = editor_data.get_edited_scene_root();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (scene) {
file->set_current_path(scene->get_filename());
};
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file->set_title(p_option == FILE_OPEN_SCENE ? TTR("Open Scene") : TTR("Open Base Scene"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
file->popup_centered_ratio();
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
case FILE_QUICK_OPEN_SCENE: {
Quick open now can open multiple scenes and scripts
2016-01-08 12:27:34 +01:00
quick_open->popup("PackedScene", true);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
quick_open->set_title(TTR("Quick Open Scene.."));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
case FILE_QUICK_OPEN_SCRIPT: {
Quick open now can open multiple scenes and scripts
2016-01-08 12:27:34 +01:00
quick_open->popup("Script", true);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
quick_open->set_title(TTR("Quick Open Script.."));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
-run script in editor -add search docs dialog that returns places string was found -added flash
2014-02-21 03:01:44 +01:00
case FILE_RUN_SCRIPT: {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-run script in editor -add search docs dialog that returns places string was found -added flash
2014-02-21 03:01:44 +01:00
file_script->popup_centered_ratio();
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case FILE_OPEN_PREV: {
if (previous_scenes.empty())
break;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
opening_prev = true;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
open_request(previous_scenes.back()->get());
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
} break;
case FILE_CLOSE: {
Scene->Close scene: ask confirmation only when unsaved changes
2016-01-08 16:53:47 +01:00
if (!p_confirmed && unsaved_cache) {
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
confirmation->get_ok()->set_text(TTR("Yes"));
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
//confirmation->get_cancel()->show();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
confirmation->set_text(TTR("Close scene? (Unsaved changes will be lost)"));
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
confirmation->popup_centered_minsize();
break;
}
_remove_edited_scene();
Ask confirmation on closing a scene tab
2015-11-19 14:15:17 +01:00
} break;
case SCENE_TAB_CLOSE: {
_remove_scene(tab_closing);
_update_scene_tabs();
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
case FILE_SAVE_SCENE: {
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Node *scene = editor_data.get_edited_scene_root();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (scene && scene->get_filename() != "") {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Stopped save scene flicker, issue 4118
2016-03-26 21:31:23 +01:00
// save in background if in the script editor
if (_get_current_main_editor() == EDITOR_SCRIPT) {
_save_scene(scene->get_filename());
} else {
_save_scene_with_preview(scene->get_filename());
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
};
// fallthrough to save_as
Fix 'Save Scene' doing nothing on new scenes
2015-12-04 16:51:36 +01:00
};
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case FILE_SAVE_AS_SCENE: {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Node *scene = editor_data.get_edited_scene_root();
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!scene) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//confirmation->get_cancel()->hide();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("I see.."));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
accept->set_text("This operation can't be done without a tree root.");
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
remove trailing whitespace
2016-03-09 00:00:52 +01:00
break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
remove trailing whitespace
2016-03-09 00:00:52 +01:00
work in progress, resource previews
2015-05-31 06:59:42 +02:00
file->set_mode(EditorFileDialog::MODE_SAVE_FILE);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
List<String> extensions;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Ref<PackedScene> sd = memnew(PackedScene);
ResourceSaver::get_recognized_extensions(sd, &extensions);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
file->clear_filters();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < extensions.size(); i++) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file->add_filter("*." + extensions[i] + " ; " + extensions[i].to_upper());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//file->set_current_path(current_path);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (scene->get_filename() != "") {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
file->set_current_path(scene->get_filename());
if (extensions.size()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String ext = scene->get_filename().extension().to_lower();
if (extensions.find(ext) == NULL) {
file->set_current_path(scene->get_filename().replacen("." + ext, "." + extensions.front()->get()));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
} else {
String existing;
if (extensions.size()) {
use node name as filename when save scene fix #4723
2016-05-23 15:27:58 +02:00
String root_name(get_edited_scene()->get_name());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
existing = root_name + "." + extensions.front()->get().to_lower();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
file->set_current_path(existing);
}
file->popup_centered_ratio();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
file->set_title(TTR("Save Scene As.."));
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
Save all edited scenes when Runing (and auto-save is enabled). Fixes #4410
2016-06-26 05:54:17 +02:00
case FILE_SAVE_ALL_SCENES: {
for (int i = 0; i < editor_data.get_edited_scene_count(); i++) {
Node *scene = editor_data.get_edited_scene_root(i);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (scene && scene->get_filename() != "") {
Save all edited scenes when Runing (and auto-save is enabled). Fixes #4410
2016-06-26 05:54:17 +02:00
// save in background if in the script editor
if (i != editor_data.get_edited_scene() || _get_current_main_editor() == EDITOR_SCRIPT) {
_save_scene(scene->get_filename(), i);
} else {
_save_scene_with_preview(scene->get_filename());
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
} // else: ignore new scenes
Save all edited scenes when Runing (and auto-save is enabled). Fixes #4410
2016-06-26 05:54:17 +02:00
}
} break;
Prompt save dialog if running a unsaved scene. Solution for #966
2015-01-06 23:28:25 +01:00
case FILE_SAVE_BEFORE_RUN: {
if (!p_confirmed) {
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("Yes"));
accept->set_text(TTR("This scene has never been saved. Save before running?"));
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
Prompt save dialog if running a unsaved scene. Solution for #966
2015-01-06 23:28:25 +01:00
break;
}
_menu_option(FILE_SAVE_AS_SCENE);
_menu_option_confirm(FILE_SAVE_AND_RUN, true);
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case FILE_DUMP_STRINGS: {
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Node *scene = editor_data.get_edited_scene_root();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!scene) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//confirmation->get_cancel()->hide();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("I see.."));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
accept->set_text("This operation can't be done without a tree root.");
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
break;
}
String cpath;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (scene->get_filename() != "") {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
cpath = scene->get_filename();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String fn = cpath.substr(0, cpath.length() - cpath.extension().size());
String ext = cpath.extension();
cpath = fn + ".pot";
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//confirmation->get_cancel()->hide();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("I see.."));
accept->set_text(TTR("Please save the scene first."));
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
break;
}
work in progress, resource previews
2015-05-31 06:59:42 +02:00
file->set_mode(EditorFileDialog::MODE_SAVE_FILE);
Fix export translation(can't save pot file)
2014-04-23 03:28:23 +02:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
file->set_current_path(cpath);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
file->set_title(TTR("Save Translatable Strings"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
file->popup_centered_ratio();
} break;
case FILE_SAVE_OPTIMIZED: {
#if 0
Removed unused variables (second pass) + dead code Fixes various gcc 5.4.0 warnings for -Wunused-variable and -Wunused-but-set-variable
2016-07-06 19:04:21 +02:00
Node *scene = editor_data.get_edited_scene_root();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!scene) {
current_option=-1;
//confirmation->get_cancel()->hide();
i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated.
2016-05-21 01:18:35 +02:00
accept->get_ok()->set_text("I see..");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
accept->set_text("This operation can't be done without a tree root.");
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
accept->popup_centered(Size2(300,70));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
break;
}
//file->set_current_path(current_path);
String cpath;
if (scene->get_filename()!="") {
cpath = scene->get_filename();
String fn = cpath.substr(0,cpath.length() - cpath.extension().size());
String ext=cpath.extension();
cpath=fn+".optimized.scn";
optimized_save->set_optimized_scene(cpath);
optimized_save->popup_centered(Size2(500,143));
} else {
current_option=-1;
//confirmation->get_cancel()->hide();
i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated.
2016-05-21 01:18:35 +02:00
accept->get_ok()->set_text("I see..");
accept->set_text("Please save the scene first.");
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
accept->popup_centered(Size2(300,70));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
break;
}
#endif
} break;
case FILE_EXPORT_PROJECT: {
defer project export filesystem update if not visible
2016-01-27 11:23:12 +01:00
project_export_settings->popup_export();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
/*
String target = export_db->get_current_platform();
Ref<EditorExporter> exporter = export_db->get_exporter(target);
if (exporter.is_null()) {
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
accept->set_text("No exporter for platform '"+target+"' yet.");
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
accept->popup_centered(Size2(300,70));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
String extension = exporter->get_binary_extension();
print_line("for target: "+target+" extension: "+extension);
file_export_password->set_editable( exporter->requieres_password(file_export_check->is_pressed()));
file_export->clear_filters();
if (extension!="") {
file_export->add_filter("*."+extension);
}
file_export->popup_centered_ratio();*/
} break;
case FILE_EXPORT_MESH_LIBRARY: {
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
if (!editor_data.get_edited_scene_root()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//confirmation->get_cancel()->hide();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("I see.."));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
accept->set_text("This operation can't be done without a scene.");
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
break;
}
List<String> extensions;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Ref<MeshLibrary> ml(memnew(MeshLibrary));
ResourceSaver::get_recognized_extensions(ml, &extensions);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
file_export_lib->clear_filters();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (List<String>::Element *E = extensions.front(); E; E = E->next()) {
file_export_lib->add_filter("*." + E->get());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
file_export_lib->popup_centered_ratio();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
file_export_lib->set_title(TTR("Export Mesh Library"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
case FILE_EXPORT_TILESET: {
List<String> extensions;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Ref<TileSet> ml(memnew(TileSet));
ResourceSaver::get_recognized_extensions(ml, &extensions);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
file_export_lib->clear_filters();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (List<String>::Element *E = extensions.front(); E; E = E->next()) {
file_export_lib->add_filter("*." + E->get());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
file_export_lib->popup_centered_ratio();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
file_export_lib->set_title(TTR("Export Tile Set"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
case SETTINGS_EXPORT_PREFERENCES: {
//project_export_settings->popup_centered_ratio();
} break;
case FILE_IMPORT_SUBSCENE: {
//import_subscene->popup_centered_ratio();
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
if (!editor_data.get_edited_scene_root()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//accept->get_cancel()->hide();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("I see.."));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
accept->set_text("This operation can't be done without a selected node.");
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
break;
}
scene_tree_dock->import_subscene();
} break;
case FILE_QUIT: {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!p_confirmed) {
fix quit bug on linux when using alt-f4, fixes #1677
2015-04-27 00:02:32 +02:00
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
confirmation->get_ok()->set_text(TTR("Quit"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//confirmation->get_cancel()->show();
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
confirmation->set_text(TTR("Exit the editor?"));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
confirmation->popup_centered(Size2(180, 70) * EDSCALE);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
break;
}
stops running process when quitting editor I noticed a bug where I could close Godot while I was running a project. If the program was left running and then ran into an error, or if an error was caught by the debugger and then I quit Godot, I could no longer close the running project without manually killing it. This fixes that problem by essentially hitting the Stop button automatically just prior to quitting the editor.
2014-04-24 04:06:12 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_menu_option_confirm(RUN_STOP, true);
exiting = true;
SceneMainLoop -> SceneTree -=-=-=-=-=-=-=-=-=-=-=-=-=- *YOUR SOURCE MIGHT NOT WORK* For mor information on fix: https://github.com/okamstudio/godot/wiki/devel_scene_tree Other stuff: -Shower of bullets demo -Fixes all around
2014-11-06 01:20:42 +01:00
get_tree()->quit();
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
case FILE_EXTERNAL_OPEN_SCENE: {
if (unsaved_cache && !p_confirmed) {
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
confirmation->get_ok()->set_text(TTR("Open"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//confirmation->get_cancel()->show();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
confirmation->set_text(TTR("Current scene not saved. Open anyway?"));
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
confirmation->popup_centered_minsize();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
break;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool oprev = opening_prev;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Error err = load_scene(external_file);
if (err == OK && oprev) {
previous_scenes.pop_back();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
opening_prev = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
} break;
case EDIT_UNDO: {
if (OS::get_singleton()->get_mouse_button_state())
break; // can't undo while mouse buttons are pressed
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String action = editor_data.get_undo_redo().get_current_action_name();
if (action != "")
log->add_message("UNDO: " + action);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
editor_data.get_undo_redo().undo();
} break;
case EDIT_REDO: {
if (OS::get_singleton()->get_mouse_button_state())
break; // can't redo while mouse buttons are pressed
editor_data.get_undo_redo().redo();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String action = editor_data.get_undo_redo().get_current_action_name();
if (action != "")
log->add_message("REDO: " + action);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
-orphan resource explorer dialog + tools menu
2015-11-29 05:08:31 +01:00
case TOOLS_ORPHAN_RESOURCES: {
orphan_resources->show();
} break;
-WIP Exporter to Godot 3.0, only text scenes (no .scn) and still kind of buggy
2017-02-13 02:52:02 +01:00
case TOOLS_EXPORT_GODOT3: {
Add a revert menu item.
2015-01-25 01:14:06 +01:00
-WIP Exporter to Godot 3.0, only text scenes (no .scn) and still kind of buggy
2017-02-13 02:52:02 +01:00
export_godot3_dialog->popup_centered_ratio();
} break;
Add a revert menu item.
2015-01-25 01:14:06 +01:00
case EDIT_REVERT: {
Node *scene = get_edited_scene();
if (!scene)
break;
-Fixed revert scene, should work proprely now, fixes #2782
2016-01-23 22:28:30 +01:00
String filename = scene->get_filename();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (filename == String()) {
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
show_warning(TTR("Can't reload a scene that was never saved."));
-Fixed revert scene, should work proprely now, fixes #2782
2016-01-23 22:28:30 +01:00
break;
}
Show a confirmation for the revert action.
2015-01-27 01:00:07 +01:00
if (unsaved_cache && !p_confirmed) {
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
confirmation->get_ok()->set_text(TTR("Revert"));
confirmation->set_text(TTR("This action cannot be undone. Revert anyway?"));
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
confirmation->popup_centered_minsize();
Show a confirmation for the revert action.
2015-01-27 01:00:07 +01:00
break;
}
Add a revert menu item.
2015-01-25 01:14:06 +01:00
-Fixed revert scene, should work proprely now, fixes #2782
2016-01-23 22:28:30 +01:00
int cur_idx = editor_data.get_edited_scene();
_remove_edited_scene();
Error err = load_scene(filename);
editor_data.move_edited_scene_to_index(cur_idx);
get_undo_redo()->clear_history();
scene_tabs->set_current_tab(cur_idx);
Add a revert menu item.
2015-01-25 01:14:06 +01:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#if 0
case NODE_EXTERNAL_INSTANCE: {
if (!edited_scene) {
current_option=-1;
//accept->get_cancel()->hide();
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
accept->get_ok()->set_text("I see..");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
accept->set_text("This operation can't be done without a selected node.");
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
accept->popup_centered(Size2(300,70));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
break;
}
Node *parent = scene_tree_editor->get_selected();
if (!parent) {
current_option=-1;
//confirmation->get_cancel()->hide();
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
accept->get_ok()->set_text("I see..");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
accept->set_text("This operation can't be done without a selected node.");
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
accept->popup_centered(Size2(300,70));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
break;
}
Node*instanced_scene=SceneLoader::load(external_file,true);
if (!instanced_scene) {
current_option=-1;
//accept->get_cancel()->hide();
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
accept->get_ok()->set_text("Ugh");
accept->set_text("Error loading scene from "+external_file);
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
accept->popup_centered(Size2(300,70));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
instanced_scene->generate_instance_state();
instanced_scene->set_filename( Globals::get_singleton()->localize_path(external_file) );
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
editor_data.get_undo_redo().create_action("Instance Scene");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
editor_data.get_undo_redo().add_do_method(parent,"add_child",instanced_scene);
editor_data.get_undo_redo().add_do_method(instanced_scene,"set_owner",edited_scene);
editor_data.get_undo_redo().add_do_reference(instanced_scene);
editor_data.get_undo_redo().add_undo_method(parent,"remove_child",instanced_scene);
editor_data.get_undo_redo().commit_action();
// parent->add_child(instanced_scene);
// instanced_scene->set_owner(edited_scene);
_last_instanced_scene=instanced_scene;
} break;
#endif
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
case RESOURCE_NEW: {
Fix custom types showing on wrong dialogs * The custom types are visible when the dialog is shown
2016-07-10 13:19:15 +02:00
create_dialog->popup(true);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
} break;
case RESOURCE_LOAD: {
open_resource();
} break;
case RESOURCE_SAVE: {
uint32_t current = editor_history.get_current();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Object *current_obj = current > 0 ? ObjectDB::get_instance(current) : NULL;
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
ERR_FAIL_COND(!current_obj->cast_to<Resource>())
RES current_res = RES(current_obj->cast_to<Resource>());
save_resource(current_res);
} break;
case RESOURCE_SAVE_AS: {
uint32_t current = editor_history.get_current();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Object *current_obj = current > 0 ? ObjectDB::get_instance(current) : NULL;
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
ERR_FAIL_COND(!current_obj->cast_to<Resource>())
RES current_res = RES(current_obj->cast_to<Resource>());
save_resource_as(current_res);
} break;
case RESOURCE_UNREF: {
uint32_t current = editor_history.get_current();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Object *current_obj = current > 0 ? ObjectDB::get_instance(current) : NULL;
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
ERR_FAIL_COND(!current_obj->cast_to<Resource>())
RES current_res = RES(current_obj->cast_to<Resource>());
current_res->set_path("");
_edit_current();
} break;
case RESOURCE_COPY: {
uint32_t current = editor_history.get_current();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Object *current_obj = current > 0 ? ObjectDB::get_instance(current) : NULL;
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
ERR_FAIL_COND(!current_obj->cast_to<Resource>())
RES current_res = RES(current_obj->cast_to<Resource>());
EditorSettings::get_singleton()->set_resource_clipboard(current_res);
} break;
case RESOURCE_PASTE: {
RES r = EditorSettings::get_singleton()->get_resource_clipboard();
if (r.is_valid()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
push_item(EditorSettings::get_singleton()->get_resource_clipboard().ptr(), String());
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
}
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case OBJECT_REQUEST_HELP: {
if (current) {
Put 2D, 3D and Script editor index in enum To avoid invalid index out of bounds mistakes.
2015-11-25 00:46:44 +01:00
_editor_select(EDITOR_SCRIPT);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
emit_signal("request_help", current->get_type());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
} break;
case OBJECT_COPY_PARAMS: {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
editor_data.apply_changes_in_editors();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (current)
editor_data.copy_object_params(current);
} break;
case OBJECT_PASTE_PARAMS: {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
editor_data.apply_changes_in_editors();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (current)
editor_data.paste_object_params(current);
editor_data.get_undo_redo().clear_history();
} break;
Bug Fixes -=-=-=-=- -Fixed problem with scaling shapes (#827), related to not taking scale in consideration for calculating the moment of inertia -Added support for multiline strings (or comments) using """ -Save subscene bug, properties not being saved in root node (#806) -Fix Crash in CollisionPolygon2DEditor (#814) -Restored Ability to compile without 3D (#795) -Fix InterpolatedCamera (#803) -Fix UV Import for OBJ Meshes (#771) -Fixed issue with modifier gizmos (#794) -Fixed CapsuleShape gizmo handle (#50) -Fixed Import Button (not properly working in 3D) (#733) -Many misc fixes (though no new features)
2014-11-02 15:31:01 +01:00
case OBJECT_UNIQUE_RESOURCES: {
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
editor_data.apply_changes_in_editors();
Bug Fixes -=-=-=-=- -Fixed problem with scaling shapes (#827), related to not taking scale in consideration for calculating the moment of inertia -Added support for multiline strings (or comments) using """ -Save subscene bug, properties not being saved in root node (#806) -Fix Crash in CollisionPolygon2DEditor (#814) -Restored Ability to compile without 3D (#795) -Fix InterpolatedCamera (#803) -Fix UV Import for OBJ Meshes (#771) -Fixed issue with modifier gizmos (#794) -Fixed CapsuleShape gizmo handle (#50) -Fixed Import Button (not properly working in 3D) (#733) -Many misc fixes (though no new features)
2014-11-02 15:31:01 +01:00
if (current) {
List<PropertyInfo> props;
current->get_property_list(&props);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Map<RES, RES> duplicates;
for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
Bug Fixes -=-=-=-=- -Fixed problem with scaling shapes (#827), related to not taking scale in consideration for calculating the moment of inertia -Added support for multiline strings (or comments) using """ -Save subscene bug, properties not being saved in root node (#806) -Fix Crash in CollisionPolygon2DEditor (#814) -Restored Ability to compile without 3D (#795) -Fix InterpolatedCamera (#803) -Fix UV Import for OBJ Meshes (#771) -Fixed issue with modifier gizmos (#794) -Fixed CapsuleShape gizmo handle (#50) -Fixed Import Button (not properly working in 3D) (#733) -Many misc fixes (though no new features)
2014-11-02 15:31:01 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (!(E->get().usage & PROPERTY_USAGE_STORAGE))
Bug Fixes -=-=-=-=- -Fixed problem with scaling shapes (#827), related to not taking scale in consideration for calculating the moment of inertia -Added support for multiline strings (or comments) using """ -Save subscene bug, properties not being saved in root node (#806) -Fix Crash in CollisionPolygon2DEditor (#814) -Restored Ability to compile without 3D (#795) -Fix InterpolatedCamera (#803) -Fix UV Import for OBJ Meshes (#771) -Fixed issue with modifier gizmos (#794) -Fixed CapsuleShape gizmo handle (#50) -Fixed Import Button (not properly working in 3D) (#733) -Many misc fixes (though no new features)
2014-11-02 15:31:01 +01:00
continue;
Variant v = current->get(E->get().name);
if (v.is_ref()) {
REF ref = v;
if (ref.is_valid()) {
RES res = ref;
if (res.is_valid()) {
if (!duplicates.has(res)) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
duplicates[res] = res->duplicate();
Bug Fixes -=-=-=-=- -Fixed problem with scaling shapes (#827), related to not taking scale in consideration for calculating the moment of inertia -Added support for multiline strings (or comments) using """ -Save subscene bug, properties not being saved in root node (#806) -Fix Crash in CollisionPolygon2DEditor (#814) -Restored Ability to compile without 3D (#795) -Fix InterpolatedCamera (#803) -Fix UV Import for OBJ Meshes (#771) -Fixed issue with modifier gizmos (#794) -Fixed CapsuleShape gizmo handle (#50) -Fixed Import Button (not properly working in 3D) (#733) -Many misc fixes (though no new features)
2014-11-02 15:31:01 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
res = duplicates[res];
Bug Fixes -=-=-=-=- -Fixed problem with scaling shapes (#827), related to not taking scale in consideration for calculating the moment of inertia -Added support for multiline strings (or comments) using """ -Save subscene bug, properties not being saved in root node (#806) -Fix Crash in CollisionPolygon2DEditor (#814) -Restored Ability to compile without 3D (#795) -Fix InterpolatedCamera (#803) -Fix UV Import for OBJ Meshes (#771) -Fixed issue with modifier gizmos (#794) -Fixed CapsuleShape gizmo handle (#50) -Fixed Import Button (not properly working in 3D) (#733) -Many misc fixes (though no new features)
2014-11-02 15:31:01 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current->set(E->get().name, res);
Bug Fixes -=-=-=-=- -Fixed problem with scaling shapes (#827), related to not taking scale in consideration for calculating the moment of inertia -Added support for multiline strings (or comments) using """ -Save subscene bug, properties not being saved in root node (#806) -Fix Crash in CollisionPolygon2DEditor (#814) -Restored Ability to compile without 3D (#795) -Fix InterpolatedCamera (#803) -Fix UV Import for OBJ Meshes (#771) -Fixed issue with modifier gizmos (#794) -Fixed CapsuleShape gizmo handle (#50) -Fixed Import Button (not properly working in 3D) (#733) -Many misc fixes (though no new features)
2014-11-02 15:31:01 +01:00
}
}
}
}
}
editor_data.get_undo_redo().clear_history();
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
_set_editing_top_editors(NULL);
_set_editing_top_editors(current);
Bug Fixes -=-=-=-=- -Fixed problem with scaling shapes (#827), related to not taking scale in consideration for calculating the moment of inertia -Added support for multiline strings (or comments) using """ -Save subscene bug, properties not being saved in root node (#806) -Fix Crash in CollisionPolygon2DEditor (#814) -Restored Ability to compile without 3D (#795) -Fix InterpolatedCamera (#803) -Fix UV Import for OBJ Meshes (#771) -Fixed issue with modifier gizmos (#794) -Fixed CapsuleShape gizmo handle (#50) -Fixed Import Button (not properly working in 3D) (#733) -Many misc fixes (though no new features)
2014-11-02 15:31:01 +01:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case OBJECT_CALL_METHOD: {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_data.apply_changes_in_editors();
;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
call_dialog->set_object(current);
call_dialog->popup_centered_ratio();
} break;
case RUN_PLAY: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_menu_option_confirm(RUN_STOP, true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
_run(false);
} break;
case RUN_PLAY_CUSTOM_SCENE: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (run_custom_filename.empty() || editor_run.get_status() == EditorRun::STATUS_STOP) {
_menu_option_confirm(RUN_STOP, true);
quick_run->popup("PackedScene", true);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
quick_run->set_title(TTR("Quick Run Scene.."));
Keep 'Play custom scene' button unpressed when not running
2016-02-18 13:16:31 +01:00
play_custom_scene_button->set_pressed(false);
Added option to restart custom scene
2016-02-17 20:51:56 +01:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String last_custom_scene = run_custom_filename;
_menu_option_confirm(RUN_STOP, true);
_run(false, last_custom_scene);
Added option to restart custom scene
2016-02-17 20:51:56 +01:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
case RUN_STOP: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (editor_run.get_status() == EditorRun::STATUS_STOP)
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
break;
editor_run.stop();
Added option to restart custom scene
2016-02-17 20:51:56 +01:00
run_custom_filename.clear();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
play_button->set_pressed(false);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_button->set_icon(gui_base->get_icon("MainPlay", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
play_scene_button->set_pressed(false);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_scene_button->set_icon(gui_base->get_icon("PlayScene", "EditorIcons"));
Added option to restart custom scene
2016-02-17 20:51:56 +01:00
play_custom_scene_button->set_pressed(false);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_custom_scene_button->set_icon(gui_base->get_icon("PlayCustom", "EditorIcons"));
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-21 00:38:02 +02:00
//pause_button->set_pressed(false);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
emit_signal("stop_pressed");
} break;
case RUN_PLAY_SCENE: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_menu_option_confirm(RUN_STOP, true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
_run(true);
-Merged the file server with the live editing and remote debug -It is now really easy to deploy an android build with debug, and debug it
2015-08-06 07:37:40 +02:00
} break;
case RUN_PLAY_NATIVE: {
editor_node: add an option to stop the update spinner from spinning, fixes #6653 (cherry picked from commit 4527fbcfa11c8e5fe618ce862d641c63b0204301)
2016-10-01 16:15:07 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool autosave = EDITOR_DEF("run/auto_save_before_running", true);
Fix autosave when run on remote device Fix #5367
2016-06-24 14:20:43 +02:00
if (autosave) {
As volzhs mentioned in #5385, changes to save to FILE_SAVE_ALL_SCENES
2016-07-10 19:37:48 +02:00
_menu_option_confirm(FILE_SAVE_ALL_SCENES, false);
Fix autosave when run on remote device Fix #5367
2016-06-24 14:20:43 +02:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (run_native->is_deploy_debug_remote_enabled()) {
_menu_option_confirm(RUN_STOP, true);
Fix autosave when run on remote device Fix #5367
2016-06-24 14:20:43 +02:00
emit_signal("play_pressed");
editor_run.run_native_notify();
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
case RUN_SCENE_SETTINGS: {
run_settings_dialog->popup_run_settings();
} break;
case RUN_SETTINGS: {
project_settings->popup_project_settings();
} break;
Able to open project manager inside editor (Scene->Project Manager) Remove unnecessary include of project_manager.h
2014-02-18 05:21:06 +01:00
case RUN_PROJECT_MANAGER: {
if (!p_confirmed) {
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
confirmation->get_ok()->set_text(TTR("Yes"));
Added more translatable strings in code. Updated template tools.pot. also improved Russian localization.
2016-05-30 20:47:53 +02:00
confirmation->set_text(TTR("Open Project Manager? \n(Unsaved changes will be lost)"));
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
confirmation->popup_centered_minsize();
Able to open project manager inside editor (Scene->Project Manager) Remove unnecessary include of project_manager.h
2014-02-18 05:21:06 +01:00
break;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_menu_option_confirm(RUN_STOP, true);
exiting = true;
SceneMainLoop -> SceneTree -=-=-=-=-=-=-=-=-=-=-=-=-=- *YOUR SOURCE MIGHT NOT WORK* For mor information on fix: https://github.com/okamstudio/godot/wiki/devel_scene_tree Other stuff: -Shower of bullets demo -Fixes all around
2014-11-06 01:20:42 +01:00
get_tree()->quit();
Able to open project manager inside editor (Scene->Project Manager) Remove unnecessary include of project_manager.h
2014-02-18 05:21:06 +01:00
String exec = OS::get_singleton()->get_executable_path();
List<String> args;
Editor: Fix base dir when going back to project manager This caused the PM to load with the parameters of the previously loaded project. Was a regression from ea751724a21e3513ff2291aa24491e9d91c8c0f0. Closes #4045.
2016-05-28 14:59:00 +02:00
args.push_back("-path");
args.push_back(exec.get_base_dir());
adds -pm and -project_manager command line options to start project manager fixes bug where the user has an engine.cfg on the executable directory so it runs the game instead of opening the project manager
2016-02-25 07:02:09 +01:00
args.push_back("-pm");
Able to open project manager inside editor (Scene->Project Manager) Remove unnecessary include of project_manager.h
2014-02-18 05:21:06 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
OS::ProcessID pid = 0;
Error err = OS::get_singleton()->execute(exec, args, false, &pid);
Able to open project manager inside editor (Scene->Project Manager) Remove unnecessary include of project_manager.h
2014-02-18 05:21:06 +01:00
ERR_FAIL_COND(err);
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case RUN_FILE_SERVER: {
//file_server
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool ischecked = debug_button->get_popup()->is_item_checked(debug_button->get_popup()->get_item_index(RUN_FILE_SERVER));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (ischecked) {
file_server->stop();
Cleaned up remote menu -Merged fileserver & deploy dumb clients option -Live Script Reloading can now happen automatically on script save -Changed Live to Mirror term to differentiate from Unity and Unreal, as what Godot does is not the same thing.
2016-06-03 17:34:11 +02:00
run_native->set_deploy_dumb(false);
-Merged the file server with the live editing and remote debug -It is now really easy to deploy an android build with debug, and debug it
2015-08-06 07:37:40 +02:00
//debug_button->set_icon(gui_base->get_icon("FileServer","EditorIcons"));
i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated.
2016-05-21 01:18:35 +02:00
//debug_button->get_popup()->set_item_text( debug_button->get_popup()->get_item_index(RUN_FILE_SERVER),"Enable File Server");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
file_server->start();
Cleaned up remote menu -Merged fileserver & deploy dumb clients option -Live Script Reloading can now happen automatically on script save -Changed Live to Mirror term to differentiate from Unity and Unreal, as what Godot does is not the same thing.
2016-06-03 17:34:11 +02:00
run_native->set_deploy_dumb(true);
-Merged the file server with the live editing and remote debug -It is now really easy to deploy an android build with debug, and debug it
2015-08-06 07:37:40 +02:00
//debug_button->set_icon(gui_base->get_icon("FileServerActive","EditorIcons"));
i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated.
2016-05-21 01:18:35 +02:00
//debug_button->get_popup()->set_item_text( debug_button->get_popup()->get_item_index(RUN_FILE_SERVER),"Disable File Server");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
debug_button->get_popup()->set_item_checked(debug_button->get_popup()->get_item_index(RUN_FILE_SERVER), !ischecked);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
Live edit WORK IN PROGRESS 1) press the heart while the game is running 2) select a scene to live edit from the opened scenes 3) edit/add/remove nodes or resources, change their properties, etc. 4) watch changes reflected in running game, in all places this scene is edited 5) It's not perfect obviously, but the aim of it is to try to reflect your changes as best as possible in the running game.
2015-08-02 17:29:37 +02:00
case RUN_LIVE_DEBUG: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool ischecked = debug_button->get_popup()->is_item_checked(debug_button->get_popup()->get_item_index(RUN_LIVE_DEBUG));
-Merged the file server with the live editing and remote debug -It is now really easy to deploy an android build with debug, and debug it
2015-08-06 07:37:40 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
debug_button->get_popup()->set_item_checked(debug_button->get_popup()->get_item_index(RUN_LIVE_DEBUG), !ischecked);
-Merged the file server with the live editing and remote debug -It is now really easy to deploy an android build with debug, and debug it
2015-08-06 07:37:40 +02:00
ScriptEditor::get_singleton()->get_debugger()->set_live_debugging(!ischecked);
Live edit WORK IN PROGRESS 1) press the heart while the game is running 2) select a scene to live edit from the opened scenes 3) edit/add/remove nodes or resources, change their properties, etc. 4) watch changes reflected in running game, in all places this scene is edited 5) It's not perfect obviously, but the aim of it is to try to reflect your changes as best as possible in the running game.
2015-08-02 17:29:37 +02:00
} break;
Cleaned up remote menu -Merged fileserver & deploy dumb clients option -Live Script Reloading can now happen automatically on script save -Changed Live to Mirror term to differentiate from Unity and Unreal, as what Godot does is not the same thing.
2016-06-03 17:34:11 +02:00
/*case RUN_DEPLOY_DUMB_CLIENTS: {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-Merged the file server with the live editing and remote debug -It is now really easy to deploy an android build with debug, and debug it
2015-08-06 07:37:40 +02:00
bool ischecked = debug_button->get_popup()->is_item_checked( debug_button->get_popup()->get_item_index(RUN_DEPLOY_DUMB_CLIENTS));
debug_button->get_popup()->set_item_checked( debug_button->get_popup()->get_item_index(RUN_DEPLOY_DUMB_CLIENTS),!ischecked);
More 3D Improvements -=-=-=-=-=-=-=-=-=-= -Sprite3D and AnimatedSprite3D support. -Opaque pre-pass works, is compatible with shadows -Improved shadow map rendering (can differentiate between plain opaque and opaque with shaders/discard/etc) -Added option to use alpha discard in FixedMaterial -Improved Glow FX, many more options (three modes, Additive, Screen and SoftLight), strength and scale -Ability for Background (image or cubemap) to send to glow buffer -Dumb Deploy of clients now actually works in Android -Many Many rendering fixes, 3D is much more usable now.
2014-05-29 15:56:39 +02:00
run_native->set_deploy_dumb(!ischecked);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Cleaned up remote menu -Merged fileserver & deploy dumb clients option -Live Script Reloading can now happen automatically on script save -Changed Live to Mirror term to differentiate from Unity and Unreal, as what Godot does is not the same thing.
2016-06-03 17:34:11 +02:00
} break;*/
-Merged the file server with the live editing and remote debug -It is now really easy to deploy an android build with debug, and debug it
2015-08-06 07:37:40 +02:00
case RUN_DEPLOY_REMOTE_DEBUG: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool ischecked = debug_button->get_popup()->is_item_checked(debug_button->get_popup()->get_item_index(RUN_DEPLOY_REMOTE_DEBUG));
debug_button->get_popup()->set_item_checked(debug_button->get_popup()->get_item_index(RUN_DEPLOY_REMOTE_DEBUG), !ischecked);
-Merged the file server with the live editing and remote debug -It is now really easy to deploy an android build with debug, and debug it
2015-08-06 07:37:40 +02:00
run_native->set_deploy_debug_remote(!ischecked);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
Ability to visually debug geometry visually: -Visible 2D and 3D Shapes, Polygons, Tile collisions, etc. -Visible Navmesh and Navpoly -Visible collision contacts for 2D and 3D as a red point -Customizable colors in project settings
2015-09-20 18:03:46 +02:00
case RUN_DEBUG_COLLISONS: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool ischecked = debug_button->get_popup()->is_item_checked(debug_button->get_popup()->get_item_index(RUN_DEBUG_COLLISONS));
debug_button->get_popup()->set_item_checked(debug_button->get_popup()->get_item_index(RUN_DEBUG_COLLISONS), !ischecked);
Ability to visually debug geometry visually: -Visible 2D and 3D Shapes, Polygons, Tile collisions, etc. -Visible Navmesh and Navpoly -Visible collision contacts for 2D and 3D as a red point -Customizable colors in project settings
2015-09-20 18:03:46 +02:00
run_native->set_debug_collisions(!ischecked);
editor_run.set_debug_collisions(!ischecked);
} break;
case RUN_DEBUG_NAVIGATION: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool ischecked = debug_button->get_popup()->is_item_checked(debug_button->get_popup()->get_item_index(RUN_DEBUG_NAVIGATION));
debug_button->get_popup()->set_item_checked(debug_button->get_popup()->get_item_index(RUN_DEBUG_NAVIGATION), !ischecked);
Ability to visually debug geometry visually: -Visible 2D and 3D Shapes, Polygons, Tile collisions, etc. -Visible Navmesh and Navpoly -Visible collision contacts for 2D and 3D as a red point -Customizable colors in project settings
2015-09-20 18:03:46 +02:00
run_native->set_debug_navigation(!ischecked);
editor_run.set_debug_navigation(!ischecked);
} break;
Ability to reload scripts on running game
2016-06-02 01:22:02 +02:00
case RUN_RELOAD_SCRIPTS: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool ischecked = debug_button->get_popup()->is_item_checked(debug_button->get_popup()->get_item_index(RUN_RELOAD_SCRIPTS));
debug_button->get_popup()->set_item_checked(debug_button->get_popup()->get_item_index(RUN_RELOAD_SCRIPTS), !ischecked);
Cleaned up remote menu -Merged fileserver & deploy dumb clients option -Live Script Reloading can now happen automatically on script save -Changed Live to Mirror term to differentiate from Unity and Unreal, as what Godot does is not the same thing.
2016-06-03 17:34:11 +02:00
ScriptEditor::get_singleton()->set_live_auto_reload_running_scripts(!ischecked);
Ability to reload scripts on running game
2016-06-02 01:22:02 +02:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case SETTINGS_UPDATE_ALWAYS: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
update_menu->get_popup()->set_item_checked(0, true);
update_menu->get_popup()->set_item_checked(1, false);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::get_singleton()->set_low_processor_usage_mode(false);
} break;
case SETTINGS_UPDATE_CHANGES: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
update_menu->get_popup()->set_item_checked(0, false);
update_menu->get_popup()->set_item_checked(1, true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::get_singleton()->set_low_processor_usage_mode(true);
} break;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
case SETTINGS_UPDATE_SPINNER_HIDE: {
update_menu->set_icon(gui_base->get_icon("Collapse", "EditorIcons"));
update_menu->get_popup()->toggle_item_checked(3);
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case SETTINGS_PREFERENCES: {
settings_config_dialog->popup_edit_settings();
} break;
case SETTINGS_OPTIMIZED_PRESETS: {
//optimized_presets->popup_centered_ratio();
} break;
case SETTINGS_LOAD_EXPORT_TEMPLATES: {
file_templates->popup_centered_ratio();
Ask about selecting a main scene if one has not been selected.
2016-06-28 00:59:33 +02:00
} break;
case SETTINGS_PICK_MAIN_SCENE: {
//print_tree();
file->set_mode(EditorFileDialog::MODE_OPEN_FILE);
//not for now?
List<String> extensions;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ResourceLoader::get_recognized_extensions_for_type("PackedScene", &extensions);
Ask about selecting a main scene if one has not been selected.
2016-06-28 00:59:33 +02:00
file->clear_filters();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < extensions.size(); i++) {
Ask about selecting a main scene if one has not been selected.
2016-06-28 00:59:33 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file->add_filter("*." + extensions[i] + " ; " + extensions[i].to_upper());
Ask about selecting a main scene if one has not been selected.
2016-06-28 00:59:33 +02:00
}
//file->set_current_path(current_path);
Node *scene = editor_data.get_edited_scene_root();
if (scene) {
file->set_current_path(scene->get_filename());
};
i18n: Corrected a typo (#5460)
2016-06-28 12:00:18 +02:00
file->set_title(TTR("Pick a Main Scene"));
Ask about selecting a main scene if one has not been selected.
2016-06-28 00:59:33 +02:00
file->popup_centered_ratio();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
case SETTINGS_ABOUT: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
about->popup_centered_minsize(Size2(500, 130) * EDSCALE);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
case SOURCES_REIMPORT: {
reimport_dialog->popup_reimport();
} break;
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 03:50:23 +02:00
case DEPENDENCY_LOAD_CHANGED_IMAGES: {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
List<Ref<Resource> > cached;
ResourceCache::get_cached_resources(&cached);
Make most resources (save for packedscenes and scripts) reload if they change on disk. Closes #4059.
2016-06-27 18:17:20 +02:00
//this should probably be done in a thread..
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (List<Ref<Resource> >::Element *E = cached.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Make most resources (save for packedscenes and scripts) reload if they change on disk. Closes #4059.
2016-06-27 18:17:20 +02:00
if (!E->get()->editor_can_reload_from_file())
continue;
if (!E->get()->get_path().is_resource_file() && !E->get()->get_path().is_abs_path())
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
continue;
Fix ERROR: FileAccessWindows::_get_modified_time: Method/Function Failed on windows due to accessing modifiled time of internal resource when editor gaining focus
2014-06-30 07:23:17 +02:00
if (!FileAccess::exists(E->get()->get_path()))
continue;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
uint64_t mt = FileAccess::get_modified_time(E->get()->get_path());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (mt != E->get()->get_last_modified_time()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
E->get()->reload_from_file();
}
}
} break;
case DEPENDENCY_UPDATE_IMPORTED: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
/*
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
bool editing_changed = _find_editing_changed_scene(get_edited_scene());
import_reload_fn="";
if (editing_changed) {
if (unsaved_cache && !bool(EDITOR_DEF("import/ask_save_before_reimport",false))) {
if (!p_confirmed) {
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
confirmation->get_ok()->set_text("Open");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//confirmation->get_cancel()->show();
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
confirmation->set_text("Current scene changed, save and re-import ?");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
confirmation->popup_centered(Size2(300,70));
break;
}
}
Node *scene = get_edited_scene();
if (scene->get_filename()=="") {
current_option=-1;
//accept->get_cancel()->hide();
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
accept->get_ok()->set_text("I see..");
accept->set_text("Can't import if edited scene was not saved."); //i dont think this code will ever run
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
accept->popup_centered(Size2(300,70));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
break;
}
import_reload_fn = scene->get_filename();
_save_scene(import_reload_fn);
_cleanup_scene();
}
*/
} break;
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 19:18:40 +02:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
default: {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_option >= OBJECT_METHOD_BASE) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
ERR_FAIL_COND(!current);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
int idx = p_option - OBJECT_METHOD_BASE;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
List<MethodInfo> methods;
current->get_method_list(&methods);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ERR_FAIL_INDEX(idx, methods.size());
String name = methods[idx].name;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (current)
current->call(name);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
} else if (p_option >= IMPORT_PLUGIN_BASE) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Ref<EditorImportPlugin> p = editor_import_export->get_import_plugin(p_option - IMPORT_PLUGIN_BASE);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (p.is_valid()) {
p->import_dialog();
}
}
}
remove trailing whitespace
2016-03-09 00:00:52 +01:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Control *EditorNode::get_viewport() {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return viewport;
}
void EditorNode::_editor_select(int p_which) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
static bool selecting = false;
-Merged Script and Help tabs -Help tabs can be opened many at the same time -Color temperatures for opened scripts -Dominant script opening when switching scene tab
2015-11-17 13:46:08 +01:00
if (selecting || changing_scene)
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
selecting = true;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ERR_FAIL_INDEX(p_which, editor_table.size());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < main_editor_buttons.size(); i++) {
main_editor_buttons[i]->set_pressed(i == p_which);
-fixed tabs
2015-11-18 08:47:41 +01:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
selecting = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
EditorPlugin *new_editor = editor_table[p_which];
ERR_FAIL_COND(!new_editor);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (editor_plugin_screen == new_editor)
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
if (editor_plugin_screen) {
editor_plugin_screen->make_visible(false);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_plugin_screen = new_editor;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
editor_plugin_screen->make_visible(true);
editor_plugin_screen->selected_notify();
}
void EditorNode::add_editor_plugin(EditorPlugin *p_editor) {
if (p_editor->has_main_screen()) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ToolButton *tb = memnew(ToolButton);
-fixed tabs
2015-11-18 08:47:41 +01:00
tb->set_toggle_mode(true);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
tb->connect("pressed", singleton, "_editor_select", varray(singleton->main_editor_buttons.size()));
-fixed tabs
2015-11-18 08:47:41 +01:00
tb->set_text(p_editor->get_name());
singleton->main_editor_buttons.push_back(tb);
singleton->main_editor_button_vb->add_child(tb);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
singleton->editor_table.push_back(p_editor);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
singleton->editor_data.add_editor_plugin(p_editor);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
singleton->add_child(p_editor);
}
void EditorNode::remove_editor_plugin(EditorPlugin *p_editor) {
if (p_editor->has_main_screen()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < singleton->main_editor_buttons.size(); i++) {
-fixed tabs
2015-11-18 08:47:41 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_editor->get_name() == singleton->main_editor_buttons[i]->get_text()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Fix crash when disabling main screen plugin (cherry picked from commit 0ec2b7baea235c3c5cf43ab296b40c06982b32de)
2016-09-22 00:17:55 +02:00
if (singleton->main_editor_buttons[i]->is_pressed()) {
singleton->_editor_select(EDITOR_SCRIPT);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
memdelete(singleton->main_editor_buttons[i]);
-fixed tabs
2015-11-18 08:47:41 +01:00
singleton->main_editor_buttons.remove(i);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
break;
}
}
-fixed tabs
2015-11-18 08:47:41 +01:00
//singleton->main_editor_tabs->add_tab(p_editor->get_name());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
singleton->editor_table.erase(p_editor);
}
editor_node.cpp now takes care of removing plugin after deactivating it
2016-06-19 00:29:16 +02:00
p_editor->make_visible(false);
p_editor->clear();
singleton->editor_plugins_over->get_plugins_list().erase(p_editor);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
singleton->remove_child(p_editor);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
singleton->editor_data.remove_editor_plugin(p_editor);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::add_editor_import_plugin(const Ref<EditorImportPlugin> &p_editor_import) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ERR_FAIL_COND(p_editor_import.is_null());
Added the ability to add and remove editor import plugins.
2015-02-10 07:36:16 +01:00
editor_import_export->add_import_plugin(p_editor_import);
_rebuild_import_menu();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::remove_editor_import_plugin(const Ref<EditorImportPlugin> &p_editor_import) {
ERR_FAIL_COND(p_editor_import.is_null());
Added the ability to add and remove editor import plugins.
2015-02-10 07:36:16 +01:00
editor_import_export->remove_import_plugin(p_editor_import);
_rebuild_import_menu();
}
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
void EditorNode::_update_addon_config() {
if (_initializing_addons)
return;
Vector<String> enabled_addons;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (Map<String, EditorPlugin *>::Element *E = plugin_addons.front(); E; E = E->next()) {
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
enabled_addons.push_back(E->key());
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (enabled_addons.size() == 0) {
Globals::get_singleton()->set("editor_plugins/enabled", Variant());
Globals::get_singleton()->set_persisting("editor_plugins/enabled", false);
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Globals::get_singleton()->set("editor_plugins/enabled", enabled_addons);
Globals::get_singleton()->set_persisting("editor_plugins/enabled", true);
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
}
project_settings->queue_save();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::set_addon_plugin_enabled(const String &p_addon, bool p_enabled) {
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
ERR_FAIL_COND(p_enabled && plugin_addons.has(p_addon));
ERR_FAIL_COND(!p_enabled && !plugin_addons.has(p_addon));
if (!p_enabled) {
EditorPlugin *addon = plugin_addons[p_addon];
editor_node.cpp now takes care of removing plugin after deactivating it
2016-06-19 00:29:16 +02:00
remove_editor_plugin(addon);
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
memdelete(addon); //bye
plugin_addons.erase(p_addon);
_update_addon_config();
return;
}
Ref<ConfigFile> cf;
cf.instance();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String addon_path = "res://addons/" + p_addon + "/plugin.cfg";
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
Error err = cf->load(addon_path);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (err != OK) {
show_warning("Unable to enable addon plugin at: '" + addon_path + "' parsing of config failed.");
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
return;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (!cf->has_section_key("plugin", "script")) {
show_warning("Unable to find script field for addon plugin at: 'res://addons/" + p_addon + "''.");
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
return;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String path = cf->get_value("plugin", "script");
path = "res://addons/" + p_addon + "/" + path;
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
Ref<Script> script = ResourceLoader::load(path);
if (script.is_null()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
show_warning("Unable to load addon script from path: '" + path + "'.");
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
return;
}
//could check inheritance..
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (String(script->get_instance_base_type()) != "EditorPlugin") {
show_warning("Unable to load addon script from path: '" + path + "' Base type is not EditorPlugin.");
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
return;
}
if (!script->is_tool()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
show_warning("Unable to load addon script from path: '" + path + "' Script is does not support tool mode.");
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
return;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
EditorPlugin *ep = memnew(EditorPlugin);
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
ep->set_script(script.get_ref_ptr());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
plugin_addons[p_addon] = ep;
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
add_editor_plugin(ep);
_update_addon_config();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool EditorNode::is_addon_plugin_enabled(const String &p_addon) const {
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
return plugin_addons.has(p_addon);
}
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
void EditorNode::_remove_edited_scene() {
int new_index = editor_data.get_edited_scene();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
int old_index = new_index;
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (new_index > 0) {
new_index = new_index - 1;
} else if (editor_data.get_edited_scene_count() > 1) {
new_index = 1;
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
} else {
editor_data.add_edited_scene(-1);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
new_index = 1;
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (editor_data.get_scene_path(old_index) != String()) {
Only allow built-in scripts to be edited when the scene they belong to is loaded, closes #5403
2016-07-07 01:35:49 +02:00
ScriptEditor::get_singleton()->close_builtin_scripts_from_scene(editor_data.get_scene_path(old_index));
}
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
_scene_tab_changed(new_index);
editor_data.remove_scene(old_index);
editor_data.get_undo_redo().clear_history();
_update_title();
_update_scene_tabs();
Added the ability to add and remove editor import plugins.
2015-02-10 07:36:16 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// if (editor_data.get_edited_scene_count()==1) {
// //make new scene appear saved
// set_current_version(editor_data.get_undo_redo().get_version());
// unsaved_cache=false;
// }
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
}
Fix #2623
2015-10-22 00:23:42 +02:00
void EditorNode::_remove_scene(int index) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// printf("Attempting to remove scene %d (current is %d)\n", index, editor_data.get_edited_scene());
Ask confirmation on closing a scene tab
2015-11-19 14:15:17 +01:00
Fix #2623
2015-10-22 00:23:42 +02:00
if (editor_data.get_edited_scene() == index) {
//Scene to remove is current scene
_remove_edited_scene();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
} else {
Ask confirmation on closing a scene tab
2015-11-19 14:15:17 +01:00
// Scene to remove is not active scene
Fix #2623
2015-10-22 00:23:42 +02:00
editor_data.remove_scene(index);
}
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
void EditorNode::set_edited_scene(Node *p_scene) {
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
if (get_editor_data().get_edited_scene_root()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (get_editor_data().get_edited_scene_root()->get_parent() == scene_root)
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
scene_root->remove_child(get_editor_data().get_edited_scene_root());
remove trailing whitespace
2016-03-09 00:00:52 +01:00
}
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
get_editor_data().set_edited_scene_root(p_scene);
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
if (p_scene && p_scene->cast_to<Popup>())
p_scene->cast_to<Popup>()->show(); //show popups
scene_tree_dock->set_edited_scene(p_scene);
SceneMainLoop -> SceneTree -=-=-=-=-=-=-=-=-=-=-=-=-=- *YOUR SOURCE MIGHT NOT WORK* For mor information on fix: https://github.com/okamstudio/godot/wiki/devel_scene_tree Other stuff: -Shower of bullets demo -Fixes all around
2014-11-06 01:20:42 +01:00
if (get_tree())
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
get_tree()->set_edited_scene_root(p_scene);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
if (p_scene) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_scene->get_parent() != scene_root)
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
scene_root->add_child(p_scene);
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_fetch_translatable_strings(const Object *p_object, Set<StringName> &strings) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
List<String> tstrings;
p_object->get_translatable_strings(&tstrings);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (List<String>::Element *E = tstrings.front(); E; E = E->next())
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
strings.insert(E->get());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
const Node *node = p_object->cast_to<Node>();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!node)
return;
Ref<Script> script = node->get_script();
if (script.is_valid())
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_fetch_translatable_strings(script.ptr(), strings);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < node->get_child_count(); i++) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Node *c = node->get_child(i);
if (c->get_owner() != get_edited_scene())
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_fetch_translatable_strings(c, strings);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Error EditorNode::save_translatable_strings(const String &p_to_file) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
SceneMainLoop -> SceneTree -=-=-=-=-=-=-=-=-=-=-=-=-=- *YOUR SOURCE MIGHT NOT WORK* For mor information on fix: https://github.com/okamstudio/godot/wiki/devel_scene_tree Other stuff: -Shower of bullets demo -Fixes all around
2014-11-06 01:20:42 +01:00
if (!is_inside_tree()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
defer_translatable = p_to_file;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return OK;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ERR_FAIL_COND_V(!get_edited_scene(), ERR_INVALID_DATA);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Set<StringName> strings;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_fetch_translatable_strings(get_edited_scene(), strings);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Error err;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
FileAccess *f = FileAccess::open(p_to_file, FileAccess::WRITE, &err);
ERR_FAIL_COND_V(err, err);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::Date date = OS::get_singleton()->get_date();
OS::Time time = OS::get_singleton()->get_time();
f->store_line("# Translation Strings Dump.");
f->store_line("# Created By.");
Welcome in 2017, dear changelog reader! That year should bring the long-awaited OpenGL ES 3.0 compatible renderer with state-of-the-art rendering techniques tuned to work as low as middle end handheld devices - without compromising with the possibilities given for higher end desktop games of course. Great times ahead for the Godot community and the gamers that will play our games! (cherry picked from commit c7bc44d5ad9aae4902280012f7654e2318cd910e)
2017-01-01 22:01:57 +01:00
f->store_line("# \t" VERSION_FULL_NAME " (c) 2008-2017 Juan Linietsky, Ariel Manzur.");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
f->store_line("# From Scene: ");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
f->store_line("# \t" + get_edited_scene()->get_filename());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
f->store_line("");
f->store_line("msgid \"\"");
f->store_line("msgstr \"\"");
f->store_line("\"Report-Msgid-Bugs-To: <define>\\n\"");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
f->store_line("\"POT-Creation-Date: " + itos(date.year) + "-" + itos(date.month) + "-" + itos(date.day) + " " + itos(time.hour) + ":" + itos(time.min) + "0000\\n\"");
// f->store_line("\"PO-Revision-Date: 2006-08-30 13:56-0700\\n\"");
// f->store_line("\"Last-Translator: Rubén C. Díaz Alonso <outime@gmail.com>\\n\"");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
f->store_line("\"Language-Team: <define>\\n\"");
f->store_line("\"MIME-Version: 1.0\\n\"");
f->store_line("\"Content-Type: text/plain; charset=UTF-8\\n\"");
f->store_line("\"Content-Transfer-Encoding: 8bit\\n\"");
f->store_line("");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (Set<StringName>::Element *E = strings.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
String s = E->get();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (s == "" || s.strip_edges() == "")
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
continue;
Vector<String> substr = s.split("\n");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ERR_CONTINUE(substr.size() == 0);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
f->store_line("");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (substr.size() == 1) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
f->store_line("msgid \"" + substr[0].c_escape() + "\"");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
f->store_line("msgid \"\"");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < substr.size(); i++) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
String s = substr[i];
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (i != substr.size() - 1)
s += "\n";
f->store_line("\"" + s.c_escape() + "\"");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
f->store_line("msgstr \"\"");
}
f->close();
memdelete(f);
return OK;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Error EditorNode::save_optimized_copy(const String &p_scene, const String &p_preset) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#if 0
if (!is_inside_scene()) {
defer_optimize=p_scene;
defer_optimize_preset=p_preset;
return OK;
}
if (!get_edited_scene()) {
get_scene()->quit();
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
ERR_EXPLAIN("No scene to optimize (loading failed?)");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
ERR_FAIL_V(ERR_FILE_NOT_FOUND);
}
String src_scene=Globals::get_singleton()->localize_path(get_edited_scene()->get_filename());
String path=p_scene;
print_line("p_path: "+p_scene);
print_line("src_scene: "+p_scene);
if (path.is_rel_path()) {
print_line("rel path!?");
path=src_scene.get_base_dir()+"/"+path;
}
path = Globals::get_singleton()->localize_path(path);
print_line("path: "+path);
String preset = "optimizer_presets/"+p_preset;
if (!Globals::get_singleton()->has(preset)) {
//accept->"()->hide();
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
accept->get_ok()->set_text("I see..");
accept->set_text("Optimizer preset not found: "+p_preset);
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
accept->popup_centered(Size2(300,70));
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
ERR_EXPLAIN("Optimizer preset not found: "+p_preset);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
ERR_FAIL_V(ERR_INVALID_PARAMETER);
}
Dictionary d = Globals::get_singleton()->get(preset);
ERR_FAIL_COND_V(!d.has("__type__"),ERR_INVALID_DATA);
String type=d["__type__"];
Ref<EditorOptimizedSaver> saver;
for(int i=0;i<editor_data.get_optimized_saver_count();i++) {
print_line(type+" vs "+editor_data.get_optimized_saver(i)->get_target_name());
if (editor_data.get_optimized_saver(i)->get_target_name()==type) {
saver=editor_data.get_optimized_saver(i);
}
}
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
ERR_EXPLAIN("Preset '"+p_preset+"' references nonexistent saver: "+type);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
ERR_FAIL_COND_V(saver.is_null(),ERR_INVALID_DATA);
List<Variant> keys;
d.get_key_list(&keys);
saver->clear();
for(List<Variant>::Element *E=keys.front();E;E=E->next()) {
saver->set(E->get(),d[E->get()]);
}
uint32_t flags=0;
// if (saver->is_bundle_scenes_enabled())
// flags|=ResourceSaver::FLAG_BUNDLE_INSTANCED_SCENES;
if (saver->is_bundle_resources_enabled())
flags|=ResourceSaver::FLAG_BUNDLE_RESOURCES;
if (saver->is_remove_editor_data_enabled())
flags|=ResourceSaver::FLAG_OMIT_EDITOR_PROPERTIES;
if (saver->is_big_endian_data_enabled())
flags|=ResourceSaver::FLAG_SAVE_BIG_ENDIAN;
String platform=saver->get_target_platform();
if (platform=="")
platform="all";
Ref<PackedScene> sdata = memnew( PackedScene );
Error err = sdata->pack(get_edited_scene());
if (err) {
current_option=-1;
//accept->get_cancel()->hide();
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
accept->get_ok()->set_text("I see..");
accept->set_text("Couldn't save scene. Likely dependencies (instances) couldn't be satisfied.");
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
accept->popup_centered(Size2(300,70));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return ERR_INVALID_DATA;
}
err = ResourceSaver::save(path,sdata,flags); //todo, saverSceneSaver::save(path,get_edited_scene(),flags,saver);
if (err) {
//accept->"()->hide();
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
accept->get_ok()->set_text("I see..");
accept->set_text("Error saving optimized scene: "+path);
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
accept->popup_centered(Size2(300,70));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
ERR_FAIL_COND_V(err,err);
}
project_settings->add_remapped_path(src_scene,path,platform);
#endif
return OK;
}
-fixed tabs
2015-11-18 08:47:41 +01:00
int EditorNode::_get_current_main_editor() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < editor_table.size(); i++) {
if (editor_table[i] == editor_plugin_screen)
-fixed tabs
2015-11-18 08:47:41 +01:00
return i;
}
return 0;
}
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Dictionary EditorNode::_get_main_scene_state() {
Dictionary state;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
state["main_tab"] = _get_current_main_editor();
state["scene_tree_offset"] = scene_tree_dock->get_tree_editor()->get_scene_tree()->get_vscroll_bar()->get_val();
state["property_edit_offset"] = get_property_editor()->get_scene_tree()->get_vscroll_bar()->get_val();
state["saved_version"] = saved_version;
state["node_filter"] = scene_tree_dock->get_filter();
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
//print_line(" getting main tab: "+itos(state["main_tab"]));
return state;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_set_main_scene_state(Dictionary p_state, Node *p_for_scene) {
Editor properly reloads scenes if they changed on disk or were reimported
2016-06-28 23:53:31 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (get_edited_scene() != p_for_scene && p_for_scene != NULL)
Editor properly reloads scenes if they changed on disk or were reimported
2016-06-28 23:53:31 +02:00
return; //not for this scene
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
//print_line("set current 7 ");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
changing_scene = false;
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
-Merged Script and Help tabs -Help tabs can be opened many at the same time -Color temperatures for opened scripts -Dominant script opening when switching scene tab
2015-11-17 13:46:08 +01:00
#if 0
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
if (p_state.has("main_tab")) {
int idx = p_state["main_tab"];
-Merged Script and Help tabs -Help tabs can be opened many at the same time -Color temperatures for opened scripts -Dominant script opening when switching scene tab
2015-11-17 13:46:08 +01:00
print_line("comes with tab: "+itos(idx));
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
int current=-1;
for(int i=0;i<editor_table.size();i++) {
if (editor_plugin_screen==editor_table[i]) {
current=i;
break;
}
}
-Merged Script and Help tabs -Help tabs can be opened many at the same time -Color temperatures for opened scripts -Dominant script opening when switching scene tab
2015-11-17 13:46:08 +01:00
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
if (idx<2 && current<2) {
//only set tab for 2D and 3D
-Merged Script and Help tabs -Help tabs can be opened many at the same time -Color temperatures for opened scripts -Dominant script opening when switching scene tab
2015-11-17 13:46:08 +01:00
_editor_select(idx);
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
//print_line(" setting main tab: "+itos(p_state["main_tab"]));
}
}
-Merged Script and Help tabs -Help tabs can be opened many at the same time -Color temperatures for opened scripts -Dominant script opening when switching scene tab
2015-11-17 13:46:08 +01:00
#else
if (get_edited_scene()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
int current = -1;
for (int i = 0; i < editor_table.size(); i++) {
if (editor_plugin_screen == editor_table[i]) {
current = i;
-Merged Script and Help tabs -Help tabs can be opened many at the same time -Color temperatures for opened scripts -Dominant script opening when switching scene tab
2015-11-17 13:46:08 +01:00
break;
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (current < 2) {
-Merged Script and Help tabs -Help tabs can be opened many at the same time -Color temperatures for opened scripts -Dominant script opening when switching scene tab
2015-11-17 13:46:08 +01:00
//use heuristic instead
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
int n2d = 0, n3d = 0;
_find_node_types(get_edited_scene(), n2d, n3d);
if (n2d > n3d) {
Put 2D, 3D and Script editor index in enum To avoid invalid index out of bounds mistakes.
2015-11-25 00:46:44 +01:00
_editor_select(EDITOR_2D);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
} else if (n3d > n2d) {
Put 2D, 3D and Script editor index in enum To avoid invalid index out of bounds mistakes.
2015-11-25 00:46:44 +01:00
_editor_select(EDITOR_3D);
-Merged Script and Help tabs -Help tabs can be opened many at the same time -Color temperatures for opened scripts -Dominant script opening when switching scene tab
2015-11-17 13:46:08 +01:00
}
}
}
#endif
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
if (p_state.has("scene_tree_offset"))
scene_tree_dock->get_tree_editor()->get_scene_tree()->get_vscroll_bar()->set_val(p_state["scene_tree_offset"]);
if (p_state.has("property_edit_offset"))
get_property_editor()->get_scene_tree()->get_vscroll_bar()->set_val(p_state["property_edit_offset"]);
Contextualized Scene Tree menu -Added context menu to Scene Tree Dock -Removed Buttons -Added a filter to search for nods more easily in the dock
2016-05-16 17:23:40 +02:00
if (p_state.has("node_filter"))
scene_tree_dock->set_filter(p_state["node_filter"]);
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
//print_line("set current 8 ");
-Merged Script and Help tabs -Help tabs can be opened many at the same time -Color temperatures for opened scripts -Dominant script opening when switching scene tab
2015-11-17 13:46:08 +01:00
//this should only happen at the very end
//changing_scene=true; //avoid script change from opening editor
ScriptEditor::get_singleton()->get_debugger()->update_live_edit_root();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ScriptEditor::get_singleton()->set_scene_root_script(editor_data.get_scene_root_script(editor_data.get_edited_scene()));
-ability to change scripts in external editor and still have properties reloaded in godot UI, fixes #3003
2015-12-09 13:08:41 +01:00
editor_data.notify_edited_scene_changed();
-Merged Script and Help tabs -Help tabs can be opened many at the same time -Color temperatures for opened scripts -Dominant script opening when switching scene tab
2015-11-17 13:46:08 +01:00
//changing_scene=false;
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
}
void EditorNode::set_current_version(uint64_t p_version) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
saved_version = p_version;
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
editor_data.set_edited_scene_version(p_version);
}
bool EditorNode::is_changing_scene() const {
return changing_scene;
}
-scenes are properly reloaded when a dependency changes, fixes #2896 (it's clevery done so local changes to scenes are kept even if unsaved)
2015-12-14 00:39:01 +01:00
void EditorNode::_clear_undo_history() {
get_undo_redo()->clear_history();
}
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
void EditorNode::set_current_scene(int p_idx) {
-scenes are properly reloaded when a dependency changes, fixes #2896 (it's clevery done so local changes to scenes are kept even if unsaved)
2015-12-14 00:39:01 +01:00
if (editor_data.check_and_update_scene(p_idx)) {
call_deferred("_clear_undo_history");
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
changing_scene = true;
editor_data.save_edited_scene_state(editor_selection, &editor_history, _get_main_scene_state());
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
if (get_editor_data().get_edited_scene_root()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (get_editor_data().get_edited_scene_root()->get_parent() == scene_root)
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
scene_root->remove_child(get_editor_data().get_edited_scene_root());
}
//print_line("set current 2 ");
editor_selection->clear();
editor_data.set_edited_scene(p_idx);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Node *new_scene = editor_data.get_edited_scene_root();
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
if (new_scene && new_scene->cast_to<Popup>())
new_scene->cast_to<Popup>()->show(); //show popups
//print_line("set current 3 ");
scene_tree_dock->set_edited_scene(new_scene);
if (get_tree())
get_tree()->set_edited_scene_root(new_scene);
if (new_scene) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (new_scene->get_parent() != scene_root)
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
scene_root->add_child(new_scene);
}
//print_line("set current 4 ");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Dictionary state = editor_data.restore_edited_scene_state(editor_selection, &editor_history);
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
_edit_current();
/*if (!unsaved) {
saved_version=editor_data.get_undo_redo().get_version();
if (p_backwards)
saved_version--;
else
saved_version++;
print_line("was saved, updating version");
} else {
saved_version=state["saved_version"];
}*/
//_set_main_scene_state(state);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
call_deferred("_set_main_scene_state", state, get_edited_scene()); //do after everything else is done setting up
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
//print_line("set current 6 ");
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool EditorNode::is_scene_open(const String &p_path) {
**WARNING BEFORE PULLING** This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools. If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :) Summary of Changes -New Filesystem dock, with filesystem & tree view modes. -New refactoring tools, to change or fix dependencies. -Quick search dialog, to quickly search any file
2015-08-24 01:15:56 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < editor_data.get_edited_scene_count(); i++) {
if (editor_data.get_scene_path(i) == p_path)
**WARNING BEFORE PULLING** This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools. If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :) Summary of Changes -New Filesystem dock, with filesystem & tree view modes. -New refactoring tools, to change or fix dependencies. -Quick search dialog, to quickly search any file
2015-08-24 01:15:56 +02:00
return true;
}
return false;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::fix_dependencies(const String &p_for_file) {
**WARNING BEFORE PULLING** This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools. If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :) Summary of Changes -New Filesystem dock, with filesystem & tree view modes. -New refactoring tools, to change or fix dependencies. -Quick search dialog, to quickly search any file
2015-08-24 01:15:56 +02:00
dependency_fixer->edit(p_for_file);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, bool p_set_inherited, bool p_clear_errors) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
SceneMainLoop -> SceneTree -=-=-=-=-=-=-=-=-=-=-=-=-=- *YOUR SOURCE MIGHT NOT WORK* For mor information on fix: https://github.com/okamstudio/godot/wiki/devel_scene_tree Other stuff: -Shower of bullets demo -Fixes all around
2014-11-06 01:20:42 +01:00
if (!is_inside_tree()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
defer_load_scene = p_scene;
return OK;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (!p_set_inherited) {
for (int i = 0; i < editor_data.get_edited_scene_count(); i++) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (editor_data.get_scene_path(i) == p_scene) {
You can create an inherited scene based on an already opened scene.
2016-01-02 23:42:41 +01:00
_scene_tab_changed(i);
return OK;
}
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
}
}
Fix error reporting when a scene is not imported properly, closes #3968
2016-06-26 20:37:04 +02:00
if (p_clear_errors)
load_errors->clear();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
String lpath = Globals::get_singleton()->localize_path(p_scene);
if (!lpath.begins_with("res://")) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//accept->get_cancel()->hide();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("Ugh"));
accept->set_text(TTR("Error loading scene, it must be inside the project path. Use 'Import' to open the scene, then save it inside the project path."));
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
opening_prev = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return ERR_FILE_NOT_FOUND;
}
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
int prev = editor_data.get_edited_scene();
int idx = editor_data.add_edited_scene(-1);
//print_line("load scene callback");
//set_current_scene(idx);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (!editor_data.get_edited_scene_root() && editor_data.get_edited_scene_count() == 2) {
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
_remove_edited_scene();
} else {
_scene_tab_changed(idx);
}
//_cleanup_scene(); // i'm sorry but this MUST happen to avoid modified resources to not be reloaded.
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
**WARNING BEFORE PULLING** This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools. If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :) Summary of Changes -New Filesystem dock, with filesystem & tree view modes. -New refactoring tools, to change or fix dependencies. -Quick search dialog, to quickly search any file
2015-08-24 01:15:56 +02:00
dependency_errors.clear();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Ref<PackedScene> sdata = ResourceLoader::load(lpath, "", true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!sdata.is_valid()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//accept->get_cancel()->hide();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("Ugh"));
accept->set_text(TTR("Error loading scene."));
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
opening_prev = false;
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (prev != -1) {
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
set_current_scene(prev);
editor_data.remove_scene(idx);
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return ERR_FILE_NOT_FOUND;
}
**WARNING BEFORE PULLING** This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools. If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :) Summary of Changes -New Filesystem dock, with filesystem & tree view modes. -New refactoring tools, to change or fix dependencies. -Quick search dialog, to quickly search any file
2015-08-24 01:15:56 +02:00
if (!p_ignore_broken_deps && dependency_errors.has(lpath)) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
**WARNING BEFORE PULLING** This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools. If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :) Summary of Changes -New Filesystem dock, with filesystem & tree view modes. -New refactoring tools, to change or fix dependencies. -Quick search dialog, to quickly search any file
2015-08-24 01:15:56 +02:00
Vector<String> errors;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (Set<String>::Element *E = dependency_errors[lpath].front(); E; E = E->next()) {
**WARNING BEFORE PULLING** This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools. If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :) Summary of Changes -New Filesystem dock, with filesystem & tree view modes. -New refactoring tools, to change or fix dependencies. -Quick search dialog, to quickly search any file
2015-08-24 01:15:56 +02:00
errors.push_back(E->get());
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dependency_error->show(lpath, errors);
opening_prev = false;
**WARNING BEFORE PULLING** This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools. If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :) Summary of Changes -New Filesystem dock, with filesystem & tree view modes. -New refactoring tools, to change or fix dependencies. -Quick search dialog, to quickly search any file
2015-08-24 01:15:56 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (prev != -1) {
**WARNING BEFORE PULLING** This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools. If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :) Summary of Changes -New Filesystem dock, with filesystem & tree view modes. -New refactoring tools, to change or fix dependencies. -Quick search dialog, to quickly search any file
2015-08-24 01:15:56 +02:00
set_current_scene(prev);
editor_data.remove_scene(idx);
}
return ERR_FILE_MISSING_DEPENDENCIES;
}
dependency_errors.erase(lpath); //at least not self path
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (Map<String, Set<String> >::Element *E = dependency_errors.front(); E; E = E->next()) {
**WARNING BEFORE PULLING** This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools. If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :) Summary of Changes -New Filesystem dock, with filesystem & tree view modes. -New refactoring tools, to change or fix dependencies. -Quick search dialog, to quickly search any file
2015-08-24 01:15:56 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String txt = vformat(TTR("Scene '%s' has broken dependencies:"), E->key()) + "\n";
for (Set<String>::Element *F = E->get().front(); F; F = F->next()) {
txt += "\t" + F->get() + "\n";
**WARNING BEFORE PULLING** This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools. If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :) Summary of Changes -New Filesystem dock, with filesystem & tree view modes. -New refactoring tools, to change or fix dependencies. -Quick search dialog, to quickly search any file
2015-08-24 01:15:56 +02:00
}
add_io_error(txt);
}
-Make sure scenes properly update when switching tabs, even if sub-instances changed. Fixes #3201
2016-01-14 15:06:20 +01:00
if (ResourceCache::has(lpath)) {
properly export sample compression type option
2016-01-14 15:50:24 +01:00
//used from somewhere else? no problem! update state and replace sdata
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Ref<PackedScene> ps = Ref<PackedScene>(ResourceCache::get(lpath)->cast_to<PackedScene>());
-Make sure scenes properly update when switching tabs, even if sub-instances changed. Fixes #3201
2016-01-14 15:06:20 +01:00
if (ps.is_valid()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ps->replace_state(sdata->get_state());
ps->set_last_modified_time(sdata->get_last_modified_time());
sdata = ps;
-Make sure scenes properly update when switching tabs, even if sub-instances changed. Fixes #3201
2016-01-14 15:06:20 +01:00
}
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
sdata->set_path(lpath, true); //take over path
-Make sure scenes properly update when switching tabs, even if sub-instances changed. Fixes #3201
2016-01-14 15:06:20 +01:00
}
improved get_node(), connect(), etc code completion. -properly completes text arguments -includes the "/root" autoloads
2015-06-26 06:14:31 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Node *new_scene = sdata->instance(true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!new_scene) {
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
sdata.unref();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//accept->get_cancel()->hide();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
accept->get_ok()->set_text(TTR("Ugh"));
accept->set_text(TTR("Error loading scene."));
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 19:02:13 +02:00
accept->popup_centered_minsize();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
opening_prev = false;
if (prev != -1) {
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
set_current_scene(prev);
editor_data.remove_scene(idx);
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return ERR_FILE_NOT_FOUND;
}
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
//guess not needed in the end?
//new_scene->clear_internal_tree_resource_paths(); //make sure no internal tree paths to internal resources exist
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
/*
Node *old_scene = edited_scene;
_hide_top_editors();
set_edited_scene(NULL);
editor_data.clear_editor_states();
if (old_scene) {
if (!opening_prev && old_scene->get_filename()!="") {
previous_scenes.push_back(old_scene->get_filename());
}
memdelete(old_scene);
}
*/
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 14:09:09 +02:00
if (p_set_inherited) {
Ref<SceneState> state = sdata->get_state();
remove trailing whitespace
2016-03-09 00:00:52 +01:00
state->set_path(lpath);
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 14:09:09 +02:00
new_scene->set_scene_inherited_state(state);
-remove path after inheriting, fixes #2616
2015-10-18 01:55:12 +02:00
new_scene->set_filename(String());
-Fixed bug with scene inheritance, should work again -Proper .tscn and .tres parsing, should work, please test well!
2015-11-29 00:56:14 +01:00
//if (new_scene->get_scene_instance_state().is_valid())
// new_scene->get_scene_instance_state()->set_path(String());
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 14:09:09 +02:00
}
-Fixed bug with scene inheritance, should work again -Proper .tscn and .tres parsing, should work, please test well!
2015-11-29 00:56:14 +01:00
new_scene->set_scene_instance_state(Ref<SceneState>());
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 14:09:09 +02:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
set_edited_scene(new_scene);
-Ensure .tscn and .tres always save in a deterministic way, fixes #2495 -Scene edit state is saved outside the scene now, to avoid changes .tscn files when nothing really changed -Created a VariantWriter helper to unify all variant to text writing -Moved SceneFormatText writing to VariantWriter -Moved ConfigFile to use VariantWriter and VariantParser, added compatibility mode for old .cfg files that use engine.cfg format
2015-12-31 04:31:00 +01:00
_get_scene_metadata(p_scene);
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
/*
editor_data.set_edited_scene_root(new_scene);
Fixed when opening sub-scene by pressing sub-scene icon in scene tree, tab changed to script tab
2014-05-18 11:56:08 +02:00
scene_tree_dock->set_selected(new_scene, true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
property_editor->edit(new_scene);
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
editor_data.set_edited_scene_root(new_scene);
*/
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_data.set_edited_scene_import_metadata(sdata->get_import_metadata());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// editor_data.get_undo_redo().clear_history();
saved_version = editor_data.get_undo_redo().get_version();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
_update_title();
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
_update_scene_tabs();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
_add_to_recent_scenes(lpath);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
prev_scene->set_disabled(previous_scenes.size() == 0);
opening_prev = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Live edit WORK IN PROGRESS 1) press the heart while the game is running 2) select a scene to live edit from the opened scenes 3) edit/add/remove nodes or resources, change their properties, etc. 4) watch changes reflected in running game, in all places this scene is edited 5) It's not perfect obviously, but the aim of it is to try to reflect your changes as best as possible in the running game.
2015-08-02 17:29:37 +02:00
ScriptEditor::get_singleton()->get_debugger()->update_live_edit_root();
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
//top_pallete->set_current_tab(0); //always go to scene
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Polygon2D -=-=-=-=- Another gift for those who make 2D games: -Edit polygons, concave or convex, color them, texture them and uv-map them -Corresponding editor -Can have a custom pivot, so they are compatible with bones and IK
2014-07-07 22:44:21 +02:00
push_item(new_scene);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return OK;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::open_request(const String &p_path) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
load_scene(p_path); // as it will be opened in separate tab
//external_file=p_path;
//_menu_option_confirm(FILE_EXTERNAL_OPEN_SCENE,false);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
ability to drag scenes from filesystem to tree for instancing
2016-05-12 01:57:52 +02:00
void EditorNode::request_instance_scene(const String &p_path) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
ability to drag scenes from filesystem to tree for instancing
2016-05-12 01:57:52 +02:00
scene_tree_dock->instance(p_path);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::request_instance_scenes(const Vector<String> &p_files) {
"FileSystem" dock now instance all selected scenes in one action
2016-07-20 19:09:03 +02:00
scene_tree_dock->instance_scenes(p_files);
}
Remove Quick Filter Files and fix FS search hotkey The new Quick Filter Files behaviour since 8b47e26 had not been implemented, so this implements it and makes it an editor hotkey instead of a menu entry. Fixes #7582. (cherry picked from commit c4d6e54e93431e94888c5594386bcd0aa22528ee)
2017-01-21 13:07:29 +01:00
FileSystemDock *EditorNode::get_filesystem_dock() {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Remove Quick Filter Files and fix FS search hotkey The new Quick Filter Files behaviour since 8b47e26 had not been implemented, so this implements it and makes it an editor hotkey instead of a menu entry. Fixes #7582. (cherry picked from commit c4d6e54e93431e94888c5594386bcd0aa22528ee)
2017-01-21 13:07:29 +01:00
return filesystem_dock;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Created a NodeDock with signals and groups
2016-06-04 18:17:56 +02:00
SceneTreeDock *EditorNode::get_scene_tree_dock() {
return scene_tree_dock;
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_instance_request(const Vector<String> &p_files) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
"FileSystem" dock now instance all selected scenes in one action
2016-07-20 19:09:03 +02:00
request_instance_scenes(p_files);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_property_keyed(const String &p_keyed, const Variant &p_value, bool p_advance) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
AnimationPlayerEditor::singleton->get_key_editor()->insert_value_key(p_keyed, p_value, p_advance);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_transform_keyed(Object *sp, const String &p_sub, const Transform &p_key) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Spatial *s = sp->cast_to<Spatial>();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!s)
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
AnimationPlayerEditor::singleton->get_key_editor()->insert_transform_key(s, p_sub, p_key);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
void EditorNode::update_keying() {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
i18n: Don't make print_line calls translatable
2016-05-04 15:28:37 +02:00
//print_line("KR: "+itos(p_enabled));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool valid = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
if (AnimationPlayerEditor::singleton->get_key_editor()->has_keying()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (editor_history.get_path_size() >= 1) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Object *obj = ObjectDB::get_instance(editor_history.get_path_object(0));
if (obj && obj->cast_to<Node>()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
valid = true;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
}
property_editor->set_keying(valid);
Fix animation toolbar
2016-01-27 15:10:51 +01:00
AnimationPlayerEditor::singleton->get_key_editor()->update_keying();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
void EditorNode::_close_messages() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// left_split->set_dragger_visible(false);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
old_split_ofs = center_split->get_split_offset();
center_split->set_split_offset(0);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// scene_root_parent->set_anchor_and_margin(MARGIN_BOTTOM,Control::ANCHOR_END,0);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
void EditorNode::_show_messages() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// left_split->set_dragger_visible(true);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
center_split->set_split_offset(old_split_ofs);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// scene_root_parent->set_anchor_and_margin(MARGIN_BOTTOM,Control::ANCHOR_END,log->get_margin(MARGIN_TOP));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
#if 0
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
void EditorNode::animation_panel_make_visible(bool p_visible) {
if (!p_visible) {
animation_panel->hide();
} else {
animation_panel->show();
}
int idx = settings_menu->get_popup()->get_item_index(SETTINGS_SHOW_ANIMATION);
settings_menu->get_popup()->set_item_checked(idx,p_visible);
}
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
void EditorNode::animation_editor_make_visible(bool p_visible) {
if (p_visible) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
animation_editor->show();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
animation_vb->get_parent_control()->minimum_size_changed();
//pd_anim->show();
top_split->set_collapsed(false);
//scene_root_parent->set_margin(MARGIN_TOP,animation_editor->get_margin(MARGIN_BOTTOM));
} else {
//pd_anim->hide();
animation_editor->hide();
// scene_root_parent->set_margin(MARGIN_TOP,0);
Batch of Bugfixes -=-=-=-=-=-=-=-=- -Fixed Export UV XForm (should work now). #923 -Fixed enforcement of limits in property editor. #919 -Fixed long-standing bug of export editings in script inheritance. #914, #859, #756 -Fixed horrible error reporting in shader language. #912 -Added kinematic collision with plane (please test well). #911 -Fixed double animation track insert when using 2D rigs. #904 -VKey updates offset parameter in sprite edition. #901 -Do not allow anymore a script to preload itself. (does not fix #899, but narrows it down) -Avoid connection editor from overriding selected text. #897 -Fixed timer autostart. #876 -Fixed collision layers in 3D physics. #872 -Improved operators in shader #857 -Fixed ambient lighting bug #834 -Avoid editor from processing gamepad input #813 -Added not keyword #752 Please test!
2014-12-07 06:04:20 +01:00
if (!animation_vb->get_parent_control())
return;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
animation_vb->get_parent_control()->minimum_size_changed();
top_split->set_collapsed(true);
}
animation_editor->set_keying(p_visible);
}
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
#endif
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_add_to_recent_scenes(const String &p_scene) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String base = "_" + Globals::get_singleton()->get_resource_path().replace("\\", "::").replace("/", "::");
Vector<String> rc = EDITOR_DEF(base + "/_recent_scenes", Array());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
String name = p_scene;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
name = name.replace("res://", "");
if (rc.find(name) != -1)
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
rc.erase(name);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
rc.insert(0, name);
if (rc.size() > 10)
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
rc.resize(10);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
EditorSettings::get_singleton()->set(base + "/_recent_scenes", rc);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
EditorSettings::get_singleton()->save();
_update_recent_scenes();
}
void EditorNode::_open_recent_scene(int p_idx) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String base = "_" + Globals::get_singleton()->get_resource_path().replace("\\", "::").replace("/", "::");
Vector<String> rc = EDITOR_DEF(base + "/_recent_scenes", Array());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ERR_FAIL_INDEX(p_idx, rc.size());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String path = "res://" + rc[p_idx];
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
/*if (unsaved_cache) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
_recent_scene=rc[p_idx];
open_recent_confirmation->set_text("Discard current scene and open:\n'"+rc[p_idx]+"'");
open_recent_confirmation->get_label()->set_align(Label::ALIGN_CENTER);
open_recent_confirmation->popup_centered(Size2(400,100));
return;
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
}*/
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
load_scene(path);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
void EditorNode::_save_optimized() {
// save_optimized_copy(optimized_save->get_optimized_scene(),optimized_save->get_preset());
#if 0
String path = optimized_save->get_optimized_scene();
uint32_t flags=0;
String platform="all";
Ref<EditorOptimizedSaver> saver=editor_data.get_optimized_saver(optimized_save->get_preset());
if (saver->is_bundle_scenes_enabled())
flags|=SceneSaver::FLAG_BUNDLE_INSTANCED_SCENES;
if (saver->is_bundle_resources_enabled())
flags|=SceneSaver::FLAG_BUNDLE_RESOURCES;
if (saver->is_remove_editor_data_enabled())
flags|=SceneSaver::FLAG_OMIT_EDITOR_PROPERTIES;
if (saver->is_big_endian_data_enabled())
flags|=SceneSaver::FLAG_SAVE_BIG_ENDIAN;
platform=saver->get_target_platform();
Error err = SceneSaver::save(path,get_edited_scene(),flags,saver);
if (err) {
//accept->"()->hide();
i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated.
2016-05-21 01:18:35 +02:00
accept->get_ok()->set_text("I see..");
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
accept->set_text("Error saving optimized scene: "+path);
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
accept->popup_centered(Size2(300,70));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
project_settings->add_remapped_path(Globals::get_singleton()->localize_path(get_edited_scene()->get_filename()),Globals::get_singleton()->localize_path(path),platform);
#endif
}
void EditorNode::_update_recent_scenes() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String base = "_" + Globals::get_singleton()->get_resource_path().replace("\\", "::").replace("/", "::");
Vector<String> rc = EDITOR_DEF(base + "/_recent_scenes", Array());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
recent_scenes->clear();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < rc.size(); i++) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
recent_scenes->add_item(rc[i], i);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
Quick open now can open multiple scenes and scripts
2016-01-08 12:27:34 +01:00
void EditorNode::_quick_opened() {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Quick open now can open multiple scenes and scripts
2016-01-08 12:27:34 +01:00
Vector<String> files = quick_open->get_selected_files();
for (int i = 0; i < files.size(); i++) {
String res_path = files[i];
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (quick_open->get_base_type() == "PackedScene") {
Quick open now can open multiple scenes and scripts
2016-01-08 12:27:34 +01:00
open_request(res_path);
} else {
load_resource(res_path);
}
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Fix _quick_run method (Play custom scene)
2016-02-17 19:40:06 +01:00
void EditorNode::_quick_run() {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_run(false, quick_run->get_selected());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
void EditorNode::notify_child_process_exited() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_menu_option_confirm(RUN_STOP, false);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
stop_button->set_pressed(false);
editor_run.stop();
}
bool EditorNode::_find_editing_changed_scene(Node *p_from) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
/*
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!p_from)
return false;
if (p_from->get_filename()!="") {
StringName fn = p_from->get_filename();
for(int i=0;i<import_monitor->get_changes().size();i++) {
if (fn==import_monitor->get_changes()[i])
return true;
}
}
for(int i=0;i<p_from->get_child_count();i++) {
if (_find_editing_changed_scene(p_from->get_child(i)))
return true;
}
*/
return false;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::add_io_error(const String &p_error) {
Fix error reporting when a scene is not imported properly, closes #3968
2016-06-26 20:37:04 +02:00
//CharString err_ut = p_error.utf8();
//ERR_PRINT(!err_ut.get_data());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_load_error_notify(singleton, p_error);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_load_error_notify(void *p_ud, const String &p_text) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
EditorNode *en = (EditorNode *)p_ud;
en->load_errors->add_image(en->gui_base->get_icon("Error", "EditorIcons"));
en->load_errors->add_text(p_text + "\n");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
en->load_error_dialog->popup_centered_ratio(0.5);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool EditorNode::_find_scene_in_use(Node *p_node, const String &p_path) const {
Import 3D Scene Improvements -=-=-=-=-=-=-=-=-=-=-=-=-=-=- -If re-importing from the "dependency changed" dialog, edited scene will keep the local changes. -Imported scene will keep track of changes in the source asset -Geometry changes in source geometry or nodes with a different transform will be updated. -Materials will be kept if changed locally. -New nodes added will be kept -If nodes were reparented or renamed, they will still keep track -Deleted notes will be restored, use the -noimp option to avoid this. -In general, you can trust that if you do local modifications to the imported scene, they will not be erased after re-import. -Erasing your changes is done by re-importing from the "Re-Import" menu, re-opening the "Import 3D Scene" dialog. This wil re-import fresh. Overall, This should allow you to work on a scene and see changes made to 3D assets in real-time. So Please test!!
2014-06-19 07:23:03 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_node->get_filename() == p_path) {
Import 3D Scene Improvements -=-=-=-=-=-=-=-=-=-=-=-=-=-=- -If re-importing from the "dependency changed" dialog, edited scene will keep the local changes. -Imported scene will keep track of changes in the source asset -Geometry changes in source geometry or nodes with a different transform will be updated. -Materials will be kept if changed locally. -New nodes added will be kept -If nodes were reparented or renamed, they will still keep track -Deleted notes will be restored, use the -noimp option to avoid this. -In general, you can trust that if you do local modifications to the imported scene, they will not be erased after re-import. -Erasing your changes is done by re-importing from the "Re-Import" menu, re-opening the "Import 3D Scene" dialog. This wil re-import fresh. Overall, This should allow you to work on a scene and see changes made to 3D assets in real-time. So Please test!!
2014-06-19 07:23:03 +02:00
return true;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < p_node->get_child_count(); i++) {
Import 3D Scene Improvements -=-=-=-=-=-=-=-=-=-=-=-=-=-=- -If re-importing from the "dependency changed" dialog, edited scene will keep the local changes. -Imported scene will keep track of changes in the source asset -Geometry changes in source geometry or nodes with a different transform will be updated. -Materials will be kept if changed locally. -New nodes added will be kept -If nodes were reparented or renamed, they will still keep track -Deleted notes will be restored, use the -noimp option to avoid this. -In general, you can trust that if you do local modifications to the imported scene, they will not be erased after re-import. -Erasing your changes is done by re-importing from the "Re-Import" menu, re-opening the "Import 3D Scene" dialog. This wil re-import fresh. Overall, This should allow you to work on a scene and see changes made to 3D assets in real-time. So Please test!!
2014-06-19 07:23:03 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (_find_scene_in_use(p_node->get_child(i), p_path)) {
Import 3D Scene Improvements -=-=-=-=-=-=-=-=-=-=-=-=-=-=- -If re-importing from the "dependency changed" dialog, edited scene will keep the local changes. -Imported scene will keep track of changes in the source asset -Geometry changes in source geometry or nodes with a different transform will be updated. -Materials will be kept if changed locally. -New nodes added will be kept -If nodes were reparented or renamed, they will still keep track -Deleted notes will be restored, use the -noimp option to avoid this. -In general, you can trust that if you do local modifications to the imported scene, they will not be erased after re-import. -Erasing your changes is done by re-importing from the "Re-Import" menu, re-opening the "Import 3D Scene" dialog. This wil re-import fresh. Overall, This should allow you to work on a scene and see changes made to 3D assets in real-time. So Please test!!
2014-06-19 07:23:03 +02:00
return true;
}
}
return false;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool EditorNode::is_scene_in_use(const String &p_path) {
Import 3D Scene Improvements -=-=-=-=-=-=-=-=-=-=-=-=-=-=- -If re-importing from the "dependency changed" dialog, edited scene will keep the local changes. -Imported scene will keep track of changes in the source asset -Geometry changes in source geometry or nodes with a different transform will be updated. -Materials will be kept if changed locally. -New nodes added will be kept -If nodes were reparented or renamed, they will still keep track -Deleted notes will be restored, use the -noimp option to avoid this. -In general, you can trust that if you do local modifications to the imported scene, they will not be erased after re-import. -Erasing your changes is done by re-importing from the "Re-Import" menu, re-opening the "Import 3D Scene" dialog. This wil re-import fresh. Overall, This should allow you to work on a scene and see changes made to 3D assets in real-time. So Please test!!
2014-06-19 07:23:03 +02:00
Node *es = get_edited_scene();
if (es)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
return _find_scene_in_use(es, p_path);
Import 3D Scene Improvements -=-=-=-=-=-=-=-=-=-=-=-=-=-=- -If re-importing from the "dependency changed" dialog, edited scene will keep the local changes. -Imported scene will keep track of changes in the source asset -Geometry changes in source geometry or nodes with a different transform will be updated. -Materials will be kept if changed locally. -New nodes added will be kept -If nodes were reparented or renamed, they will still keep track -Deleted notes will be restored, use the -noimp option to avoid this. -In general, you can trust that if you do local modifications to the imported scene, they will not be erased after re-import. -Erasing your changes is done by re-importing from the "Re-Import" menu, re-opening the "Import 3D Scene" dialog. This wil re-import fresh. Overall, This should allow you to work on a scene and see changes made to 3D assets in real-time. So Please test!!
2014-06-19 07:23:03 +02:00
return false;
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
void EditorNode::register_editor_types() {
ObjectTypeDB::register_type<EditorPlugin>();
ObjectTypeDB::register_type<EditorImportPlugin>();
First attempt at making a more useful EditorPlugin API. Still undocumented, but feedback welcome!
2016-02-27 04:32:00 +01:00
ObjectTypeDB::register_type<EditorExportPlugin>();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
ObjectTypeDB::register_type<EditorScenePostImport>();
-run script in editor -add search docs dialog that returns places string was found -added flash
2014-02-21 03:01:44 +01:00
ObjectTypeDB::register_type<EditorScript>();
First attempt at making a more useful EditorPlugin API. Still undocumented, but feedback welcome!
2016-02-27 04:32:00 +01:00
ObjectTypeDB::register_type<EditorSelection>();
work in progress, resource previews
2015-05-31 06:59:42 +02:00
ObjectTypeDB::register_type<EditorFileDialog>();
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
//ObjectTypeDB::register_type<EditorImportExport>();
First attempt at making a more useful EditorPlugin API. Still undocumented, but feedback welcome!
2016-02-27 04:32:00 +01:00
ObjectTypeDB::register_type<EditorSettings>();
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
ObjectTypeDB::register_type<EditorSpatialGizmo>();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//ObjectTypeDB::register_type<EditorImporter>();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// ObjectTypeDB::register_type<EditorPostImport>();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
-scripts are converted to bytecode on export -fix bug in doc where touchscreen events were not documented
2014-02-25 13:31:47 +01:00
void EditorNode::unregister_editor_types() {
_init_callbacks.clear();
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
void EditorNode::stop_child_process() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_menu_option_confirm(RUN_STOP, false);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::progress_add_task(const String &p_task, const String &p_label, int p_steps) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
singleton->progress_dialog->add_task(p_task, p_label, p_steps);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::progress_task_step(const String &p_task, const String &p_state, int p_step, bool p_force_redraw) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
singleton->progress_dialog->task_step(p_task, p_state, p_step, p_force_redraw);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::progress_end_task(const String &p_task) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
singleton->progress_dialog->end_task(p_task);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::progress_add_task_bg(const String &p_task, const String &p_label, int p_steps) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
singleton->progress_hb->add_task(p_task, p_label, p_steps);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::progress_task_step_bg(const String &p_task, int p_step) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
singleton->progress_hb->task_step(p_task, p_step);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::progress_end_task_bg(const String &p_task) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
singleton->progress_hb->end_task(p_task);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Ref<Texture> EditorNode::_file_dialog_get_icon(const String &p_path) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
EditorFileSystemDirectory *efsd = EditorFileSystem::get_singleton()->get_path(p_path.get_base_dir());
if (efsd) {
String file = p_path.get_file();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < efsd->get_file_count(); i++) {
if (efsd->get_file(i) == file) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
String type = efsd->get_file_type(i);
if (singleton->icon_type_cache.has(type)) {
return singleton->icon_type_cache[type];
} else {
return singleton->icon_type_cache["Object"];
}
}
}
}
return singleton->icon_type_cache["Object"];
}
void EditorNode::_file_dialog_register(FileDialog *p_dialog) {
singleton->file_dialogs.insert(p_dialog);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_file_dialog_unregister(FileDialog *p_dialog) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
singleton->file_dialogs.erase(p_dialog);
}
work in progress, resource previews
2015-05-31 06:59:42 +02:00
void EditorNode::_editor_file_dialog_register(EditorFileDialog *p_dialog) {
singleton->editor_file_dialogs.insert(p_dialog);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_editor_file_dialog_unregister(EditorFileDialog *p_dialog) {
work in progress, resource previews
2015-05-31 06:59:42 +02:00
singleton->editor_file_dialogs.erase(p_dialog);
}
-scripts are converted to bytecode on export -fix bug in doc where touchscreen events were not documented
2014-02-25 13:31:47 +01:00
Vector<EditorNodeInitCallback> EditorNode::_init_callbacks;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Error EditorNode::export_platform(const String &p_platform, const String &p_path, bool p_debug, const String &p_password, bool p_quit_after) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
export_defer.platform = p_platform;
export_defer.path = p_path;
export_defer.debug = p_debug;
export_defer.password = p_password;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return OK;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::show_warning(const String &p_text, const String &p_title) {
New Navigation & Pathfinding support for 2D -Added Navigation & NavigationPolygon nodes -Added corresponding visual editor -New pathfinding algorithm is modern and fast! -Similar API to 3D Pathfinding (more coherent)
2015-02-14 16:09:52 +01:00
warning->set_text(p_text);
-Made editor support SSL certs by default (embedded them) -Made asset sharing support https -Many fixes to HTTPRequest -Added an asset installer dialog -Visual cleanups to asset sharing tab -Fixed some issues in ScrollContainer, hope it does not break things -Asset sharing tab is not visible (hidden on purpose) for now.
2016-03-12 14:44:12 +01:00
warning->set_title(p_title);
New Navigation & Pathfinding support for 2D -Added Navigation & NavigationPolygon nodes -Added corresponding visual editor -New pathfinding algorithm is modern and fast! -Similar API to 3D Pathfinding (more coherent)
2015-02-14 16:09:52 +01:00
warning->popup_centered_minsize();
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_dock_select_input(const InputEvent &p_input) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_input.type == InputEvent::MOUSE_BUTTON || p_input.type == InputEvent::MOUSE_MOTION) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Vector2 point(p_input.mouse_motion.x, p_input.mouse_motion.y);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
int nrect = -1;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < DOCK_SLOT_MAX; i++) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
if (dock_select_rect[i].has_point(point)) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
nrect = i;
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
break;
}
}
fixes for dock motion
2015-06-14 05:41:08 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (nrect != dock_select_rect_over) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
dock_select->update();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_select_rect_over = nrect;
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (nrect == -1)
fixes for dock motion
2015-06-14 05:41:08 +02:00
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_input.type == InputEvent::MOUSE_BUTTON && p_input.mouse_button.button_index == 1 && p_input.mouse_button.pressed && dock_popup_selected != nrect) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Control *dock = dock_slot[dock_popup_selected]->get_current_tab_control();
if (dock) {
dock_slot[dock_popup_selected]->remove_child(dock);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (dock_slot[dock_popup_selected]->get_tab_count() == 0) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
dock_slot[dock_popup_selected]->hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
} else {
fixed small refresh issue when moving docks
2015-06-14 06:09:58 +02:00
dock_slot[dock_popup_selected]->set_current_tab(0);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
}
fixed small refresh issue when moving docks
2015-06-14 06:09:58 +02:00
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
dock_slot[nrect]->add_child(dock);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_popup_selected = nrect;
dock_slot[nrect]->set_current_tab(dock_slot[nrect]->get_tab_count() - 1);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
dock_slot[nrect]->show();
dock_select->update();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
VSplitContainer *splits[DOCK_SLOT_MAX / 2] = {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
left_l_vsplit,
left_r_vsplit,
right_l_vsplit,
right_r_vsplit,
};
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < 4; i++) {
bool in_use = dock_slot[i * 2 + 0]->get_tab_count() || dock_slot[i * 2 + 1]->get_tab_count();
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
if (in_use)
splits[i]->show();
else
splits[i]->hide();
}
_save_docks();
}
}
}
fixes for dock motion
2015-06-14 05:41:08 +02:00
void EditorNode::_dock_popup_exit() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_select_rect_over = -1;
fixes for dock motion
2015-06-14 05:41:08 +02:00
dock_select->update();
}
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
void EditorNode::_dock_pre_popup(int p_which) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_popup_selected = p_which;
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
}
fixes for dock motion
2015-06-14 05:41:08 +02:00
void EditorNode::_dock_move_left() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (dock_popup_selected < 0 || dock_popup_selected >= DOCK_SLOT_MAX)
fixes for dock motion
2015-06-14 05:41:08 +02:00
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Control *current = dock_slot[dock_popup_selected]->get_tab_control(dock_slot[dock_popup_selected]->get_current_tab());
Control *prev = dock_slot[dock_popup_selected]->get_tab_control(dock_slot[dock_popup_selected]->get_current_tab() - 1);
fixes for dock motion
2015-06-14 05:41:08 +02:00
if (!current || !prev)
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_slot[dock_popup_selected]->move_child(current, prev->get_index());
dock_slot[dock_popup_selected]->set_current_tab(dock_slot[dock_popup_selected]->get_current_tab() - 1);
fixes for dock motion
2015-06-14 05:41:08 +02:00
dock_select->update();
_save_docks();
}
void EditorNode::_dock_move_right() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Control *current = dock_slot[dock_popup_selected]->get_tab_control(dock_slot[dock_popup_selected]->get_current_tab());
Control *next = dock_slot[dock_popup_selected]->get_tab_control(dock_slot[dock_popup_selected]->get_current_tab() + 1);
fixes for dock motion
2015-06-14 05:41:08 +02:00
if (!current || !next)
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_slot[dock_popup_selected]->move_child(next, current->get_index());
dock_slot[dock_popup_selected]->set_current_tab(dock_slot[dock_popup_selected]->get_current_tab() + 1);
fixes for dock motion
2015-06-14 05:41:08 +02:00
dock_select->update();
_save_docks();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_dock_select_draw() {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Size2 s = dock_select->get_size();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
s.y /= 2.0;
s.x /= 6.0;
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Color used = Color(0.6, 0.6, 0.6, 0.8);
Color used_selected = Color(0.8, 0.8, 0.8, 0.8);
Color tab_selected = Color(1, 1, 1, 1);
Color unused = used;
unused.a = 0.4;
Color unusable = unused;
unusable.a = 0.1;
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Rect2 unr(s.x * 2, 0, s.x * 2, s.y * 2);
unr.pos += Vector2(2, 5);
unr.size -= Vector2(4, 7);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_select->draw_rect(unr, unusable);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
dock_tab_move_left->set_disabled(true);
dock_tab_move_right->set_disabled(true);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (dock_popup_selected != -1 && dock_slot[dock_popup_selected]->get_tab_count()) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_tab_move_left->set_disabled(dock_slot[dock_popup_selected]->get_current_tab() == 0);
dock_tab_move_right->set_disabled(dock_slot[dock_popup_selected]->get_current_tab() >= dock_slot[dock_popup_selected]->get_tab_count() - 1);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < DOCK_SLOT_MAX; i++) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Vector2 ofs;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
switch (i) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
case DOCK_SLOT_LEFT_UL: {
} break;
case DOCK_SLOT_LEFT_BL: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ofs.y += s.y;
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
} break;
case DOCK_SLOT_LEFT_UR: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ofs.x += s.x;
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
} break;
case DOCK_SLOT_LEFT_BR: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ofs += s;
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
} break;
case DOCK_SLOT_RIGHT_UL: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ofs.x += s.x * 4;
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
} break;
case DOCK_SLOT_RIGHT_BL: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ofs.x += s.x * 4;
ofs.y += s.y;
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
} break;
case DOCK_SLOT_RIGHT_UR: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ofs.x += s.x * 4;
ofs.x += s.x;
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
} break;
case DOCK_SLOT_RIGHT_BR: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ofs.x += s.x * 4;
ofs += s;
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
} break;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Rect2 r(ofs, s);
dock_select_rect[i] = r;
r.pos += Vector2(2, 5);
r.size -= Vector2(4, 7);
fixes for dock motion
2015-06-14 05:41:08 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (i == dock_select_rect_over) {
dock_select->draw_rect(r, used_selected);
} else if (dock_slot[i]->get_child_count() == 0) {
dock_select->draw_rect(r, unused);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_select->draw_rect(r, used);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int j = 0; j < MIN(3, dock_slot[i]->get_child_count()); j++) {
int xofs = (r.size.width / 3) * j;
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Color c = used;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (i == dock_popup_selected && (dock_slot[i]->get_current_tab() > 3 || dock_slot[i]->get_current_tab() == j))
c = tab_selected;
dock_select->draw_rect(Rect2(2 + ofs.x + xofs, ofs.y, r.size.width / 3 - 1, 3), c);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
}
}
}
void EditorNode::_save_docks() {
Ref<ConfigFile> config;
config.instance();
Editor layouts menu
2015-11-22 19:11:17 +01:00
_save_docks_to_config(config, "docks");
editor_data.get_plugin_window_layout(config);
config->save(EditorSettings::get_singleton()->get_project_settings_path().plus_file("editor_layout.cfg"));
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_save_docks_to_config(Ref<ConfigFile> p_layout, const String &p_section) {
Editor layouts menu
2015-11-22 19:11:17 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < DOCK_SLOT_MAX; i++) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
String names;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int j = 0; j < dock_slot[i]->get_tab_count(); j++) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
String name = dock_slot[i]->get_tab_control(j)->get_name();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (names != "")
names += ",";
names += name;
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (names != "") {
p_layout->set_value(p_section, "dock_" + itos(i + 1), names);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p_layout->set_value(p_section, "dock_filesystem_split", filesystem_dock->get_split_offset());
Include filesystem dock split offset in editor layouts
2017-01-25 02:46:44 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
VSplitContainer *splits[DOCK_SLOT_MAX / 2] = {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
left_l_vsplit,
left_r_vsplit,
right_l_vsplit,
right_r_vsplit,
};
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < DOCK_SLOT_MAX / 2; i++) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
if (splits[i]->is_visible()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p_layout->set_value(p_section, "dock_split_" + itos(i + 1), splits[i]->get_split_offset());
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
HSplitContainer *h_splits[4] = {
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
left_l_hsplit,
left_r_hsplit,
main_hsplit,
right_hsplit,
};
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < 4; i++) {
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p_layout->set_value(p_section, "dock_hsplit_" + itos(i + 1), h_splits[i]->get_split_offset());
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
}
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
}
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
void EditorNode::save_layout() {
dock_drag_timer->start();
}
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
void EditorNode::_dock_split_dragged(int ofs) {
dock_drag_timer->start();
}
void EditorNode::_load_docks() {
Ref<ConfigFile> config;
config.instance();
Error err = config->load(EditorSettings::get_singleton()->get_project_settings_path().plus_file("editor_layout.cfg"));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (err != OK) {
Allow to override the default editor layout
2016-01-11 22:23:45 +01:00
//no config
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (overridden_default_layout >= 0) {
Allow to override the default editor layout
2016-01-11 22:23:45 +01:00
_layout_menu_option(overridden_default_layout);
}
return;
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
}
Editor layouts menu
2015-11-22 19:11:17 +01:00
_load_docks_from_config(config, "docks");
editor_data.set_plugin_window_layout(config);
}
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
void EditorNode::_update_dock_slots_visibility() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
VSplitContainer *splits[DOCK_SLOT_MAX / 2] = {
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
left_l_vsplit,
left_r_vsplit,
right_l_vsplit,
right_r_vsplit,
};
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
HSplitContainer *h_splits[4] = {
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
left_l_hsplit,
left_r_hsplit,
main_hsplit,
right_hsplit,
};
Added fullscreen and distraction free modes
2016-05-30 20:29:43 +02:00
if (!docks_visible) {
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < DOCK_SLOT_MAX; i++) {
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
dock_slot[i]->hide();
Added fullscreen and distraction free modes
2016-05-30 20:29:43 +02:00
}
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < DOCK_SLOT_MAX / 2; i++) {
Added fullscreen and distraction free modes
2016-05-30 20:29:43 +02:00
splits[i]->hide();
}
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
Added fullscreen and distraction free modes
2016-05-30 20:29:43 +02:00
right_hsplit->hide();
bottom_panel->hide();
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < DOCK_SLOT_MAX; i++) {
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
Added fullscreen and distraction free modes
2016-05-30 20:29:43 +02:00
if (dock_slot[i]->get_tab_count())
dock_slot[i]->show();
else
dock_slot[i]->hide();
}
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < DOCK_SLOT_MAX / 2; i++) {
bool in_use = dock_slot[i * 2 + 0]->get_tab_count() || dock_slot[i * 2 + 1]->get_tab_count();
Added fullscreen and distraction free modes
2016-05-30 20:29:43 +02:00
if (in_use)
splits[i]->show();
else
splits[i]->hide();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < DOCK_SLOT_MAX; i++) {
Added fullscreen and distraction free modes
2016-05-30 20:29:43 +02:00
if (!dock_slot[i]->is_hidden() && dock_slot[i]->get_tab_count()) {
dock_slot[i]->set_current_tab(0);
}
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
}
Added fullscreen and distraction free modes
2016-05-30 20:29:43 +02:00
bottom_panel->show();
right_hsplit->show();
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
}
}
Added fullscreen and distraction free modes
2016-05-30 20:29:43 +02:00
void EditorNode::_update_top_menu_visibility() {
if (distraction_free_mode) {
play_cc->hide();
menu_hb->hide();
scene_tabs->hide();
} else {
play_cc->show();
menu_hb->show();
scene_tabs->show();
}
}
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_load_docks_from_config(Ref<ConfigFile> p_layout, const String &p_section) {
Editor layouts menu
2015-11-22 19:11:17 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < DOCK_SLOT_MAX; i++) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (!p_layout->has_section_key(p_section, "dock_" + itos(i + 1)))
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Vector<String> names = String(p_layout->get_value(p_section, "dock_" + itos(i + 1))).split(",");
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int j = 0; j < names.size(); j++) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String name = names[j];
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
//find it, in a horribly inefficient way
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
int atidx = -1;
Control *node = NULL;
for (int k = 0; k < DOCK_SLOT_MAX; k++) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
if (!dock_slot[k]->has_node(name))
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
node = dock_slot[k]->get_node(name)->cast_to<Control>();
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
if (!node)
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
atidx = k;
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
break;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (atidx == -1) //well, it's not anywhere
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (atidx == i) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
node->raise();
continue;
}
dock_slot[atidx]->remove_child(node);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (dock_slot[atidx]->get_tab_count() == 0) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
dock_slot[atidx]->hide();
}
dock_slot[i]->add_child(node);
dock_slot[i]->show();
}
}
Include filesystem dock split offset in editor layouts
2017-01-25 02:46:44 +01:00
int fs_split_ofs = 0;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_layout->has_section_key(p_section, "dock_filesystem_split")) {
fs_split_ofs = p_layout->get_value(p_section, "dock_filesystem_split");
Include filesystem dock split offset in editor layouts
2017-01-25 02:46:44 +01:00
}
filesystem_dock->set_split_offset(fs_split_ofs);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
VSplitContainer *splits[DOCK_SLOT_MAX / 2] = {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
left_l_vsplit,
left_r_vsplit,
right_l_vsplit,
right_r_vsplit,
};
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < DOCK_SLOT_MAX / 2; i++) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (!p_layout->has_section_key(p_section, "dock_split_" + itos(i + 1)))
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
int ofs = p_layout->get_value(p_section, "dock_split_" + itos(i + 1));
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
splits[i]->set_split_offset(ofs);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
HSplitContainer *h_splits[4] = {
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
left_l_hsplit,
left_r_hsplit,
main_hsplit,
right_hsplit,
};
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < 4; i++) {
if (!p_layout->has_section_key(p_section, "dock_hsplit_" + itos(i + 1)))
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
int ofs = p_layout->get_value(p_section, "dock_hsplit_" + itos(i + 1));
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
h_splits[i]->set_split_offset(ofs);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < DOCK_SLOT_MAX / 2; i++) {
bool in_use = dock_slot[i * 2 + 0]->get_tab_count() || dock_slot[i * 2 + 1]->get_tab_count();
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
if (in_use)
splits[i]->show();
else
splits[i]->hide();
}
fixes for dock motion
2015-06-14 05:41:08 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < DOCK_SLOT_MAX; i++) {
fixes for dock motion
2015-06-14 05:41:08 +02:00
if (!dock_slot[i]->is_hidden() && dock_slot[i]->get_tab_count()) {
dock_slot[i]->set_current_tab(0);
}
}
Editor layouts menu
2015-11-22 19:11:17 +01:00
}
fixes for dock motion
2015-06-14 05:41:08 +02:00
Editor layouts menu
2015-11-22 19:11:17 +01:00
void EditorNode::_update_layouts_menu() {
editor_layouts->clear();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
overridden_default_layout = -1;
Allow to override the default editor layout
2016-01-11 22:23:45 +01:00
Editor layouts menu
2015-11-22 19:11:17 +01:00
editor_layouts->set_size(Vector2());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_layouts->add_shortcut(ED_SHORTCUT("layout/save", TTR("Save Layout")), SETTINGS_LAYOUT_SAVE);
editor_layouts->add_shortcut(ED_SHORTCUT("layout/delete", TTR("Delete Layout")), SETTINGS_LAYOUT_DELETE);
Editor layouts menu
2015-11-22 19:11:17 +01:00
editor_layouts->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_layouts->add_shortcut(ED_SHORTCUT("layout/default", TTR("Default")), SETTINGS_LAYOUT_DEFAULT);
Editor layouts menu
2015-11-22 19:11:17 +01:00
Ref<ConfigFile> config;
config.instance();
Error err = config->load(EditorSettings::get_singleton()->get_settings_path().plus_file("editor_layouts.cfg"));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (err != OK) {
Editor layouts menu
2015-11-22 19:11:17 +01:00
return; //no config
}
List<String> layouts;
config.ptr()->get_sections(&layouts);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (List<String>::Element *E = layouts.front(); E; E = E->next()) {
Editor layouts menu
2015-11-22 19:11:17 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
String layout = E->get();
Editor layouts menu
2015-11-22 19:11:17 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (layout == TTR("Default")) {
Allow to override the default editor layout
2016-01-11 22:23:45 +01:00
editor_layouts->remove_item(editor_layouts->get_item_index(SETTINGS_LAYOUT_DEFAULT));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
overridden_default_layout = editor_layouts->get_item_count();
Allow to override the default editor layout
2016-01-11 22:23:45 +01:00
}
editor_layouts->add_item(layout);
Editor layouts menu
2015-11-22 19:11:17 +01:00
}
}
void EditorNode::_layout_menu_option(int p_id) {
switch (p_id) {
case SETTINGS_LAYOUT_SAVE: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = p_id;
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
layout_dialog->set_title(TTR("Save Layout"));
layout_dialog->get_ok()->set_text(TTR("Save"));
Editor layouts menu
2015-11-22 19:11:17 +01:00
layout_dialog->popup_centered();
} break;
case SETTINGS_LAYOUT_DELETE: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current_option = p_id;
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
layout_dialog->set_title(TTR("Delete Layout"));
layout_dialog->get_ok()->set_text(TTR("Delete"));
Editor layouts menu
2015-11-22 19:11:17 +01:00
layout_dialog->popup_centered();
} break;
case SETTINGS_LAYOUT_DEFAULT: {
Allow to override the default editor layout
2016-01-11 22:23:45 +01:00
_load_docks_from_config(default_layout, "docks");
Editor layouts menu
2015-11-22 19:11:17 +01:00
_save_docks();
} break;
default: {
Ref<ConfigFile> config;
config.instance();
Error err = config->load(EditorSettings::get_singleton()->get_settings_path().plus_file("editor_layouts.cfg"));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (err != OK) {
Editor layouts menu
2015-11-22 19:11:17 +01:00
return; //no config
}
Fix editor layouts broken after 9a7ff65
2015-12-14 16:44:15 +01:00
_load_docks_from_config(config, editor_layouts->get_item_text(p_id));
Editor layouts menu
2015-11-22 19:11:17 +01:00
_save_docks();
}
}
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
}
QOL, script buttons in scene tabs
2015-07-26 15:44:10 +02:00
void EditorNode::_scene_tab_script_edited(int p_tab) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Ref<Script> script = editor_data.get_scene_root_script(p_tab);
QOL, script buttons in scene tabs
2015-07-26 15:44:10 +02:00
if (script.is_valid())
edit_resource(script);
}
Added close button to tab. Added 4 display policies for this close button (show always, show never, show active tab only, show hover). Set the scene tabs in editor to follow the hover policy.
2015-08-18 20:27:01 +02:00
void EditorNode::_scene_tab_closed(int p_tab) {
Ask confirmation on closing a scene tab
2015-11-19 14:15:17 +01:00
current_option = SCENE_TAB_CLOSE;
tab_closing = p_tab;
Fix checking unsaved changes only in current scene
2016-05-02 13:40:44 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool unsaved = (p_tab == editor_data.get_edited_scene()) ?
saved_version != editor_data.get_undo_redo().get_version() :
editor_data.get_scene_version(p_tab) != 0;
Fix checking unsaved changes only in current scene
2016-05-02 13:40:44 +02:00
if (unsaved) {
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
confirmation->get_ok()->set_text(TTR("Yes"));
Merge remote-tracking branch 'origin/master'
2016-05-04 03:32:38 +02:00
Ask confirmation on closing a scene tab
2015-11-19 14:15:17 +01:00
//confirmation->get_cancel()->show();
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
confirmation->set_text(TTR("Close scene? (Unsaved changes will be lost)"));
Ask confirmation on closing a scene tab
2015-11-19 14:15:17 +01:00
confirmation->popup_centered_minsize();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
} else {
Ask confirmation on closing a scene tab
2015-11-19 14:15:17 +01:00
_remove_scene(p_tab);
Fixed closing a scene tab when it was not the CURRENT tab. Fixes #3810
2016-02-24 22:07:46 +01:00
_update_scene_tabs();
Ask confirmation on closing a scene tab
2015-11-19 14:15:17 +01:00
}
Added close button to tab. Added 4 display policies for this close button (show always, show never, show active tab only, show hover). Set the scene tabs in editor to follow the hover policy.
2015-08-18 20:27:01 +02:00
}
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
void EditorNode::_scene_tab_changed(int p_tab) {
//print_line("set current 1 ");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool unsaved = (saved_version != editor_data.get_undo_redo().get_version());
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
//print_line("version: "+itos(editor_data.get_undo_redo().get_version())+", saved "+itos(saved_version));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_tab == editor_data.get_edited_scene())
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
return; //pointless
uint64_t next_scene_version = editor_data.get_scene_version(p_tab);
//print_line("scene tab changed???");
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
editor_data.get_undo_redo().create_action(TTR("Switch Scene Tab"));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_data.get_undo_redo().add_do_method(this, "set_current_version", unsaved ? saved_version : 0);
editor_data.get_undo_redo().add_do_method(this, "set_current_scene", p_tab);
-Fixes a bunch of stdout errors, closes #2763 closes #2731
2016-01-23 23:51:51 +01:00
//editor_data.get_undo_redo().add_do_method(scene_tabs,"set_current_tab",p_tab);
//editor_data.get_undo_redo().add_do_method(scene_tabs,"ensure_tab_visible",p_tab);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_data.get_undo_redo().add_do_method(this, "set_current_version", next_scene_version == 0 ? editor_data.get_undo_redo().get_version() + 1 : next_scene_version);
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_data.get_undo_redo().add_undo_method(this, "set_current_version", next_scene_version);
editor_data.get_undo_redo().add_undo_method(this, "set_current_scene", editor_data.get_edited_scene());
-Fixes a bunch of stdout errors, closes #2763 closes #2731
2016-01-23 23:51:51 +01:00
//editor_data.get_undo_redo().add_undo_method(scene_tabs,"set_current_tab",editor_data.get_edited_scene());
//editor_data.get_undo_redo().add_undo_method(scene_tabs,"ensure_tab_visible",p_tab,editor_data.get_edited_scene());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_data.get_undo_redo().add_undo_method(this, "set_current_version", saved_version);
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
editor_data.get_undo_redo().commit_action();
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
}
Import 3D Scene Improvements -=-=-=-=-=-=-=-=-=-=-=-=-=-=- -If re-importing from the "dependency changed" dialog, edited scene will keep the local changes. -Imported scene will keep track of changes in the source asset -Geometry changes in source geometry or nodes with a different transform will be updated. -Materials will be kept if changed locally. -New nodes added will be kept -If nodes were reparented or renamed, they will still keep track -Deleted notes will be restored, use the -noimp option to avoid this. -In general, you can trust that if you do local modifications to the imported scene, they will not be erased after re-import. -Erasing your changes is done by re-importing from the "Re-Import" menu, re-opening the "Import 3D Scene" dialog. This wil re-import fresh. Overall, This should allow you to work on a scene and see changes made to 3D assets in real-time. So Please test!!
2014-06-19 07:23:03 +02:00
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 17:42:15 +01:00
void EditorNode::_toggle_search_bar(bool p_pressed) {
property_editor->set_use_filter(p_pressed);
if (p_pressed) {
search_bar->show();
search_box->grab_focus();
search_box->select_all();
} else {
search_bar->hide();
}
}
void EditorNode::_clear_search_box() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (search_box->get_text() == "")
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 17:42:15 +01:00
return;
search_box->clear();
property_editor->update_tree();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ToolButton *EditorNode::add_bottom_panel_item(String p_text, Control *p_item) {
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ToolButton *tb = memnew(ToolButton);
tb->connect("toggled", this, "_bottom_panel_switch", varray(bottom_panel_items.size()));
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
tb->set_text(p_text);
tb->set_toggle_mode(true);
tb->set_focus_mode(Control::FOCUS_NONE);
bottom_panel_vb->add_child(p_item);
bottom_panel_hb->raise();
bottom_panel_hb->add_child(tb);
p_item->set_v_size_flags(Control::SIZE_EXPAND_FILL);
p_item->hide();
BottomPanelItem bpi;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bpi.button = tb;
bpi.control = p_item;
bpi.name = p_text;
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
bottom_panel_items.push_back(bpi);
return tb;
}
Fix Output panel annoying focus steal
2016-01-24 16:26:03 +01:00
bool EditorNode::are_bottom_panels_hidden() const {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < bottom_panel_items.size(); i++) {
Fix Output panel annoying focus steal
2016-01-24 16:26:03 +01:00
if (bottom_panel_items[i].button->is_pressed())
return false;
}
return true;
}
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
void EditorNode::hide_bottom_panel() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_bottom_panel_switch(false, 0);
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
}
void EditorNode::make_bottom_panel_item_visible(Control *p_item) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < bottom_panel_items.size(); i++) {
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (bottom_panel_items[i].control == p_item) {
_bottom_panel_switch(true, i);
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
break;
}
}
}
void EditorNode::raise_bottom_panel_item(Control *p_item) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < bottom_panel_items.size(); i++) {
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (bottom_panel_items[i].control == p_item) {
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
bottom_panel_items[i].button->raise();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
SWAP(bottom_panel_items[i], bottom_panel_items[bottom_panel_items.size() - 1]);
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
break;
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < bottom_panel_items.size(); i++) {
bottom_panel_items[i].button->disconnect("toggled", this, "_bottom_panel_switch");
bottom_panel_items[i].button->connect("toggled", this, "_bottom_panel_switch", varray(i));
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
}
}
Adds EditorPlugin::remove_control_from_bottom_panel() Also renames `add_control_to_bottom_dock` to `add_control_to_bottom_panel` so that it would be clear that the removal functions are different too.
2016-02-28 20:58:17 +01:00
void EditorNode::remove_bottom_panel_item(Control *p_item) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < bottom_panel_items.size(); i++) {
Adds EditorPlugin::remove_control_from_bottom_panel() Also renames `add_control_to_bottom_dock` to `add_control_to_bottom_panel` so that it would be clear that the removal functions are different too.
2016-02-28 20:58:17 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (bottom_panel_items[i].control == p_item) {
Adds EditorPlugin::remove_control_from_bottom_panel() Also renames `add_control_to_bottom_dock` to `add_control_to_bottom_panel` so that it would be clear that the removal functions are different too.
2016-02-28 20:58:17 +01:00
if (p_item->is_visible()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_bottom_panel_switch(false, 0);
Adds EditorPlugin::remove_control_from_bottom_panel() Also renames `add_control_to_bottom_dock` to `add_control_to_bottom_panel` so that it would be clear that the removal functions are different too.
2016-02-28 20:58:17 +01:00
}
bottom_panel_vb->remove_child(bottom_panel_items[i].control);
bottom_panel_hb->remove_child(bottom_panel_items[i].button);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
memdelete(bottom_panel_items[i].button);
Adds EditorPlugin::remove_control_from_bottom_panel() Also renames `add_control_to_bottom_dock` to `add_control_to_bottom_panel` so that it would be clear that the removal functions are different too.
2016-02-28 20:58:17 +01:00
bottom_panel_items.remove(i);
break;
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < bottom_panel_items.size(); i++) {
bottom_panel_items[i].button->disconnect("toggled", this, "_bottom_panel_switch");
bottom_panel_items[i].button->connect("toggled", this, "_bottom_panel_switch", varray(i));
Adds EditorPlugin::remove_control_from_bottom_panel() Also renames `add_control_to_bottom_dock` to `add_control_to_bottom_panel` so that it would be clear that the removal functions are different too.
2016-02-28 20:58:17 +01:00
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_bottom_panel_switch(bool p_enable, int p_idx) {
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ERR_FAIL_INDEX(p_idx, bottom_panel_items.size());
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
if (p_enable) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < bottom_panel_items.size(); i++) {
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bottom_panel_items[i].button->set_pressed(i == p_idx);
bottom_panel_items[i].control->set_hidden(i != p_idx);
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
}
center_split->set_dragger_visibility(SplitContainer::DRAGGER_VISIBLE);
center_split->set_collapsed(false);
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < bottom_panel_items.size(); i++) {
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
bottom_panel_items[i].button->set_pressed(false);
bottom_panel_items[i].control->set_hidden(true);
}
center_split->set_dragger_visibility(SplitContainer::DRAGGER_HIDDEN);
center_split->set_collapsed(true);
}
}
Added fullscreen and distraction free modes
2016-05-30 20:29:43 +02:00
void EditorNode::set_docks_visible(bool p_show) {
docks_visible = p_show;
_update_dock_slots_visibility();
}
bool EditorNode::get_docks_visible() const {
return docks_visible;
}
void EditorNode::set_distraction_free_mode(bool p_enter) {
distraction_free_mode = p_enter;
if (p_enter) {
if (docks_visible) {
set_docks_visible(false);
}
} else {
set_docks_visible(true);
}
_update_top_menu_visibility();
}
bool EditorNode::get_distraction_free_mode() const {
return distraction_free_mode;
}
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::add_control_to_dock(DockSlot p_slot, Control *p_control) {
ERR_FAIL_INDEX(p_slot, DOCK_SLOT_MAX);
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
dock_slot[p_slot]->add_child(p_control);
_update_dock_slots_visibility();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::remove_control_from_dock(Control *p_control) {
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Control *dock = NULL;
for (int i = 0; i < DOCK_SLOT_MAX; i++) {
if (p_control->get_parent() == dock_slot[i]) {
dock = dock_slot[i];
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
break;
}
}
ERR_EXPLAIN("Control was not in dock");
ERR_FAIL_COND(!dock);
dock->remove_child(p_control);
_update_dock_slots_visibility();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Variant EditorNode::drag_resource(const Ref<Resource> &p_res, Control *p_from) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Control *drag_control = memnew(Control);
TextureFrame *drag_preview = memnew(TextureFrame);
Label *label = memnew(Label);
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
waiting_for_sources_changed = true; //
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
Ref<Texture> preview;
{
//todo make proper previews
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Ref<ImageTexture> pic = gui_base->get_icon("FileBig", "EditorIcons");
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
Image img = pic->get_data();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
img.resize(48, 48); //meh
Ref<ImageTexture> resized_pic = Ref<ImageTexture>(memnew(ImageTexture));
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
resized_pic->create_from_image(img);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
preview = resized_pic;
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
}
drag_preview->set_texture(preview);
drag_control->add_child(drag_preview);
if (p_res->get_path().is_resource_file()) {
label->set_text(p_res->get_path().get_file());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
} else if (p_res->get_name() != "") {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
label->set_text(p_res->get_name());
} else {
label->set_text(p_res->get_type());
}
drag_control->add_child(label);
p_from->set_drag_preview(drag_control); //wait until it enters scene
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
label->set_pos(Point2((preview->get_width() - label->get_minimum_size().width) / 2, preview->get_height()));
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
Dictionary drag_data;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
drag_data["type"] = "resource";
drag_data["resource"] = p_res;
drag_data["from"] = p_from;
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
return drag_data;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Variant EditorNode::drag_files(const Vector<String> &p_files, Control *p_from) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
VBoxContainer *files = memnew(VBoxContainer);
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
int max_files = 6;
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < MIN(max_files, p_files.size()); i++) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Label *label = memnew(Label);
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
label->set_text(p_files[i].get_file());
files->add_child(label);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_files.size() > max_files) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Label *label = memnew(Label);
label->set_text(vformat(TTR("%d more file(s)"), p_files.size() - max_files));
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
files->add_child(label);
}
Dictionary drag_data;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
drag_data["type"] = "files";
drag_data["files"] = p_files;
drag_data["from"] = p_from;
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
p_from->set_drag_preview(files); //wait until it enters scene
return drag_data;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Variant EditorNode::drag_files_and_dirs(const Vector<String> &p_files, Control *p_from) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
VBoxContainer *files = memnew(VBoxContainer);
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
int max_files = 6;
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < MIN(max_files, p_files.size()); i++) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Label *label = memnew(Label);
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
label->set_text(p_files[i].get_file());
files->add_child(label);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (p_files.size() > max_files) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Label *label = memnew(Label);
label->set_text(vformat(TTR("%d more file(s) or folder(s)"), p_files.size() - max_files));
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
files->add_child(label);
}
Dictionary drag_data;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
drag_data["type"] = "files_and_dirs";
drag_data["files"] = p_files;
drag_data["from"] = p_from;
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 16:46:08 +02:00
p_from->set_drag_preview(files); //wait until it enters scene
return drag_data;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_dropped_files(const Vector<String> &p_files, int p_screen) {
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 19:18:40 +02:00
Remove Quick Filter Files and fix FS search hotkey The new Quick Filter Files behaviour since 8b47e26 had not been implemented, so this implements it and makes it an editor hotkey instead of a menu entry. Fixes #7582. (cherry picked from commit c4d6e54e93431e94888c5594386bcd0aa22528ee)
2017-01-21 13:07:29 +01:00
String cur_path = filesystem_dock->get_current_path();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < EditorImportExport::get_singleton()->get_import_plugin_count(); i++) {
EditorImportExport::get_singleton()->get_import_plugin(i)->import_from_drop(p_files, cur_path);
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 19:18:40 +02:00
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_file_access_close_error_notify(const String &p_str) {
-Add visible IO errors when closing a file fails due to it being locked (most likely on windows), closes #4760
2016-06-13 15:10:50 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
add_io_error("Unable to write to file '" + p_str + "', file in use, locked or lacking permissions.");
-Add visible IO errors when closing a file fails due to it being locked (most likely on windows), closes #4760
2016-06-13 15:10:50 +02:00
}
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 19:18:40 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::reload_scene(const String &p_path) {
Editor properly reloads scenes if they changed on disk or were reimported
2016-06-28 23:53:31 +02:00
//first of all, reload textures as they might have changed on disk
List<Ref<Resource> > cached;
ResourceCache::get_cached_resources(&cached);
List<Ref<Resource> > to_clear; //clear internal resources from previous scene from being used
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (List<Ref<Resource> >::Element *E = cached.front(); E; E = E->next()) {
Editor properly reloads scenes if they changed on disk or were reimported
2016-06-28 23:53:31 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (E->get()->get_path().begins_with(p_path + "::")) //subresources of existing scene
Editor properly reloads scenes if they changed on disk or were reimported
2016-06-28 23:53:31 +02:00
to_clear.push_back(E->get());
if (!E->get()->cast_to<Texture>())
continue;
if (!E->get()->get_path().is_resource_file() && !E->get()->get_path().is_abs_path())
continue;
if (!FileAccess::exists(E->get()->get_path()))
continue;
uint64_t mt = FileAccess::get_modified_time(E->get()->get_path());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (mt != E->get()->get_last_modified_time()) {
Editor properly reloads scenes if they changed on disk or were reimported
2016-06-28 23:53:31 +02:00
E->get()->reload_from_file();
}
}
//so reload reloads everything, clear subresources of previous scene
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
while (to_clear.front()) {
Editor properly reloads scenes if they changed on disk or were reimported
2016-06-28 23:53:31 +02:00
to_clear.front()->get()->set_path("");
to_clear.pop_front();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
int scene_idx = -1;
for (int i = 0; i < editor_data.get_edited_scene_count(); i++) {
Editor properly reloads scenes if they changed on disk or were reimported
2016-06-28 23:53:31 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (editor_data.get_scene_path(i) == p_path) {
scene_idx = i;
Editor properly reloads scenes if they changed on disk or were reimported
2016-06-28 23:53:31 +02:00
break;
}
}
int current_tab = editor_data.get_edited_scene();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (scene_idx == -1) {
Editor properly reloads scenes if they changed on disk or were reimported
2016-06-28 23:53:31 +02:00
if (get_edited_scene()) {
//scene is not open, so at it might be instanced, just refresh, set tab to itself and it will reload
set_current_scene(current_tab);
editor_data.get_undo_redo().clear_history();
}
return;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (current_tab == scene_idx) {
Editor properly reloads scenes if they changed on disk or were reimported
2016-06-28 23:53:31 +02:00
editor_data.apply_changes_in_editors();
_set_scene_metadata(p_path);
}
//remove scene
_remove_scene(scene_idx);
//reload scene
load_scene(p_path);
//adjust index so tab is back a the previous position
editor_data.move_edited_scene_to_index(scene_idx);
get_undo_redo()->clear_history();
//recover the tab
scene_tabs->set_current_tab(current_tab);
_scene_tab_changed(current_tab);
}
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
void EditorNode::_bind_methods() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ObjectTypeDB::bind_method("_menu_option", &EditorNode::_menu_option);
ObjectTypeDB::bind_method("_menu_confirm_current", &EditorNode::_menu_confirm_current);
ObjectTypeDB::bind_method("_dialog_action", &EditorNode::_dialog_action);
ObjectTypeDB::bind_method("_resource_selected", &EditorNode::_resource_selected, DEFVAL(""));
ObjectTypeDB::bind_method("_property_editor_forward", &EditorNode::_property_editor_forward);
ObjectTypeDB::bind_method("_property_editor_back", &EditorNode::_property_editor_back);
ObjectTypeDB::bind_method("_editor_select", &EditorNode::_editor_select);
ObjectTypeDB::bind_method("_node_renamed", &EditorNode::_node_renamed);
ObjectTypeDB::bind_method("edit_node", &EditorNode::edit_node);
ObjectTypeDB::bind_method("_imported", &EditorNode::_imported);
ObjectTypeDB::bind_method("_unhandled_input", &EditorNode::_unhandled_input);
ObjectTypeDB::bind_method("_get_scene_metadata", &EditorNode::_get_scene_metadata);
ObjectTypeDB::bind_method("set_edited_scene", &EditorNode::set_edited_scene);
ObjectTypeDB::bind_method("open_request", &EditorNode::open_request);
ObjectTypeDB::bind_method("_instance_request", &EditorNode::_instance_request);
ObjectTypeDB::bind_method("update_keying", &EditorNode::update_keying);
ObjectTypeDB::bind_method("_property_keyed", &EditorNode::_property_keyed);
ObjectTypeDB::bind_method("_transform_keyed", &EditorNode::_transform_keyed);
ObjectTypeDB::bind_method("_close_messages", &EditorNode::_close_messages);
ObjectTypeDB::bind_method("_show_messages", &EditorNode::_show_messages);
ObjectTypeDB::bind_method("_vp_resized", &EditorNode::_vp_resized);
ObjectTypeDB::bind_method("_quick_opened", &EditorNode::_quick_opened);
ObjectTypeDB::bind_method("_quick_run", &EditorNode::_quick_run);
ObjectTypeDB::bind_method("_resource_created", &EditorNode::_resource_created);
ObjectTypeDB::bind_method("_import_action", &EditorNode::_import_action);
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
//ObjectTypeDB::bind_method("_import",&EditorNode::_import);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// ObjectTypeDB::bind_method("_import_conflicts_solved",&EditorNode::_import_conflicts_solved);
ObjectTypeDB::bind_method("_open_recent_scene", &EditorNode::_open_recent_scene);
// ObjectTypeDB::bind_method("_open_recent_scene_confirm",&EditorNode::_open_recent_scene_confirm);
ObjectTypeDB::bind_method("_save_optimized", &EditorNode::_save_optimized);
ObjectTypeDB::bind_method("stop_child_process", &EditorNode::stop_child_process);
ObjectTypeDB::bind_method("_sources_changed", &EditorNode::_sources_changed);
ObjectTypeDB::bind_method("_fs_changed", &EditorNode::_fs_changed);
ObjectTypeDB::bind_method("_dock_select_draw", &EditorNode::_dock_select_draw);
ObjectTypeDB::bind_method("_dock_select_input", &EditorNode::_dock_select_input);
ObjectTypeDB::bind_method("_dock_pre_popup", &EditorNode::_dock_pre_popup);
ObjectTypeDB::bind_method("_dock_split_dragged", &EditorNode::_dock_split_dragged);
ObjectTypeDB::bind_method("_save_docks", &EditorNode::_save_docks);
ObjectTypeDB::bind_method("_dock_popup_exit", &EditorNode::_dock_popup_exit);
ObjectTypeDB::bind_method("_dock_move_left", &EditorNode::_dock_move_left);
ObjectTypeDB::bind_method("_dock_move_right", &EditorNode::_dock_move_right);
ObjectTypeDB::bind_method("_layout_menu_option", &EditorNode::_layout_menu_option);
ObjectTypeDB::bind_method("set_current_scene", &EditorNode::set_current_scene);
ObjectTypeDB::bind_method("set_current_version", &EditorNode::set_current_version);
ObjectTypeDB::bind_method("_scene_tab_changed", &EditorNode::_scene_tab_changed);
ObjectTypeDB::bind_method("_scene_tab_closed", &EditorNode::_scene_tab_closed);
ObjectTypeDB::bind_method("_scene_tab_script_edited", &EditorNode::_scene_tab_script_edited);
ObjectTypeDB::bind_method("_set_main_scene_state", &EditorNode::_set_main_scene_state);
ObjectTypeDB::bind_method("_update_scene_tabs", &EditorNode::_update_scene_tabs);
ObjectTypeDB::bind_method("_prepare_history", &EditorNode::_prepare_history);
ObjectTypeDB::bind_method("_select_history", &EditorNode::_select_history);
ObjectTypeDB::bind_method("_toggle_search_bar", &EditorNode::_toggle_search_bar);
ObjectTypeDB::bind_method("_clear_search_box", &EditorNode::_clear_search_box);
ObjectTypeDB::bind_method("_clear_undo_history", &EditorNode::_clear_undo_history);
ObjectTypeDB::bind_method("_dropped_files", &EditorNode::_dropped_files);
ObjectTypeDB::bind_method("_export_godot3_path", &EditorNode::_export_godot3_path);
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
ObjectTypeDB::bind_method(_MD("add_editor_import_plugin", "plugin"), &EditorNode::add_editor_import_plugin);
ObjectTypeDB::bind_method(_MD("remove_editor_import_plugin", "plugin"), &EditorNode::remove_editor_import_plugin);
ObjectTypeDB::bind_method(_MD("get_gui_base"), &EditorNode::get_gui_base);
ObjectTypeDB::bind_method(_MD("_bottom_panel_switch"), &EditorNode::_bottom_panel_switch);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ADD_SIGNAL(MethodInfo("play_pressed"));
ADD_SIGNAL(MethodInfo("pause_pressed"));
ADD_SIGNAL(MethodInfo("stop_pressed"));
ADD_SIGNAL(MethodInfo("request_help"));
ADD_SIGNAL(MethodInfo("script_add_function_request", PropertyInfo(Variant::OBJECT, "obj"), PropertyInfo(Variant::STRING, "function"), PropertyInfo(Variant::STRING_ARRAY, "args")));
ADD_SIGNAL(MethodInfo("resource_saved", PropertyInfo(Variant::OBJECT, "obj")));
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorNode::_export_godot3_path(const String &p_path) {
-WIP Exporter to Godot 3.0, only text scenes (no .scn) and still kind of buggy
2017-02-13 02:52:02 +01:00
Error err = export_godot3.export_godot3(p_path);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (err != OK) {
-WIP Exporter to Godot 3.0, only text scenes (no .scn) and still kind of buggy
2017-02-13 02:52:02 +01:00
show_warning("Error exporting to Godot 3.0");
}
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
EditorNode::EditorNode() {
-project settings are saved when changed -load() was in the GDScript docs but missing in the scripting-different music for platformer 2D and 3D -fix how documentation is generated, built in doc browser should be always up to date -copypaste, scrolling, etc in builtin doc -built-in scripts get saved now (though debugger may not always work on them) -Theme can be set to controls as a property
2014-02-16 01:16:33 +01:00
EditorHelp::generate_doc(); //before any editor classes are crated
-fixes and more fixes to new scene system, seems stable now.. BUT DONT TRUST ME IT MAY STILL BREAK, USE WITH CARE!!
2015-10-17 00:11:23 +02:00
SceneState::set_disable_placeholders(true);
-Made editor support SSL certs by default (embedded them) -Made asset sharing support https -Many fixes to HTTPRequest -Added an asset installer dialog -Visual cleanups to asset sharing tab -Fixed some issues in ScrollContainer, hope it does not break things -Asset sharing tab is not visible (hidden on purpose) for now.
2016-03-12 14:44:12 +01:00
editor_initialize_certificates(); //for asset sharing
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Added ability to set custom mouse cursors. Not hardware accelerated yet.
2015-09-24 23:06:15 +02:00
InputDefault *id = Input::get_singleton()->cast_to<InputDefault>();
if (id) {
if (!OS::get_singleton()->has_touchscreen_ui_hint() && Input::get_singleton()) {
//only if no touchscreen ui hint, set emulation
-display/emulate_touchscreen now really emulates a touchscreen -icons to show node menus
2015-08-29 22:16:11 +02:00
id->set_emulate_touch(false); //just disable just in case
Added ability to set custom mouse cursors. Not hardware accelerated yet.
2015-09-24 23:06:15 +02:00
}
id->set_custom_mouse_cursor(RES());
-display/emulate_touchscreen now really emulates a touchscreen -icons to show node menus
2015-08-29 22:16:11 +02:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
singleton = this;
exiting = false;
last_checked_version = 0;
changing_scene = false;
_initializing_addons = false;
Added fullscreen and distraction free modes
2016-05-30 20:29:43 +02:00
docks_visible = true;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
distraction_free_mode = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
FileAccess::set_backup_save(true);
Style: Various fixes to play nice with clang-format (cherry picked from commit 2a0ddc1e89ec7b947152c8d0cb132d58f2c00a81)
2017-01-15 22:15:47 +01:00
PathRemap::get_singleton()->clear_remaps(); //editor uses no remaps
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
TranslationServer::get_singleton()->set_enabled(false);
// load settings
if (!EditorSettings::get_singleton())
EditorSettings::create();
make hdpi manually configurable in project settings also added hidpi support to project manager
2016-06-05 23:43:45 +02:00
{
HiDPI: Use global/hidpi_mode as property
2016-06-06 07:37:58 +02:00
int dpi_mode = EditorSettings::get_singleton()->get("global/hidpi_mode");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (dpi_mode == 0) {
editor_set_hidpi(OS::get_singleton()->get_screen_dpi(0) > 150);
} else if (dpi_mode == 2) {
make hdpi manually configurable in project settings also added hidpi support to project manager
2016-06-05 23:43:45 +02:00
editor_set_hidpi(true);
} else {
editor_set_hidpi(false);
}
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
ResourceLoader::set_abort_on_missing_resources(false);
crash bug solved, fixes #1560
2015-03-23 17:44:03 +01:00
FileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("file_dialog/show_hidden_files"));
Better hidden folders display preferences for editor file dialogs
2015-12-06 23:35:31 +01:00
EditorFileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("file_dialog/show_hidden_files"));
Add editor setting for display mode on file dialog and filesystem dock
2015-12-15 17:39:13 +01:00
EditorFileDialog::set_default_display_mode((EditorFileDialog::DisplayMode)EditorSettings::get_singleton()->get("file_dialog/display_mode").operator int());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ResourceLoader::set_error_notify_func(this, _load_error_notify);
ResourceLoader::set_dependency_error_notify_func(this, _dependency_error_report);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
ResourceLoader::set_timestamp_on_load(true);
ResourceSaver::set_timestamp_on_save(true);
_pvrtc_register_compressors();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_selection = memnew(EditorSelection);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
EditorFileSystem *efs = memnew(EditorFileSystem);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
add_child(efs);
//used for previews
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
FileDialog::get_icon_func = _file_dialog_get_icon;
FileDialog::register_func = _file_dialog_register;
FileDialog::unregister_func = _file_dialog_unregister;
work in progress, resource previews
2015-05-31 06:59:42 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
EditorFileDialog::get_icon_func = _file_dialog_get_icon;
EditorFileDialog::register_func = _editor_file_dialog_register;
EditorFileDialog::unregister_func = _editor_file_dialog_unregister;
work in progress, resource previews
2015-05-31 06:59:42 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_import_export = memnew(EditorImportExport);
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-21 00:38:02 +02:00
add_child(editor_import_export);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
register_exporters();
editor_import_export->load_config();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
GLOBAL_DEF("editor/main_run_args", "$scene");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ObjectTypeDB::set_type_enabled("CollisionShape", true);
ObjectTypeDB::set_type_enabled("CollisionShape2D", true);
ObjectTypeDB::set_type_enabled("CollisionPolygon2D", true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Control *theme_base = memnew(Control);
-added missing .inc files -Made it possible to change the editor theme -Added two options to theme editor plugin to create empty template themes and editor themes -Make sure that saved themes to .tres keep the null theme fields, to make it easier to keep those when saving/loading the theme
2016-06-17 06:13:23 +02:00
add_child(theme_base);
theme_base->set_area_as_parent_rect();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
gui_base = memnew(Panel);
-added missing .inc files -Made it possible to change the editor theme -Added two options to theme editor plugin to create empty template themes and editor themes -Make sure that saved themes to .tres keep the null theme fields, to make it easier to keep those when saving/loading the theme
2016-06-17 06:13:23 +02:00
theme_base->add_child(gui_base);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
gui_base->set_area_as_parent_rect();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
theme_base->set_theme(create_default_theme());
Clean up editor theme creation
2016-06-18 07:32:03 +02:00
theme = create_editor_theme();
gui_base->set_theme(theme);
-added missing .inc files -Made it possible to change the editor theme -Added two options to theme editor plugin to create empty template themes and editor themes -Make sure that saved themes to .tres keep the null theme fields, to make it easier to keep those when saving/loading the theme
2016-06-17 06:13:23 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
resource_preview = memnew(EditorResourcePreview);
work in progress, resource previews
2015-05-31 06:59:42 +02:00
add_child(resource_preview);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
progress_dialog = memnew(ProgressDialog);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
gui_base->add_child(progress_dialog);
// take up all screen
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
gui_base->set_anchor(MARGIN_RIGHT, Control::ANCHOR_END);
gui_base->set_anchor(MARGIN_BOTTOM, Control::ANCHOR_END);
gui_base->set_end(Point2(0, 0));
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
main_vbox = memnew(VBoxContainer);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
gui_base->add_child(main_vbox);
main_vbox->set_area_as_parent_rect(8);
-fixed tabs
2015-11-18 08:47:41 +01:00
#if 0
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
PanelContainer *top_dark_panel = memnew( PanelContainer );
Ref<StyleBoxTexture> top_dark_sb;
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
top_dark_sb.instance();
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
top_dark_sb->set_texture(theme->get_icon("PanelTop","EditorIcons"));
for(int i=0;i<4;i++) {
top_dark_sb->set_margin_size(Margin(i),3);
top_dark_sb->set_default_margin(Margin(i),0);
}
top_dark_sb->set_expand_margin_size(MARGIN_LEFT,20);
top_dark_sb->set_expand_margin_size(MARGIN_RIGHT,20);
top_dark_panel->add_style_override("panel",top_dark_sb);
VBoxContainer *top_dark_vb = memnew( VBoxContainer );
main_vbox->add_child(top_dark_panel);
top_dark_panel->add_child(top_dark_vb);
-fixed tabs
2015-11-18 08:47:41 +01:00
#endif
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
menu_hb = memnew(HBoxContainer);
-fixed tabs
2015-11-18 08:47:41 +01:00
main_vbox->add_child(menu_hb);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// top_dark_vb->add_child(scene_tabs);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
//left
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
left_l_hsplit = memnew(HSplitContainer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
main_vbox->add_child(left_l_hsplit);
left_l_hsplit->set_v_size_flags(Control::SIZE_EXPAND_FILL);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
left_l_vsplit = memnew(VSplitContainer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
left_l_hsplit->add_child(left_l_vsplit);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_slot[DOCK_SLOT_LEFT_UL] = memnew(TabContainer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
left_l_vsplit->add_child(dock_slot[DOCK_SLOT_LEFT_UL]);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_slot[DOCK_SLOT_LEFT_BL] = memnew(TabContainer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
left_l_vsplit->add_child(dock_slot[DOCK_SLOT_LEFT_BL]);
left_l_vsplit->hide();
dock_slot[DOCK_SLOT_LEFT_UL]->hide();
dock_slot[DOCK_SLOT_LEFT_BL]->hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
left_r_hsplit = memnew(HSplitContainer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
left_l_hsplit->add_child(left_r_hsplit);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
left_r_vsplit = memnew(VSplitContainer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
left_r_hsplit->add_child(left_r_vsplit);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_slot[DOCK_SLOT_LEFT_UR] = memnew(TabContainer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
left_r_vsplit->add_child(dock_slot[DOCK_SLOT_LEFT_UR]);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_slot[DOCK_SLOT_LEFT_BR] = memnew(TabContainer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
left_r_vsplit->add_child(dock_slot[DOCK_SLOT_LEFT_BR]);
//left_r_vsplit->hide();
//dock_slot[DOCK_SLOT_LEFT_UR]->hide();
//dock_slot[DOCK_SLOT_LEFT_BR]->hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
main_hsplit = memnew(HSplitContainer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
left_r_hsplit->add_child(main_hsplit);
//main_split->set_v_size_flags(Control::SIZE_EXPAND_FILL);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
VBoxContainer *center_vb = memnew(VBoxContainer);
-fixed tabs
2015-11-18 08:47:41 +01:00
main_hsplit->add_child(center_vb);
center_vb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
center_split = memnew(VSplitContainer);
-fixed tabs
2015-11-18 08:47:41 +01:00
//main_hsplit->add_child(center_split);
center_split->set_v_size_flags(Control::SIZE_EXPAND_FILL);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
center_split->set_collapsed(false);
-fixed tabs
2015-11-18 08:47:41 +01:00
center_vb->add_child(center_split);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
right_hsplit = memnew(HSplitContainer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
main_hsplit->add_child(right_hsplit);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
right_l_vsplit = memnew(VSplitContainer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
right_hsplit->add_child(right_l_vsplit);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_slot[DOCK_SLOT_RIGHT_UL] = memnew(TabContainer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
right_l_vsplit->add_child(dock_slot[DOCK_SLOT_RIGHT_UL]);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_slot[DOCK_SLOT_RIGHT_BL] = memnew(TabContainer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
right_l_vsplit->add_child(dock_slot[DOCK_SLOT_RIGHT_BL]);
Hide right_r dock slots by default
2015-08-09 21:59:13 +02:00
//right_l_vsplit->hide();
//dock_slot[DOCK_SLOT_RIGHT_UL]->hide();
//dock_slot[DOCK_SLOT_RIGHT_BL]->hide();
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
right_r_vsplit = memnew(VSplitContainer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
right_hsplit->add_child(right_r_vsplit);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_slot[DOCK_SLOT_RIGHT_UR] = memnew(TabContainer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
right_r_vsplit->add_child(dock_slot[DOCK_SLOT_RIGHT_UR]);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_slot[DOCK_SLOT_RIGHT_BR] = memnew(TabContainer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
right_r_vsplit->add_child(dock_slot[DOCK_SLOT_RIGHT_BR]);
right_r_vsplit->hide();
Hide right_r dock slots by default
2015-08-09 21:59:13 +02:00
dock_slot[DOCK_SLOT_RIGHT_UR]->hide();
dock_slot[DOCK_SLOT_RIGHT_BR]->hide();
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
left_l_vsplit->connect("dragged", this, "_dock_split_dragged");
left_r_vsplit->connect("dragged", this, "_dock_split_dragged");
right_l_vsplit->connect("dragged", this, "_dock_split_dragged");
right_r_vsplit->connect("dragged", this, "_dock_split_dragged");
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
left_l_hsplit->connect("dragged", this, "_dock_split_dragged");
left_r_hsplit->connect("dragged", this, "_dock_split_dragged");
main_hsplit->connect("dragged", this, "_dock_split_dragged");
right_hsplit->connect("dragged", this, "_dock_split_dragged");
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_select_popoup = memnew(PopupPanel);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
gui_base->add_child(dock_select_popoup);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
VBoxContainer *dock_vb = memnew(VBoxContainer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
dock_select_popoup->add_child(dock_vb);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
HBoxContainer *dock_hb = memnew(HBoxContainer);
dock_tab_move_left = memnew(ToolButton);
dock_tab_move_left->set_icon(theme->get_icon("Back", "EditorIcons"));
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
dock_tab_move_left->set_focus_mode(Control::FOCUS_NONE);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_tab_move_left->connect("pressed", this, "_dock_move_left");
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
//dock_tab_move_left->set_h_size_flags(Control::SIZE_EXPAND_FILL);
dock_hb->add_child(dock_tab_move_left);
dock_hb->add_spacer();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_tab_move_right = memnew(ToolButton);
dock_tab_move_right->set_icon(theme->get_icon("Forward", "EditorIcons"));
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
dock_tab_move_right->set_focus_mode(Control::FOCUS_NONE);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_tab_move_right->connect("pressed", this, "_dock_move_right");
fixes for dock motion
2015-06-14 05:41:08 +02:00
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
//dock_tab_move_right->set_h_size_flags(Control::SIZE_EXPAND_FILL);
dock_hb->add_child(dock_tab_move_right);
dock_vb->add_child(dock_hb);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_select = memnew(Control);
dock_select->set_custom_minimum_size(Size2(128, 64) * EDSCALE);
dock_select->connect("input_event", this, "_dock_select_input");
dock_select->connect("draw", this, "_dock_select_draw");
dock_select->connect("mouse_exit", this, "_dock_popup_exit");
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
dock_select->set_v_size_flags(Control::SIZE_EXPAND_FILL);
dock_vb->add_child(dock_select);
dock_select_popoup->set_child_rect(dock_vb);
dock_select_popoup->set_as_minsize();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_select_rect_over = -1;
dock_popup_selected = -1;
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
//dock_select_popoup->set_(Size2(20,20));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < DOCK_SLOT_MAX; i++) {
dock_slot[i]->set_custom_minimum_size(Size2(230, 220) * EDSCALE);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
dock_slot[i]->set_v_size_flags(Control::SIZE_EXPAND_FILL);
dock_slot[i]->set_popup(dock_select_popoup);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_slot[i]->connect("pre_popup_pressed", this, "_dock_pre_popup", varray(i));
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
//dock_slot[i]->set_tab_align(TabContainer::ALIGN_LEFT);
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_drag_timer = memnew(Timer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
add_child(dock_drag_timer);
dock_drag_timer->set_wait_time(0.5);
dock_drag_timer->set_one_shot(true);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dock_drag_timer->connect("timeout", this, "_save_docks");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
top_split = memnew(VSplitContainer);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
center_split->add_child(top_split);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
top_split->set_v_size_flags(Control::SIZE_EXPAND_FILL);
top_split->set_collapsed(true);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
VBoxContainer *srt = memnew(VBoxContainer);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
srt->set_v_size_flags(Control::SIZE_EXPAND_FILL);
top_split->add_child(srt);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
srt->add_constant_override("separation", 0);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
/* main_editor_tabs = memnew( Tabs );
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
main_editor_tabs->connect("tab_changed",this,"_editor_select");
Added close button to tab. Added 4 display policies for this close button (show always, show never, show active tab only, show hover). Set the scene tabs in editor to follow the hover policy.
2015-08-18 20:27:01 +02:00
main_editor_tabs->set_tab_close_display_policy(Tabs::SHOW_NEVER);
-fixed tabs
2015-11-18 08:47:41 +01:00
*/
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
scene_tabs = memnew(Tabs);
-fixed tabs
2015-11-18 08:47:41 +01:00
scene_tabs->add_tab("unsaved");
scene_tabs->set_tab_align(Tabs::ALIGN_CENTER);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
scene_tabs->set_tab_close_display_policy((bool(EDITOR_DEF("global/always_show_close_button_in_scene_tabs", false)) ? Tabs::CLOSE_BUTTON_SHOW_ALWAYS : Tabs::CLOSE_BUTTON_SHOW_ACTIVE_ONLY));
scene_tabs->connect("tab_changed", this, "_scene_tab_changed");
scene_tabs->connect("right_button_pressed", this, "_scene_tab_script_edited");
-fixed tabs
2015-11-18 08:47:41 +01:00
scene_tabs->connect("tab_close", this, "_scene_tab_closed");
srt->add_child(scene_tabs);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
scene_root_parent = memnew(PanelContainer);
scene_root_parent->set_custom_minimum_size(Size2(0, 80) * EDSCALE);
-Property apply limits to V/H Splits in main editor window. Fixes #3567
2016-02-08 17:01:54 +01:00
//Ref<StyleBox> sp = scene_root_parent->get_stylebox("panel","TabContainer");
//scene_root_parent->add_style_override("panel",sp);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
/*scene_root_parent->set_anchor( MARGIN_RIGHT, Control::ANCHOR_END );
scene_root_parent->set_anchor( MARGIN_BOTTOM, Control::ANCHOR_END );
scene_root_parent->set_begin( Point2( 0, 0) );
scene_root_parent->set_end( Point2( 0,80 ) );*/
srt->add_child(scene_root_parent);
scene_root_parent->set_v_size_flags(Control::SIZE_EXPAND_FILL);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
scene_root = memnew(Viewport);
New option to send canvas to render buffer allows to use 3D environment effects for post processing such as Glow, Bloom, HDR, etc. in 2D.
2015-03-16 04:47:37 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//scene_root_base->add_child(scene_root);
-Moved all the "root" input handling for GUI from individual Controls to Viewport. -Should fix several reported bugs when controls don't have a common parent This may have added new bugs, so please report if so!
2016-01-17 02:41:10 +01:00
//scene_root->set_meta("_editor_disable_input",true);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
VisualServer::get_singleton()->viewport_set_hide_scenario(scene_root->get_viewport(), true);
-Moved all the "root" input handling for GUI from individual Controls to Viewport. -Should fix several reported bugs when controls don't have a common parent This may have added new bugs, so please report if so!
2016-01-17 02:41:10 +01:00
scene_root->set_disable_input(true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
scene_root->set_as_audio_listener_2d(true);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
scene_root->set_size_override(true, Size2(Globals::get_singleton()->get("display/width"), Globals::get_singleton()->get("display/height")));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// scene_root->set_world_2d( Ref<World2D>( memnew( World2D )) );
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
viewport = memnew(VBoxContainer);
-Property apply limits to V/H Splits in main editor window. Fixes #3567
2016-02-08 17:01:54 +01:00
viewport->set_v_size_flags(Control::SIZE_EXPAND_FILL);
/*for(int i=0;i<4;i++) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
viewport->set_margin(Margin(i),sp->get_margin(Margin(i)));
-Property apply limits to V/H Splits in main editor window. Fixes #3567
2016-02-08 17:01:54 +01:00
}*/
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
scene_root_parent->add_child(viewport);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
PanelContainer *top_region = memnew(PanelContainer);
top_region->add_style_override("panel", gui_base->get_stylebox("hover", "Button"));
HBoxContainer *left_menu_hb = memnew(HBoxContainer);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
top_region->add_child(left_menu_hb);
menu_hb->add_child(top_region);
PopupMenu *p;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file_menu = memnew(MenuButton);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
file_menu->set_text(TTR("Scene"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//file_menu->set_icon(gui_base->get_icon("Save","EditorIcons"));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
left_menu_hb->add_child(file_menu);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
prev_scene = memnew(ToolButton);
prev_scene->set_icon(gui_base->get_icon("PrevScene", "EditorIcons"));
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
prev_scene->set_tooltip(TTR("Go to previously opened scene."));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
prev_scene->set_disabled(true);
//left_menu_hb->add_child( prev_scene );
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
prev_scene->connect("pressed", this, "_menu_option", make_binds(FILE_OPEN_PREV));
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-21 00:38:02 +02:00
gui_base->add_child(prev_scene);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
prev_scene->set_pos(Point2(3, 24));
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-21 00:38:02 +02:00
prev_scene->hide();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ED_SHORTCUT("editor/fullscreen_mode", TTR("Fullscreen Mode"), KEY_MASK_SHIFT | KEY_F11);
ED_SHORTCUT("editor/distraction_free_mode", TTR("Distraction Free Mode"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_F11);
Configurable shortcuts for tabs switching
2016-06-25 06:42:09 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ED_SHORTCUT("editor/next_tab", TTR("Next tab"), KEY_MASK_CMD + KEY_TAB);
ED_SHORTCUT("editor/prev_tab", TTR("Previous tab"), KEY_MASK_CMD + KEY_MASK_SHIFT + KEY_TAB);
ED_SHORTCUT("editor/filter_files", TTR("Filter Files.."), KEY_MASK_ALT + KEY_MASK_CMD + KEY_P);
Configurable shortcuts for tabs switching
2016-06-25 06:42:09 +02:00
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
file_menu->set_tooltip(TTR("Operations with scene files."));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p = file_menu->get_popup();
p->add_shortcut(ED_SHORTCUT("editor/new_scene", TTR("New Scene")), FILE_NEW_SCENE);
p->add_shortcut(ED_SHORTCUT("editor/new_inherited_scene", TTR("New Inherited Scene..")), FILE_NEW_INHERITED_SCENE);
p->add_shortcut(ED_SHORTCUT("editor/open_scene", TTR("Open Scene.."), KEY_MASK_CMD + KEY_O), FILE_OPEN_SCENE);
issue #1715 - menu separator There was a request for a separator between Open Scene and Save Scene to avoid accidental mis-clicks. So here's that!
2015-04-26 04:45:49 +02:00
p->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_shortcut(ED_SHORTCUT("editor/save_scene", TTR("Save Scene"), KEY_MASK_CMD + KEY_S), FILE_SAVE_SCENE);
p->add_shortcut(ED_SHORTCUT("editor/save_scene_as", TTR("Save Scene As.."), KEY_MASK_SHIFT + KEY_MASK_CMD + KEY_S), FILE_SAVE_AS_SCENE);
p->add_shortcut(ED_SHORTCUT("editor/save_all_scenes", TTR("Save all Scenes"), KEY_MASK_ALT + KEY_MASK_SHIFT + KEY_MASK_CMD + KEY_S), FILE_SAVE_ALL_SCENES);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
p->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_shortcut(ED_SHORTCUT("editor/close_scene", TTR("Close Scene"), KEY_MASK_SHIFT + KEY_MASK_CTRL + KEY_W), FILE_CLOSE);
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
p->add_separator();
-customizable shortcuts in editor -editor settings now save to .tres instead of .xml -buttons can now hold a shortcut
2016-06-05 02:31:29 +02:00
//p->add_shortcut(ED_SHORTCUT("editor/save_scene",TTR("Close Goto Prev. Scene")),FILE_OPEN_PREV,KEY_MASK_SHIFT+KEY_MASK_CMD+KEY_P);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_submenu_item(TTR("Open Recent"), "RecentScenes", FILE_OPEN_RECENT);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
p->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_shortcut(ED_SHORTCUT("editor/quick_open_scene", TTR("Quick Open Scene.."), KEY_MASK_SHIFT + KEY_MASK_CMD + KEY_O), FILE_QUICK_OPEN_SCENE);
p->add_shortcut(ED_SHORTCUT("editor/quick_open_script", TTR("Quick Open Script.."), KEY_MASK_ALT + KEY_MASK_CMD + KEY_O), FILE_QUICK_OPEN_SCRIPT);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
p->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
PopupMenu *pm_export = memnew(PopupMenu);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
pm_export->set_name("Export");
p->add_child(pm_export);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_submenu_item(TTR("Convert To.."), "Export");
pm_export->add_item(TTR("Translatable Strings.."), FILE_DUMP_STRINGS);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
pm_export->add_separator();
Added shortcuts to convert_to/MeshLibrary and convert_to/TileSet (pretty handy), dissabled by default.
2016-06-12 04:51:54 +02:00
pm_export->add_shortcut(ED_SHORTCUT("editor/convert_to_MeshLibrary", TTR("MeshLibrary..")), FILE_EXPORT_MESH_LIBRARY);
pm_export->add_shortcut(ED_SHORTCUT("editor/convert_to_TileSet", TTR("TileSet..")), FILE_EXPORT_TILESET);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
pm_export->connect("item_pressed", this, "_menu_option");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
p->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_item(TTR("Undo"), EDIT_UNDO, KEY_MASK_CMD + KEY_Z);
p->add_item(TTR("Redo"), EDIT_REDO, KEY_MASK_CMD + KEY_MASK_SHIFT + KEY_Z);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
p->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_item(TTR("Run Script"), FILE_RUN_SCRIPT, KEY_MASK_SHIFT + KEY_MASK_CMD + KEY_R);
-run script in editor -add search docs dialog that returns places string was found -added flash
2014-02-21 03:01:44 +01:00
p->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_item(TTR("Project Settings"), RUN_SETTINGS);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
p->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_item(TTR("Revert Scene"), EDIT_REVERT);
Move the Revert Scene menu item to be less intrusive.
2015-01-27 00:51:13 +01:00
p->add_separator();
restored quit to project list keybinding, but kept change for OSX, closes #3185
2016-01-10 19:57:24 +01:00
#ifdef OSX_ENABLED
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_item(TTR("Quit to Project List"), RUN_PROJECT_MANAGER, KEY_MASK_SHIFT + KEY_MASK_ALT + KEY_Q);
restored quit to project list keybinding, but kept change for OSX, closes #3185
2016-01-10 19:57:24 +01:00
#else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_item(TTR("Quit to Project List"), RUN_PROJECT_MANAGER, KEY_MASK_SHIFT + KEY_MASK_CTRL + KEY_Q);
restored quit to project list keybinding, but kept change for OSX, closes #3185
2016-01-10 19:57:24 +01:00
#endif
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_item(TTR("Quit"), FILE_QUIT, KEY_MASK_CMD + KEY_Q);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
recent_scenes = memnew(PopupMenu);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
recent_scenes->set_name("RecentScenes");
p->add_child(recent_scenes);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
recent_scenes->connect("item_pressed", this, "_open_recent_scene");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-fixed tabs
2015-11-18 08:47:41 +01:00
{
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Control *sp = memnew(Control);
sp->set_custom_minimum_size(Size2(30, 0) * EDSCALE);
-fixed tabs
2015-11-18 08:47:41 +01:00
menu_hb->add_child(sp);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
PanelContainer *editor_region = memnew(PanelContainer);
editor_region->add_style_override("panel", gui_base->get_stylebox("hover", "Button"));
main_editor_button_vb = memnew(HBoxContainer);
-fixed tabs
2015-11-18 08:47:41 +01:00
editor_region->add_child(main_editor_button_vb);
menu_hb->add_child(editor_region);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
//menu_hb->add_spacer();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#if 0
node_menu = memnew( MenuButton );
node_menu->set_text("Node");
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
node_menu->set_pos( Point2( 50,0) );
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
menu_panel->add_child( node_menu );
p=node_menu->get_popup();
i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated.
2016-05-21 01:18:35 +02:00
p->add_item("Create",NODE_CREATE);
p->add_item("Instance",NODE_INSTANCE);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
p->add_separator();
i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated.
2016-05-21 01:18:35 +02:00
p->add_item("Reparent",NODE_REPARENT);
p->add_item("Move Up",NODE_MOVE_UP);
p->add_item("Move Down",NODE_MOVE_DOWN);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
p->add_separator();
i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated.
2016-05-21 01:18:35 +02:00
p->add_item("Duplicate",NODE_DUPLICATE);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
p->add_separator();
i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated.
2016-05-21 01:18:35 +02:00
p->add_item("Remove (Branch)",NODE_REMOVE_BRANCH);
p->add_item("Remove (Element)",NODE_REMOVE_ELEMENT);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
p->add_separator();
i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated.
2016-05-21 01:18:35 +02:00
p->add_item("Edit Subscriptions..",NODE_CONNECTIONS);
p->add_item("Edit Groups..",NODE_GROUPS);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
resource_menu = memnew( MenuButton );
resource_menu->set_text("Resource");
resource_menu->set_pos( Point2( 90,0) );
menu_panel->add_child( resource_menu );
#endif
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
import_menu = memnew(MenuButton);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
import_menu->set_tooltip(TTR("Import assets to the project."));
import_menu->set_text(TTR("Import"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//import_menu->set_icon(gui_base->get_icon("Save","EditorIcons"));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
left_menu_hb->add_child(import_menu);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p = import_menu->get_popup();
p->connect("item_pressed", this, "_menu_option");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
tool_menu = memnew(MenuButton);
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
tool_menu->set_tooltip(TTR("Miscellaneous project or scene-wide tools."));
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
tool_menu->set_text(TTR("Tools"));
-orphan resource explorer dialog + tools menu
2015-11-29 05:08:31 +01:00
//tool_menu->set_icon(gui_base->get_icon("Save","EditorIcons"));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
left_menu_hb->add_child(tool_menu);
-orphan resource explorer dialog + tools menu
2015-11-29 05:08:31 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p = tool_menu->get_popup();
p->connect("item_pressed", this, "_menu_option");
p->add_item(TTR("Orphan Resource Explorer"), TOOLS_ORPHAN_RESOURCES);
p->add_item(TTR("Export to Godot 3.0"), TOOLS_EXPORT_GODOT3);
-orphan resource explorer dialog + tools menu
2015-11-29 05:08:31 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
export_button = memnew(ToolButton);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
export_button->set_tooltip(TTR("Export the project to many platforms."));
export_button->set_text(TTR("Export"));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
export_button->connect("pressed", this, "_menu_option", varray(FILE_EXPORT_PROJECT));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
export_button->set_focus_mode(Control::FOCUS_NONE);
left_menu_hb->add_child(export_button);
menu_hb->add_spacer();
//Separator *s1 = memnew( VSeparator );
//menu_panel->add_child(s1);
//s1->set_pos(Point2(210,4));
//s1->set_size(Point2(10,15));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_cc = memnew(CenterContainer);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
play_cc->set_ignore_mouse(true);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
gui_base->add_child(play_cc);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
play_cc->set_area_as_parent_rect();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_cc->set_anchor_and_margin(MARGIN_BOTTOM, Control::ANCHOR_BEGIN, 10);
play_cc->set_margin(MARGIN_TOP, 5);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
top_region = memnew(PanelContainer);
top_region->add_style_override("panel", gui_base->get_stylebox("hover", "Button"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
play_cc->add_child(top_region);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
HBoxContainer *play_hb = memnew(HBoxContainer);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
top_region->add_child(play_hb);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_button = memnew(ToolButton);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
play_hb->add_child(play_button);
play_button->set_toggle_mode(true);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_button->set_icon(gui_base->get_icon("MainPlay", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
play_button->set_focus_mode(Control::FOCUS_NONE);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_button->connect("pressed", this, "_menu_option", make_binds(RUN_PLAY));
-customizable shortcuts in editor -editor settings now save to .tres instead of .xml -buttons can now hold a shortcut
2016-06-05 02:31:29 +02:00
play_button->set_tooltip(TTR("Play the project."));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_button->set_shortcut(ED_SHORTCUT("editor/play", TTR("Play"), KEY_F5));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
pause_button = memnew(ToolButton);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//menu_panel->add_child(pause_button); - not needed for now?
pause_button->set_toggle_mode(true);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
pause_button->set_icon(gui_base->get_icon("Pause", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
pause_button->set_focus_mode(Control::FOCUS_NONE);
First version of Profiler It is now possible to profile GDScript as well as some parts of Godot internals.
2016-05-22 02:18:16 +02:00
//pause_button->connect("pressed", this,"_menu_option",make_binds(RUN_PAUSE));
pause_button->set_tooltip(TTR("Pause the scene"));
pause_button->set_disabled(true);
play_hb->add_child(pause_button);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
pause_button->set_shortcut(ED_SHORTCUT("editor/pause_scene", TTR("Pause Scene"), KEY_F7));
First version of Profiler It is now possible to profile GDScript as well as some parts of Godot internals.
2016-05-22 02:18:16 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
stop_button = memnew(ToolButton);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
play_hb->add_child(stop_button);
//stop_button->set_toggle_mode(true);
stop_button->set_focus_mode(Control::FOCUS_NONE);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
stop_button->set_icon(gui_base->get_icon("MainStop", "EditorIcons"));
stop_button->connect("pressed", this, "_menu_option", make_binds(RUN_STOP));
-customizable shortcuts in editor -editor settings now save to .tres instead of .xml -buttons can now hold a shortcut
2016-06-05 02:31:29 +02:00
stop_button->set_tooltip(TTR("Stop the scene."));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
stop_button->set_shortcut(ED_SHORTCUT("editor/stop", TTR("Stop"), KEY_F8));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
run_native = memnew(EditorRunNative);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
play_hb->add_child(run_native);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
native_play_button = memnew(MenuButton);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
native_play_button->set_text("NTV");
menu_hb->add_child(native_play_button);
native_play_button->hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
native_play_button->get_popup()->connect("item_pressed", this, "_run_in_device");
run_native->connect("native_run", this, "_menu_option", varray(RUN_PLAY_NATIVE));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// VSeparator *s1 = memnew( VSeparator );
// play_hb->add_child(s1);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_scene_button = memnew(ToolButton);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
play_hb->add_child(play_scene_button);
play_scene_button->set_toggle_mode(true);
play_scene_button->set_focus_mode(Control::FOCUS_NONE);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_scene_button->set_icon(gui_base->get_icon("PlayScene", "EditorIcons"));
play_scene_button->connect("pressed", this, "_menu_option", make_binds(RUN_PLAY_SCENE));
-customizable shortcuts in editor -editor settings now save to .tres instead of .xml -buttons can now hold a shortcut
2016-06-05 02:31:29 +02:00
play_scene_button->set_tooltip(TTR("Play the edited scene."));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_scene_button->set_shortcut(ED_SHORTCUT("editor/play_scene", TTR("Play Scene"), KEY_F6));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_custom_scene_button = memnew(ToolButton);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
play_hb->add_child(play_custom_scene_button);
play_custom_scene_button->set_toggle_mode(true);
play_custom_scene_button->set_focus_mode(Control::FOCUS_NONE);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_custom_scene_button->set_icon(gui_base->get_icon("PlayCustom", "EditorIcons"));
play_custom_scene_button->connect("pressed", this, "_menu_option", make_binds(RUN_PLAY_CUSTOM_SCENE));
Fix "Play custom scene" keyboard shortcut
2016-07-11 19:46:41 +02:00
play_custom_scene_button->set_tooltip(TTR("Play custom scene"));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
play_custom_scene_button->set_shortcut(ED_SHORTCUT("editor/play_custom_scene", TTR("Play Custom Scene"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_F5));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
debug_button = memnew(MenuButton);
-Merged the file server with the live editing and remote debug -It is now really easy to deploy an android build with debug, and debug it
2015-08-06 07:37:40 +02:00
debug_button->set_flat(true);
play_hb->add_child(debug_button);
//debug_button->set_toggle_mode(true);
debug_button->set_focus_mode(Control::FOCUS_NONE);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
debug_button->set_icon(gui_base->get_icon("Remote", "EditorIcons"));
-Merged the file server with the live editing and remote debug -It is now really easy to deploy an android build with debug, and debug it
2015-08-06 07:37:40 +02:00
//debug_button->connect("pressed", this,"_menu_option",make_binds(RUN_LIVE_DEBUG));
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
debug_button->set_tooltip(TTR("Debug options"));
-Merged the file server with the live editing and remote debug -It is now really easy to deploy an android build with debug, and debug it
2015-08-06 07:37:40 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p = debug_button->get_popup();
PopupMenu upgrade: Hide on item selection (#7306) * Added the option to set hide on item selection. Usable in GDScript and from within the source code when you want to specify popup menus you don't want to close immediately when selecting an item * Renamed getter from get_ to is_, fixed parent/child behavior, renamed bool variable to match most code and added ADD_PROPERTYNO to save some memory (cherry picked from commit da950cd0f27a4f1f2a2d596efae846d1c22442a2)
2016-12-23 15:43:45 +01:00
p->set_hide_on_item_selection(false);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_check_item(TTR("Deploy with Remote Debug"), RUN_DEPLOY_REMOTE_DEBUG);
p->set_item_tooltip(p->get_item_count() - 1, TTR("When exporting or deploying, the resulting executable will attempt to connect to the IP of this computer in order to be debugged."));
p->add_check_item(TTR("Small Deploy with Network FS"), RUN_FILE_SERVER);
p->set_item_tooltip(p->get_item_count() - 1, TTR("When this option is enabled, export or deploy will produce a minimal executable.\nThe filesystem will be provided from the project by the editor over the network.\nOn Android, deploy will use the USB cable for faster performance. This option speeds up testing for games with a large footprint."));
Ability to visually debug geometry visually: -Visible 2D and 3D Shapes, Polygons, Tile collisions, etc. -Visible Navmesh and Navpoly -Visible collision contacts for 2D and 3D as a red point -Customizable colors in project settings
2015-09-20 18:03:46 +02:00
p->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_check_item(TTR("Visible Collision Shapes"), RUN_DEBUG_COLLISONS);
p->set_item_tooltip(p->get_item_count() - 1, TTR("Collision shapes and raycast nodes (for 2D and 3D) will be visible on the running game if this option is turned on."));
p->add_check_item(TTR("Visible Navigation"), RUN_DEBUG_NAVIGATION);
p->set_item_tooltip(p->get_item_count() - 1, TTR("Navigation meshes and polygons will be visible on the running game if this option is turned on."));
Ability to reload scripts on running game
2016-06-02 01:22:02 +02:00
p->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_check_item(TTR("Sync Scene Changes"), RUN_LIVE_DEBUG);
p->set_item_tooltip(p->get_item_count() - 1, TTR("When this option is turned on, any changes made to the scene in the editor will be replicated in the running game.\nWhen used remotely on a device, this is more efficient with network filesystem."));
p->add_check_item(TTR("Sync Script Changes"), RUN_RELOAD_SCRIPTS);
p->set_item_tooltip(p->get_item_count() - 1, TTR("When this option is turned on, any script that is saved will be reloaded on the running game.\nWhen used remotely on a device, this is more efficient with network filesystem."));
p->connect("item_pressed", this, "_menu_option");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-21 00:38:02 +02:00
/*
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
run_settings_button = memnew( ToolButton );
//menu_hb->add_child(run_settings_button);
//run_settings_button->set_toggle_mode(true);
run_settings_button->set_focus_mode(Control::FOCUS_NONE);
run_settings_button->set_icon(gui_base->get_icon("Run","EditorIcons"));
run_settings_button->connect("pressed", this,"_menu_option",make_binds(RUN_SCENE_SETTINGS));
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-21 00:38:02 +02:00
*/
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
/*
run_settings_button = memnew( ToolButton );
menu_panel->add_child(run_settings_button);
run_settings_button->set_pos(Point2(305,0));
run_settings_button->set_focus_mode(Control::FOCUS_NONE);
run_settings_button->set_icon(gui_base->get_icon("Run","EditorIcons"));
run_settings_button->connect("pressed", this,"_menu_option",make_binds(RUN_SETTINGS));
*/
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
progress_hb = memnew(BackgroundProgress);
-fixed tabs
2015-11-18 08:47:41 +01:00
menu_hb->add_child(progress_hb);
{
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Control *sp = memnew(Control);
sp->set_custom_minimum_size(Size2(30, 0) * EDSCALE);
-fixed tabs
2015-11-18 08:47:41 +01:00
menu_hb->add_child(sp);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
PanelContainer *vu_cont = memnew(PanelContainer);
vu_cont->add_style_override("panel", gui_base->get_stylebox("hover", "Button"));
-fixed tabs
2015-11-18 08:47:41 +01:00
menu_hb->add_child(vu_cont);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
audio_vu = memnew(TextureProgress);
CenterContainer *vu_cc = memnew(CenterContainer);
-fixed tabs
2015-11-18 08:47:41 +01:00
vu_cc->add_child(audio_vu);
vu_cont->add_child(vu_cc);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
audio_vu->set_under_texture(gui_base->get_icon("VuEmpty", "EditorIcons"));
audio_vu->set_progress_texture(gui_base->get_icon("VuFull", "EditorIcons"));
-fixed tabs
2015-11-18 08:47:41 +01:00
audio_vu->set_max(24);
audio_vu->set_min(-80);
audio_vu->set_step(0.01);
audio_vu->set_val(0);
{
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Control *sp = memnew(Control);
sp->set_custom_minimum_size(Size2(30, 0) * EDSCALE);
-fixed tabs
2015-11-18 08:47:41 +01:00
menu_hb->add_child(sp);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
top_region = memnew(PanelContainer);
top_region->add_style_override("panel", gui_base->get_stylebox("hover", "Button"));
HBoxContainer *right_menu_hb = memnew(HBoxContainer);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
top_region->add_child(right_menu_hb);
menu_hb->add_child(top_region);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
settings_menu = memnew(MenuButton);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
settings_menu->set_text(TTR("Settings"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//settings_menu->set_anchor(MARGIN_RIGHT,ANCHOR_END);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
right_menu_hb->add_child(settings_menu);
p = settings_menu->get_popup();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated.
2016-05-21 01:18:35 +02:00
//p->add_item("Export Settings",SETTINGS_EXPORT_PREFERENCES);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_item(TTR("Editor Settings"), SETTINGS_PREFERENCES);
i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated.
2016-05-21 01:18:35 +02:00
//p->add_item("Optimization Presets",SETTINGS_OPTIMIZED_PRESETS);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
p->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_layouts = memnew(PopupMenu);
Editor layouts menu
2015-11-22 19:11:17 +01:00
editor_layouts->set_name("Layouts");
p->add_child(editor_layouts);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_layouts->connect("item_pressed", this, "_layout_menu_option");
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
p->add_submenu_item(TTR("Editor Layout"), "Layouts");
Editor layouts menu
2015-11-22 19:11:17 +01:00
p->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_item(TTR("Install Export Templates"), SETTINGS_LOAD_EXPORT_TEMPLATES);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
p->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
p->add_item(TTR("About"), SETTINGS_ABOUT);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
layout_dialog = memnew(EditorNameDialog);
Editor layouts menu
2015-11-22 19:11:17 +01:00
gui_base->add_child(layout_dialog);
layout_dialog->set_hide_on_ok(false);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
layout_dialog->set_size(Size2(175, 70) * EDSCALE);
layout_dialog->connect("name_confirmed", this, "_dialog_action");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
sources_button = memnew(ToolButton);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
right_menu_hb->add_child(sources_button);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
sources_button->set_icon(gui_base->get_icon("DependencyOk", "EditorIcons"));
sources_button->connect("pressed", this, "_menu_option", varray(SOURCES_REIMPORT));
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
sources_button->set_tooltip(TTR("Alerts when an external resource has changed."));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
update_menu = memnew(MenuButton);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
update_menu->set_tooltip(TTR("Spins when the editor window repaints!"));
-fixed tabs
2015-11-18 08:47:41 +01:00
right_menu_hb->add_child(update_menu);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
update_menu->set_icon(gui_base->get_icon("Progress1", "EditorIcons"));
p = update_menu->get_popup();
p->add_check_item(TTR("Update Always"), SETTINGS_UPDATE_ALWAYS);
p->add_check_item(TTR("Update Changes"), SETTINGS_UPDATE_CHANGES);
p->add_separator();
p->add_check_item(TTR("Disable Update Spinner"), SETTINGS_UPDATE_SPINNER_HIDE);
p->set_item_checked(1, true);
-fixed tabs
2015-11-18 08:47:41 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//sources_button->connect();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
/*
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Separator *s2 = memnew( VSeparator );
menu_panel->add_child(s2);
s2->set_pos(Point2(338,4));
s2->set_size(Point2(10,15));
*/
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
//editor_hsplit = memnew( HSplitContainer );
//main_split->add_child(editor_hsplit);
//editor_hsplit->set_v_size_flags(Control::SIZE_EXPAND_FILL);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
//editor_vsplit = memnew( VSplitContainer );
//editor_hsplit->add_child(editor_vsplit);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
//top_pallete = memnew( TabContainer );
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
scene_tree_dock = memnew(SceneTreeDock(this, scene_root, editor_selection, editor_data));
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
scene_tree_dock->set_name(TTR("Scene"));
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
//top_pallete->add_child(scene_tree_dock);
Signals became a tab added icons to contextual scene tree menu
2016-06-04 02:03:09 +02:00
dock_slot[DOCK_SLOT_RIGHT_UL]->add_child(scene_tree_dock);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
#if 0
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
resources_dock = memnew( ResourcesDock(this) );
i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated.
2016-05-21 01:18:35 +02:00
resources_dock->set_name("Resources");
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
//top_pallete->add_child(resources_dock);
dock_slot[DOCK_SLOT_RIGHT_BL]->add_child(resources_dock);
//top_pallete->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
#endif
Signals became a tab added icons to contextual scene tree menu
2016-06-04 02:03:09 +02:00
dock_slot[DOCK_SLOT_LEFT_BR]->hide();
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
/*Control *editor_spacer = memnew( Control );
-Completely removed EmptyControl (but added fallback), closes #1017
2015-01-03 21:24:16 +01:00
editor_spacer->set_custom_minimum_size(Size2(260,200));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
editor_spacer->set_v_size_flags(Control::SIZE_EXPAND_FILL);
editor_vsplit->add_child( editor_spacer );
editor_spacer->add_child( top_pallete );
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
top_pallete->set_area_as_parent_rect();*/
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
//prop_pallete = memnew( TabContainer );
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
//prop_pallete->set_v_size_flags(Control::SIZE_EXPAND_FILL);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
/*editor_spacer = memnew( Control );
-Completely removed EmptyControl (but added fallback), closes #1017
2015-01-03 21:24:16 +01:00
editor_spacer->set_custom_minimum_size(Size2(260,200));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
editor_spacer->set_v_size_flags(Control::SIZE_EXPAND_FILL);
editor_vsplit->add_child( editor_spacer );
editor_spacer->add_child( prop_pallete );
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
prop_pallete->set_area_as_parent_rect();*/
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
VBoxContainer *prop_editor_base = memnew(VBoxContainer);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
prop_editor_base->set_name(TTR("Inspector")); // Properties?
Signals became a tab added icons to contextual scene tree menu
2016-06-04 02:03:09 +02:00
dock_slot[DOCK_SLOT_RIGHT_BL]->add_child(prop_editor_base);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
HBoxContainer *prop_editor_hb = memnew(HBoxContainer);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
prop_editor_base->add_child(prop_editor_hb);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
prop_editor_vb = prop_editor_base;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
resource_new_button = memnew(ToolButton);
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
resource_new_button->set_tooltip(TTR("Create a new resource in memory and edit it."));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
resource_new_button->set_icon(gui_base->get_icon("New", "EditorIcons"));
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
prop_editor_hb->add_child(resource_new_button);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
resource_new_button->connect("pressed", this, "_menu_option", varray(RESOURCE_NEW));
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
resource_new_button->set_focus_mode(Control::FOCUS_NONE);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
resource_load_button = memnew(ToolButton);
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
resource_load_button->set_tooltip(TTR("Load an existing resource from disk and edit it."));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
resource_load_button->set_icon(gui_base->get_icon("Load", "EditorIcons"));
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
prop_editor_hb->add_child(resource_load_button);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
resource_load_button->connect("pressed", this, "_menu_option", varray(RESOURCE_LOAD));
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
resource_load_button->set_focus_mode(Control::FOCUS_NONE);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
resource_save_button = memnew(MenuButton);
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
resource_save_button->set_tooltip(TTR("Save the currently edited resource."));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
resource_save_button->set_icon(gui_base->get_icon("Save", "EditorIcons"));
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
prop_editor_hb->add_child(resource_save_button);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
resource_save_button->get_popup()->add_item(TTR("Save"), RESOURCE_SAVE);
resource_save_button->get_popup()->add_item(TTR("Save As.."), RESOURCE_SAVE_AS);
resource_save_button->get_popup()->connect("item_pressed", this, "_menu_option");
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
resource_save_button->set_focus_mode(Control::FOCUS_NONE);
resource_save_button->set_disabled(true);
prop_editor_hb->add_spacer();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
property_back = memnew(ToolButton);
property_back->set_icon(gui_base->get_icon("Back", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
property_back->set_flat(true);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
property_back->set_tooltip(TTR("Go to the previous edited object in history."));
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
property_back->set_disabled(true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
prop_editor_hb->add_child(property_back);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
property_forward = memnew(ToolButton);
property_forward->set_icon(gui_base->get_icon("Forward", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
property_forward->set_flat(true);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
property_forward->set_tooltip(TTR("Go to the next edited object in history."));
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
property_forward->set_disabled(true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
prop_editor_hb->add_child(property_forward);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_history_menu = memnew(MenuButton);
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
editor_history_menu->set_tooltip(TTR("History of recently edited objects."));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_history_menu->set_icon(gui_base->get_icon("History", "EditorIcons"));
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
prop_editor_hb->add_child(editor_history_menu);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_history_menu->connect("about_to_show", this, "_prepare_history");
editor_history_menu->get_popup()->connect("item_pressed", this, "_select_history");
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
prop_editor_hb = memnew(HBoxContainer); //again...
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
prop_editor_base->add_child(prop_editor_hb);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_path = memnew(EditorPath(&editor_history));
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
editor_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
prop_editor_hb->add_child(editor_path);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
search_button = memnew(ToolButton);
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 17:42:15 +01:00
search_button->set_toggle_mode(true);
search_button->set_pressed(false);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
search_button->set_icon(gui_base->get_icon("Zoom", "EditorIcons"));
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 17:42:15 +01:00
prop_editor_hb->add_child(search_button);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
search_button->connect("toggled", this, "_toggle_search_bar");
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
object_menu = memnew(MenuButton);
object_menu->set_icon(gui_base->get_icon("Tools", "EditorIcons"));
prop_editor_hb->add_child(object_menu);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
object_menu->set_tooltip(TTR("Object properties."));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
create_dialog = memnew(CreateDialog);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
gui_base->add_child(create_dialog);
create_dialog->set_base_type("Resource");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
create_dialog->connect("create", this, "_resource_created");
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
search_bar = memnew(HBoxContainer);
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 17:42:15 +01:00
search_bar->set_h_size_flags(Control::SIZE_EXPAND_FILL);
prop_editor_base->add_child(search_bar);
search_bar->hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Label *l = memnew(Label(TTR("Search:") + " "));
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 17:42:15 +01:00
search_bar->add_child(l);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
search_box = memnew(LineEdit);
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 17:42:15 +01:00
search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
search_bar->add_child(search_box);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ToolButton *clear_button = memnew(ToolButton);
clear_button->set_icon(gui_base->get_icon("Close", "EditorIcons"));
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 17:42:15 +01:00
search_bar->add_child(clear_button);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
clear_button->connect("pressed", this, "_clear_search_box");
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
property_editor = memnew(PropertyEditor);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
property_editor->set_autoclear(true);
property_editor->set_show_categories(true);
property_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
property_editor->set_use_doc_hints(true);
property_editor->hide_top_label();
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 17:42:15 +01:00
property_editor->register_text_enter(search_box);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
prop_editor_base->add_child(property_editor);
-removed resources dock, good bye old friend
2015-09-01 05:49:47 +02:00
property_editor->set_undo_redo(&editor_data.get_undo_redo());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
node_dock = memnew(NodeDock);
Created a NodeDock with signals and groups
2016-06-04 18:17:56 +02:00
//node_dock->set_undoredo(&editor_data.get_undo_redo());
dock_slot[DOCK_SLOT_RIGHT_BL]->add_child(node_dock);
Signals became a tab added icons to contextual scene tree menu
2016-06-04 02:03:09 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
filesystem_dock = memnew(FileSystemDock(this));
Remove Quick Filter Files and fix FS search hotkey The new Quick Filter Files behaviour since 8b47e26 had not been implemented, so this implements it and makes it an editor hotkey instead of a menu entry. Fixes #7582. (cherry picked from commit c4d6e54e93431e94888c5594386bcd0aa22528ee)
2017-01-21 13:07:29 +01:00
filesystem_dock->set_name(TTR("FileSystem"));
filesystem_dock->set_display_mode(int(EditorSettings::get_singleton()->get("filesystem_dock/display_mode")));
dock_slot[DOCK_SLOT_LEFT_UR]->add_child(filesystem_dock);
//prop_pallete->add_child(filesystem_dock);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
filesystem_dock->connect("open", this, "open_request");
filesystem_dock->connect("instance", this, "_instance_request");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Editor layouts menu
2015-11-22 19:11:17 +01:00
const String docks_section = "docks";
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
overridden_default_layout = -1;
Allow to override the default editor layout
2016-01-11 22:23:45 +01:00
default_layout.instance();
Make the choosable default editor layout the same as the actual default one. Fixes #6266 (cherry picked from commit a2bff72eee3bde88184a97f2386055d369ed03f6)
2016-09-19 18:52:08 +02:00
default_layout->set_value(docks_section, "dock_3", TTR("FileSystem"));
default_layout->set_value(docks_section, "dock_5", TTR("Scene"));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
default_layout->set_value(docks_section, "dock_6", TTR("Inspector") + "," + TTR("Node"));
Editor layouts menu
2015-11-22 19:11:17 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < DOCK_SLOT_MAX / 2; i++)
default_layout->set_value(docks_section, "dock_hsplit_" + itos(i + 1), 0);
for (int i = 0; i < DOCK_SLOT_MAX / 2; i++)
default_layout->set_value(docks_section, "dock_split_" + itos(i + 1), 0);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Editor layouts menu
2015-11-22 19:11:17 +01:00
_update_layouts_menu();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bottom_panel = memnew(PanelContainer);
bottom_panel->add_style_override("panel", gui_base->get_stylebox("panelf", "Panel"));
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
center_split->add_child(bottom_panel);
center_split->set_dragger_visibility(SplitContainer::DRAGGER_HIDDEN);
-fixed tabs
2015-11-18 08:47:41 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bottom_panel_vb = memnew(VBoxContainer);
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
bottom_panel->add_child(bottom_panel_vb);
//bottom_panel_vb->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-fixed tabs
2015-11-18 08:47:41 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bottom_panel_hb = memnew(HBoxContainer);
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
bottom_panel_vb->add_child(bottom_panel_hb);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
log = memnew(EditorLog);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
add_bottom_panel_item(TTR("Output"), log);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
//left_split->set_dragger_visible(false);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
old_split_ofs = 0;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
center_split->connect("resized", this, "_vp_resized");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-fixed tabs
2015-11-18 08:47:41 +01:00
/*PanelContainer *bottom_pc = memnew( PanelContainer );
srt->add_child(bottom_pc);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
bottom_hb = memnew( HBoxContainer );
-fixed tabs
2015-11-18 08:47:41 +01:00
bottom_pc->add_child(bottom_hb);*/
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// center_vb->add_child( log->get_button() );
// log->get_button()->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-fixed tabs
2015-11-18 08:47:41 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//progress_hb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
/*
animation_menu = memnew( ToolButton );
animation_menu->set_pos(Point2(500,0));
animation_menu->set_size(Size2(20,20));
animation_menu->set_toggle_mode(true);
animation_menu->set_focus_mode(Control::FOCUS_NONE);
menu_panel->add_child(animation_menu);
animation_menu->set_icon(gui_base->get_icon("Animation","EditorIcons"));
Style: Fix statements ending with ';;' (cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
2017-01-14 18:03:38 +01:00
animation_menu->connect("pressed",this,"_animation_visibility_toggle");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
*/
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
call_dialog = memnew(CallDialog);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
call_dialog->hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
gui_base->add_child(call_dialog);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
orphan_resources = memnew(OrphanResourcesDialog);
-orphan resource explorer dialog + tools menu
2015-11-29 05:08:31 +01:00
gui_base->add_child(orphan_resources);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
confirmation = memnew(ConfirmationDialog);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
gui_base->add_child(confirmation);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
confirmation->connect("confirmed", this, "_menu_confirm_current");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
accept = memnew(AcceptDialog);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
gui_base->add_child(accept);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
accept->connect("confirmed", this, "_menu_confirm_current");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// optimized_save = memnew( OptimizedSaveDialog(&editor_data) );
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//gui_base->add_child(optimized_save);
//optimized_save->connect("confirmed",this,"_save_optimized");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
project_export = memnew(ProjectExport(&editor_data));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
gui_base->add_child(project_export);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
project_export_settings = memnew(ProjectExportDialog(this));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
gui_base->add_child(project_export_settings);
//optimized_presets = memnew( OptimizedPresetsDialog(&editor_data) );
//gui_base->add_child(optimized_presets);
//optimized_presets->connect("confirmed",this,"_presets_optimized");
//import_subscene = memnew( EditorSubScene );
//gui_base->add_child(import_subscene);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dependency_error = memnew(DependencyErrorDialog);
**WARNING BEFORE PULLING** This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools. If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :) Summary of Changes -New Filesystem dock, with filesystem & tree view modes. -New refactoring tools, to change or fix dependencies. -Quick search dialog, to quickly search any file
2015-08-24 01:15:56 +02:00
gui_base->add_child(dependency_error);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
dependency_fixer = memnew(DependencyEditor);
gui_base->add_child(dependency_fixer);
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
settings_config_dialog = memnew(EditorSettingsDialog);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
gui_base->add_child(settings_config_dialog);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
project_settings = memnew(ProjectSettings(&editor_data));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
gui_base->add_child(project_settings);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
import_confirmation = memnew(ConfirmationDialog);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
import_confirmation->get_ok()->set_text(TTR("Re-Import"));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
import_confirmation->add_button(TTR("Update"), !OS::get_singleton()->get_swap_ok_cancel(), "update");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
import_confirmation->get_label()->set_align(Label::ALIGN_CENTER);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
import_confirmation->connect("confirmed", this, "_import_action", make_binds("re-import"));
import_confirmation->connect("custom_action", this, "_import_action");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
gui_base->add_child(import_confirmation);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
open_recent_confirmation = memnew(ConfirmationDialog);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
add_child(open_recent_confirmation);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
open_recent_confirmation->connect("confirmed", this, "_open_recent_scene_confirm");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
run_settings_dialog = memnew(RunSettingsDialog);
gui_base->add_child(run_settings_dialog);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
about = memnew(AcceptDialog);
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
about->set_title(TTR("Thanks from the Godot community!"));
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
about->get_ok()->set_text(TTR("Thanks!"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
about->set_hide_on_ok(true);
Editor: Fix "About" dialog Use a HBoxContainer instead of hardcoded positions. (cherry picked from commit 7ec697695f9a12cbc2338725d887e752022e30f4)
2017-03-18 01:53:20 +01:00
gui_base->add_child(about);
HBoxContainer *hbc = memnew(HBoxContainer);
about->add_child(hbc);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Label *about_text = memnew(Label);
about_text->set_text(VERSION_FULL_NAME "\n(c) 2008-2017 Juan Linietsky, Ariel Manzur.\n");
TextureFrame *logo = memnew(TextureFrame);
logo->set_texture(gui_base->get_icon("Logo", "EditorIcons"));
Editor: Fix "About" dialog Use a HBoxContainer instead of hardcoded positions. (cherry picked from commit 7ec697695f9a12cbc2338725d887e752022e30f4)
2017-03-18 01:53:20 +01:00
hbc->add_child(logo);
hbc->add_child(about_text);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
warning = memnew(AcceptDialog);
Fix the warning message from not using the editor theme, closes #5002
2016-06-12 02:38:25 +02:00
gui_base->add_child(warning);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file_templates = memnew(FileDialog);
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
file_templates->set_title(TTR("Import Templates From ZIP File"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
gui_base->add_child(file_templates);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
file_templates->set_mode(FileDialog::MODE_OPEN_FILE);
file_templates->set_access(FileDialog::ACCESS_FILESYSTEM);
file_templates->clear_filters();
-Added google play services (needed for some stuff) -Added new screen resizing options, stretch_2d is removed, new much more flexible ones. -Fixed bug in viewport (can create more instances in 3d-in-2d demo now) -Can set android permissions and screen sizes manually in the export settings -Changed export templates extension to .tpz (too many people unzipped the manually..) -File dialog now ensures that the proper extension is used (will not allow to save without it) -Fixed bug that made collision exceptions not work in 2D
2014-04-15 03:43:44 +02:00
file_templates->add_filter("*.tpz ; Template Package");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file = memnew(EditorFileDialog);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
gui_base->add_child(file);
file->set_current_dir("res://");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file_export = memnew(FileDialog);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
file_export->set_access(FileDialog::ACCESS_FILESYSTEM);
gui_base->add_child(file_export);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
file_export->set_title(TTR("Export Project"));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file_export->connect("file_selected", this, "_dialog_action");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file_export_lib = memnew(FileDialog);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
file_export_lib->set_title(TTR("Export Library"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
file_export_lib->set_mode(FileDialog::MODE_SAVE_FILE);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file_export_lib->connect("file_selected", this, "_dialog_action");
file_export_lib_merge = memnew(CheckButton);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
file_export_lib_merge->set_text(TTR("Merge With Existing"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
file_export_lib_merge->set_pressed(true);
file_export_lib->get_vbox()->add_child(file_export_lib_merge);
gui_base->add_child(file_export_lib);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file_export_password = memnew(LineEdit);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
file_export_password->set_secret(true);
file_export_password->set_editable(false);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file_export->get_vbox()->add_margin_child(TTR("Password:"), file_export_password);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file_script = memnew(FileDialog);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
file_script->set_title(TTR("Open & Run a Script"));
-run script in editor -add search docs dialog that returns places string was found -added flash
2014-02-21 03:01:44 +01:00
file_script->set_access(FileDialog::ACCESS_FILESYSTEM);
file_script->set_mode(FileDialog::MODE_OPEN_FILE);
List<String> sexts;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
ResourceLoader::get_recognized_extensions_for_type("Script", &sexts);
for (List<String>::Element *E = sexts.front(); E; E = E->next()) {
file_script->add_filter("*." + E->get());
-run script in editor -add search docs dialog that returns places string was found -added flash
2014-02-21 03:01:44 +01:00
}
gui_base->add_child(file_script);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file_script->connect("file_selected", this, "_dialog_action");
-run script in editor -add search docs dialog that returns places string was found -added flash
2014-02-21 03:01:44 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
reimport_dialog = memnew(EditorReImportDialog);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
gui_base->add_child(reimport_dialog);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
property_forward->connect("pressed", this, "_property_editor_forward");
property_back->connect("pressed", this, "_property_editor_back");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file_menu->get_popup()->connect("item_pressed", this, "_menu_option");
object_menu->get_popup()->connect("item_pressed", this, "_menu_option");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
update_menu->get_popup()->connect("item_pressed", this, "_menu_option");
settings_menu->get_popup()->connect("item_pressed", this, "_menu_option");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file->connect("file_selected", this, "_dialog_action");
file_templates->connect("file_selected", this, "_dialog_action");
property_editor->connect("resource_selected", this, "_resource_selected");
property_editor->connect("property_keyed", this, "_property_keyed");
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//plugin stuff
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
file_server = memnew(EditorFileServer);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_import_export->add_import_plugin(Ref<EditorTextureImportPlugin>(memnew(EditorTextureImportPlugin(this))));
Ref<EditorSceneImportPlugin> _scene_import = memnew(EditorSceneImportPlugin(this));
Ref<EditorSceneImporterCollada> _collada_import = memnew(EditorSceneImporterCollada);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
_scene_import->add_importer(_collada_import);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// Ref<EditorSceneImporterFBXConv> _fbxconv_import = memnew( EditorSceneImporterFBXConv);
// _scene_import->add_importer(_fbxconv_import);
editor_import_export->add_import_plugin(_scene_import);
Remove unimplemented SceneAnimationImport plugin from menu The code structure is still available if someone wanted to implement it. Issue #3667 will be kept as a reminder for the added todo.
2016-02-17 22:17:34 +01:00
// TODO: This plugin has no code, it should be either implemented or dropped (GH-3667)
// editor_import_export->add_import_plugin( Ref<EditorSceneAnimationImportPlugin>( memnew(EditorSceneAnimationImportPlugin(this))));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_import_export->add_import_plugin(Ref<EditorMeshImportPlugin>(memnew(EditorMeshImportPlugin(this))));
editor_import_export->add_import_plugin(Ref<EditorFontImportPlugin>(memnew(EditorFontImportPlugin(this))));
editor_import_export->add_import_plugin(Ref<EditorSampleImportPlugin>(memnew(EditorSampleImportPlugin(this))));
editor_import_export->add_import_plugin(Ref<EditorTranslationImportPlugin>(memnew(EditorTranslationImportPlugin(this))));
editor_import_export->add_import_plugin(Ref<EditorBitMaskImportPlugin>(memnew(EditorBitMaskImportPlugin(this))));
Bitmask import plugin
2016-06-05 20:11:57 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_import_export->add_export_plugin(Ref<EditorTextureExportPlugin>(memnew(EditorTextureExportPlugin)));
editor_import_export->add_export_plugin(Ref<EditorSampleExportPlugin>(memnew(EditorSampleExportPlugin)));
editor_import_export->add_export_plugin(Ref<EditorSceneExportPlugin>(memnew(EditorSceneExportPlugin)));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
add_editor_plugin(memnew(AnimationPlayerEditorPlugin(this)));
add_editor_plugin(memnew(CanvasItemEditorPlugin(this)));
add_editor_plugin(memnew(SpatialEditorPlugin(this)));
add_editor_plugin(memnew(ScriptEditorPlugin(this)));
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
Better way to disable asset library
2016-06-10 03:47:43 +02:00
if (StreamPeerSSL::is_available()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
add_editor_plugin(memnew(AssetLibraryEditorPlugin(this)));
Better way to disable asset library
2016-06-10 03:47:43 +02:00
} else {
WARN_PRINT("Asset Library not available, as it requires SSL to work.");
}
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-18 00:03:57 +01:00
//more visually meaningful to have this later
raise_bottom_panel_item(AnimationPlayerEditor::singleton);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
add_editor_plugin(memnew(ShaderGraphEditorPlugin(this, true)));
add_editor_plugin(memnew(ShaderGraphEditorPlugin(this, false)));
add_editor_plugin(memnew(ShaderEditorPlugin(this, true)));
add_editor_plugin(memnew(ShaderEditorPlugin(this, false)));
add_editor_plugin(memnew(CameraEditorPlugin(this)));
add_editor_plugin(memnew(SampleEditorPlugin(this)));
add_editor_plugin(memnew(SampleLibraryEditorPlugin(this)));
add_editor_plugin(memnew(ThemeEditorPlugin(this)));
add_editor_plugin(memnew(MultiMeshEditorPlugin(this)));
add_editor_plugin(memnew(MeshInstanceEditorPlugin(this)));
add_editor_plugin(memnew(AnimationTreeEditorPlugin(this)));
-Improve resource previews -Also fixed draw_texture_rect() tile parameter
2016-05-23 22:10:26 +02:00
//add_editor_plugin( memnew( SamplePlayerEditorPlugin(this) ) ); - this is kind of useless at this point
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
add_editor_plugin(memnew(MeshLibraryEditorPlugin(this)));
-Improve resource previews -Also fixed draw_texture_rect() tile parameter
2016-05-23 22:10:26 +02:00
//add_editor_plugin( memnew( StreamEditorPlugin(this) ) );
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
add_editor_plugin(memnew(StyleBoxEditorPlugin(this)));
add_editor_plugin(memnew(ParticlesEditorPlugin(this)));
add_editor_plugin(memnew(ResourcePreloaderEditorPlugin(this)));
add_editor_plugin(memnew(ItemListEditorPlugin(this)));
-Many fixes and demo for RichTexLabel -Proper ability to edit BBCode in RTL.
2015-04-21 21:01:58 +02:00
//add_editor_plugin( memnew( RichTextEditorPlugin(this) ) );
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
add_editor_plugin(memnew(CollisionPolygonEditorPlugin(this)));
add_editor_plugin(memnew(CollisionPolygon2DEditorPlugin(this)));
add_editor_plugin(memnew(TileSetEditorPlugin(this)));
add_editor_plugin(memnew(TileMapEditorPlugin(this)));
add_editor_plugin(memnew(SpriteFramesEditorPlugin(this)));
add_editor_plugin(memnew(TextureRegionEditorPlugin(this)));
add_editor_plugin(memnew(Particles2DEditorPlugin(this)));
add_editor_plugin(memnew(Path2DEditorPlugin(this)));
add_editor_plugin(memnew(PathEditorPlugin(this)));
add_editor_plugin(memnew(BakedLightEditorPlugin(this)));
add_editor_plugin(memnew(Polygon2DEditorPlugin(this)));
add_editor_plugin(memnew(LightOccluder2DEditorPlugin(this)));
add_editor_plugin(memnew(NavigationPolygonEditorPlugin(this)));
add_editor_plugin(memnew(ColorRampEditorPlugin(this)));
add_editor_plugin(memnew(CollisionShape2DEditorPlugin(this)));
add_editor_plugin(memnew(TextureEditorPlugin(this)));
add_editor_plugin(memnew(MaterialEditorPlugin(this)));
add_editor_plugin(memnew(MeshEditorPlugin(this)));
for (int i = 0; i < EditorPlugins::get_plugin_count(); i++)
add_editor_plugin(EditorPlugins::create(i, this));
resource_preview->add_preview_generator(Ref<EditorTexturePreviewPlugin>(memnew(EditorTexturePreviewPlugin)));
resource_preview->add_preview_generator(Ref<EditorPackedScenePreviewPlugin>(memnew(EditorPackedScenePreviewPlugin)));
resource_preview->add_preview_generator(Ref<EditorMaterialPreviewPlugin>(memnew(EditorMaterialPreviewPlugin)));
resource_preview->add_preview_generator(Ref<EditorScriptPreviewPlugin>(memnew(EditorScriptPreviewPlugin)));
resource_preview->add_preview_generator(Ref<EditorSamplePreviewPlugin>(memnew(EditorSamplePreviewPlugin)));
resource_preview->add_preview_generator(Ref<EditorMeshPreviewPlugin>(memnew(EditorMeshPreviewPlugin)));
resource_preview->add_preview_generator(Ref<EditorBitmapPreviewPlugin>(memnew(EditorBitmapPreviewPlugin)));
circle_step_msec = OS::get_singleton()->get_ticks_msec();
circle_step_frame = OS::get_singleton()->get_frames_drawn();
circle_step = 0;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Added the ability to add and remove editor import plugins.
2015-02-10 07:36:16 +01:00
_rebuild_import_menu();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
editor_plugin_screen = NULL;
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
editor_plugins_over = memnew(EditorPluginList);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// force_top_viewport(true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
_edit_current();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
current = NULL;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
PhysicsServer::get_singleton()->set_active(false); // no physics by default if editor
Physics2DServer::get_singleton()->set_active(false); // no physics by default if editor
ScriptServer::set_scripting_enabled(false); // no scripting by default if editor
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
Globals::get_singleton()->set("debug/indicators_enabled", true);
Globals::get_singleton()->set("render/room_cull_enabled", false);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
reference_resource_mem = true;
save_external_resources_mem = true;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
set_process(true);
OS::get_singleton()->set_low_processor_usage_mode(true);
if (0) { //not sure if i want this to happen after all
//store project name in ssettings
String project_name;
//figure it out from path
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
project_name = Globals::get_singleton()->get_resource_path().replace("\\", "/");
print_line("path: " + project_name);
if (project_name.length() && project_name[project_name.length() - 1] == '/')
project_name = project_name.substr(0, project_name.length() - 1);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
project_name = project_name.replace("/", "::");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
if (project_name != "") {
EditorSettings::get_singleton()->set("projects/" + project_name, Globals::get_singleton()->get_resource_path());
EditorSettings::get_singleton()->raise_order("projects/" + project_name);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
EditorSettings::get_singleton()->save();
}
}
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
//edited_scene=NULL;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
saved_version = 1;
unsaved_cache = true;
_last_instanced_scene = NULL;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
quick_open = memnew(EditorQuickOpen);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
gui_base->add_child(quick_open);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
quick_open->connect("quick_open", this, "_quick_opened");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
quick_run = memnew(EditorQuickOpen);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
gui_base->add_child(quick_run);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
quick_run->connect("quick_open", this, "_quick_run");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
_update_recent_scenes();
editor_data.restore_editor_global_states();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
convert_old = false;
opening_prev = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
set_process_unhandled_input(true);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_playing_edited = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// Panel *errors = memnew( Panel );
load_errors = memnew(RichTextLabel);
// load_errors->set_readonly(true);
load_error_dialog = memnew(AcceptDialog);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
load_error_dialog->add_child(load_errors);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
load_error_dialog->set_title(TTR("Load Errors"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
load_error_dialog->set_child_rect(load_errors);
Ask about selecting a main scene if one has not been selected.
2016-06-28 00:59:33 +02:00
gui_base->add_child(load_error_dialog);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//EditorImport::add_importer( Ref<EditorImporterCollada>( memnew(EditorImporterCollada )));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
EditorFileSystem::get_singleton()->connect("sources_changed", this, "_sources_changed");
EditorFileSystem::get_singleton()->connect("filesystem_changed", this, "_fs_changed");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
{
List<StringName> tl;
StringName ei = "EditorIcons";
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
theme_base->get_theme()->get_icon_list(ei, &tl);
for (List<StringName>::Element *E = tl.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!ObjectTypeDB::type_exists(E->get()))
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
icon_type_cache[E->get()] = theme_base->get_theme()->get_icon(E->get(), ei);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
export_godot3_dialog = memnew(FileDialog);
-WIP Exporter to Godot 3.0, only text scenes (no .scn) and still kind of buggy
2017-02-13 02:52:02 +01:00
export_godot3_dialog->set_access(FileDialog::ACCESS_FILESYSTEM);
export_godot3_dialog->set_mode(FileDialog::MODE_OPEN_DIR);
gui_base->add_child(export_godot3_dialog);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
export_godot3_dialog->connect("dir_selected", this, "_export_godot3_path");
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
-added kinematic body -added kinematic body demos
2014-02-23 00:28:19 +01:00
Node::set_human_readable_collision_renaming(true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
pick_main_scene = memnew(ConfirmationDialog);
Ask about selecting a main scene if one has not been selected.
2016-06-28 00:59:33 +02:00
gui_base->add_child(pick_main_scene);
pick_main_scene->get_ok()->set_text("Select");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
pick_main_scene->connect("confirmed", this, "_menu_option", varray(SETTINGS_PICK_MAIN_SCENE));
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
// Ref<ImageTexture> it = gui_base->get_icon("logo","Icons");
// OS::get_singleton()->set_icon( it->get_data() );
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < _init_callbacks.size(); i++)
-scripts are converted to bytecode on export -fix bug in doc where touchscreen events were not documented
2014-02-25 13:31:47 +01:00
_init_callbacks[i]();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
editor_data.add_edited_scene(-1);
editor_data.set_edited_scene(0);
_update_scene_tabs();
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
{
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_initializing_addons = true;
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
Vector<String> addons = Globals::get_singleton()->get("editor_plugins/enabled");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
for (int i = 0; i < addons.size(); i++) {
set_addon_plugin_enabled(addons[i], true);
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
_initializing_addons = false;
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 03:10:44 +01:00
}
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
_load_docks();
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 05:03:19 +02:00
-Add visible IO errors when closing a file fails due to it being locked (most likely on windows), closes #4760
2016-06-13 15:10:50 +02:00
FileAccess::set_file_close_fail_notify_callback(_file_access_close_error_notify);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
remove trailing whitespace
2016-03-09 00:00:52 +01:00
EditorNode::~EditorNode() {
remove trailing whitespace
2016-05-21 15:29:25 +02:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
memdelete(EditorHelp::get_doc_data());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
memdelete(editor_selection);
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
memdelete(editor_plugins_over);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
memdelete(file_server);
EditorSettings::destroy();
}
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
/*
* EDITOR PLUGIN LIST
*/
void EditorPluginList::make_visible(bool p_visible) {
if (!plugins_list.empty()) {
for (int i = 0; i < plugins_list.size(); i++) {
plugins_list[i]->make_visible(p_visible);
}
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
void EditorPluginList::edit(Object *p_object) {
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
if (!plugins_list.empty()) {
for (int i = 0; i < plugins_list.size(); i++) {
plugins_list[i]->edit(p_object);
}
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool EditorPluginList::forward_input_event(const InputEvent &p_event) {
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
bool discard = false;
if (!plugins_list.empty()) {
for (int i = 0; i < plugins_list.size(); i++) {
if (plugins_list[i]->forward_input_event(p_event)) {
discard = true;
}
}
}
return discard;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-19 00:36:26 +01:00
bool EditorPluginList::forward_spatial_input_event(Camera *p_camera, const InputEvent &p_event) {
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
bool discard = false;
if (!plugins_list.empty()) {
for (int i = 0; i < plugins_list.size(); i++) {
if (plugins_list[i]->forward_spatial_input_event(p_camera, p_event)) {
discard = true;
}
}
}
return discard;
}
bool EditorPluginList::empty() {
return plugins_list.empty();
}
void EditorPluginList::clear() {
plugins_list.clear();
}
EditorPluginList::EditorPluginList() {
}
EditorPluginList::~EditorPluginList() {
}
Reference in a new issue Copy permalink