xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity
2,245 Commits 81 Branches 9 Tags 86 MiB
Commit Graph

1504 Commits

Author SHA1 Message Date
Diren D Bharwani 931f6fe5e2 Fixed almost everything. Ray debug drawing has a small bug 2023-02-02 20:56:55 +08:00
Diren D Bharwani d5c731dd20 Fixed collision shape debug drawing and more serialisation bugs 2023-02-02 20:48:32 +08:00
Diren D Bharwani 931ed58287 Added individual collider debug drawing 2023-02-02 20:19:21 +08:00
Diren D Bharwani 3593df3ada Fixed collider shape serialisation 2023-02-02 20:15:59 +08:00
Diren D Bharwani 71f4cdd29e Fixed rigidbody serialisation 2023-02-02 19:23:42 +08:00
Diren D Bharwani 6a57be2e60 Refactored old physics to match new interface 
Compiles but still buggy, need a bit of time to clear up all the bugs
 2023-02-02 19:06:56 +08:00
Kah Wei ee03722153 Merge branch 'main' into SP3-6-c-scripting 2023-02-01 23:49:44 +08:00
Kah Wei 3a4288d4bc Merge branch 'SP3-6-c-scripting' into SP3-6-CSharpStaticReset 2023-02-01 19:18:29 +08:00
maverickdgg d149aae6fb Merge branch 'main' into SP3-20-UI-System 2023-02-01 12:44:30 +08:00
maverickdgg 2dfaa75ab3 Add CreateComponentSparseSet and bug fix for togglebutton nt triggering 2023-02-01 12:42:51 +08:00
Kah Wei 0b0590180d Fixed incorrect functor called in SHScriptEngine::onUIElementClicked() 2023-02-01 11:57:11 +08:00
Kah Wei 39fbfbd6fa Added more reliable method of reloading static C# data 2023-02-01 00:34:09 +08:00
Kah Wei 72953762cb Attempt at resetting static data members 2023-01-31 23:48:44 +08:00
Brandon Mak d9833ca8b0 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-01-31 19:07:28 +08:00
Brandon Mak 109f35f297 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-01-31 19:02:11 +08:00
Brandon Mak ea74f5ebf6 Fixed some errors in SHUISystem 2023-01-31 19:01:21 +08:00
SHAM-DP d6fc83d3b7 Merge branch 'main' into SP3-4-Editor 2023-01-31 18:56:09 +08:00
SHAM-DP 4c4d39d4bb Added double click asset id in inspector to scroll to asset in asset browser 
Added asset browser filter by name and type
 2023-01-31 18:55:50 +08:00
Kah Wei 8f9a4e8c73 Fixed bug where onDestroy() is not called for scripts that are destroyed when leaving play mode in the editor 2023-01-31 18:09:07 +08:00
Brandon Mak e9452093f0 Fixed UI 2023-01-31 15:17:40 +08:00
mushgunAX 710bfe1dac Merge branch 'main' into SP3-10-input-management 2023-01-31 12:51:50 +08:00
mushgunAX 38f2ba69db Force use of Dedicated GPU 2023-01-31 12:43:02 +08:00
Kah Wei a5b7672102 Merge branch 'main' into SP3-6-c-scripting 2023-01-30 20:53:42 +08:00
Kah Wei f93d5fcd63 Added scripting inteface for SHUIComponent 2023-01-30 20:52:39 +08:00
Xiao Qi c13f06e4a6 Added warning line to check for existing path 2023-01-30 19:55:42 +08:00
XiaoQiDigipen f1bf9cb865
Merge pull request #322 from SHADE-DP/SP3-4-Editor 
Added hierarchy panel filter
 2023-01-30 18:29:47 +08:00
Xiao Qi f2b8e52608 Commented unused shader build lines 2023-01-30 18:28:49 +08:00
SHAM-DP f2a0b38406 Merge branch 'main' into SP3-4-Editor 2023-01-30 17:56:38 +08:00
SHAM-DP cf999b0d3b Added entity filter 2023-01-30 17:44:06 +08:00
XiaoQiDigipen 213ac9d275
Merge pull request #321 from SHADE-DP/SP3-17-animation-system 
Animation WIP merge
 2023-01-30 17:35:56 +08:00
