Commit Graph

2547 Commits

Author SHA1 Message Date
Diren D Bharwani d55a965e32 Merge remote-tracking branch 'origin/PhySH' into PhySH 2022-12-16 18:34:58 +08:00
Diren D Bharwani 24b13ed6e4 Refactored colliders to use parent-child transform logic 2022-12-16 18:34:53 +08:00
Diren D Bharwani 6a20e93704 Refactored colliders to use a parent-child transform logic 2022-12-16 18:34:29 +08:00
Diren D Bharwani a6e1064e64 Fixed bug where collider offsets were not recomputed 2022-12-16 15:03:55 +08:00
Diren D Bharwani 2bd90e7c14 Adjusted physics debug draw to fit new debug draw interface 2022-12-16 14:38:46 +08:00
Diren D Bharwani 1b91f60c4a Fixed warning with wrongly declared friends 2022-12-16 14:38:22 +08:00
Diren D Bharwani ddf2d8bde9 Fixed warnings for subscript operator in vectors and removed react conversions 2022-12-16 14:38:01 +08:00
Diren D Bharwani af39662748 Merge remote-tracking branch 'origin/main' into PhySH 2022-12-16 14:04:58 +08:00
Kah Wei 12a46c4266 Merge branch 'main' into SP3-17-animation-system
# Conflicts:
#	SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp
#	SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHDebugDrawSystem.cpp
#	SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.cpp
#	SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.h
2022-12-16 12:59:11 +08:00
XiaoQiDigipen c479e6c8d8
Merge pull request #294 from SHADE-DP/SP3-1-DebugDraw
Reworked DebugDraw System
2022-12-16 02:21:32 +08:00
Diren D Bharwani 6b8232ae91 Fixed bug where intertia tensors were not reset when unlocking axes 2022-12-16 02:02:20 +08:00
Kah Wei 0a3ff527d9 SHDebugDraw drawing functions now have the colour parameter defaulted to white 2022-12-16 00:05:03 +08:00
Kah Wei 77a164cefb Updated C# Gizmos class with DrawCube and DrawSphere in 2022-12-15 23:33:53 +08:00
Kah Wei 8978515cb9 Reworked SHDebugDraw to fit new interface of SHDebugDrawSystem 2022-12-15 23:25:49 +08:00
Diren D Bharwani 27760a95c9 Tested physics interactions with scripts 2022-12-15 23:00:15 +08:00
Diren D Bharwani 27c7a17397 Fixed computation of global inverse inertia tensor 2022-12-15 22:59:55 +08:00
Kah Wei eb06eebc32 Added ability to debug draw circles 2022-12-15 20:30:20 +08:00
Kah Wei 78575b11e4 Added debug draw of wire spheres, filled cube and filled sphere 2022-12-15 18:08:12 +08:00
Kah Wei b6ab7b44d9 Renamed DrawWireBox to DrawWireCube 2022-12-15 02:19:30 +08:00
Diren D Bharwani 53edffebac Added (untested) rotational motion to rigidbodies
Also added a temporary solution for debug drawing rotated spheres
2022-12-15 02:08:25 +08:00
Kah Wei 9ef005346b Merge branch 'main' into SP3-1-DebugDraw 2022-12-15 01:46:26 +08:00
Kah Wei 98ff16d00c Added deebug drawing of cubes of any transform 2022-12-15 01:45:44 +08:00
mushgunAX 3041761e96 Merge branch 'main' into SP3-10-input-management 2022-12-14 16:13:27 +08:00
Kah Wei 06cc969658 Reworked DebugDraw system (only lines now) 2022-12-14 01:20:12 +08:00
XiaoQiDigipen 269edfcdfc
Merge pull request #293 from SHADE-DP/SP3-12-SceneGraph
Added ActiveInHierarchy property to Scene Nodes
2022-12-13 21:58:13 +08:00
Diren D Bharwani af3a5e7dc9 Re-implemented Collider Debug Drawing 2022-12-13 03:54:37 +08:00
mushgunAX 775dcd5337 Merge branch 'main' into SP3-10-input-management 2022-12-12 20:11:51 +08:00
Diren D Bharwani 7820d332b1 Changed managed code's GameObject to synce with the node's active state 2022-12-12 17:58:15 +08:00
Diren D Bharwani 9b17c62b1d Added active in hierarchy property to scene nodes 2022-12-12 17:07:18 +08:00
Diren D Bharwani 970b9e7ec0 Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph 2022-12-12 17:00:43 +08:00
Sri Sham Haran 82765648c4 fix colliderpanel 2022-12-12 11:49:52 +08:00
Sri Sham Haran a820d19670 Merge branch 'main' into SP3-4-Editor 2022-12-12 10:39:07 +08:00
Diren D Bharwani 0cebedeee0 Fixed compile errors with merged scene init and exit events 2022-12-11 20:44:40 +08:00
Diren D Bharwani 60409b47cb Merge remote-tracking branch 'origin/main' into PhySH 2022-12-11 20:44:25 +08:00
Diren D Bharwani bf8a410fa2 Fixed bug where colliders were not properly deserialised 2022-12-11 20:33:30 +08:00
Diren D Bharwani c1d7702914 Moved debug draw state to colliders. Synced collider positions with rigid bodies 2022-12-11 20:12:26 +08:00
Diren D Bharwani 74e50e10bd Refactored the colliders?
This took me 4 days omg
2022-12-09 01:15:43 +08:00
XiaoQiDigipen 8df2d66f79
Merge pull request #291 from SHADE-DP/SP3-12-SceneGraph
Added Scene Init Exit events
2022-12-06 13:39:58 +08:00
maverickdgg 4f1007e6be Added scene init exit events 2022-12-06 13:09:47 +08:00
maverickdgg 9eddcc8460 Merge branch 'main' into SP3-12-SceneGraph 2022-12-06 12:54:43 +08:00
mushgunAX 9a5dc52d77 Minor fixes to input manager
- Pass binding names into functions by const reference instead of by value
- Fixed oversight of not being able to modify or read mouse Y positive multiplier for a binding
2022-12-05 23:25:43 +08:00
Diren D Bharwani 38b1c46d1f Added physics world and tested applied gravity for linear movement 2022-12-05 00:20:29 +08:00
Diren D Bharwani 36ceec5855 Added SceneInit & SceneExit events 2022-12-05 00:19:48 +08:00
Diren D Bharwani ca45a12186 Restructured Physics Systems & Interfaces 2022-12-04 17:31:22 +08:00
Diren D Bharwani 6cd203179a Added Rigid Body 2022-12-02 19:01:08 +08:00
Diren D Bharwani 52dc993941 goodbye react 2022-12-02 17:44:44 +08:00
XiaoQiDigipen d25253118f
Merge pull request #286 from SHADE-DP/PlayerController
Change Script folders and added more audio
2022-11-26 10:09:23 +08:00
Glence 81978a90b6 added more audio and tidy up folder
tidy up scripts folder
added more audio (cause burden randall cant make up his mind)
adjusted main scene abit
2022-11-26 08:28:37 +08:00
Sri Sham Haran 128f07030b
Merge pull request #285 from SHADE-DP/PlayerController
Updated Audio and Scene along with bug fixes
2022-11-25 23:11:01 +08:00
Glence cae8358341 updated scene changes 2022-11-25 23:10:17 +08:00