Xiao Qi
1d171710c5
Fixed bug where sub assets were not being loading properly
...
Implemented saving of parent container when cips are changed for animation
2023-03-10 17:11:09 +08:00
Brandon Mak
e9dee89b17
Accommodated animation when shadows are in the scene
2023-03-10 16:47:19 +08:00
Glence
9eb5399f7b
Merge branch 'main' into PlayerController
2023-03-10 16:28:26 +08:00
Glence
9b9cf1a1bb
WIP for animatons
2023-03-10 16:26:52 +08:00
Kah Wei
0173e7c302
Fixed RawAnimInspector changing any specific animation clip's values, causing a change in all animation clips' values
2023-03-10 16:21:18 +08:00
Glence
2cf67a1378
Merge branch 'main' into PlayerController
2023-03-10 14:59:47 +08:00
Kah Wei
8c0ad47921
Added timescale for animation system
2023-03-10 14:55:49 +08:00
Diren D Bharwani
d4158faed1
Merge branch 'main' into SP3-2-Physics
2023-03-09 21:18:18 +08:00
Diren D Bharwani
97013ba73c
Added override for simulating gravity in SimulateBody method
2023-03-09 21:18:05 +08:00
Glence
2eee1d4ab7
camera offset rotation fix along with ai not hard hard for box collider
2023-03-09 18:47:06 +08:00
XiaoQiDigipen
0fb6927342
Merge pull request #410 from SHADE-DP/SP3-22-AnimationController
...
Implemented Animation Clip asset and animation controller
2023-03-09 16:19:39 +08:00
Kah Wei
8a42cb4940
Merge branch 'main' into SP3-22-AnimationController
2023-03-09 15:46:31 +08:00
Kah Wei
7f170deb27
Fixed animations not playing from the correct start point
2023-03-09 15:46:15 +08:00
SHAM-DP
65cece3e3c
Merge branch 'main' into SP3-4-Editor
2023-03-09 15:28:45 +08:00
SHAM-DP
fe41245008
Bug Fixes & Tweaks for editor
...
fixed window width for physics settings drop down
fixed double click to look at
fix crash when some fields in collider and rigidbody are set to 0.0f
2023-03-09 15:28:32 +08:00
Kah Wei
baed0bec0b
Fixed animator component always using manual mode playback time
2023-03-09 15:08:38 +08:00
Brandon Mak
bf08be045a
Solved bugs with shadows
...
Switching a scene causes a crash from shadows.
2023-03-09 14:56:03 +08:00
Kah Wei
ab2f3e395b
Animation clips now load the correct raw animation
2023-03-09 14:47:48 +08:00
Kah Wei
ac971f0945
Fixed infinite loop and incorrect playback setting for Animator
2023-03-09 14:46:06 +08:00
Xiao Qi
3d6bfaa119
Write raw anim asset id into anim clips
2023-03-09 13:46:39 +08:00
Kah Wei
07a2eb2f64
Fixed not opening the correct Visual Studio version for scripts
2023-03-09 13:18:09 +08:00
Kah Wei
e816df28a8
Clips can now be dragged and dropped into the animation controller editor
2023-03-09 12:07:16 +08:00
Brandon Mak
e3a552f983
Wrote scripting interface for trajectory rendering
2023-03-09 10:45:57 +08:00
Xiao Qi
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
Xiao Qi
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
Xiao Qi
2692db1ed3
Changed function to return pointer type instead of std::optional
2023-03-09 01:49:43 +08:00
Kah Wei
8670fe5fa9
Added text RawAnimInspector for when no animations are selected
2023-03-08 22:03:08 +08:00
Brandon Mak
4012eb97ba
Auto stash before merge of "SP3-1-Rendering" and "origin/main"
...
Solved shadow bugs and WIP trajectory
2023-03-08 21:23:03 +08:00
Kah Wei
57a8e385e4
Added editor field for Animation Controller of the Animator component in the inspector
2023-03-08 20:58:21 +08:00
Kah Wei
69ac4d1219
Merge branch 'main' into SP3-22-AnimationController
2023-03-08 20:00:58 +08:00
Diren D Bharwani
35b60a24e4
Added variable to control number of simulation steps for the SimulateBody method
2023-03-08 19:06:57 +08:00
Kah Wei
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
Kah Wei
1c12a05837
Added C# interface for animator, animation clip and animation controller
2023-03-08 15:29:29 +08:00
Brandon Mak
441d2fe7a4
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-08 14:15:12 +08:00
Diren D Bharwani
6f8387a5ea
Fixed bug where gravity scales were initialised to NaN
2023-03-08 12:59:51 +08:00
Brandon Mak
2bba48b09f
Accounted for deletion of lights
...
- Not entirely urgent, but removal of resources from render graph fails. Need a valid check of handles.
2023-03-08 10:02:51 +08:00
Brandon Mak
64e60a5114
Added editor functionality for lights to enable shadows
2023-03-08 09:38:07 +08:00
Kah Wei
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
Xiao Qi
ea3b851ed0
Merge branch 'main' into SP3-13-Assets-Manager
2023-03-07 23:01:21 +08:00
Xiao Qi
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
Kah Wei
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
Kah Wei
e285d5e6b2
Added functions for setting animation parameters
2023-03-07 22:34:32 +08:00
XiaoQiDigipen
4d64dd34d8
Merge pull request #403 from SHADE-DP/AnimationClipAsset
...
Reimplemented animation clip container assets
2023-03-07 22:10:34 +08:00
Xiao Qi
3cc949bb7e
Animation container redefinition
2023-03-07 22:07:38 +08:00
Xiao Qi
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
Xiao Qi
eae6f6399b
Changed implementation of binary loader to load animation clip containers instead of individual animation clips
2023-03-07 22:05:33 +08:00
Kah Wei
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
Kah Wei
dc32c5c9aa
Implemented saving of animation controller from editor
2023-03-07 20:29:57 +08:00
XiaoQiDigipen
259fca6443
Merge pull request #402 from SHADE-DP/SP3-2-Physics
...
Added Capsule Collider, AABB Query & SimulateBody for Trajectory path prediction
2023-03-07 20:11:21 +08:00
Kah Wei
ff27925f2d
Added ability to reset state, delete links and nodes
2023-03-07 20:05:37 +08:00
Kah Wei
6d01bd0b78
Added ability to set starting node
2023-03-07 19:00:10 +08:00
Diren D Bharwani
e3fb14d698
Merge branch 'main' into SP3-2-Physics
2023-03-07 18:48:31 +08:00
Diren D Bharwani
c36345c60c
Added a simulate body method
...
Raycast effectiveness is untested, but simulation logic matches standard 3D rigid body simulation methods
2023-03-07 18:48:06 +08:00
Diren D Bharwani
50dafa555a
Fixed conversion warnings
2023-03-07 18:46:36 +08:00
Brandon Mak
ff4c294313
Added dynamic flags for render graph nodes and light comp shadow flags
2023-03-07 18:43:59 +08:00
SHAM-DP
e1fa843511
Merge branch 'main' into SP3-129-AudioSystem
2023-03-07 18:10:52 +08:00
SHAM-DP
5ba50cfbcc
Fix for 3d audio (listener up vec was wrong)
2023-03-07 17:57:48 +08:00
Brandon Mak
b6b2c75fc3
Implemented Shadows (f0kin finally)
2023-03-07 17:39:51 +08:00
Kah Wei
493f2c3cfe
Fixed parameters panel for animation controller editor and added menu bar
2023-03-07 16:38:00 +08:00
Diren D Bharwani
cc2afbcf9f
Fixed duplicate collision calls
2023-03-07 14:13:06 +08:00
SHAM-DP
87d9158f75
Added 3d right handed flag for core init.
...
Added profile flags for debug configuration.
Added handling of software format and output type (TO BE TESTED)
2023-03-07 10:35:45 +08:00
maverickdgg
e42a5c68f3
Settings
2023-03-07 10:08:30 +08:00
Diren D Bharwani
2147c2c34b
Fixed capsule debug draw
...
Height is distance between centers
2023-03-07 05:00:43 +08:00
Diren D Bharwani
2197a3bcb9
Added capsule collider
...
Debug draw is a bit wonky. Further polish needed,
2023-03-07 04:51:58 +08:00
Diren D Bharwani
33ccdccd8a
Expanded Physics Settings
...
Editor Menu needs to be resized...idgi...
2023-03-07 03:23:40 +08:00
Xiao Qi
6911ad0d2b
Fixed bug with extensions count, resulting in regeneration of bank metas every time
2023-03-07 01:31:23 +08:00
Kah Wei
9855d7e245
Total time and tickers per second is now auto calculated in SHAnimationClip
2023-03-06 19:42:40 +08:00
Kah Wei
43fd04dd5e
Modified SHAnimationClip and SHAnimatorComponent to use frame timestamps instead of indices
2023-03-06 18:59:04 +08:00
Diren D Bharwani
e89f5df35f
Added physics constants
2023-03-06 18:17:13 +08:00
Diren D Bharwani
8506298fd3
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-03-06 17:56:52 +08:00
Diren D Bharwani
78a3bf4575
Added function to test an AABB against the physics world
...
Update React Dependency
2023-03-06 17:44:58 +08:00
Diren D Bharwani
550b99b3d7
Added a generic AABB class
2023-03-06 17:44:40 +08:00
Xiao Qi
f861304f5e
Testing in progress for skinning test
2023-03-06 17:34:38 +08:00
Kah Wei
9a8114f5dd
Added work in progress animation parameter panel
2023-03-06 16:44:34 +08:00
Kah Wei
d16f807a8a
Added links properties panel
2023-03-06 16:17:05 +08:00
Xiao Qi
becff4824f
Camera without editor compile fix
2023-03-06 15:38:42 +08:00
Diren D Bharwani
0b803d0bd1
Merge branch 'main' into SP3-2-Physics
2023-03-06 13:31:48 +08:00
Kah Wei
f8cc1fe2dc
Size of animation controller editor is now adjustable
2023-03-06 11:47:30 +08:00
Brandon Mak
826df94c96
Shadows WIP
2023-03-06 00:02:06 +08:00
Glence
8d6ef16625
Hot fix
...
Pause menu fix
Offing gameplay UI on preview level
clipping of mouse
change some keydown to keyup
2023-03-05 23:48:25 +08:00
Diren D Bharwani
d59f4e88c2
Added gravity scale
...
Update react dependency
2023-03-05 23:39:33 +08:00
Sri Sham Haran
9866c6e307
Handle mouse center/visible when editor play/pause/stop
2023-03-05 21:33:05 +08:00
Sri Sham Haran
77e3fe376b
Handle mouse center/visible when editor play/pause/stop
2023-03-05 21:24:16 +08:00
Sri Sham Haran
0e2b767263
Fix for button w wrong textures (remove reflection of currentTexture)
2023-03-05 20:23:52 +08:00
Glence
bf5472e2c6
stuff dont ask me
2023-03-05 15:35:57 +08:00
maverickdgg
8b24d7e32b
re-added the button texture check before setting texture
2023-03-05 13:58:07 +08:00
maverickdgg
76e794a543
Merge branch 'main' into SP3-20-UI-System
2023-03-05 13:56:29 +08:00
maverickdgg
4bc568899d
Fix Button click state not resetting if the release event happen when button is inactive
2023-03-05 13:55:51 +08:00
Kah Wei
cedd10c188
Merge branch 'main' into SP3-6-c-scripting
2023-03-05 12:17:31 +08:00
Kah Wei
24f09ab537
Fixed issue with ImGui corrupting strings passed to managed data.
2023-03-05 12:17:19 +08:00
maverickdgg
ef0ff801e4
Camera arm target offset rotation fix
2023-03-05 10:55:39 +08:00
Xiao Qi
816c16324c
WIP Commit, Node and Joint indexing
2023-03-05 04:25:30 +08:00
Kah Wei
066d060b29
Split main animation controller panel into 3 segments
2023-03-05 01:45:26 +08:00
Kah Wei
32adb0c540
Reworked how AnimationControllerEditor works
2023-03-05 01:08:39 +08:00
Brandon Mak
13f28d6bdb
Fixed shiny highlight shaders
2023-03-04 15:55:04 +08:00
Xiao Qi
d4081a7e09
Tranpose Inverse Bind Matrix
...
WIP, building transform matrix not working
2023-03-04 03:20:01 +08:00
Brandon Mak
17bb7a08eb
Fixed render to swapchain errors
2023-03-04 01:01:26 +08:00
Brandon Mak
ce41e975d0
Merge branch 'main' into SP3-1-Rendering
2023-03-04 00:52:05 +08:00
Kah Wei
b93a08fa90
Fixed ImGui crash with SHRawAnimationInspector
2023-03-04 00:48:10 +08:00
Xiao Qi
56693565f4
WIP Load and test animations
2023-03-04 00:43:31 +08:00