improved formatting of debug strings

small fixes

SConstruct

@@ -158,6 +158,14 @@ setup_options(env, args)
 setup_defines_and_flags(env, additional_src)
 generate_sources_for_resources(env, additional_src)
 
+scons_cache_path = os.environ.get("SCONS_CACHE")
+if scons_cache_path is None:
+    # store all obj's in a dedicated folder
+    env["SHOBJPREFIX"] = "#obj/"
+else:
+    env.CacheDir(scons_cache_path)
+    env.Decider("MD5")
+
 extra_tags = ""
 if "release" in env["target"] and env["force_enabled_dd3d"]:
     extra_tags += ".enabled"

dev_build_godot_cpp.bat

@@ -1,11 +1,6 @@
-cd godot-cpp
-::set api=custom_api_file="../api.json"
-set api= 
+scons apply_patches
 
-git apply --ignore-space-change --ignore-whitespace ../patches/godot_cpp_exclude_unused_classes.patch
-git apply --ignore-space-change --ignore-whitespace ../patches/unity_build.patch
-git apply --ignore-space-change --ignore-whitespace ../patches/web_threads.patch
-::git apply --ignore-space-change --ignore-whitespace ../patches/debug_string.patch
+cd godot-cpp
 
 title win x64 debug dev
 scons platform=windows target=editor arch=x86_64 dev_build=yes %api% generate_bindings=yes
