maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Style: Cleanups, added headers, renamed files

Browse source 
Made sure files in core/ and tools/ have a proper Godot license header
when written by us. Also renamed aabb.{cpp,h} and object_type_db.{cpp,h}
to rect3.{cpp,h} and class_db.{cpp,h} respectively.

Also added a proper header to core/io/base64.{c,h} after clarifying
the licensing with the original author (public domain).
This commit is contained in:
Rémi Verschelde 2017-01-16 08:04:19 +01:00
parent b400c69cd4
commit 3890256fc5
168 changed files with 782 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/array.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "array.h"
#include "vector.h"
#include "hashfuncs.h"
#include "variant.h"

5
core/object_type_db.cpp → core/class_db.cpp
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* object_type_db.cpp */
/* class_db.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -26,7 +26,8 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "object_type_db.h"
#include "class_db.h"
#include "os/mutex.h"
#ifdef NO_THREADS

9
core/object_type_db.h → core/class_db.h
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* object_type_db.h */
/* class_db.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -26,12 +26,13 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef OBJECT_TYPE_DB_H
#define OBJECT_TYPE_DB_H
#ifndef CLASS_DB_H
#define CLASS_DB_H
#include "object.h"
#include "method_bind.h"
#include "print_string.h"
/**
@author Juan Linietsky <reduzio@gmail.com>
*/
@ -537,4 +538,4 @@ public:
#endif
#endif // CLASS_DB_H

1
core/color.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "color.h"
#include "math_funcs.h"
#include "print_string.h"
#include "map.h"

