8a42cb4940
Merge branch 'main' into SP3-22-AnimationController
2023-03-09 15:46:31 +08:00
7f170deb27
Fixed animations not playing from the correct start point
2023-03-09 15:46:15 +08:00
54e186063c
Changed to correct RIG
2023-03-09 15:20:40 +08:00
bfbca68d50
Added more animation tests
2023-03-09 15:14:30 +08:00
baed0bec0b
Fixed animator component always using manual mode playback time
2023-03-09 15:08:38 +08:00
ab2f3e395b
Animation clips now load the correct raw animation
2023-03-09 14:47:48 +08:00
ac971f0945
Fixed infinite loop and incorrect playback setting for Animator
2023-03-09 14:46:06 +08:00
3d6bfaa119
Write raw anim asset id into anim clips
2023-03-09 13:46:39 +08:00
5669babc0f
Fixed animator components in scripts not being retrievable. Also added script for testing animations
2023-03-09 13:35:49 +08:00
07a2eb2f64
Fixed not opening the correct Visual Studio version for scripts
2023-03-09 13:18:09 +08:00
fc789334bd
Fixed animation assets fields for scripts not supporting the correct types
2023-03-09 13:10:06 +08:00
e816df28a8
Clips can now be dragged and dropped into the animation controller editor
2023-03-09 12:07:16 +08:00
2c8eca4125
Added facility to create new animation clip container asset.
...
Changed raw anim editor to open when double clicking anim container asset/after creating new anim container asset
Changed new clip fields from slider to unsigned int input
2023-03-09 01:51:54 +08:00
7df9897598
Fixed bug in binary loader where result from load was always nullptr, changed pointer to pointer reference
2023-03-09 01:50:26 +08:00
2692db1ed3
Changed function to return pointer type instead of std::optional
2023-03-09 01:49:43 +08:00
8670fe5fa9
Added text RawAnimInspector for when no animations are selected
2023-03-08 22:03:08 +08:00
57a8e385e4
Added editor field for Animation Controller of the Animator component in the inspector
2023-03-08 20:58:21 +08:00
7ab1ee6fec
Added serialization for animation assets for scripts
2023-03-08 20:34:11 +08:00
69ac4d1219
Merge branch 'main' into SP3-22-AnimationController
2023-03-08 20:00:58 +08:00
43edfeb14f
Added serialization of animation assets for scripts
2023-03-08 16:13:04 +08:00
79fe9ec43d
Merge branch 'main' into SP3-22-AnimationController
...
# Conflicts:
# SHADE_Engine/src/Animation/SHAnimationClip.cpp
# SHADE_Engine/src/Animation/SHAnimationClip.h
# SHADE_Engine/src/Animation/SHAnimatorComponent.cpp
# SHADE_Engine/src/Animation/SHAnimatorComponent.h
# SHADE_Engine/src/Assets/Asset Types/Models/SHAnimationAsset.h
# SHADE_Engine/src/Assets/SHAssetMacros.h
# SHADE_Engine/src/Assets/SHAssetManager.cpp
2023-03-08 15:54:32 +08:00
1c12a05837
Added C# interface for animator, animation clip and animation controller
2023-03-08 15:29:29 +08:00
6383e7d559
Merge branch 'SP3-22-AnimationController' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-22-AnimationController
2023-03-08 00:24:45 +08:00
615a5796f0
Added line to add subasset meta to parent asset
...
Rewrote loading of all animation clips into resource manager
2023-03-07 22:51:40 +08:00
73af61d2cb
Merge branch 'SP3-22-AnimationController' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-22-AnimationController
2023-03-07 22:34:36 +08:00
e285d5e6b2
Added functions for setting animation parameters
2023-03-07 22:34:32 +08:00
4d64dd34d8
Merge pull request #403 from SHADE-DP/AnimationClipAsset
...
Reimplemented animation clip container assets
2023-03-07 22:10:34 +08:00
3cc949bb7e
Animation container redefinition
2023-03-07 22:07:38 +08:00
07100de950
Added recognition for animation clip container as a file
...
Added functions to create new sub asset for animation clips
Added recognition for animation clip containers when creating new assets
2023-03-07 22:06:42 +08:00
eae6f6399b
Changed implementation of binary loader to load animation clip containers instead of individual animation clips
2023-03-07 22:05:33 +08:00
4144fe0d4a
Merge branch 'main' into SP3-22-AnimationController
...
# Conflicts:
# SHADE_Application/src/Application/SBApplication.cpp
# SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp
2023-03-07 20:30:47 +08:00
dc32c5c9aa
Implemented saving of animation controller from editor
2023-03-07 20:29:57 +08:00
ff27925f2d
Added ability to reset state, delete links and nodes
2023-03-07 20:05:37 +08:00
6d01bd0b78
Added ability to set starting node
2023-03-07 19:00:10 +08:00
493f2c3cfe
Fixed parameters panel for animation controller editor and added menu bar
2023-03-07 16:38:00 +08:00
9a8114f5dd
Added work in progress animation parameter panel
2023-03-06 16:44:34 +08:00
d16f807a8a
Added links properties panel
2023-03-06 16:17:05 +08:00
f8cc1fe2dc
Size of animation controller editor is now adjustable
2023-03-06 11:47:30 +08:00
066d060b29
Split main animation controller panel into 3 segments
2023-03-05 01:45:26 +08:00
32adb0c540
Reworked how AnimationControllerEditor works
2023-03-05 01:08:39 +08:00
b93a08fa90
Fixed ImGui crash with SHRawAnimationInspector
2023-03-04 00:48:10 +08:00
97605cc8fe
Added preliminary implementation of animation controller connection attributes
2023-03-03 22:00:56 +08:00
41784d4c04
Fixed animation clips list for Raw Animation Inspector
2023-03-03 21:28:28 +08:00
beeeae99ca
SHRawAnimInspector can now generate incomplete animation clips
2023-03-03 18:53:59 +08:00
0741163774
Merge remote-tracking branch 'origin/SP3-22-AnimationController' into SP3-22-AnimationController
2023-03-03 17:23:18 +08:00
184fd4f459
[NOT TESTED] Animation Clip asset reading/writing as asset file into binary implemented
2023-03-03 17:16:23 +08:00
c736967d1c
Merge branch 'main' into SP3-22-AnimationController
2023-03-02 19:08:20 +08:00
69fa0d4da0
Fixed SHRawAnimInspector warnings
2023-03-02 17:44:28 +08:00
6779f48b5a
Fixed typo
2023-03-02 17:33:02 +08:00
65d57e96b3
Merge branch 'main' into SP3-22-AnimationController
...
# Conflicts:
# SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
2023-03-02 16:55:13 +08:00
3a14f0a887
Added SHRawAnimInspector
2023-03-02 16:54:34 +08:00
62fa2ba41a
Merge branch 'main' into SP3-22-AnimationController
2023-03-02 13:03:33 +08:00
dfb53bf290
Added WIP AnimationControllerEditor
2023-03-01 23:49:30 +08:00
d21f9d6c4b
Added functions for adding transitions and parameters to an AnimationController
2023-03-01 22:10:09 +08:00
e878b7b65a
Added implementation of SHAnimationController Transition logic
2023-03-01 21:55:26 +08:00
2679d12afb
Merge branch 'main' into SP3-22-AnimationController
2023-03-01 14:02:28 +08:00
e97f5747cb
Modified SHAnimatorComponent to support manual and animation controller modes. Fleshed out SHAnimationController. Added SHAnimControllerAsset stub.
2023-03-01 01:30:34 +08:00
36af939c67
Added reworked AnimationClip and SHAnimClipAsset
2023-02-28 19:19:06 +08:00
33b5b84fd4
add anim clip
2023-02-27 17:04:16 +08:00
f061e8ed43
Updated comments to use SHRawAnimation instead of SHAnimationData
2023-02-27 16:52:41 +08:00
7839bd21f2
Renamed SHAnimationData to SHRawAnimation
2023-02-27 16:51:02 +08:00
ba22638520
Renamed SHAnimationClip to SHAnimationData
2023-02-27 16:17:36 +08:00
9486762693
Merge branch 'main' into SP3-22-AnimationController
2023-02-27 15:54:48 +08:00
ecc88dc142
Fleshed out SHAnimationController more
2023-02-22 23:45:42 +08:00
913241c73a
Merge branch 'main' into SP3-22-AnimationController
2023-02-22 21:49:45 +08:00
c85298db88
Added initial stubs for SHAnimationController
2023-02-20 16:55:08 +08:00
Kah Wei