@@ -18,11 +13,3 @@ if errorlevel 1 ( echo Failed to generate and compile debug godot-cpp source cod
 title win x64
 scons platform=windows target=template_release arch=x86_64 debug_symbols=no %api%
 if errorlevel 1 ( echo Failed to compile Windows godot-cpp for x64. Code: %errorlevel% && exit /b %errorlevel% )
-
-title android arm64v8 debug
-scons platform=android target=template_debug arch=arm64v8 ANDROID_HOME="" %api%
-if errorlevel 1 ( echo Failed to compile debug Android godot-cpp for arm64v8. Code: %errorlevel% && exit /b %errorlevel% )
-
-title android arm64v8
-scons platform=android target=template_release arch=arm64v8 ANDROID_HOME="" %api%
-if errorlevel 1 ( echo Failed to compile Android godot-cpp for arm64v8. Code: %errorlevel% && exit /b %errorlevel% )

lib_utils.py

@@ -7,34 +7,41 @@
 import os, json, re
 
 
-def get_sources(src: list, src_folder: str, lib_name: str = "unity_"):
-    res = [os.path.join(src_folder, file) for file in src]
+def get_sources(src: list, src_folder: str = "", lib_name: str = "unity_"):
+    if len(src_folder):
+        res = [os.path.join(src_folder, file) for file in src]
+    else:
+        res = src.copy()
     res = unity_tools.generate_unity_build(res, lib_name + "_")
     return res
 
 
-def get_library_object(env: SConsEnvironment, project_name: str, lib_name: str, extra_tags: str, output_path: str, src_folder: str, additional_src: list) -> str:
+def get_library_object(
+    other_env: SConsEnvironment,
+    project_name: str,
+    lib_name: str,
+    extra_tags: str,
+    output_path: str,
+    src_folder: str,
+    additional_src: list,
+) -> str:
+    env = other_env.Clone()
     env.Append(CPPPATH=src_folder)
 
     src = []
     with open(src_folder + "/default_sources.json") as f:
         src = json.load(f)
 
-    scons_cache_path = os.environ.get("SCONS_CACHE")
-    if scons_cache_path is None:
-        # store all obj's in a dedicated folder
-        env["SHOBJPREFIX"] = "#obj/"
-    else:
-        env.CacheDir(scons_cache_path)
-        env.Decider("MD5")
-
     # some additional tags if needed
     additional_tags = ""
 
     if env["platform"] == "web" and env.get("threads", True):
         additional_tags = ".threads"
 
-    lib_filename = "lib{}.{}.{}.{}{}".format(lib_name, env["platform"], env["target"], env["arch"], additional_tags + extra_tags) + env["SHLIBSUFFIX"]
+    lib_filename = (
+        "lib{}.{}.{}.{}{}".format(lib_name, env["platform"], env["target"], env["arch"], additional_tags + extra_tags)
+        + env["SHLIBSUFFIX"]
+    )
 
     if env["platform"] == "macos":
         generate_framework_folder(env, project_name, lib_name, lib_filename, output_path)
@@ -43,10 +50,7 @@ def get_library_object(env: SConsEnvironment, project_name: str, lib_name: str,
         lib_filename = os.path.join(output_path, lib_filename)
 
     env.Default(
-        env.SharedLibrary(
-            target=env.File(lib_filename),
-            source=get_sources(additional_src + src, src_folder, lib_name)
-        )
+        env.SharedLibrary(target=env.File(lib_filename), source=get_sources(additional_src + src, src_folder, lib_name))
     )
 
     return lib_filename
@@ -67,7 +71,35 @@ def get_library_version():
     return f"{major_value}.{minor_value}.{patch_value}"
 
 
-def generate_framework_folder(env: SConsEnvironment, project_name: str, lib_name: str, lib_filename: str, output_path: str):
+def read_all_text(file_path: str) -> str | None:
+    try:
+        with open(file_path, "r") as file:
+            text_data = file.read()
+    except UnicodeDecodeError:
+        try:
+            with open(file_path, "r", encoding="utf-8") as file:
+                text_data = file.read()
+        except UnicodeDecodeError as e:
+            print(
+                "Couldn't open file due to 'UnicodeDecodeError' exception: "
+                + (file_path).resolve().as_posix()
+                + "\nException: "
+                + str(e)
+            )
+            return None
+    return text_data
+
+
+def write_all_text(file_path: str, text: str) -> bool:
+    with open(file_path, "w+", encoding="utf-8") as file:
+        file.write(text)
+        return True
+    return False
+
+
+def generate_framework_folder(
+    env: SConsEnvironment, project_name: str, lib_name: str, lib_filename: str, output_path: str
+):
     min_version = env.get("macos_deployment_target", "10.15")
     lib_version = get_library_version()
     lib_filename_noext = os.path.splitext(lib_filename)[0]
@@ -113,10 +145,12 @@ def generate_framework_folder(env: SConsEnvironment, project_name: str, lib_name
         info_plist_file.write(info_plist)
 
 
-def generate_resources_cpp_h_files(input_files: list, namespace: str, src_folder: str, output_no_ext: str, src_out: list):
+def generate_resources_cpp_h_files(
+    input_files: list, namespace: str, src_folder: str, output_no_ext: str, src_out: list
+):
     """
     input_files : list of tuples
-        (path: str, is_text: bool)
+        (path: str, is_text: bool, content: list)
     namespace : str
         source code namespace
     src_folder : str
@@ -151,31 +185,26 @@ def generate_resources_cpp_h_files(input_files: list, namespace: str, src_folder
         for input_file_touple in input_files:
             is_text = input_file_touple[1]
             input_file_path = input_file_touple[0]
+            file_content = None
+            if len(input_file_touple) >= 3:
+                file_content = input_file_touple[2]
             file_name_escaped = input_file_path.replace(".", "_").replace("/", "_").replace("\\", "_").replace(":", "_")
 
             if is_text:
-                try:
-                    with open(input_file_path, "r") as file:
-                        text_data = file.read()
-                except UnicodeDecodeError:
-                    try:
-                        with open(input_file_path, "r", encoding="utf-8") as file:
-                            text_data = file.read()
-                    except UnicodeDecodeError as e:
-                        print(
-                            "Skipping file due to 'UnicodeDecodeError' exception: "
-                            + (input_file_path).resolve().as_posix()
-                            + "\nException: "
-                            + str(e)
-                        )
-                        continue
+                if file_content == None:
+                    text_data = read_all_text(input_file_path)
+                else:
+                    text_data = file_content
 
                 cpp_file.write(f'\tconst char *{file_name_escaped} = R"({text_data})";\n\n')
 
                 h_file.write(f"\textern const char *{file_name_escaped};\n")
             else:
-                with open(input_file_touple[0], "rb") as input_file:
-                    binary_data = input_file.read()
+                if file_content == None:
+                    with open(input_file_touple[0], "rb") as input_file:
+                        binary_data = input_file.read()
+                else:
+                    binary_data = file_content
 
                 cpp_array = ", ".join([f"{byte}" for byte in binary_data])
                 cpp_file.write(

src/2d/debug_draw_2d.cpp

@@ -13,7 +13,6 @@ GODOT_WARNING_RESTORE()
 #define NEED_LEAVE (!_is_enabled_override())
 
 DebugDraw2D *DebugDraw2D::singleton = nullptr;
-const char *DebugDraw2D::s_marked_dirty = "marked_dirty";
 
 void DebugDraw2D::_bind_methods() {
 #define REG_CLASS_NAME DebugDraw2D

src/2d/debug_draw_2d.h

@@ -34,7 +34,7 @@ class DebugDraw2D : public Object {
 	DebugDrawManager *root_node = nullptr;
 
 	// 2d
-	const static char *s_marked_dirty;
+	static constexpr const char *s_marked_dirty = "marked_dirty";
 
 	bool _is_drawing_frame = true;
 	bool _canvas_need_update = true;

src/2d/grouped_text.cpp

@@ -7,7 +7,7 @@ using namespace godot;
 
 #ifndef DISABLE_DEBUG_RENDERING
 TextGroupItem::TextGroupItem(const double &p_expiration_time, const String &p_key, const String &p_text, const int &p_priority, const Color &p_color) {
-	DEV_PRINT_STD("New " NAMEOF(TextGroupItem) " created: %s : %s\n", p_key.utf8().get_data(), p_text.utf8().get_data());
+	DEV_PRINT_STD("New %s created: %s : %s\n", NAMEOF(TextGroupItem), p_key.utf8().get_data(), p_text.utf8().get_data());
 
 	expiration_time = p_expiration_time;
 	key = p_key;
@@ -85,7 +85,7 @@ int TextGroup::get_text_size() {
 }
 
 TextGroup::TextGroup(DebugDraw2D *p_owner, const String &p_title, const int &p_priority, const bool &p_show_title, const Color &p_group_color, const int &p_title_size, const int &p_text_size) {
-	DEV_PRINT_STD("New " NAMEOF(TextGroup) " created: %s\n", p_title.utf8().get_data());
+	DEV_PRINT_STD("New %s created: %s\n", NAMEOF(TextGroup), p_title.utf8().get_data());
 
 	owner = p_owner;
 	title = p_title;

src/3d/debug_draw_3d.cpp

@@ -45,19 +45,6 @@ _DD3D_WorldWatcher::_DD3D_WorldWatcher(DebugDraw3D *p_root, uint64_t p_world_id)
 #endif
 
 DebugDraw3D *DebugDraw3D::singleton = nullptr;
-const char *DebugDraw3D::s_use_icosphere = "use_icosphere";
-const char *DebugDraw3D::s_use_icosphere_hd = "use_icosphere_for_hd";
-const char *DebugDraw3D::s_add_bevel_to_volumetric = "add_bevel_to_volumetric_geometry";
-const char *DebugDraw3D::s_default_frustum_scale = "defaults/frustum_length_scale";
-
-const char *DebugDraw3D::s_default_thickness = "volumetric_defaults/thickness";
-const char *DebugDraw3D::s_default_center_brightness = "volumetric_defaults/center_brightness";
-const char *DebugDraw3D::s_default_hd_spheres = "volumetric_defaults/hd_spheres";
-const char *DebugDraw3D::s_default_plane_size = "volumetric_defaults/plane_size";
-
-const char *DebugDraw3D::s_render_priority = "rendering/render_priority";
-const char *DebugDraw3D::s_render_mode = "rendering/render_mode";
-const char *DebugDraw3D::s_render_fog_disabled = "rendering/disable_fog";
 
 void DebugDraw3D::_bind_methods() {
 #define REG_CLASS_NAME DebugDraw3D

src/3d/debug_draw_3d.h

@@ -53,7 +53,7 @@ class _DD3D_WorldWatcher : public Node3D {
 protected:
 	DebugDraw3D *m_owner = nullptr;
 	uint64_t m_world_id;
-	static void _bind_methods(){};
+	static void _bind_methods() {};
 
 public:
 	virtual void _process(double p_delta) override;
@@ -136,19 +136,19 @@ class DebugDraw3D : public Object, public IScopeStorage<DebugDraw3DScopeConfig,
 	static DebugDraw3D *singleton;
 
 	String root_settings_section;
-	const static char *s_use_icosphere;
-	const static char *s_use_icosphere_hd;
-	const static char *s_add_bevel_to_volumetric;
-	const static char *s_default_frustum_scale;
+	static constexpr const char *s_use_icosphere = "use_icosphere";
+	static constexpr const char *s_use_icosphere_hd = "use_icosphere_for_hd";
+	static constexpr const char *s_add_bevel_to_volumetric = "add_bevel_to_volumetric_geometry";
+	static constexpr const char *s_default_frustum_scale = "defaults/frustum_length_scale";
 
-	const static char *s_default_thickness;
-	const static char *s_default_center_brightness;
-	const static char *s_default_hd_spheres;
-	const static char *s_default_plane_size;
+	static constexpr const char *s_default_thickness = "volumetric_defaults/thickness";
+	static constexpr const char *s_default_center_brightness = "volumetric_defaults/center_brightness";
+	static constexpr const char *s_default_hd_spheres = "volumetric_defaults/hd_spheres";
+	static constexpr const char *s_default_plane_size = "volumetric_defaults/plane_size";
 
-	const static char *s_render_priority;
-	const static char *s_render_mode;
-	const static char *s_render_fog_disabled;
+	static constexpr const char *s_render_priority = "rendering/render_priority";
+	static constexpr const char *s_render_mode = "rendering/render_mode";
+	static constexpr const char *s_render_fog_disabled = "rendering/disable_fog";
 
 	std::vector<SubViewport *> custom_editor_viewports;
 	DebugDrawManager *root_node = nullptr;
@@ -273,7 +273,7 @@ class DebugDraw3D : public Object, public IScopeStorage<DebugDraw3DScopeConfig,
 
 #pragma region Exposed Parameters
 	/// @private
-	void set_empty_color(const Color &col){};
+	void set_empty_color(const Color &col) {};
 	/**
 	 * Get the color that is used as the default parameter for `draw_*` calls.
 	 */

src/3d/debug_geometry_container.cpp

@@ -18,7 +18,7 @@ using namespace godot;
 
 DebugGeometryContainer::DebugGeometryContainer(class DebugDraw3D *p_root, bool p_no_depth_test) {
 	ZoneScoped;
-	DEV_PRINT_STD("New " NAMEOF(DebugGeometryContainer) " created: %s\n", p_no_depth_test ? "NoDepth" : "Normal");
+	DEV_PRINT_STD("New %s created: %s\n", NAMEOF(DebugGeometryContainer), p_no_depth_test ? "NoDepth" : "Normal");
 	owner = p_root;
 	RenderingServer *rs = RenderingServer::get_singleton();
 	no_depth_test = p_no_depth_test;
@@ -80,7 +80,7 @@ DebugGeometryContainer::DebugGeometryContainer(class DebugDraw3D *p_root, bool p
 
 DebugGeometryContainer::~DebugGeometryContainer() {
 	ZoneScoped;
-	DEV_PRINT_STD(NAMEOF(DebugGeometryContainer) " destroyed: %s, World3D (%d)\n", no_depth_test ? "NoDepth" : "Normal", base_world_viewport.is_valid() ? base_world_viewport->get_instance_id() : 0);
+	DEV_PRINT_STD("%s destroyed: %s, World3D (%d)\n", NAMEOF(DebugGeometryContainer), no_depth_test ? "NoDepth" : "Normal", base_world_viewport.is_valid() ? base_world_viewport->get_instance_id() : 0);
 	LOCK_GUARD(owner->datalock);
 
 	geometry_pool.clear_pool();

src/3d/render_instances.cpp

@@ -32,13 +32,13 @@ bool DelayedRenderer::update_visibility(const std::shared_ptr<GeometryPoolCullin
 
 DelayedRendererInstance::DelayedRendererInstance() :
 		DelayedRenderer() {
-	DEV_PRINT_STD("New " NAMEOF(DelayedRendererInstance) " created\n");
+	DEV_PRINT_STD("New %s created\n", NAMEOF(DelayedRendererInstance));
 }
 
 DelayedRendererLine::DelayedRendererLine() :
 		DelayedRenderer(),
 		lines_count(0) {
-	DEV_PRINT_STD("New " NAMEOF(DelayedRendererLine) " created\n");
+	DEV_PRINT_STD("New %s created\n", NAMEOF(DelayedRendererLine));
 }
 
 void GeometryPool::fill_mesh_data(const std::vector<Ref<MultiMesh> *> &p_meshes, Ref<ArrayMesh> p_ig, std::unordered_map<Viewport *, std::shared_ptr<GeometryPoolCullingData> > &p_culling_data) {

src/debug_draw_manager.cpp

@@ -32,13 +32,6 @@ void _DD3D_PhysicsWatcher::_physics_process(double p_delta) {
 
 DebugDrawManager *DebugDrawManager::singleton = nullptr;
 
-const char *DebugDrawManager::s_initial_state = "initial_debug_state";
-const char *DebugDrawManager::s_manager_aliases = NAMEOF(DebugDrawManager) "_singleton_aliases ";
-const char *DebugDrawManager::s_dd2d_aliases = NAMEOF(DebugDraw2D) "_singleton_aliases";
-const char *DebugDrawManager::s_dd3d_aliases = NAMEOF(DebugDraw3D) "_singleton_aliases";
-
-const char *DebugDrawManager::s_extension_unloading = "extension_unloading";
-
 void DebugDrawManager::_bind_methods() {
 #ifdef DEV_ENABLED
 	ClassDB::bind_method(D_METHOD(NAMEOF(api_test1)), &DebugDrawManager::api_test1);

src/debug_draw_manager.h

@@ -17,7 +17,7 @@ class _DD3D_PhysicsWatcher : public Node {
 	GDCLASS(_DD3D_PhysicsWatcher, Node)
 protected:
 	DebugDrawManager *root_node;
-	static void _bind_methods(){};
+	static void _bind_methods() {};
 
 public:
 	void init(DebugDrawManager *p_root);
@@ -64,10 +64,10 @@ class DebugDrawManager : public CanvasLayer {
 	static DebugDrawManager *singleton;
 
 	String root_settings_section;
-	const static char *s_initial_state;
-	const static char *s_manager_aliases;
-	const static char *s_dd2d_aliases;
-	const static char *s_dd3d_aliases;
+	static constexpr const char *s_initial_state = "initial_debug_state";
+	static constexpr const char *s_manager_aliases = NAMEOF(DebugDrawManager) "_singleton_aliases ";
+	static constexpr const char *s_dd2d_aliases = NAMEOF(DebugDraw2D) "_singleton_aliases";
+	static constexpr const char *s_dd3d_aliases = NAMEOF(DebugDraw3D) "_singleton_aliases";
 
 	double log_flush_time = 0;
 	bool debug_enabled = true;
@@ -106,7 +106,7 @@ class DebugDrawManager : public CanvasLayer {
 	static Object *default_arg_obj;
 
 	// Test regular arguments
-	void api_test1(Variant, Object *, bool, int, float, String, StringName, NodePath){};
+	void api_test1(Variant, Object *, bool, int, float, String, StringName, NodePath) {};
 	void api_test2(Color, Vector2, Vector2i, Vector3, Vector3i, Vector4, Vector4i, Rect2, Rect2i){};
 	void api_test3(Transform2D, Transform3D, Plane, Quaternion, AABB, Basis, Projection){};
 	void api_test4(RID, Callable, Signal, Dictionary, Array){};
@@ -123,7 +123,7 @@ class DebugDrawManager : public CanvasLayer {
 
 public:
 	/// @private
-	static const char *s_extension_unloading;
+	static constexpr const char *s_extension_unloading = "extension_unloading";
 
 	DebugDrawManager();
 	~DebugDrawManager();