Merge pull request #43385 from reduz/reorganize-core

Reorganize and clean up core/ directory
godotengine · Nov 8, 2020 · 90edd83 · 90edd83
2 parents 30b6db9 + 127458e
commit 90edd83
Show file tree

Hide file tree

Showing 811 changed files with 2,232 additions and 2,488 deletions.
diff --git a/core/SCsub b/core/SCsub
@@ -34,7 +34,7 @@ if "SCRIPT_AES256_ENCRYPTION_KEY" in os.environ:
 
 # NOTE: It is safe to generate this file here, since this is still executed serially
 with open("script_encryption_key.gen.cpp", "w") as f:
-    f.write('#include "core/project_settings.h"\nuint8_t script_encryption_key[32]={' + txt + "};\n")
+    f.write('#include "core/config/project_settings.h"\nuint8_t script_encryption_key[32]={' + txt + "};\n")
 
 
 # Add required thirdparty code.
@@ -174,7 +174,12 @@ SConscript("crypto/SCsub")
 SConscript("io/SCsub")
 SConscript("debugger/SCsub")
 SConscript("input/SCsub")
-SConscript("bind/SCsub")
+SConscript("variant/SCsub")
+SConscript("object/SCsub")
+SConscript("templates/SCsub")
+SConscript("string/SCsub")
+SConscript("config/SCsub")
+SConscript("error/SCsub")
 
 
 # Build it all as a library

diff --git a/core/bind/SCsub b/core/bind/SCsub
diff --git a/core/color_names.inc b/core/color_names.inc
diff --git a/core/config/SCsub b/core/config/SCsub
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+Import("env")
+
+env_config = env.Clone()
+
+env_config.add_source_files(env.core_sources, "*.cpp")
diff --git a/core/engine.cpp → core/config/engine.cpp b/core/engine.cpp → core/config/engine.cpp
diff --git a/core/engine.h → core/config/engine.h b/core/engine.h → core/config/engine.h
@@ -31,10 +31,10 @@
 #ifndef ENGINE_H
 #define ENGINE_H
 
-#include "core/list.h"
 #include "core/os/main_loop.h"
-#include "core/ustring.h"
-#include "core/vector.h"
+#include "core/string/ustring.h"
+#include "core/templates/list.h"
+#include "core/templates/vector.h"
 
 class Engine {
 public:

diff --git a/core/project_settings.cpp → core/config/project_settings.cpp b/core/project_settings.cpp → core/config/project_settings.cpp
@@ -30,7 +30,7 @@
 
 #include "project_settings.h"
 
-#include "core/bind/core_bind.h"
+#include "core/core_bind.h"
 #include "core/core_string_names.h"
 #include "core/io/file_access_network.h"
 #include "core/io/file_access_pack.h"
@@ -39,7 +39,7 @@
 #include "core/os/file_access.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
-#include "core/variant_parser.h"
+#include "core/variant/variant_parser.h"
 
 #include <zlib.h>
 

diff --git a/core/project_settings.h → core/config/project_settings.h b/core/project_settings.h → core/config/project_settings.h
@@ -31,9 +31,9 @@
 #ifndef PROJECT_SETTINGS_H
 #define PROJECT_SETTINGS_H
 
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/os/thread_safe.h"
-#include "core/set.h"
+#include "core/templates/set.h"
 
 class ProjectSettings : public Object {
 	GDCLASS(ProjectSettings, Object);

diff --git a/core/bind/core_bind.cpp → core/core_bind.cpp b/core/bind/core_bind.cpp → core/core_bind.cpp
@@ -30,6 +30,7 @@
 
 #include "core_bind.h"
 
+#include "core/config/project_settings.h"
 #include "core/crypto/crypto_core.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/io/file_access_compressed.h"
@@ -40,7 +41,6 @@
 #include "core/math/geometry_3d.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
-#include "core/project_settings.h"
 
 /**
  *  Time constants borrowed from loc_time.h

diff --git a/core/bind/core_bind.h → core/core_bind.h b/core/bind/core_bind.h → core/core_bind.h
@@ -31,8 +31,8 @@
 #ifndef CORE_BIND_H
 #define CORE_BIND_H
 
-#include "core/image.h"
 #include "core/io/compression.h"
+#include "core/io/image.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
 #include "core/os/dir_access.h"