b3f79e31db
Forgot to commit shader binary
2023-01-30 14:58:52 +08:00
52c0cc2f84
Merge branch 'main' into SP3-17-animation-system
...
# Conflicts:
# Assets/Shaders/TestCube_VS.shshaderb
# SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
# SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.h
# SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.h
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsConstants.h
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.h
# SHADE_Engine/src/Graphics/MiddleEnd/Pipeline/SHPipelineLibrary.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Pipeline/SHPipelineLibrary.h
# SHADE_Engine/src/Serialization/SHYAMLConverters.h
2023-01-30 14:57:46 +08:00
2fd8506fab
Merge pull request #319 from SHADE-DP/revert-316-SHPhysics
...
Revert "Implemented a custom physics engine"
2023-01-30 14:41:09 +08:00
3ff2e6bb92
Revert "Implemented a custom physics engine"
2023-01-30 14:40:55 +08:00
8c3703ce04
Fixed models using wrong animation bone matrices
2023-01-29 20:52:04 +08:00
4a00312f57
Added serialization of AnimatorComponent
2023-01-29 20:35:18 +08:00
2d1987e14b
Added handling for rendering objects using an animated shader but without an animator component or an attached rig
2023-01-29 19:27:58 +08:00
741489b0ae
Merge branch 'SP3-17-animation-system' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-17-animation-system
2023-01-29 18:51:36 +08:00
6af4933b52
Fixed on-close crashes coming from SHResourceManager
2023-01-29 18:51:31 +08:00
83a33b3851
Bone count data member in mesh asset
2023-01-29 18:38:12 +08:00
eab2f2d54a
Fixed bug where replacing an animator's rig causes the GPU to be lost
2023-01-29 16:03:08 +08:00
3f1a25c95b
Fixed crash caused by loading more than one SHRig
2023-01-29 15:39:48 +08:00
1472823dc0
Removed buggy animation debug draw
2023-01-29 14:45:46 +08:00
d5897387c5
Merge branch 'main' into SP3-1-Rendering
2023-01-29 13:25:40 +08:00
ac10b95b01
Tooltips
2023-01-25 23:54:04 +08:00
bde191aeca
Input Bindings Panel Done
2023-01-25 23:22:15 +08:00
7d9ab7a381
items changes
...
items now return back to their original position when owner collides with it
2023-01-25 18:20:26 +08:00
80a7fe701b
Added debug draw for animation system
2023-01-24 23:31:00 +08:00
e70354df74
Get input code name functions
2023-01-24 19:17:27 +08:00
834d474f21
Merge branch 'main' into SP3-10-input-management
2023-01-23 18:04:07 +08:00
cec8d9e618
Merge pull request #316 from SHADE-DP/SHPhysics
...
Implemented a custom physics engine
2023-01-23 15:55:45 +08:00
4ed7aa3aed
Reverted an attempt to stabilise edge detection between polyhedrons
2023-01-23 03:03:40 +08:00
5730381302
Physics objects can be implicity static if only a collider was added.
...
Removed the need to create an extra body. Math is great.
2023-01-23 00:56:46 +08:00
a0f6cd3ae7
Cached SAT for improved stability
...
The effects of baumgarte stabilisation can be rather obvious especially when polyhedrons are thrown around at angles. Regardless, the system is relatively stable bar the added energy from the solving method, which may make for a more "bombastic" physics playground
2023-01-23 00:37:22 +08:00
354d9434f6
SHAnimatorComponent and SHRig now use the proper transform and offset matrices
2023-01-22 21:43:37 +08:00
0c3106f15b
Abstracted contact derivation as setup for cached SAT
2023-01-22 19:20:03 +08:00
dddb556553
Progress
2023-01-22 17:59:36 +08:00
826a1bc617
Merge remote-tracking branch 'origin/main' into SHPhysics
2023-01-22 17:39:06 +08:00
1dc16fdcda
Fixed typos
2023-01-22 17:38:51 +08:00
80fb8f7c73
Saved and loaded bone offsets
2023-01-22 17:00:55 +08:00
7f787f2593
Merge branch 'main' into PlayerController
2023-01-20 15:19:49 +08:00
79a40cb58b
Merge branch 'main' into SP3-10-input-management
2023-01-20 14:02:06 +08:00
71572381f7
Progress on input bindings in editor
2023-01-20 14:00:24 +08:00
62f104a535
Added Global Inverse Matrix for SHRig
2023-01-18 20:11:48 +08:00
a543f6cc3a
Removed unecessary check in SHAnimatorComponent
2023-01-18 19:52:26 +08:00
3e23f08aa8
Fixed bug where keyframes of animation clips are not interpolated
2023-01-18 19:25:27 +08:00
b9fcdc43d4
Modified how SHAnimatorComponent computes the bone matrices
2023-01-18 19:16:45 +08:00
35b7ac0178
Fixed SHAnimationClip::GetTotalTime()
2023-01-18 19:16:20 +08:00
e013112b2c
Fixed validation errors when rendering a non-animated model
2023-01-18 16:03:25 +08:00
6c6e3bfe28
Merge branch 'SP3-17-animation-system' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-17-animation-system
2023-01-18 15:12:03 +08:00
4854e35e75
Merge pull request #315 from SHADE-DP/SP3-4-Editor
...
Added open by default for component inspector toggle headers, Added drag/drop receiving for all uint32_t fields
2023-01-18 04:05:49 +08:00
1b97cd72bd
TEMP fix to get anim timing correct
2023-01-18 04:05:36 +08:00
6872bae151
Updated compiled shmodel file for racoon with fixed rig node order and build format
...
Fixed bug when building histogram for vertex weights
2023-01-18 04:00:48 +08:00
b36145fa39
Added isAnimated check with base 0-index identity matrix for bones
2023-01-17 22:55:33 +08:00
20ffd67fcc
Fixed move constructor and assignment for SHBatch and added a check for if a batch is animated
2023-01-17 21:54:53 +08:00
c3a140b9aa
Merge branch 'main' into SP3-4-Editor
...
reordered draw order for some windows
2023-01-17 21:08:37 +08:00
3cb1e5c7fc
Merge branch 'main' into SP3-4-Editor
2023-01-17 21:02:01 +08:00
6b19a635e3
All component view toggle headers open by default
...
uint32_t fields now accept EID & Resource drag/drop
2023-01-17 20:52:22 +08:00
af3e4a3cfd
Modified SHRig to use indices provided by SHRigAsset instead of auto generated indices
2023-01-17 18:26:58 +08:00
2d898851c5
Fixed rig asset node delete
2023-01-17 16:07:19 +08:00
Kah Wei