1
core/command_queue_mt.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "command_queue_mt.h"
#include "os/os.h"
void CommandQueueMT::lock() {

1
core/compressed_translation.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "compressed_translation.h"
#include "pair.h"
#include <string.h>

1
core/dictionary.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "dictionary.h"
#include "safe_refcount.h"
#include "variant.h"

1
core/engine.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "engine.h"
#include "version.h"
void Engine::set_iterations_per_second(int p_ips) {

1
core/error_macros.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "error_macros.h"
#include "os/os.h"

1
core/global_constants.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "global_constants.h"
#include "variant.h"
#include "os/keyboard.h"
#include "object.h"

3
core/globals.cpp
View file

@ -27,9 +27,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "globals.h"
#include "os/dir_access.h"
#include "os/file_access.h"
#include "os/keyboard.h"
#include "io/marshalls.h"
#include "bind/core_bind.h"
@ -37,6 +37,7 @@
#include "io/file_access_pack.h"
#include "io/file_access_network.h"
#include "variant_parser.h"
GlobalConfig *GlobalConfig::singleton=NULL;
GlobalConfig *GlobalConfig::get_singleton() {

2
core/image.cpp
View file

@ -27,11 +27,13 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "image.h"
#include "hash_map.h"
#include "core/io/image_loader.h"
#include "core/os/copymem.h"
#include "hq2x.h"
#include "print_string.h"
#include <stdio.h>

1
core/input_map.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "input_map.h"
#include "globals.h"
#include "os/keyboard.h"

8
core/io/base64.c
View file

@ -1,3 +1,11 @@
/*
* File: base64.c
* Description: Simple BASE64 conversion methods
* Author: Ari Edelkind
* License: Public Domain
* Website: http://episec.com/people/edelkind/c.html
*/
#include <string.h>
char b64string[] =

8
core/io/base64.h
View file

@ -1,3 +1,11 @@
/*
* File: base64.h
* Description: Simple BASE64 conversion methods
* Author: Ari Edelkind
* License: Public Domain
* Website: http://episec.com/people/edelkind/c.html
*/
#ifndef BASE64_H
#define BASE64_H

28
core/io/networked_multiplayer_peer.cpp
View file

@ -1,3 +1,31 @@
/*************************************************************************/
/* networked_multiplayer_peer.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* http://www.godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
/* */
/* 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 "networked_multiplayer_peer.h"

28
core/io/networked_multiplayer_peer.h
View file

@ -1,3 +1,31 @@
/*************************************************************************/
/* networked_multiplayer_peer.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* http://www.godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
/* */
/* 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. */
/*************************************************************************/
#ifndef NETWORKED_MULTIPLAYER_PEER_H
#define NETWORKED_MULTIPLAYER_PEER_H

2
core/io/pck_packer.cpp
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* pkc_packer.cpp */
/* pck_packer.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */

2
core/math/a_star.cpp
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* a_star.cpp */
/* a_star.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */

2
core/math/bsp_tree.h
View file

@ -30,7 +30,7 @@
#define BSP_TREE_H
#include "plane.h"
#include "aabb.h"
#include "rect3.h"
#include "face3.h"
#include "vector.h"
#include "dvector.h"

2
core/math/face3.h
View file

@ -31,7 +31,7 @@
#include "vector3.h"
#include "plane.h"
#include "aabb.h"
#include "rect3.h"
#include "transform.h"
class Face3 {

2
core/math/octree.h
View file

@ -30,7 +30,7 @@
#define OCTREE_H
#include "vector3.h"
#include "aabb.h"
#include "rect3.h"
#include "list.h"
#include "variant.h"
#include "map.h"

2
core/math/quick_hull.h
View file

@ -29,7 +29,7 @@
#ifndef QUICK_HULL_H
#define QUICK_HULL_H
#include "aabb.h"
#include "rect3.h"
#include "set.h"
#include "list.h"
#include "geometry.h"

4
core/math/aabb.cpp → core/math/rect3.cpp
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* aabb.cpp */
/* rect3.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -26,7 +26,7 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "aabb.h"
#include "rect3.h"
#include "print_string.h"

2
core/math/aabb.h → core/math/rect3.h
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* aabb.h */
/* rect3.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */

2
core/math/transform.h
View file

@ -31,7 +31,7 @@
#include "matrix3.h"
#include "plane.h"
#include "aabb.h"
#include "rect3.h"
/**
@author Juan Linietsky <reduzio@gmail.com>
*/

2
core/message_queue.cpp
View file

@ -27,8 +27,10 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "message_queue.h"
#include "globals.h"
#include "script_language.h"
MessageQueue *MessageQueue::singleton=NULL;
MessageQueue *MessageQueue::get_singleton() {

3
core/object.cpp
View file

@ -27,8 +27,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "object.h"
#include "print_string.h"
#include "object_type_db.h"
#include "class_db.h"
#include "script_language.h"
#include "message_queue.h"
#include "core_string_names.h"

2
core/object.h
View file

@ -721,6 +721,6 @@ public:
};
//needed by macros
#include "object_type_db.h"
#include "class_db.h"
#endif

2
core/packed_data_container.cpp
View file

@ -27,11 +27,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "packed_data_container.h"
#include "io/marshalls.h"
#include "core_string_names.h"
Variant PackedDataContainer::getvar(const Variant& p_key, bool *r_valid) const {
bool err=false;

2
core/path_db.cpp
View file

@ -27,8 +27,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "path_db.h"
#include "print_string.h"
#include "print_string.h"
uint32_t NodePath::hash() const {

2
core/path_remap.cpp
View file

@ -27,9 +27,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "path_remap.h"
#include "globals.h"
#include "os/os.h"
#include "translation.h"
PathRemap* PathRemap::singleton=NULL;
PathRemap* PathRemap::get_singleton() {

3
core/pool_allocator.cpp
View file

@ -27,12 +27,15 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "pool_allocator.h"
#include "error_macros.h"
#include "core/os/os.h"
#include "os/memory.h"
#include "os/copymem.h"
#include "print_string.h"
#include <assert.h>
#define COMPACT_CHUNK( m_entry , m_to_pos ) \
do { \
void *_dst=&((unsigned char*)pool)[m_to_pos]; \

2
core/print_string.cpp
View file

@ -27,7 +27,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "print_string.h"
#include "os/os.h"
#include <stdio.h>
static PrintHandlerList *print_handler_list=NULL;

1
core/ref_ptr.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "ref_ptr.h"
#include "reference.h"
#include "resource.h"

1
core/reference.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "reference.h"
#include "script_language.h"

2
core/reference.h
View file

@ -32,7 +32,7 @@
#include "object.h"
#include "safe_refcount.h"
#include "ref_ptr.h"
#include "object_type_db.h"
#include "class_db.h"
/**
@author Juan Linietsky <reduzio@gmail.com>

2
core/register_core_types.cpp
View file

@ -36,7 +36,7 @@
#include "math/a_star.h"
#include "math/triangle_mesh.h"
#include "globals.h"
#include "object_type_db.h"
#include "class_db.h"
#include "geometry.h"
#include "bind/core_bind.h"
#include "core_string_names.h"

4
core/resource.cpp
View file

@ -27,12 +27,14 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "resource.h"
#include "core_string_names.h"
#include <stdio.h>
#include "os/file_access.h"
#include "io/resource_loader.h"
#include "script_language.h"
#include <stdio.h>
void ResourceImportMetadata::set_editor(const String& p_editor) {
editor=p_editor;

2
core/resource.h
View file

@ -33,7 +33,7 @@
#include "safe_refcount.h"
#include "ref_ptr.h"
#include "reference.h"
#include "object_type_db.h"
#include "class_db.h"
/**
@author Juan Linietsky <reduzio@gmail.com>

1
core/script_debugger_local.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "script_debugger_local.h"
#include "os/os.h"
void ScriptDebuggerLocal::debug(ScriptLanguage *p_script,bool p_can_continue) {

2
core/script_debugger_remote.cpp
View file

@ -27,10 +27,12 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "script_debugger_remote.h"
#include "os/os.h"
#include "io/ip.h"
#include "globals.h"
#include "os/input.h"
void ScriptDebuggerRemote::_send_video_memory() {
List<ResourceUsage> usage;

2
core/string_db.cpp
View file

@ -27,8 +27,10 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "string_db.h"
#include "print_string.h"
#include "os/os.h"
StaticCString StaticCString::create(const char *p_ptr) {
StaticCString scs; scs.ptr=p_ptr; return scs;
}

1
core/translation.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "translation.h"
#include "globals.h"
#include "io/resource_loader.h"
#include "os/os.h"

1
core/undo_redo.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "undo_redo.h"
#include "os/os.h"
void UndoRedo::_discard_redo() {

10
core/ustring.cpp
View file

@ -26,8 +26,8 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include <wchar.h>
#include "ustring.h"
#include "os/memory.h"
#include "print_string.h"
#include "math_funcs.h"
@ -36,10 +36,8 @@
#include "ucaps.h"
#include "color.h"
#include "variant.h"
#define MAX_DIGITS 6
#define UPPERCASE(m_c) (((m_c)>='a' && (m_c)<='z')?((m_c)-('a'-'A')):(m_c))
#define LOWERCASE(m_c) (((m_c)>='A' && (m_c)<='Z')?((m_c)+('a'-'A')):(m_c))
#include <wchar.h>
#ifndef NO_USE_STDLIB
#include <stdlib.h>
@ -50,6 +48,10 @@
#define snprintf _snprintf
#endif
#define MAX_DIGITS 6
#define UPPERCASE(m_c) (((m_c)>='a' && (m_c)<='z')?((m_c)-('a'-'A')):(m_c))
#define LOWERCASE(m_c) (((m_c)>='A' && (m_c)<='Z')?((m_c)+('a'-'A')):(m_c))
/** STRING **/
const char *CharString::get_data() const {

1
core/variant.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "variant.h"
#include "resource.h"
#include "print_string.h"
#include "scene/main/node.h"

2
core/variant.h
View file

@ -33,7 +33,7 @@
@author Juan Linietsky <reduzio@gmail.com>
*/
#include "aabb.h"
#include "rect3.h"
#include "ustring.h"
#include "vector3.h"
#include "plane.h"

1
core/variant_call.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "variant.h"
#include "object.h"
#include "os/os.h"
#include "core_string_names.h"

2
core/variant_op.cpp
View file

@ -27,9 +27,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "variant.h"
#include "object.h"
#include "script_language.h"
#include "core_string_names.h"
Variant::operator bool() const {
bool b;

2
core/variant_parser.cpp
View file

@ -27,11 +27,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "variant_parser.h"
#include "io/resource_loader.h"
#include "os/keyboard.h"
CharType VariantParser::StreamFile::get_char() {
return f->get_8();

2
modules/gdscript/gd_functions.cpp
View file

@ -28,7 +28,7 @@
/*************************************************************************/
#include "gd_functions.h"
#include "math_funcs.h"
#include "object_type_db.h"
#include "class_db.h"
#include "reference.h"
#include "gd_script.h"
#include "func_ref.h"

2
modules/gridmap/register_types.cpp
View file

@ -28,7 +28,7 @@
/*************************************************************************/
#include "register_types.h"
#ifndef _3D_DISABLED
#include "object_type_db.h"
#include "class_db.h"
#include "grid_map.h"
#include "grid_map_editor_plugin.h"
#endif

2
modules/regex/register_types.cpp
View file

@ -28,7 +28,7 @@
/*************************************************************************/
#include "register_types.h"
#include "object_type_db.h"
#include "class_db.h"
#include "regex.h"
void register_regex_types() {

2
modules/visual_script/visual_script_builtin_funcs.cpp
View file

@ -1,6 +1,6 @@
#include "visual_script_builtin_funcs.h"
#include "math_funcs.h"
#include "object_type_db.h"
#include "class_db.h"
#include "reference.h"
#include "func_ref.h"
#include "os/os.h"

2
scene/main/node.h
View file

@ -33,7 +33,7 @@
#include "object.h"
#include "path_db.h"
#include "map.h"
#include "object_type_db.h"
#include "class_db.h"
#include "script_language.h"
#include "scene/main/scene_main_loop.h"

2
scene/register_scene_types.cpp
View file

@ -34,7 +34,7 @@
//#include "scene/io/scene_format_script.h"
#include "resources/default_theme/default_theme.h"
#include "object_type_db.h"
#include "class_db.h"
#include "scene/main/canvas_layer.h"
#include "scene/main/instance_placeholder.h"
#include "scene/main/viewport.h"

2
servers/physics/broad_phase_sw.h
View file

@ -30,7 +30,7 @@
#define BROAD_PHASE_SW_H
#include "math_funcs.h"
#include "aabb.h"
#include "rect3.h"
class CollisionObjectSW;

1
tools/collada/collada.cpp
View file

@ -29,6 +29,7 @@
#ifdef TOOLS_ENABLED
#include "collada.h"
#include "stdio.h"
//#define DEBUG_DEFAULT_ANIMATION

2
tools/doc/doc_data.cpp
View file

@ -26,9 +26,9 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "version.h"
#include "doc_data.h"
#include "version.h"
#include "global_constants.h"
#include "globals.h"
#include "script_language.h"

3
tools/doc/doc_dump.cpp
View file

@ -26,8 +26,9 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "version.h"
#include "doc_dump.h"
#include "version.h"
#include "os/file_access.h"
#include "scene/main/node.h"

2
tools/doc/doc_dump.h
View file

@ -29,7 +29,7 @@
#ifndef DOC_DUMP_H
#define DOC_DUMP_H
#include "object_type_db.h"
#include "class_db.h"
class DocDump {
public:

1
tools/editor/animation_editor.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "animation_editor.h"
#include "editor_settings.h"
#include "os/keyboard.h"
#include "os/os.h"

2
tools/editor/asset_library_editor_plugin.cpp
View file

@ -27,12 +27,12 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "asset_library_editor_plugin.h"
#include "editor_node.h"
#include "editor_settings.h"
#include "io/json.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,int p_rating,const String& p_cost) {
title->set_text(p_title);

2
tools/editor/call_dialog.cpp
View file

@ -30,7 +30,7 @@
#if 0
#include "scene/gui/label.h"
#include "object_type_db.h"
#include "class_db.h"
#include "print_string.h"

1
tools/editor/code_editor.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "code_editor.h"
#include "editor_settings.h"
#include "scene/gui/margin_container.h"
#include "scene/gui/separator.h"

3
tools/editor/connections_dialog.cpp
View file

@ -28,10 +28,7 @@
/*************************************************************************/
#include "connections_dialog.h"
#include "scene/gui/label.h"
#include "print_string.h"
#include "editor_settings.h"
#include "editor_node.h"

2
tools/editor/create_dialog.cpp
View file

@ -28,7 +28,7 @@
/*************************************************************************/
#include "create_dialog.h"
#include "object_type_db.h"
#include "class_db.h"
#include "print_string.h"
#include "scene/gui/box_container.h"
#include "editor_node.h"

1
tools/editor/dependency_editor.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "dependency_editor.h"
#include "os/file_access.h"
#include "scene/gui/margin_container.h"
#include "io/resource_loader.h"

2
tools/editor/editor_asset_installer.cpp
View file

@ -27,10 +27,12 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_asset_installer.h"
#include "io/zip_io.h"
#include "os/dir_access.h"
#include "os/file_access.h"
#include "editor_node.h"
void EditorAssetInstaller::_update_subitems(TreeItem* p_item,bool p_check,bool p_first) {

2
tools/editor/editor_autoload_settings.cpp
View file

@ -26,12 +26,10 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_autoload_settings.h"
#include "globals.h"
#include "global_constants.h"
#include "editor_node.h"
#define PREVIEW_LIST_MAX_SIZE 10

1
tools/editor/editor_data.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_data.h"
#include "globals.h"
#include "editor_settings.h"
#include "os/dir_access.h"

1
tools/editor/editor_dir_dialog.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_dir_dialog.h"
#include "os/os.h"
#include "os/keyboard.h"
#include "tools/editor/editor_settings.h"

2
tools/editor/editor_file_dialog.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_file_dialog.h"
#include "scene/gui/label.h"
#include "scene/gui/center_container.h"
#include "print_string.h"
@ -36,6 +37,7 @@
#include "scene/gui/margin_container.h"
#include "os/file_access.h"
#include "editor_scale.h"
EditorFileDialog::GetIconFunc EditorFileDialog::get_icon_func=NULL;
EditorFileDialog::GetIconFunc EditorFileDialog::get_large_icon_func=NULL;

1
tools/editor/editor_file_system.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_file_system.h"
#include "globals.h"
#include "io/resource_loader.h"
#include "os/os.h"

1
tools/editor/editor_fonts.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_fonts.h"
#include "doc_font.h"
#include "doc_title_font.h"
#include "doc_code_font.h"

4
tools/editor/editor_help.cpp
View file

@ -27,15 +27,13 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_help.h"
#include "editor_node.h"
#include "editor_settings.h"
#include "os/keyboard.h"
#include "doc_data_compressed.h"
#include "tools/editor/plugins/script_editor_plugin.h"
#include "os/keyboard.h"
void EditorHelpSearch::popup() {
popup_centered_ratio(0.6);
if (search_box->get_text()!="") {

3
tools/editor/editor_import_export.cpp
View file

@ -26,8 +26,9 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "version.h"
#include "editor_import_export.h"
#include "version.h"
#include "script_language.h"
#include "globals.h"
#include "os/file_access.h"

1
tools/editor/editor_initialize_ssl.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_initialize_ssl.h"
#include "certs_compressed.h"
#include "io/stream_peer_ssl.h"
#include "io/compression.h"

3
tools/editor/editor_log.cpp
View file

@ -26,8 +26,9 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "version.h"
#include "editor_log.h"
#include "version.h"
#include "scene/gui/center_container.h"
#include "editor_node.h"

4
tools/editor/editor_name_dialog.cpp
View file

@ -26,9 +26,9 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_name_dialog.h"
#include "object_type_db.h"
#include "class_db.h"
#include "os/keyboard.h"
void EditorNameDialog::_line_gui_input(const InputEvent& p_event) {

33
tools/editor/editor_node.cpp
View file

@ -26,22 +26,20 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "version.h"
#include "editor_node.h"
#include "version.h"
#include "print_string.h"
#include "editor_themes.h"
#include "editor_help.h"
#include "core/io/resource_saver.h"
#include "core/io/resource_loader.h"
#include "servers/physics_2d_server.h"
#include "scene/resources/packed_scene.h"
#include "editor_settings.h"
#include "io_plugins/editor_import_collada.h"
#include "io_plugins/editor_scene_importer_fbxconv.h"
#include "globals.h"
#include <stdio.h>
#include "object_type_db.h"
#include "class_db.h"
#include "os/keyboard.h"
#include "os/os.h"
#include "os/file_access.h"
@ -56,6 +54,8 @@
#include "io/config_file.h"
#include "animation_editor.h"
#include "io/stream_peer_ssl.h"
#include "main/input_default.h"
// plugins
#include "plugins/sprite_frames_editor_plugin.h"
#include "plugins/texture_region_editor_plugin.h"
@ -76,7 +76,6 @@
#include "plugins/mesh_instance_editor_plugin.h"
#include "plugins/mesh_editor_plugin.h"
#include "plugins/theme_editor_plugin.h"
#include "plugins/tile_map_editor_plugin.h"
#include "plugins/cube_grid_theme_editor_plugin.h"
#include "plugins/shader_editor_plugin.h"
@ -100,17 +99,19 @@
#include "plugins/color_ramp_editor_plugin.h"
#include "plugins/collision_shape_2d_editor_plugin.h"
#include "plugins/gi_probe_editor_plugin.h"
#include "main/input_default.h"
// end
#include "tools/editor/editor_settings.h"
#include "tools/editor/io_plugins/editor_texture_import_plugin.h"
#include "tools/editor/io_plugins/editor_scene_import_plugin.h"
#include "tools/editor/io_plugins/editor_font_import_plugin.h"
#include "tools/editor/io_plugins/editor_sample_import_plugin.h"
#include "tools/editor/io_plugins/editor_translation_import_plugin.h"
#include "tools/editor/io_plugins/editor_bitmask_import_plugin.h"
#include "tools/editor/io_plugins/editor_mesh_import_plugin.h"
#include "tools/editor/io_plugins/editor_export_scene.h"
#include "editor_settings.h"
#include "io_plugins/editor_texture_import_plugin.h"
#include "io_plugins/editor_scene_import_plugin.h"
#include "io_plugins/editor_font_import_plugin.h"
#include "io_plugins/editor_sample_import_plugin.h"
#include "io_plugins/editor_translation_import_plugin.h"
#include "io_plugins/editor_bitmask_import_plugin.h"
#include "io_plugins/editor_mesh_import_plugin.h"
#include "io_plugins/editor_export_scene.h"
#include "io_plugins/editor_import_collada.h"
#include "io_plugins/editor_scene_importer_fbxconv.h"
#include "plugins/editor_preview_plugins.h"
#include "editor_initialize_ssl.h"

1
tools/editor/editor_path.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_path.h"
#include "editor_scale.h"
#include "editor_node.h"

1
tools/editor/editor_plugin.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_plugin.h"
#include "scene/gui/popup_menu.h"
#include "scene/3d/camera.h"
#include "plugins/canvas_item_editor_plugin.h"

1
tools/editor/editor_plugin_settings.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_plugin_settings.h"
#include "scene/gui/margin_container.h"
#include "io/config_file.h"
#include "os/file_access.h"

29
tools/editor/editor_profiler.cpp
View file

@ -1,4 +1,33 @@
/*************************************************************************/
/* editor_profiler.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* http://www.godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
/* */
/* 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_profiler.h"
#include "editor_settings.h"
#include "os/os.h"

28
tools/editor/editor_profiler.h
View file

@ -1,3 +1,31 @@
/*************************************************************************/
/* editor_profiler.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* http://www.godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
/* */
/* 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. */
/*************************************************************************/
#ifndef EDITORPROFILER_H
#define EDITORPROFILER_H

2
tools/editor/editor_reimport_dialog.cpp
View file

@ -27,8 +27,10 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_reimport_dialog.h"
#include "editor_file_system.h"
#include "editor_node.h"
void EditorReImportDialog::popup_reimport() {
if (EditorFileSystem::get_singleton()->is_scanning()) {

1
tools/editor/editor_resource_preview.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_resource_preview.h"
#include "editor_settings.h"
#include "os/file_access.h"
#include "io/resource_loader.h"

1
tools/editor/editor_run.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_run.h"
#include "globals.h"
#include "editor_settings.h"

2
tools/editor/editor_run_native.cpp
View file

@ -27,8 +27,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_run_native.h"
#include "editor_import_export.h"
#include "editor_import_export.h"
void EditorRunNative::_notification(int p_what) {

5
tools/editor/editor_run_script.cpp
View file

@ -27,13 +27,10 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_run_script.h"
#include "editor_node.h"
void EditorScript::add_root_node(Node *p_node) {
if (!editor) {

29
tools/editor/editor_scale.cpp
View file

@ -1,4 +1,33 @@
/*************************************************************************/
/* editor_scale.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* http://www.godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
/* */
/* 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_scale.h"
#include "os/os.h"
static float scale = 1.0;

28
tools/editor/editor_scale.h
View file

@ -1,3 +1,31 @@
/*************************************************************************/
/* editor_scale.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* http://www.godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
/* */
/* 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. */
/*************************************************************************/
#ifndef EDITOR_SCALE_H
#define EDITOR_SCALE_H

5
tools/editor/editor_settings.cpp
View file

@ -3,7 +3,7 @@
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* http:/www.godotengine.org */
/* http:/www.godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
/* */
@ -27,13 +27,12 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_settings.h"
#include "os/os.h"
#include "os/dir_access.h"
#include "os/file_access.h"
#include "version.h"
#include "scene/main/scene_main_loop.h"
#include "os/os.h"
#include "scene/main/node.h"
#include "io/resource_loader.h"
#include "io/resource_saver.h"

3
tools/editor/editor_sub_scene.cpp
View file

@ -27,10 +27,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_sub_scene.h"
#include "scene/gui/margin_container.h"
#include "scene/resources/packed_scene.h"
void EditorSubScene::_path_selected(const String& p_path) {
void EditorSubScene::_path_selected(const String& p_path) {
path->set_text(p_path);
_path_changed(p_path);

4
tools/editor/editor_themes.cpp
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* editor_themes.cpp */
/* editor_themes.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -26,8 +26,8 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_themes.h"
#include "editor_icons.h"
#include "editor_fonts.h"
#include "editor_settings.h"

2
tools/editor/editor_themes.h
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* editor_themes.h */
/* editor_themes.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */

2
tools/editor/file_type_cache.cpp
View file

@ -27,10 +27,10 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "file_type_cache.h"
#include "globals.h"
#include "os/file_access.h"
FileTypeCache* FileTypeCache::singleton=NULL;
bool FileTypeCache::has_file(const String& p_path) const {

1
tools/editor/fileserver/editor_file_server.cpp
View file

@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_file_server.h"
#include "io/marshalls.h"
#include "io/marshalls.h"
#include "../editor_settings.h"

Some files were not shown because too many files have changed in this diff Show more