Commit Graph

2651 Commits

Author SHA1 Message Date
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
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
Diren D Bharwani e46dfd0b2e Merge branch 'main' into SP3-2-Physics 2023-03-07 21:09:49 +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
XiaoQiDigipen 55932628b9
Merge pull request #401 from SHADE-DP/SP3-129-AudioSystem
Fixed 3d audio
2023-03-07 20:11:02 +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