godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #29872 from akien-mga/unexpose-resourceformatloaders

Browse Source 
Unexpose subclasses of ResourceFormatLoader and -Saver
This commit is contained in:
Rémi Verschelde
2019-06-18 20:07:10 +02:00
committed by GitHub
parent 0cdbf7315b d6176db271
commit c6507933a7
59 changed files with 10 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/io/image_loader.h
View File

@@ -88,7 +88,6 @@ public:
}; };
class ResourceFormatLoaderImage : public ResourceFormatLoader { class ResourceFormatLoaderImage : public ResourceFormatLoader {
GDCLASS(ResourceFormatLoaderImage, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;

2
core/io/resource_format_binary.h
View File

@@ -100,7 +100,6 @@ public:
}; };
class ResourceFormatLoaderBinary : public ResourceFormatLoader { class ResourceFormatLoaderBinary : public ResourceFormatLoader {
GDCLASS(ResourceFormatLoaderBinary, ResourceFormatLoader)
public: public:
virtual Ref<ResourceInteractiveLoader> load_interactive(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual Ref<ResourceInteractiveLoader> load_interactive(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
virtual void get_recognized_extensions_for_type(const String &p_type, List<String> *p_extensions) const; virtual void get_recognized_extensions_for_type(const String &p_type, List<String> *p_extensions) const;
@@ -162,7 +161,6 @@ public:
}; };
class ResourceFormatSaverBinary : public ResourceFormatSaver { class ResourceFormatSaverBinary : public ResourceFormatSaver {
GDCLASS(ResourceFormatSaverBinary, ResourceFormatSaver)
public: public:
static ResourceFormatSaverBinary *singleton; static ResourceFormatSaverBinary *singleton;
virtual Error save(const String &p_path, const RES &p_resource, uint32_t p_flags = 0); virtual Error save(const String &p_path, const RES &p_resource, uint32_t p_flags = 0);

2
core/io/resource_importer.h
View File

@@ -37,8 +37,6 @@ class ResourceImporter;
class ResourceFormatImporter : public ResourceFormatLoader { class ResourceFormatImporter : public ResourceFormatLoader {
GDCLASS(ResourceFormatImporter, ResourceFormatLoader)
struct PathAndType { struct PathAndType {
String path; String path;
String type; String type;

1
core/io/translation_loader_po.h
View File

@@ -36,7 +36,6 @@
#include "core/translation.h" #include "core/translation.h"
class TranslationLoaderPO : public ResourceFormatLoader { class TranslationLoaderPO : public ResourceFormatLoader {
GDCLASS(TranslationLoaderPO, ResourceFormatLoader)
public: public:
static RES load_translation(FileAccess *f, Error *r_error, const String &p_path = String()); static RES load_translation(FileAccess *f, Error *r_error, const String &p_path = String());
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);

13
doc/classes/GDNativeLibraryResourceLoader.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="GDNativeLibraryResourceLoader" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/GDNativeLibraryResourceSaver.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="GDNativeLibraryResourceSaver" inherits="ResourceFormatSaver" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatDDS.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatDDS" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatImporter.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatImporter" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatLoaderBMFont.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatLoaderBMFont" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatLoaderBinary.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatLoaderBinary" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatLoaderDynamicFont.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatLoaderDynamicFont" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatLoaderGDScript.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatLoaderGDScript" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatLoaderImage.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatLoaderImage" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatLoaderNativeScript.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatLoaderNativeScript" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatLoaderShader.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatLoaderShader" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatLoaderStreamTexture.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatLoaderStreamTexture" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatLoaderText.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatLoaderText" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatLoaderTextureLayered.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatLoaderTextureLayered" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatLoaderTheora.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatLoaderTheora" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatLoaderWebm.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatLoaderWebm" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatPKM.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatPKM" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatPVR.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatPVR" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatSaverBinary.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatSaverBinary" inherits="ResourceFormatSaver" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatSaverGDScript.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatSaverGDScript" inherits="ResourceFormatSaver" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatSaverNativeScript.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatSaverNativeScript" inherits="ResourceFormatSaver" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatSaverShader.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatSaverShader" inherits="ResourceFormatSaver" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceFormatSaverText.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatSaverText" inherits="ResourceFormatSaver" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceImporter.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceImporter" inherits="Reference" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
doc/classes/ResourceSaverPNG.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceSaverPNG" inherits="ResourceFormatSaver" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

14
doc/classes/TextEdit.xml
View File

@@ -515,15 +515,12 @@
</constants> </constants>
<theme_items> <theme_items>
<theme_item name="background_color" type="Color"> <theme_item name="background_color" type="Color">
Sets the background [Color] of this [TextEdit]. [member syntax_highlighting] has to be enabled.
</theme_item> </theme_item>
<theme_item name="bookmark_color" type="Color"> <theme_item name="bookmark_color" type="Color">
Sets the [Color] of the bookmark marker. [member syntax_highlighting] has to be enabled.
</theme_item> </theme_item>
<theme_item name="brace_mismatch_color" type="Color"> <theme_item name="brace_mismatch_color" type="Color">
</theme_item> </theme_item>
<theme_item name="breakpoint_color" type="Color"> <theme_item name="breakpoint_color" type="Color">
Sets the [Color] of the breakpoints. [member breakpoint_gutter] has to be enabled.
</theme_item> </theme_item>
<theme_item name="caret_background_color" type="Color"> <theme_item name="caret_background_color" type="Color">
</theme_item> </theme_item>
@@ -550,7 +547,6 @@
<theme_item name="completion_selected_color" type="Color"> <theme_item name="completion_selected_color" type="Color">
</theme_item> </theme_item>
<theme_item name="current_line_color" type="Color"> <theme_item name="current_line_color" type="Color">
Sets the current line highlight [Color]. [member highlight_current_line] has to be enabled.
</theme_item> </theme_item>
<theme_item name="executing_line_color" type="Color"> <theme_item name="executing_line_color" type="Color">
</theme_item> </theme_item>
@@ -561,48 +557,38 @@
<theme_item name="folded" type="Texture"> <theme_item name="folded" type="Texture">
</theme_item> </theme_item>
<theme_item name="font" type="Font"> <theme_item name="font" type="Font">
Sets the default [Font].
</theme_item> </theme_item>
<theme_item name="font_color" type="Color"> <theme_item name="font_color" type="Color">
Sets the font [Color].
</theme_item> </theme_item>
<theme_item name="font_color_selected" type="Color"> <theme_item name="font_color_selected" type="Color">
</theme_item> </theme_item>
<theme_item name="function_color" type="Color"> <theme_item name="function_color" type="Color">
</theme_item> </theme_item>
<theme_item name="line_number_color" type="Color"> <theme_item name="line_number_color" type="Color">
Sets the [Color] of the line numbers. [member show_line_numbers] has to be enabled.
</theme_item> </theme_item>
<theme_item name="line_spacing" type="int"> <theme_item name="line_spacing" type="int">
Sets the spacing between the lines.
</theme_item> </theme_item>
<theme_item name="mark_color" type="Color"> <theme_item name="mark_color" type="Color">
Sets the [Color] of marked text.
</theme_item> </theme_item>
<theme_item name="member_variable_color" type="Color"> <theme_item name="member_variable_color" type="Color">
</theme_item> </theme_item>
<theme_item name="normal" type="StyleBox"> <theme_item name="normal" type="StyleBox">
Sets the [StyleBox] of this [TextEdit].
</theme_item> </theme_item>
<theme_item name="number_color" type="Color"> <theme_item name="number_color" type="Color">
</theme_item> </theme_item>
<theme_item name="read_only" type="StyleBox"> <theme_item name="read_only" type="StyleBox">
Sets the [StyleBox] of this [TextEdit] when [member read_only] is enabled.
</theme_item> </theme_item>
<theme_item name="safe_line_number_color" type="Color"> <theme_item name="safe_line_number_color" type="Color">
</theme_item> </theme_item>
<theme_item name="selection_color" type="Color"> <theme_item name="selection_color" type="Color">
Sets the highlight [Color] of text selections.
</theme_item> </theme_item>
<theme_item name="space" type="Texture"> <theme_item name="space" type="Texture">
</theme_item> </theme_item>
<theme_item name="symbol_color" type="Color"> <theme_item name="symbol_color" type="Color">
</theme_item> </theme_item>
<theme_item name="tab" type="Texture"> <theme_item name="tab" type="Texture">
Sets a custom [Texture] for tab text characters.
</theme_item> </theme_item>
<theme_item name="word_highlighted_color" type="Color"> <theme_item name="word_highlighted_color" type="Color">
Sets the highlight [Color] of multiple occurrences. [member highlight_all_occurrences] has to be enabled.
</theme_item> </theme_item>
</theme_items> </theme_items>
</class> </class>

13
doc/classes/TranslationLoaderPO.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="TranslationLoaderPO" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

1
drivers/dummy/texture_loader_dummy.h
View File

@@ -35,7 +35,6 @@
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
class ResourceFormatDummyTexture : public ResourceFormatLoader { class ResourceFormatDummyTexture : public ResourceFormatLoader {
GDCLASS(ResourceFormatDummyTexture, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;

1
drivers/png/resource_saver_png.h
View File

@@ -35,7 +35,6 @@
#include "core/io/resource_saver.h" #include "core/io/resource_saver.h"
class ResourceSaverPNG : public ResourceFormatSaver { class ResourceSaverPNG : public ResourceFormatSaver {
GDCLASS(ResourceSaverPNG, ResourceFormatSaver)
public: public:
static Error save_image(const String &p_path, const Ref<Image> &p_img); static Error save_image(const String &p_path, const Ref<Image> &p_img);

1
modules/dds/texture_loader_dds.h
View File

@@ -35,7 +35,6 @@
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
class ResourceFormatDDS : public ResourceFormatLoader { class ResourceFormatDDS : public ResourceFormatLoader {
GDCLASS(ResourceFormatDDS, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;

1
modules/etc/texture_loader_pkm.h
View File

@@ -35,7 +35,6 @@
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
class ResourceFormatPKM : public ResourceFormatLoader { class ResourceFormatPKM : public ResourceFormatLoader {
GDCLASS(ResourceFormatPKM, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;

1
modules/gdnative/config.py
View File

@@ -13,7 +13,6 @@ def get_doc_classes():
"NativeScript", "NativeScript",
"PacketPeerGDNative", "PacketPeerGDNative",
"PluginScript", "PluginScript",
"ResourceFormatLoaderVideoStreamGDNative",
"StreamPeerGDNative", "StreamPeerGDNative",
"VideoStreamGDNative", "VideoStreamGDNative",
"WebRTCPeerConnectionGDNative", "WebRTCPeerConnectionGDNative",

13
modules/gdnative/doc_classes/ResourceFormatLoaderVideoStreamGDNative.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceFormatLoaderVideoStreamGDNative" inherits="ResourceFormatLoader" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

2
modules/gdnative/gdnative.h
View File

@@ -165,7 +165,6 @@ public:
}; };
class GDNativeLibraryResourceLoader : public ResourceFormatLoader { class GDNativeLibraryResourceLoader : public ResourceFormatLoader {
GDCLASS(GDNativeLibraryResourceLoader, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path, Error *r_error); virtual RES load(const String &p_path, const String &p_original_path, Error *r_error);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;
@@ -174,7 +173,6 @@ public:
}; };
class GDNativeLibraryResourceSaver : public ResourceFormatSaver { class GDNativeLibraryResourceSaver : public ResourceFormatSaver {
GDCLASS(GDNativeLibraryResourceSaver, ResourceFormatSaver)
public: public:
virtual Error save(const String &p_path, const RES &p_resource, uint32_t p_flags); virtual Error save(const String &p_path, const RES &p_resource, uint32_t p_flags);
virtual bool recognize(const RES &p_resource) const; virtual bool recognize(const RES &p_resource) const;

2
modules/gdnative/nativescript/nativescript.h
View File

@@ -382,7 +382,6 @@ public:
}; };
class ResourceFormatLoaderNativeScript : public ResourceFormatLoader { class ResourceFormatLoaderNativeScript : public ResourceFormatLoader {
GDCLASS(ResourceFormatLoaderNativeScript, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;
@@ -391,7 +390,6 @@ public:
}; };
class ResourceFormatSaverNativeScript : public ResourceFormatSaver { class ResourceFormatSaverNativeScript : public ResourceFormatSaver {
GDCLASS(ResourceFormatSaverNativeScript, ResourceFormatSaver)
virtual Error save(const String &p_path, const RES &p_resource, uint32_t p_flags = 0); virtual Error save(const String &p_path, const RES &p_resource, uint32_t p_flags = 0);
virtual bool recognize(const RES &p_resource) const; virtual bool recognize(const RES &p_resource) const;
virtual void get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const; virtual void get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const;

4
modules/gdnative/pluginscript/pluginscript_loader.h
View File

@@ -40,8 +40,6 @@ class PluginScriptLanguage;
class ResourceFormatLoaderPluginScript : public ResourceFormatLoader { class ResourceFormatLoaderPluginScript : public ResourceFormatLoader {
GDCLASS(ResourceFormatLoaderPluginScript, ResourceFormatLoader)
PluginScriptLanguage *_language; PluginScriptLanguage *_language;
public: public:
@@ -54,8 +52,6 @@ public:
class ResourceFormatSaverPluginScript : public ResourceFormatSaver { class ResourceFormatSaverPluginScript : public ResourceFormatSaver {
GDCLASS(ResourceFormatSaverPluginScript, ResourceFormatSaver)
PluginScriptLanguage *_language; PluginScriptLanguage *_language;
public: public:

1
modules/gdnative/videodecoder/video_stream_gdnative.h
View File

@@ -197,7 +197,6 @@ public:
}; };
class ResourceFormatLoaderVideoStreamGDNative : public ResourceFormatLoader { class ResourceFormatLoaderVideoStreamGDNative : public ResourceFormatLoader {
GDCLASS(ResourceFormatLoaderVideoStreamGDNative, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;

2
modules/gdscript/gdscript.h
View File

@@ -509,7 +509,6 @@ public:
}; };
class ResourceFormatLoaderGDScript : public ResourceFormatLoader { class ResourceFormatLoaderGDScript : public ResourceFormatLoader {
GDCLASS(ResourceFormatLoaderGDScript, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;
@@ -519,7 +518,6 @@ public:
}; };
class ResourceFormatSaverGDScript : public ResourceFormatSaver { class ResourceFormatSaverGDScript : public ResourceFormatSaver {
GDCLASS(ResourceFormatSaverGDScript, ResourceFormatSaver)
public: public:
virtual Error save(const String &p_path, const RES &p_resource, uint32_t p_flags = 0); 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<String> *p_extensions) const; virtual void get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const;

2
modules/mono/csharp_script.h
View File

@@ -440,7 +440,6 @@ public:
}; };
class ResourceFormatLoaderCSharpScript : public ResourceFormatLoader { class ResourceFormatLoaderCSharpScript : public ResourceFormatLoader {
GDCLASS(ResourceFormatLoaderCSharpScript, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;
@@ -449,7 +448,6 @@ public:
}; };
class ResourceFormatSaverCSharpScript : public ResourceFormatSaver { class ResourceFormatSaverCSharpScript : public ResourceFormatSaver {
GDCLASS(ResourceFormatSaverCSharpScript, ResourceFormatSaver)
public: public:
virtual Error save(const String &p_path, const RES &p_resource, uint32_t p_flags = 0); 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<String> *p_extensions) const; virtual void get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const;

1
modules/opus/audio_stream_opus.h
View File

@@ -132,7 +132,6 @@ public:
}; };
class ResourceFormatLoaderAudioStreamOpus : public ResourceFormatLoader { class ResourceFormatLoaderAudioStreamOpus : public ResourceFormatLoader {
GDCLASS(ResourceFormatLoaderAudioStreamOpus, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;

1
modules/pvr/texture_loader_pvr.h
View File

@@ -35,7 +35,6 @@
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
class ResourceFormatPVR : public ResourceFormatLoader { class ResourceFormatPVR : public ResourceFormatLoader {
GDCLASS(ResourceFormatPVR, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path, Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path, Error *r_error = NULL);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;

1
modules/stb_vorbis/config.py
View File

@@ -7,7 +7,6 @@ def configure(env):
def get_doc_classes(): def get_doc_classes():
return [ return [
"AudioStreamOGGVorbis", "AudioStreamOGGVorbis",
"ResourceImporterOGGVorbis",
] ]
def get_doc_path(): def get_doc_path():

13
modules/stb_vorbis/doc_classes/ResourceImporterOGGVorbis.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="ResourceImporterOGGVorbis" inherits="ResourceImporter" category="Core" version="3.2">
<brief_description>
</brief_description>
<description>
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<constants>
</constants>
</class>

13
modules/stb_vorbis/register_types.cpp
View File

@@ -29,15 +29,22 @@
/*************************************************************************/ /*************************************************************************/
#include "register_types.h" #include "register_types.h"
#include "audio_stream_ogg_vorbis.h" #include "audio_stream_ogg_vorbis.h"
#ifdef TOOLS_ENABLED
#include "core/engine.h"
#include "resource_importer_ogg_vorbis.h" #include "resource_importer_ogg_vorbis.h"
#endif
void register_stb_vorbis_types() { void register_stb_vorbis_types() {
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
Ref<ResourceImporterOGGVorbis> ogg_import; if (Engine::get_singleton()->is_editor_hint()) {
ogg_import.instance(); Ref<ResourceImporterOGGVorbis> ogg_import;
ResourceFormatImporter::get_singleton()->add_importer(ogg_import); ogg_import.instance();
ResourceFormatImporter::get_singleton()->add_importer(ogg_import);
}
#endif #endif
ClassDB::register_class<AudioStreamOGGVorbis>(); ClassDB::register_class<AudioStreamOGGVorbis>();
} }

1
modules/theora/config.py
View File

@@ -6,7 +6,6 @@ def configure(env):
def get_doc_classes(): def get_doc_classes():
return [ return [
"ResourceImporterTheora",
"VideoStreamTheora", "VideoStreamTheora",
] ]

1
modules/theora/video_stream_theora.h
View File

@@ -186,7 +186,6 @@ public:
}; };
class ResourceFormatLoaderTheora : public ResourceFormatLoader { class ResourceFormatLoaderTheora : public ResourceFormatLoader {
GDCLASS(ResourceFormatLoaderTheora, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;

1
modules/vorbis/audio_stream_ogg_vorbis.h
View File

@@ -127,7 +127,6 @@ public:
}; };
class ResourceFormatLoaderAudioStreamOGGVorbis : public ResourceFormatLoader { class ResourceFormatLoaderAudioStreamOGGVorbis : public ResourceFormatLoader {
GDCLASS(ResourceFormatLoaderAudioStreamOGGVorbis, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;

1
modules/webm/config.py
View File

@@ -6,7 +6,6 @@ def configure(env):
def get_doc_classes(): def get_doc_classes():
return [ return [
"ResourceImporterWebm",
"VideoStreamWebm", "VideoStreamWebm",
] ]

1
modules/webm/video_stream_webm.h
View File

@@ -127,7 +127,6 @@ public:
}; };
class ResourceFormatLoaderWebm : public ResourceFormatLoader { class ResourceFormatLoaderWebm : public ResourceFormatLoader {
GDCLASS(ResourceFormatLoaderWebm, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;

1
scene/resources/dynamic_font.h
View File

@@ -303,7 +303,6 @@ VARIANT_ENUM_CAST(DynamicFont::SpacingType);
///////////// /////////////
class ResourceFormatLoaderDynamicFont : public ResourceFormatLoader { class ResourceFormatLoaderDynamicFont : public ResourceFormatLoader {
GDCLASS(ResourceFormatLoaderDynamicFont, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;

1
scene/resources/dynamic_font_stb.h
View File

@@ -180,7 +180,6 @@ public:
///////////// /////////////
class ResourceFormatLoaderDynamicFont : public ResourceFormatLoader { class ResourceFormatLoaderDynamicFont : public ResourceFormatLoader {
GDCLASS(ResourceFormatLoaderDynamicFont, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;

1
scene/resources/font.h
View File

@@ -202,7 +202,6 @@ public:
}; };
class ResourceFormatLoaderBMFont : public ResourceFormatLoader { class ResourceFormatLoaderBMFont : public ResourceFormatLoader {
GDCLASS(ResourceFormatLoaderBMFont, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;

2
scene/resources/resource_format_text.h
View File

@@ -128,7 +128,6 @@ public:
}; };
class ResourceFormatLoaderText : public ResourceFormatLoader { class ResourceFormatLoaderText : public ResourceFormatLoader {
GDCLASS(ResourceFormatLoaderText, ResourceFormatLoader)
public: public:
static ResourceFormatLoaderText *singleton; static ResourceFormatLoaderText *singleton;
virtual Ref<ResourceInteractiveLoader> load_interactive(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual Ref<ResourceInteractiveLoader> load_interactive(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
@@ -187,7 +186,6 @@ public:
}; };
class ResourceFormatSaverText : public ResourceFormatSaver { class ResourceFormatSaverText : public ResourceFormatSaver {
GDCLASS(ResourceFormatSaverText, ResourceFormatSaver)
public: public:
static ResourceFormatSaverText *singleton; static ResourceFormatSaverText *singleton;
virtual Error save(const String &p_path, const RES &p_resource, uint32_t p_flags = 0); virtual Error save(const String &p_path, const RES &p_resource, uint32_t p_flags = 0);

2
scene/resources/shader.h
View File

@@ -100,7 +100,6 @@ public:
VARIANT_ENUM_CAST(Shader::Mode); VARIANT_ENUM_CAST(Shader::Mode);
class ResourceFormatLoaderShader : public ResourceFormatLoader { class ResourceFormatLoaderShader : public ResourceFormatLoader {
GDCLASS(ResourceFormatLoaderShader, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;
@@ -109,7 +108,6 @@ public:
}; };
class ResourceFormatSaverShader : public ResourceFormatSaver { class ResourceFormatSaverShader : public ResourceFormatSaver {
GDCLASS(ResourceFormatSaverShader, ResourceFormatSaver)
public: public:
virtual Error save(const String &p_path, const RES &p_resource, uint32_t p_flags = 0); 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<String> *p_extensions) const; virtual void get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const;

2
scene/resources/texture.h
View File

@@ -239,7 +239,6 @@ public:
}; };
class ResourceFormatLoaderStreamTexture : public ResourceFormatLoader { class ResourceFormatLoaderStreamTexture : public ResourceFormatLoader {
GDCLASS(ResourceFormatLoaderStreamTexture, ResourceFormatLoader)
public: public:
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual void get_recognized_extensions(List<String> *p_extensions) const;
@@ -537,7 +536,6 @@ public:
}; };
class ResourceFormatLoaderTextureLayered : public ResourceFormatLoader { class ResourceFormatLoaderTextureLayered : public ResourceFormatLoader {
GDCLASS(ResourceFormatLoaderTextureLayered, ResourceFormatLoader)
public: public:
enum Compression { enum Compression {
COMPRESSION_LOSSLESS, COMPRESSION_LOSSLESS,