Kah Wei c2aa067cc4 Fixed crash caused by loading incorrect renderpass for subpass replacement 2023-01-30 16:55:15 +08:00
SHAM-DP 59ef28baf1 Merge branch 'main' into AudioScripting 2023-01-30 16:47:46 +08:00
SHAM-DP 74b8ee73c5 Spatial setup 2023-01-30 16:47:03 +08:00
Brandon Mak a3ca04535f More changes 2023-01-30 16:46:42 +08:00
Brandon Mak 89b101f3e5 passed string by value dum dum brandon 2023-01-30 16:46:14 +08:00
Brandon Mak c45c469c8e Change GetUsableSubpasses to GetUsableSubpass 2023-01-30 16:42:19 +08:00
Brandon Mak f8bde9fc35 Added map to retrieve usable subpasses 2023-01-30 16:35:12 +08:00
Kah Wei 8a4a469abf Added ability to change subpass for a material and fixed typo for vertex shader in the material editor 2023-01-30 15:52:42 +08:00
Brandon Mak a67e65ff76 Made array for usable subpasses 2023-01-30 15:34:22 +08:00
Kah Wei 61fa2ae923 Merge branch 'main' into SP3-17-animation-system 2023-01-30 15:16:09 +08:00
Kah Wei 53ef202e46 Merge branch 'main' into SP3-17-animation-system 
# Conflicts:
#	SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
#	SHADE_Engine/src/Serialization/SHYAMLConverters.h
 2023-01-30 15:15:46 +08:00
XiaoQiDigipen 5240c837ec
Merge pull request #318 from SHADE-DP/SP3-10-input-management 
Implemented Input Binding Panel via Editor
 2023-01-30 15:00:58 +08:00
Kah Wei 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
XiaoQiDigipen 3ff2e6bb92
Revert "Implemented a custom physics engine" 2023-01-30 14:40:55 +08:00
Kah Wei 8c3703ce04 Fixed models using wrong animation bone matrices 2023-01-29 20:52:04 +08:00
Kah Wei 4a00312f57 Added serialization of AnimatorComponent 2023-01-29 20:35:18 +08:00
Kah Wei 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
Kah Wei 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
Kah Wei 6af4933b52 Fixed on-close crashes coming from SHResourceManager 2023-01-29 18:51:31 +08:00
Xiao Qi 83a33b3851 Bone count data member in mesh asset 2023-01-29 18:38:12 +08:00
Kah Wei eab2f2d54a Fixed bug where replacing an animator's rig causes the GPU to be lost 2023-01-29 16:03:08 +08:00
Kah Wei 3f1a25c95b Fixed crash caused by loading more than one SHRig 2023-01-29 15:39:48 +08:00
Kah Wei 1472823dc0 Removed buggy animation debug draw 2023-01-29 14:45:46 +08:00
mushgunAX ac10b95b01 Tooltips 2023-01-25 23:54:04 +08:00
mushgunAX bde191aeca Input Bindings Panel Done 2023-01-25 23:22:15 +08:00
Kah Wei 80a7fe701b Added debug draw for animation system 2023-01-24 23:31:00 +08:00
mushgunAX e70354df74 Get input code name functions 2023-01-24 19:17:27 +08:00
mushgunAX 834d474f21 Merge branch 'main' into SP3-10-input-management 2023-01-23 18:04:07 +08:00
Diren D Bharwani 4ed7aa3aed Reverted an attempt to stabilise edge detection between polyhedrons 2023-01-23 03:03:40 +08:00
Diren D Bharwani 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
Diren D Bharwani 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
Kah Wei 354d9434f6 SHAnimatorComponent and SHRig now use the proper transform and offset matrices 2023-01-22 21:43:37 +08:00
Diren D Bharwani 0c3106f15b Abstracted contact derivation as setup for cached SAT 2023-01-22 19:20:03 +08:00
mushgunAX dddb556553 Progress 2023-01-22 17:59:36 +08:00
Diren D Bharwani 826a1bc617 Merge remote-tracking branch 'origin/main' into SHPhysics 2023-01-22 17:39:06 +08:00
Diren D Bharwani 1dc16fdcda Fixed typos 2023-01-22 17:38:51 +08:00
Xiao Qi 80fb8f7c73 Saved and loaded bone offsets 2023-01-22 17:00:55 +08:00
mushgunAX 79a40cb58b Merge branch 'main' into SP3-10-input-management 2023-01-20 14:02:06 +08:00
mushgunAX 71572381f7 Progress on input bindings in editor 2023-01-20 14:00:24 +08:00
Kah Wei 62f104a535 Added Global Inverse Matrix for SHRig 2023-01-18 20:11:48 +08:00
Kah Wei a543f6cc3a Removed unecessary check in SHAnimatorComponent 2023-01-18 19:52:26 +08:00
Kah Wei 3e23f08aa8 Fixed bug where keyframes of animation clips are not interpolated 2023-01-18 19:25:27 +08:00
Kah Wei b9fcdc43d4 Modified how SHAnimatorComponent computes the bone matrices 2023-01-18 19:16:45 +08:00
Kah Wei 35b7ac0178 Fixed SHAnimationClip::GetTotalTime() 2023-01-18 19:16:20 +08:00
Kah Wei e013112b2c Fixed validation errors when rendering a non-animated model 2023-01-18 16:03:25 +08:00
Kah Wei 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
Xiao Qi 1b97cd72bd TEMP fix to get anim timing correct 2023-01-18 04:05:36 +08:00
Xiao Qi 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
Kah Wei b36145fa39 Added isAnimated check with base 0-index identity matrix for bones 2023-01-17 22:55:33 +08:00
Kah Wei 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
SHAM-DP c3a140b9aa Merge branch 'main' into SP3-4-Editor 
reordered draw order for some windows
 2023-01-17 21:08:37 +08:00
