mirror of https://github.com/godotengine/godot
Remove unused `EditorSceneFormatImporter::_get_import_flags`
This has never been used since Godot was open sourced. Import flags are used but directly through `_import_scene`.
This commit is contained in:
parent
a69ccee151
commit
21fcb56547
|
|
@ -16,11 +16,6 @@
|
||||||
Return supported file extensions for this scene importer.
|
Return supported file extensions for this scene importer.
|
||||||
</description>
|
</description>
|
||||||
</method>
|
</method>
|
||||||
<method name="_get_import_flags" qualifiers="virtual const" deprecated="Unused by the engine, and will be removed in a future version. Implementing this has no effect.">
|
|
||||||
<return type="int" />
|
|
||||||
<description>
|
|
||||||
</description>
|
|
||||||
</method>
|
|
||||||
<method name="_get_import_options" qualifiers="virtual">
|
<method name="_get_import_options" qualifiers="virtual">
|
||||||
<return type="void" />
|
<return type="void" />
|
||||||
<param index="0" name="path" type="String" />
|
<param index="0" name="path" type="String" />
|
||||||
|
|
|
||||||
|
|
@ -1796,10 +1796,6 @@ void ColladaImport::create_animation(int p_clip, bool p_import_value_tracks) {
|
||||||
/*************************************** SCENE ***********************************/
|
/*************************************** SCENE ***********************************/
|
||||||
/*********************************************************************************/
|
/*********************************************************************************/
|
||||||
|
|
||||||
uint32_t EditorSceneFormatImporterCollada::get_import_flags() const {
|
|
||||||
return IMPORT_SCENE | IMPORT_ANIMATION;
|
|
||||||
}
|
|
||||||
|
|
||||||
void EditorSceneFormatImporterCollada::get_extensions(List<String> *r_extensions) const {
|
void EditorSceneFormatImporterCollada::get_extensions(List<String> *r_extensions) const {
|
||||||
r_extensions->push_back("dae");
|
r_extensions->push_back("dae");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,6 @@ class EditorSceneFormatImporterCollada : public EditorSceneFormatImporter {
|
||||||
GDCLASS(EditorSceneFormatImporterCollada, EditorSceneFormatImporter);
|
GDCLASS(EditorSceneFormatImporterCollada, EditorSceneFormatImporter);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
virtual uint32_t get_import_flags() const override;
|
|
||||||
virtual void get_extensions(List<String> *r_extensions) const override;
|
virtual void get_extensions(List<String> *r_extensions) const override;
|
||||||
virtual Node *import_scene(const String &p_path, uint32_t p_flags, const HashMap<StringName, Variant> &p_options, List<String> *r_missing_deps = nullptr, Error *r_err = nullptr) override;
|
virtual Node *import_scene(const String &p_path, uint32_t p_flags, const HashMap<StringName, Variant> &p_options, List<String> *r_missing_deps = nullptr, Error *r_err = nullptr) override;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -38,10 +38,6 @@
|
||||||
#include "scene/resources/mesh.h"
|
#include "scene/resources/mesh.h"
|
||||||
#include "scene/resources/surface_tool.h"
|
#include "scene/resources/surface_tool.h"
|
||||||
|
|
||||||
uint32_t EditorOBJImporter::get_import_flags() const {
|
|
||||||
return IMPORT_SCENE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Error _parse_material_library(const String &p_path, HashMap<String, Ref<StandardMaterial3D>> &material_map, List<String> *r_missing_deps) {
|
static Error _parse_material_library(const String &p_path, HashMap<String, Ref<StandardMaterial3D>> &material_map, List<String> *r_missing_deps) {
|
||||||
Ref<FileAccess> f = FileAccess::open(p_path, FileAccess::READ);
|
Ref<FileAccess> f = FileAccess::open(p_path, FileAccess::READ);
|
||||||
ERR_FAIL_COND_V_MSG(f.is_null(), ERR_CANT_OPEN, vformat("Couldn't open MTL file '%s', it may not exist or not be readable.", p_path));
|
ERR_FAIL_COND_V_MSG(f.is_null(), ERR_CANT_OPEN, vformat("Couldn't open MTL file '%s', it may not exist or not be readable.", p_path));
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,6 @@ class EditorOBJImporter : public EditorSceneFormatImporter {
|
||||||
GDCLASS(EditorOBJImporter, EditorSceneFormatImporter);
|
GDCLASS(EditorOBJImporter, EditorSceneFormatImporter);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
virtual uint32_t get_import_flags() const override;
|
|
||||||
virtual void get_extensions(List<String> *r_extensions) const override;
|
virtual void get_extensions(List<String> *r_extensions) const override;
|
||||||
virtual Node *import_scene(const String &p_path, uint32_t p_flags, const HashMap<StringName, Variant> &p_options, List<String> *r_missing_deps, Error *r_err = nullptr) override;
|
virtual Node *import_scene(const String &p_path, uint32_t p_flags, const HashMap<StringName, Variant> &p_options, List<String> *r_missing_deps, Error *r_err = nullptr) override;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -57,15 +57,6 @@
|
||||||
#include "scene/resources/packed_scene.h"
|
#include "scene/resources/packed_scene.h"
|
||||||
#include "scene/resources/resource_format_text.h"
|
#include "scene/resources/resource_format_text.h"
|
||||||
|
|
||||||
uint32_t EditorSceneFormatImporter::get_import_flags() const {
|
|
||||||
uint32_t ret;
|
|
||||||
if (GDVIRTUAL_CALL(_get_import_flags, ret)) {
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
ERR_FAIL_V(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
void EditorSceneFormatImporter::get_extensions(List<String> *r_extensions) const {
|
void EditorSceneFormatImporter::get_extensions(List<String> *r_extensions) const {
|
||||||
Vector<String> arr;
|
Vector<String> arr;
|
||||||
if (GDVIRTUAL_CALL(_get_extensions, arr)) {
|
if (GDVIRTUAL_CALL(_get_extensions, arr)) {
|
||||||
|
|
@ -118,7 +109,6 @@ void EditorSceneFormatImporter::_bind_methods() {
|
||||||
ClassDB::bind_method(D_METHOD("add_import_option", "name", "value"), &EditorSceneFormatImporter::add_import_option);
|
ClassDB::bind_method(D_METHOD("add_import_option", "name", "value"), &EditorSceneFormatImporter::add_import_option);
|
||||||
ClassDB::bind_method(D_METHOD("add_import_option_advanced", "type", "name", "default_value", "hint", "hint_string", "usage_flags"), &EditorSceneFormatImporter::add_import_option_advanced, DEFVAL(PROPERTY_HINT_NONE), DEFVAL(""), DEFVAL(PROPERTY_USAGE_DEFAULT));
|
ClassDB::bind_method(D_METHOD("add_import_option_advanced", "type", "name", "default_value", "hint", "hint_string", "usage_flags"), &EditorSceneFormatImporter::add_import_option_advanced, DEFVAL(PROPERTY_HINT_NONE), DEFVAL(""), DEFVAL(PROPERTY_USAGE_DEFAULT));
|
||||||
|
|
||||||
GDVIRTUAL_BIND(_get_import_flags);
|
|
||||||
GDVIRTUAL_BIND(_get_extensions);
|
GDVIRTUAL_BIND(_get_extensions);
|
||||||
GDVIRTUAL_BIND(_import_scene, "path", "flags", "options");
|
GDVIRTUAL_BIND(_import_scene, "path", "flags", "options");
|
||||||
GDVIRTUAL_BIND(_get_import_options, "path");
|
GDVIRTUAL_BIND(_get_import_options, "path");
|
||||||
|
|
@ -3281,10 +3271,6 @@ void ResourceImporterScene::get_scene_importer_extensions(List<String> *p_extens
|
||||||
|
|
||||||
///////////////////////////////////////
|
///////////////////////////////////////
|
||||||
|
|
||||||
uint32_t EditorSceneFormatImporterESCN::get_import_flags() const {
|
|
||||||
return IMPORT_SCENE;
|
|
||||||
}
|
|
||||||
|
|
||||||
void EditorSceneFormatImporterESCN::get_extensions(List<String> *r_extensions) const {
|
void EditorSceneFormatImporterESCN::get_extensions(List<String> *r_extensions) const {
|
||||||
r_extensions->push_back("escn");
|
r_extensions->push_back("escn");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,6 @@ protected:
|
||||||
Node *import_scene_wrapper(const String &p_path, uint32_t p_flags, const Dictionary &p_options);
|
Node *import_scene_wrapper(const String &p_path, uint32_t p_flags, const Dictionary &p_options);
|
||||||
Ref<Animation> import_animation_wrapper(const String &p_path, uint32_t p_flags, const Dictionary &p_options);
|
Ref<Animation> import_animation_wrapper(const String &p_path, uint32_t p_flags, const Dictionary &p_options);
|
||||||
|
|
||||||
GDVIRTUAL0RC(uint32_t, _get_import_flags)
|
|
||||||
GDVIRTUAL0RC(Vector<String>, _get_extensions)
|
GDVIRTUAL0RC(Vector<String>, _get_extensions)
|
||||||
GDVIRTUAL3R(Object *, _import_scene, String, uint32_t, Dictionary)
|
GDVIRTUAL3R(Object *, _import_scene, String, uint32_t, Dictionary)
|
||||||
GDVIRTUAL1(_get_import_options, String)
|
GDVIRTUAL1(_get_import_options, String)
|
||||||
|
|
@ -77,7 +76,6 @@ public:
|
||||||
|
|
||||||
void add_import_option(const String &p_name, const Variant &p_default_value);
|
void add_import_option(const String &p_name, const Variant &p_default_value);
|
||||||
void add_import_option_advanced(Variant::Type p_type, const String &p_name, const Variant &p_default_value, PropertyHint p_hint = PROPERTY_HINT_NONE, const String &p_hint_string = String(), int p_usage_flags = PROPERTY_USAGE_DEFAULT);
|
void add_import_option_advanced(Variant::Type p_type, const String &p_name, const Variant &p_default_value, PropertyHint p_hint = PROPERTY_HINT_NONE, const String &p_hint_string = String(), int p_usage_flags = PROPERTY_USAGE_DEFAULT);
|
||||||
virtual uint32_t get_import_flags() const;
|
|
||||||
virtual void get_extensions(List<String> *r_extensions) const;
|
virtual void get_extensions(List<String> *r_extensions) const;
|
||||||
virtual Node *import_scene(const String &p_path, uint32_t p_flags, const HashMap<StringName, Variant> &p_options, List<String> *r_missing_deps, Error *r_err = nullptr);
|
virtual Node *import_scene(const String &p_path, uint32_t p_flags, const HashMap<StringName, Variant> &p_options, List<String> *r_missing_deps, Error *r_err = nullptr);
|
||||||
virtual void get_import_options(const String &p_path, List<ResourceImporter::ImportOption> *r_options);
|
virtual void get_import_options(const String &p_path, List<ResourceImporter::ImportOption> *r_options);
|
||||||
|
|
@ -322,7 +320,6 @@ class EditorSceneFormatImporterESCN : public EditorSceneFormatImporter {
|
||||||
GDCLASS(EditorSceneFormatImporterESCN, EditorSceneFormatImporter);
|
GDCLASS(EditorSceneFormatImporterESCN, EditorSceneFormatImporter);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
virtual uint32_t get_import_flags() const override;
|
|
||||||
virtual void get_extensions(List<String> *r_extensions) const override;
|
virtual void get_extensions(List<String> *r_extensions) const override;
|
||||||
virtual Node *import_scene(const String &p_path, uint32_t p_flags, const HashMap<StringName, Variant> &p_options, List<String> *r_missing_deps, Error *r_err = nullptr) override;
|
virtual Node *import_scene(const String &p_path, uint32_t p_flags, const HashMap<StringName, Variant> &p_options, List<String> *r_missing_deps, Error *r_err = nullptr) override;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -301,3 +301,11 @@ Validate extension JSON: Error: Field 'classes/RenderingDevice/methods/uniform_b
|
||||||
Validate extension JSON: Error: Field 'classes/RenderingDevice/methods/vertex_buffer_create/arguments': size changed value in new API, from 3 to 4.
|
Validate extension JSON: Error: Field 'classes/RenderingDevice/methods/vertex_buffer_create/arguments': size changed value in new API, from 3 to 4.
|
||||||
|
|
||||||
Optional argument added. Compatibility methods registered.
|
Optional argument added. Compatibility methods registered.
|
||||||
|
|
||||||
|
|
||||||
|
GH-101531
|
||||||
|
---------
|
||||||
|
Validate extension JSON: API was removed: classes/EditorSceneFormatImporter/methods/_get_import_flags
|
||||||
|
|
||||||
|
This virtual method, and the internal public `get_import_flags`, were never used by the engine, since it was open sourced.
|
||||||
|
So we're removing it despite the compat breakage as there's no way for users to rely on this affecting engine behavior.
|
||||||
|
|
|
||||||
|
|
@ -38,10 +38,6 @@
|
||||||
|
|
||||||
#include "modules/gltf/gltf_document.h"
|
#include "modules/gltf/gltf_document.h"
|
||||||
|
|
||||||
uint32_t EditorSceneFormatImporterFBX2GLTF::get_import_flags() const {
|
|
||||||
return ImportFlags::IMPORT_SCENE | ImportFlags::IMPORT_ANIMATION;
|
|
||||||
}
|
|
||||||
|
|
||||||
void EditorSceneFormatImporterFBX2GLTF::get_extensions(List<String> *r_extensions) const {
|
void EditorSceneFormatImporterFBX2GLTF::get_extensions(List<String> *r_extensions) const {
|
||||||
r_extensions->push_back("fbx");
|
r_extensions->push_back("fbx");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,6 @@ class EditorSceneFormatImporterFBX2GLTF : public EditorSceneFormatImporter {
|
||||||
GDCLASS(EditorSceneFormatImporterFBX2GLTF, EditorSceneFormatImporter);
|
GDCLASS(EditorSceneFormatImporterFBX2GLTF, EditorSceneFormatImporter);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
virtual uint32_t get_import_flags() const override;
|
|
||||||
virtual void get_extensions(List<String> *r_extensions) const override;
|
virtual void get_extensions(List<String> *r_extensions) const override;
|
||||||
virtual Node *import_scene(const String &p_path, uint32_t p_flags,
|
virtual Node *import_scene(const String &p_path, uint32_t p_flags,
|
||||||
const HashMap<StringName, Variant> &p_options,
|
const HashMap<StringName, Variant> &p_options,
|
||||||
|
|
|
||||||
|
|
@ -37,10 +37,6 @@
|
||||||
|
|
||||||
#include "core/config/project_settings.h"
|
#include "core/config/project_settings.h"
|
||||||
|
|
||||||
uint32_t EditorSceneFormatImporterUFBX::get_import_flags() const {
|
|
||||||
return ImportFlags::IMPORT_SCENE | ImportFlags::IMPORT_ANIMATION;
|
|
||||||
}
|
|
||||||
|
|
||||||
void EditorSceneFormatImporterUFBX::get_extensions(List<String> *r_extensions) const {
|
void EditorSceneFormatImporterUFBX::get_extensions(List<String> *r_extensions) const {
|
||||||
r_extensions->push_back("fbx");
|
r_extensions->push_back("fbx");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,6 @@ public:
|
||||||
FBX_IMPORTER_UFBX,
|
FBX_IMPORTER_UFBX,
|
||||||
FBX_IMPORTER_FBX2GLTF,
|
FBX_IMPORTER_FBX2GLTF,
|
||||||
};
|
};
|
||||||
virtual uint32_t get_import_flags() const override;
|
|
||||||
virtual void get_extensions(List<String> *r_extensions) const override;
|
virtual void get_extensions(List<String> *r_extensions) const override;
|
||||||
virtual Node *import_scene(const String &p_path, uint32_t p_flags,
|
virtual Node *import_scene(const String &p_path, uint32_t p_flags,
|
||||||
const HashMap<StringName, Variant> &p_options,
|
const HashMap<StringName, Variant> &p_options,
|
||||||
|
|
|
||||||
|
|
@ -102,10 +102,6 @@ static bool _get_blender_version(const String &p_path, int &r_major, int &r_mino
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t EditorSceneFormatImporterBlend::get_import_flags() const {
|
|
||||||
return ImportFlags::IMPORT_SCENE | ImportFlags::IMPORT_ANIMATION;
|
|
||||||
}
|
|
||||||
|
|
||||||
void EditorSceneFormatImporterBlend::get_extensions(List<String> *r_extensions) const {
|
void EditorSceneFormatImporterBlend::get_extensions(List<String> *r_extensions) const {
|
||||||
r_extensions->push_back("blend");
|
r_extensions->push_back("blend");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,6 @@ public:
|
||||||
BLEND_MODIFIERS_ALL
|
BLEND_MODIFIERS_ALL
|
||||||
};
|
};
|
||||||
|
|
||||||
virtual uint32_t get_import_flags() const override;
|
|
||||||
virtual void get_extensions(List<String> *r_extensions) const override;
|
virtual void get_extensions(List<String> *r_extensions) const override;
|
||||||
virtual Node *import_scene(const String &p_path, uint32_t p_flags,
|
virtual Node *import_scene(const String &p_path, uint32_t p_flags,
|
||||||
const HashMap<StringName, Variant> &p_options,
|
const HashMap<StringName, Variant> &p_options,
|
||||||
|
|
|
||||||
|
|
@ -35,10 +35,6 @@
|
||||||
#include "../gltf_defines.h"
|
#include "../gltf_defines.h"
|
||||||
#include "../gltf_document.h"
|
#include "../gltf_document.h"
|
||||||
|
|
||||||
uint32_t EditorSceneFormatImporterGLTF::get_import_flags() const {
|
|
||||||
return ImportFlags::IMPORT_SCENE | ImportFlags::IMPORT_ANIMATION;
|
|
||||||
}
|
|
||||||
|
|
||||||
void EditorSceneFormatImporterGLTF::get_extensions(List<String> *r_extensions) const {
|
void EditorSceneFormatImporterGLTF::get_extensions(List<String> *r_extensions) const {
|
||||||
r_extensions->push_back("gltf");
|
r_extensions->push_back("gltf");
|
||||||
r_extensions->push_back("glb");
|
r_extensions->push_back("glb");
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,6 @@ class EditorSceneFormatImporterGLTF : public EditorSceneFormatImporter {
|
||||||
GDCLASS(EditorSceneFormatImporterGLTF, EditorSceneFormatImporter);
|
GDCLASS(EditorSceneFormatImporterGLTF, EditorSceneFormatImporter);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
virtual uint32_t get_import_flags() const override;
|
|
||||||
virtual void get_extensions(List<String> *r_extensions) const override;
|
virtual void get_extensions(List<String> *r_extensions) const override;
|
||||||
virtual Node *import_scene(const String &p_path, uint32_t p_flags,
|
virtual Node *import_scene(const String &p_path, uint32_t p_flags,
|
||||||
const HashMap<StringName, Variant> &p_options,
|
const HashMap<StringName, Variant> &p_options,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue