Commit Graph

2716 Commits

Author SHA1 Message Date
Kah Wei bfbca68d50 Added more animation tests 2023-03-09 15:14:30 +08:00
XiaoQiDigipen f07ce5211b
Merge pull request #407 from SHADE-DP/SP3-1-Rendering
Fixed Shadow bugs and implemented scripting for trajectory rendering
2023-03-09 15:10:59 +08:00
Kah Wei baed0bec0b Fixed animator component always using manual mode playback time 2023-03-09 15:08:38 +08:00
Brandon Mak f34cdc0f36 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-09 14:56:14 +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
Diren D Bharwani 1304f6e591 Merge branch 'main' into SP3-2-Physics 2023-03-09 14:40:40 +08:00
SHAM-DP 6dd503daad updated audio assets, fix scale for sfx & bgm sliders 2023-03-09 14:12:17 +08:00
Xiao Qi bfc8b3600f Removed stupid 10 second time limit on dependencies pull 2023-03-09 13:56:36 +08:00
Xiao Qi 3d6bfaa119 Write raw anim asset id into anim clips 2023-03-09 13:46:39 +08:00
Glence 63360a4616 Merge branch 'main' into PlayerController 2023-03-09 13:44:49 +08:00
Kah Wei 5669babc0f Fixed animator components in scripts not being retrievable. Also added script for testing animations 2023-03-09 13:35:49 +08:00
Glence 73022cb8d6 update scene with new tween 2023-03-09 13:22:14 +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 fc789334bd Fixed animation assets fields for scripts not supporting the correct types 2023-03-09 13:10:06 +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
Glence 66026ff926 jumppad done 2023-03-09 00:33:36 +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 7ab1ee6fec Added serialization for animation assets for scripts 2023-03-08 20:34:11 +08:00
Brandon Mak 2ff28a544d Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-08 20:12:13 +08:00
Kah Wei 69ac4d1219 Merge branch 'main' into SP3-22-AnimationController 2023-03-08 20:00:58 +08:00
Diren D Bharwani 3a9ab9094f Merge branch 'main' into SP3-2-Physics 2023-03-08 19:07:46 +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
Glence 10555f646c base for jumppad 2023-03-08 18:49:36 +08:00
Diren D Bharwani 90457757a3 Merge branch 'main' into SP3-2-Physics 2023-03-08 18:46:07 +08:00
Glence 87f7b42ec3 made raccoon use capsule, setting for fov done 2023-03-08 17:00:43 +08:00
Glence 6854c41614 setting up volume 2023-03-08 16:22:05 +08:00
Kah Wei 43edfeb14f Added serialization of animation assets for scripts 2023-03-08 16:13:04 +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
XiaoQiDigipen ef7cd4c0c0
Merge pull request #406 from SHADE-DP/SP3-1-Rendering
Implemented shadows. Light components can enable shadows through editor.
2023-03-08 14:17:15 +08:00
Brandon Mak 441d2fe7a4 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-08 14:15:12 +08:00
XiaoQiDigipen 42decf10cb
Merge pull request #405 from SHADE-DP/SP3-2-Physics
Fixed a bug causing invalid gravity scales
2023-03-08 13:55:04 +08:00
Diren D Bharwani 6f8387a5ea Fixed bug where gravity scales were initialised to NaN 2023-03-08 12:59:51 +08:00
Diren D Bharwani 70804f1c3d Merge branch 'main' into SP3-2-Physics 2023-03-08 11:48:06 +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
XiaoQiDigipen ee64580505
Merge pull request #404 from SHADE-DP/SP3-13-Assets-Manager
Implmented GLTF Compile and Load Overhaul
2023-03-07 23:27:01 +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