mirror of
https://github.com/godotengine/godot
synced 2024-09-05 07:39:34 +00:00
Fix method bindings in FBXDocument by making them virtual in GLTFDocument.
This commit is contained in:
parent
68ad520da4
commit
8232759100
|
@ -2347,7 +2347,7 @@ PackedByteArray FBXDocument::generate_buffer(Ref<GLTFState> p_state) {
|
||||||
return PackedByteArray();
|
return PackedByteArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
Error write_to_filesystem(Ref<GLTFState> p_state, const String &p_path) {
|
Error FBXDocument::write_to_filesystem(Ref<GLTFState> p_state, const String &p_path) {
|
||||||
return ERR_UNAVAILABLE;
|
return ERR_UNAVAILABLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -53,14 +53,13 @@ public:
|
||||||
static String _gen_unique_name(HashSet<String> &unique_names, const String &p_name);
|
static String _gen_unique_name(HashSet<String> &unique_names, const String &p_name);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Error append_from_file(String p_path, Ref<GLTFState> p_state, uint32_t p_flags = 0, String p_base_path = String());
|
Error append_from_file(String p_path, Ref<GLTFState> p_state, uint32_t p_flags = 0, String p_base_path = String()) override;
|
||||||
Error append_from_buffer(PackedByteArray p_bytes, String p_base_path, Ref<GLTFState> p_state, uint32_t p_flags = 0);
|
Error append_from_buffer(PackedByteArray p_bytes, String p_base_path, Ref<GLTFState> p_state, uint32_t p_flags = 0) override;
|
||||||
Error append_from_scene(Node *p_node, Ref<GLTFState> p_state, uint32_t p_flags = 0);
|
Error append_from_scene(Node *p_node, Ref<GLTFState> p_state, uint32_t p_flags = 0) override;
|
||||||
|
|
||||||
public:
|
Node *generate_scene(Ref<GLTFState> p_state, float p_bake_fps = 30.0f, bool p_trimming = false, bool p_remove_immutable_tracks = true) override;
|
||||||
Node *generate_scene(Ref<GLTFState> p_state, float p_bake_fps = 30.0f, bool p_trimming = false, bool p_remove_immutable_tracks = true);
|
PackedByteArray generate_buffer(Ref<GLTFState> p_state) override;
|
||||||
PackedByteArray generate_buffer(Ref<GLTFState> p_state);
|
Error write_to_filesystem(Ref<GLTFState> p_state, const String &p_path) override;
|
||||||
Error write_to_filesystem(Ref<GLTFState> p_state, const String &p_path);
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
static void _bind_methods();
|
static void _bind_methods();
|
||||||
|
|
|
@ -311,13 +311,13 @@ private:
|
||||||
static float get_max_component(const Color &p_color);
|
static float get_max_component(const Color &p_color);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Error append_from_file(String p_path, Ref<GLTFState> p_state, uint32_t p_flags = 0, String p_base_path = String());
|
virtual Error append_from_file(String p_path, Ref<GLTFState> p_state, uint32_t p_flags = 0, String p_base_path = String());
|
||||||
Error append_from_buffer(PackedByteArray p_bytes, String p_base_path, Ref<GLTFState> p_state, uint32_t p_flags = 0);
|
virtual Error append_from_buffer(PackedByteArray p_bytes, String p_base_path, Ref<GLTFState> p_state, uint32_t p_flags = 0);
|
||||||
Error append_from_scene(Node *p_node, Ref<GLTFState> p_state, uint32_t p_flags = 0);
|
virtual Error append_from_scene(Node *p_node, Ref<GLTFState> p_state, uint32_t p_flags = 0);
|
||||||
|
|
||||||
Node *generate_scene(Ref<GLTFState> p_state, float p_bake_fps = 30.0f, bool p_trimming = false, bool p_remove_immutable_tracks = true);
|
virtual Node *generate_scene(Ref<GLTFState> p_state, float p_bake_fps = 30.0f, bool p_trimming = false, bool p_remove_immutable_tracks = true);
|
||||||
PackedByteArray generate_buffer(Ref<GLTFState> p_state);
|
virtual PackedByteArray generate_buffer(Ref<GLTFState> p_state);
|
||||||
Error write_to_filesystem(Ref<GLTFState> p_state, const String &p_path);
|
virtual Error write_to_filesystem(Ref<GLTFState> p_state, const String &p_path);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Error _parse_gltf_state(Ref<GLTFState> p_state, const String &p_search_path);
|
Error _parse_gltf_state(Ref<GLTFState> p_state, const String &p_search_path);
|
||||||
|
|
Loading…
Reference in a new issue