SHAM-DP 3cb1e5c7fc Merge branch 'main' into SP3-4-Editor 2023-01-17 21:02:01 +08:00
SHAM-DP 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
Kah Wei af3e4a3cfd Modified SHRig to use indices provided by SHRigAsset instead of auto generated indices 2023-01-17 18:26:58 +08:00
Xiao Qi 2d898851c5 Fixed rig asset node delete 2023-01-17 16:07:19 +08:00
Xiao Qi 1b4397c76d Updated all compiled models 
Fixed UV mappings
 2023-01-17 14:38:50 +08:00
Glence affa6f0dd8 added implantation for audio scripting 2023-01-16 21:05:21 +08:00
Kah Wei bce7237e20 Modified shader to support instanced bone first index and system to support runtime updating of animations 2023-01-16 21:02:37 +08:00
Kah Wei a668f38c87 Fixed bone vertex data not correctly passed to the GPU 2023-01-16 17:49:16 +08:00
Kah Wei 1fc2897150 Added SHVec4U and modified SHMesh to use SHVec4U instead of uint32_t 2023-01-16 16:30:15 +08:00
Diren D Bharwani dc55c31c36 Merge remote-tracking branch 'origin/main' into SHPhysics 2023-01-16 16:23:20 +08:00
Diren D Bharwani 8475bdccd7 Merge remote-tracking branch 'origin/main' into SHPhysics 2023-01-16 16:22:59 +08:00
Xiao Qi 5089957468 Implemented bone weight reading into desired format. 2023-01-16 16:12:43 +08:00
XiaoQiDigipen b6724eed77
Merge pull request #314 from SHADE-DP/SP3-1-Rendering 
Implemented Shadow maps (still needs improvement)
 2023-01-16 15:40:30 +08:00
Brandon Mak 09911cc50c Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-01-16 15:33:37 +08:00
maverickdgg cb93fab363 Merge branch 'main' into SP3-20-UI-System 2023-01-16 15:17:43 +08:00
maverickdgg fe39be0d61 Added asset browser tool tip that shows asset id 2023-01-16 15:17:06 +08:00
Brandon Mak 1526176c58 Shadows WIP 2023-01-16 15:06:46 +08:00
XiaoQiDigipen dfb8500c9b
Merge pull request #311 from SHADE-DP/SP3-20-UI-System 
Added Changing of textures for buttons. Change button events to be on release
 2023-01-16 15:01:51 +08:00
Diren D Bharwani c077575a73 Fixed convex-convex face detection 
Minor bugs with contact point detection. Will test more before pushing into main
 2023-01-16 15:01:14 +08:00