gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-07-08 18:10:44 +00:00
Code Issues Projects Releases Wiki Activity

Remove dependency on the editor directory being in the build's include path.

Browse Source 
- Add or remove the necessary subdirectorires to the includes to remove
dependency on the editor directory being in the build's include path.
- Ensure includes in modified files conform to style guideline.
- Remove editor from the build include path.
This commit is contained in:
Marcel Admiraal 2019-10-09 16:11:04 +02:00
parent 781e4f8673
commit a8836ba28d
10 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -189,7 +189,7 @@ Help(opts.GenerateHelpText(env_base)) # generate help
# add default include paths
env_base.Prepend(CPPPATH=['#', '#editor'])
env_base.Prepend(CPPPATH=['#'])
# configure ENV for platform
env_base.platform_exporters = platform_exporters

2
editor/import/resource_importer_obj.h
View File

@ -31,7 +31,7 @@
#ifndef RESOURCEIMPORTEROBJ_H
#define RESOURCEIMPORTEROBJ_H
#include "import/resource_importer_scene.h"
#include "resource_importer_scene.h"
class EditorOBJImporter : public EditorSceneImporter {

4
editor/plugins/asset_library_editor_plugin.cpp
View File

@ -32,8 +32,8 @@
#include "core/io/json.h"
#include "core/version.h"
#include "editor_node.h"
#include "editor_settings.h"
#include "editor/editor_node.h"
#include "editor/editor_settings.h"
void EditorAssetLibraryItem::configure(const String &p_title, int p_asset_id, const String &p_category, int p_category_id, const String &p_author, int p_author_id, const String &p_cost) {

14
editor/plugins/asset_library_editor_plugin.h
View File

@ -31,24 +31,22 @@
#ifndef ASSET_LIBRARY_EDITOR_PLUGIN_H
#define ASSET_LIBRARY_EDITOR_PLUGIN_H
#include "editor_plugin.h"
#include "editor/editor_asset_installer.h"
#include "editor/editor_plugin.h"
#include "editor/editor_plugin_settings.h"
#include "scene/gui/box_container.h"
#include "scene/gui/check_box.h"
#include "scene/gui/grid_container.h"
#include "scene/gui/line_edit.h"
#include "scene/gui/link_button.h"
#include "scene/gui/option_button.h"
#include "scene/gui/panel_container.h"
#include "scene/gui/progress_bar.h"
#include "scene/gui/separator.h"
#include "scene/gui/tab_container.h"
#include "editor_plugin_settings.h"
#include "scene/gui/grid_container.h"
#include "scene/gui/rich_text_label.h"
#include "scene/gui/scroll_container.h"
#include "scene/gui/separator.h"
#include "scene/gui/tab_container.h"
#include "scene/gui/texture_button.h"
#include "editor_asset_installer.h"
#include "scene/main/http_request.h"
class EditorAssetLibraryItem : public PanelContainer {

2
editor/plugins/text_editor.cpp
View File

@ -31,7 +31,7 @@
#include "text_editor.h"
#include "core/os/keyboard.h"
#include "editor_node.h"
#include "editor/editor_node.h"
void TextEditor::add_syntax_highlighter(SyntaxHighlighter *p_highlighter) {
highlighters[p_highlighter->get_name()] = p_highlighter;

5
modules/assimp/editor_scene_importer_assimp.cpp
View File

@ -29,11 +29,12 @@
/*************************************************************************/
#include "editor_scene_importer_assimp.h"
#include "core/bind/core_bind.h"
#include "core/io/image_loader.h"
#include "editor/editor_file_system.h"
#include "editor/editor_settings.h"
#include "editor/import/resource_importer_scene.h"
#include "editor_settings.h"
#include "import_utils.h"
#include "scene/3d/camera.h"
#include "scene/3d/light.h"
@ -1350,4 +1351,4 @@ void EditorSceneImporterAssimp::_generate_node(
_generate_node(state, recursive_state.skeleton, recursive_state.assimp_node->mChildren[i],
recursive_state.new_node != NULL ? recursive_state.new_node : recursive_state.parent_node);
}
}
}

2
modules/visual_script/visual_script_property_selector.cpp
View File

@ -32,7 +32,7 @@
#include "core/os/keyboard.h"
#include "editor/editor_node.h"
#include "editor_scale.h"
#include "editor/editor_scale.h"
#include "modules/visual_script/visual_script.h"
#include "modules/visual_script/visual_script_builtin_funcs.h"
#include "modules/visual_script/visual_script_flow_control.h"

2
modules/visual_script/visual_script_property_selector.h
View File

@ -31,8 +31,8 @@
#ifndef VISUALSCRIPT_PROPERTYSELECTOR_H
#define VISUALSCRIPT_PROPERTYSELECTOR_H
#include "editor/editor_help.h"
#include "editor/property_editor.h"
#include "editor_help.h"
#include "scene/gui/rich_text_label.h"
class VisualScriptPropertySelector : public ConfirmationDialog {

2
platform/javascript/export/export.cpp
View File

@ -29,8 +29,8 @@
/*************************************************************************/
#include "core/io/zip_io.h"
#include "editor/editor_export.h"
#include "editor/editor_node.h"
#include "editor_export.h"
#include "main/splash.gen.h"
#include "platform/javascript/logo.gen.h"
#include "platform/javascript/run_icon.gen.h"

4
scene/gui/color_picker.cpp
View File

@ -35,8 +35,8 @@
#include "core/os/os.h"
#ifdef TOOLS_ENABLED
#include "editor_scale.h"
#include "editor_settings.h"
#include "editor/editor_scale.h"
#include "editor/editor_settings.h"
#endif
#include "scene/main/viewport.h"