From 253fc093b8a4927b3a0acba88aeca70cbc55cfc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 20 Apr 2020 12:29:34 +0200 Subject: [PATCH] DocData: Skip unexposed classes Properly expose classes that we actually want accessible. (cherry picked from commit 0ef8bcac4d05a998e94d1a8b3db4f47401e5d730) --- core/crypto/crypto.h | 4 ---- doc/classes/DynamicFont.xml | 2 +- doc/classes/IP_Unix.xml | 15 --------------- doc/classes/InputDefault.xml | 15 --------------- doc/classes/Physics2DDirectBodyStateSW.xml | 15 --------------- doc/classes/Physics2DServerSW.xml | 15 --------------- doc/classes/ResourceFormatLoaderCrypto.xml | 13 ------------- doc/classes/ResourceFormatSaverCrypto.xml | 13 ------------- editor/doc/doc_data.cpp | 6 ++++++ main/main.cpp | 6 ++++-- modules/bullet/config.py | 9 --------- .../BulletPhysicsDirectBodyState.xml | 13 ------------- modules/gdscript/config.py | 1 - .../doc_classes/GDScriptNativeClass.xml | 19 ------------------- 14 files changed, 11 insertions(+), 135 deletions(-) delete mode 100644 doc/classes/IP_Unix.xml delete mode 100644 doc/classes/InputDefault.xml delete mode 100644 doc/classes/Physics2DDirectBodyStateSW.xml delete mode 100644 doc/classes/Physics2DServerSW.xml delete mode 100644 doc/classes/ResourceFormatLoaderCrypto.xml delete mode 100644 doc/classes/ResourceFormatSaverCrypto.xml delete mode 100644 modules/bullet/doc_classes/BulletPhysicsDirectBodyState.xml delete mode 100644 modules/gdscript/doc_classes/GDScriptNativeClass.xml diff --git a/core/crypto/crypto.h b/core/crypto/crypto.h index adc36255b61..35d28d71d69 100644 --- a/core/crypto/crypto.h +++ b/core/crypto/crypto.h @@ -84,8 +84,6 @@ public: }; class ResourceFormatLoaderCrypto : public ResourceFormatLoader { - GDCLASS(ResourceFormatLoaderCrypto, ResourceFormatLoader); - public: virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual void get_recognized_extensions(List *p_extensions) const; @@ -94,8 +92,6 @@ public: }; class ResourceFormatSaverCrypto : public ResourceFormatSaver { - GDCLASS(ResourceFormatSaverCrypto, ResourceFormatSaver); - public: virtual Error save(const String &p_path, const RES &p_resource, uint32_t p_flags = 0); virtual void get_recognized_extensions(const RES &p_resource, List *p_extensions) const; diff --git a/doc/classes/DynamicFont.xml b/doc/classes/DynamicFont.xml index 659b9de3ad9..2d7badcde59 100644 --- a/doc/classes/DynamicFont.xml +++ b/doc/classes/DynamicFont.xml @@ -12,7 +12,7 @@ dynamic_font.size = 64 $"Label".set("custom_fonts/font", dynamic_font) [/codeblock] - [b]Note:[/b] DynamicFont doesn't support features such as right-to-left typesetting, ligatures, text shaping, variable fonts and optional font features yet. If you wish to "bake" an optional font feature into a TTF font file, you can use [url=https://fontforge.org/]FontForge[/url] to do so. In FontForge, use [b]File > Generate Fonts[/b], click [b]Options[/b], choose the desired features then generate the font. + [b]Note:[/b] DynamicFont doesn't support features such as right-to-left typesetting, ligatures, text shaping, variable fonts and optional font features yet. If you wish to "bake" an optional font feature into a TTF font file, you can use [url=https://fontforge.org/]FontForge[/url] to do so. In FontForge, use [b]File > Generate Fonts[/b], click [b]Options[/b], choose the desired features then generate the font. diff --git a/doc/classes/IP_Unix.xml b/doc/classes/IP_Unix.xml deleted file mode 100644 index 800d4a5caeb..00000000000 --- a/doc/classes/IP_Unix.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - UNIX IP support. See [IP]. - - - UNIX-specific implementation of IP support functions. See [IP]. - - - - - - - - diff --git a/doc/classes/InputDefault.xml b/doc/classes/InputDefault.xml deleted file mode 100644 index 95b470bab94..00000000000 --- a/doc/classes/InputDefault.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - Default implementation of the [Input] class. - - - Default implementation of the [Input] class, used internally by the editor and games for default input management. - - - - - - - - diff --git a/doc/classes/Physics2DDirectBodyStateSW.xml b/doc/classes/Physics2DDirectBodyStateSW.xml deleted file mode 100644 index be79e38a626..00000000000 --- a/doc/classes/Physics2DDirectBodyStateSW.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - Software implementation of [Physics2DDirectBodyState]. - - - Software implementation of [Physics2DDirectBodyState]. This object exposes no new methods or properties and should not be used, as [Physics2DDirectBodyState] selects the best implementation available. - - - - - - - - diff --git a/doc/classes/Physics2DServerSW.xml b/doc/classes/Physics2DServerSW.xml deleted file mode 100644 index cc285a64d06..00000000000 --- a/doc/classes/Physics2DServerSW.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - Software implementation of [Physics2DServer]. - - - This class exposes no new methods or properties and should not be used, as [Physics2DServer] automatically selects the best implementation available. - - - - - - - - diff --git a/doc/classes/ResourceFormatLoaderCrypto.xml b/doc/classes/ResourceFormatLoaderCrypto.xml deleted file mode 100644 index 615584451de..00000000000 --- a/doc/classes/ResourceFormatLoaderCrypto.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/doc/classes/ResourceFormatSaverCrypto.xml b/doc/classes/ResourceFormatSaverCrypto.xml deleted file mode 100644 index fb96ef7d3e7..00000000000 --- a/doc/classes/ResourceFormatSaverCrypto.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index 3e6f5f76ddc..4c7cd435a82 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc/doc_data.cpp @@ -243,6 +243,12 @@ void DocData::generate(bool p_basic_types) { Set setters_getters; String name = classes.front()->get(); + if (!ClassDB::is_class_exposed(name)) { + print_verbose(vformat("Class '%s' is not exposed, skipping.", name)); + classes.pop_front(); + continue; + } + String cname = name; if (cname.begins_with("_")) //proxy class cname = cname.substr(1, name.length()); diff --git a/main/main.cpp b/main/main.cpp index c111245918d..b91f4ba5f32 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1131,9 +1131,11 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph ProjectSettings::get_singleton()->set_custom_property_info("debug/settings/fps/force_fps", PropertyInfo(Variant::INT, "debug/settings/fps/force_fps", PROPERTY_HINT_RANGE, "0,120,1,or_greater")); GLOBAL_DEF("debug/settings/stdout/print_fps", false); + GLOBAL_DEF("debug/settings/stdout/verbose_stdout", false); - if (!OS::get_singleton()->_verbose_stdout) //overridden - OS::get_singleton()->_verbose_stdout = GLOBAL_DEF("debug/settings/stdout/verbose_stdout", false); + if (!OS::get_singleton()->_verbose_stdout) { // Not manually overridden. + OS::get_singleton()->_verbose_stdout = GLOBAL_GET("debug/settings/stdout/verbose_stdout"); + } if (frame_delay == 0) { frame_delay = GLOBAL_DEF("application/run/frame_delay_msec", 0); diff --git a/modules/bullet/config.py b/modules/bullet/config.py index 92dbcf5cb0d..1c8cd12a2dc 100644 --- a/modules/bullet/config.py +++ b/modules/bullet/config.py @@ -3,12 +3,3 @@ def can_build(env, platform): def configure(env): pass - -def get_doc_classes(): - return [ - "BulletPhysicsDirectBodyState", - "BulletPhysicsServer", - ] - -def get_doc_path(): - return "doc_classes" diff --git a/modules/bullet/doc_classes/BulletPhysicsDirectBodyState.xml b/modules/bullet/doc_classes/BulletPhysicsDirectBodyState.xml deleted file mode 100644 index f8bfb125fed..00000000000 --- a/modules/bullet/doc_classes/BulletPhysicsDirectBodyState.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/modules/gdscript/config.py b/modules/gdscript/config.py index a525eedaaa0..aceeee22d91 100644 --- a/modules/gdscript/config.py +++ b/modules/gdscript/config.py @@ -9,7 +9,6 @@ def get_doc_classes(): "@GDScript", "GDScript", "GDScriptFunctionState", - "GDScriptNativeClass", ] def get_doc_path(): diff --git a/modules/gdscript/doc_classes/GDScriptNativeClass.xml b/modules/gdscript/doc_classes/GDScriptNativeClass.xml deleted file mode 100644 index d4a0ce33aa7..00000000000 --- a/modules/gdscript/doc_classes/GDScriptNativeClass.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - -