diff options
| author | reduz <reduzio@gmail.com> | 2021-10-11 19:20:58 -0300 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2021-10-12 20:08:42 -0300 |
| commit | ec19ed37230c368b3d24050c9f1e99869dd94bec (patch) | |
| tree | 760147dd005abb3f5b4bf71549c0f9679b7ec8ae /editor/import/resource_importer_scene.h | |
| parent | f9aec342dcd51d65c5970dd395e3c7a66cac446c (diff) | |
| download | redot-engine-ec19ed37230c368b3d24050c9f1e99869dd94bec.tar.gz | |
Remove animation 3D transform track, replace by loc/rot/scale tracks.
* `Animation.TYPE_TRANSFORM3D` track is gone.
* Added POSITION_3D, ROTATION_3D, SCALE_3D tracks.
* GLTF2, Collada, FBX importers will only import the track types found.
* Skeleton3D bone poses are now Pos/Rot/Scale, pose matrix removed.
* AnimationPlayer and AnimationTree animate these tracks separately, only when found.
* Removed BakeReset code, is useless with these changes.
This is the first in a series of commits designed to make the animation system in Godot more useful, which includes:
* Better compatibility with Autodesk products
* Better reusability of animations across models (including retargeting).
* Proper animation compression.
* etc.
*Note* GLTF2 animation saving went broken with this PR, needs to be fixed in a subsequent one.
Diffstat (limited to 'editor/import/resource_importer_scene.h')
| -rw-r--r-- | editor/import/resource_importer_scene.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/editor/import/resource_importer_scene.h b/editor/import/resource_importer_scene.h index 2a67fa9aae..eb17193c00 100644 --- a/editor/import/resource_importer_scene.h +++ b/editor/import/resource_importer_scene.h @@ -65,6 +65,13 @@ public: IMPORT_USE_NAMED_SKIN_BINDS = 16, }; + enum AnimationImportBoneTracks { + ANIMATION_IMPORT_BONE_TRACKS_IF_PRESENT, + ANIMATION_IMPORT_BONE_TRACKS_IF_PRESENT_FOR_ALL, + ANIMATION_IMPORT_BONE_TRACKS_ALWAYS, + ANIMATION_IMPORT_BONE_TRACKS_NEVER, + }; + virtual uint32_t get_import_flags() const; virtual void get_extensions(List<String> *r_extensions) const; virtual Node *import_scene(const String &p_path, uint32_t p_flags, int p_bake_fps, List<String> *r_missing_deps, Error *r_err = nullptr); |