Commit Graph

1269 Commits

Author SHA1 Message Date
Diren D Bharwani af39662748 Merge remote-tracking branch 'origin/main' into PhySH 2022-12-16 14:04:58 +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 8978515cb9 Reworked SHDebugDraw to fit new interface of SHDebugDrawSystem 2022-12-15 23:25:49 +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
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
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
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
Kah Wei c84e33731b Fixed crash which occurs when changing the material of an object twice in a row 2022-11-25 22:24:30 +08:00
Glence 413156dabb Merge branch 'main' into PlayerController 2022-11-25 15:45:35 +08:00
Diren D Bharwani 1cfd3cfd3a Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-25 14:06:28 +08:00
Diren D Bharwani afd2abf036 Fixed pre & post physics transforms update routines 2022-11-25 14:06:20 +08:00
Diren D Bharwani 43a5cb4deb Reverted world extents computation 2022-11-25 14:05:43 +08:00
Glence 9daaade56a Merge branch 'main' into PlayerController 2022-11-25 13:22:51 +08:00
Xiao Qi 300647afa6 Stopped camera from running when editor is in pause 2022-11-25 12:24:13 +08:00
maverickdgg f3e7f1747a Merge branch 'main' into SP3-141-Camera-System 2022-11-25 10:06:11 +08:00
maverickdgg 428f8f29c6 Camera collision. WIP 2022-11-25 10:06:02 +08:00
Glence c07fa3c5ae remove the clamp from the phsysicSystem routines
added cheats for maingame
added raycast for pick throw
2022-11-25 00:54:45 +08:00
Kah Wei 7c58c9a23d Fixed crash caused when building scripts in debug mode when a debugger is attached 2022-11-24 23:20:37 +08:00
Diren D Bharwani 6525a39df2 Added collision tags for raycasting. Does not apply to collider raycasting 2022-11-24 15:11:07 +08:00
Diren D Bharwani 3775df23a4 Debug draw is disabled on publish builds. 2022-11-24 14:43:41 +08:00
Diren D Bharwani a9bacc9e48 Fixed incorrect storing of world extents 2022-11-24 14:42:34 +08:00
Diren D Bharwani f6c74ad3d2 Fixed recurring bug with collision listener 2022-11-24 14:41:52 +08:00
Diren D Bharwani 74a85180ac Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-24 12:02:34 +08:00
Diren D Bharwani 7d7d40ba8e Debug draw is always enabled. 2022-11-24 12:02:08 +08:00
XiaoQiDigipen d09fefe9b4
Merge pull request #271 from SHADE-DP/SP3-2-Physics
Fixed Physics Bugs
2022-11-24 02:10:54 +08:00
Xiao Qi b7b3301158 Added isDirty copy in move ctor for SHBatch 2022-11-24 02:01:41 +08:00
Diren D Bharwani 33ac1a868a Fixed wrongly returning fixed DT in managed code & collision listener bug 2022-11-24 01:46:29 +08:00
Glence ca60b64a89 Merge branch 'main' into PlayerController 2022-11-23 20:39:47 +08:00
Kah Wei 57df4e2905 Fixed awake() and start() getting called before all objects are loaded when changing scenes 2022-11-23 20:36:28 +08:00
Glence af93e59d0e added text to maingame 2022-11-23 20:26:53 +08:00
Kah Wei 6261661ef6 Added potential fix for Vulkan buffer creation crashes from SHBatch 2022-11-23 19:30:51 +08:00
maverickdgg 49b475442f Added a targetOffset for camera arm 2022-11-23 18:27:54 +08:00
Glence 22972d7455 updated the music banks
update a tem fix for physicsSystem
2022-11-23 17:37:06 +08:00
Kah Wei 20a1fdc16e Fixed Application::Close() not closing but instead minimizing the window 2022-11-23 17:03:57 +08:00
Diren D Bharwani 9bdaea10f5 Fixed...another..bug...:( 2022-11-23 16:56:25 +08:00
Diren D Bharwani 4865a49bfa Fixed bug where rigidbody setters in the first frame causes a crash 2022-11-23 15:32:14 +08:00
XiaoQiDigipen 5af5d4ef96
Merge pull request #260 from SHADE-DP/SP3-16-Math
Added Forward & LookAt to C# Transforms
2022-11-23 15:07:23 +08:00
Diren D Bharwani 7202551838 Added Vector rotation with Quaternions 2022-11-23 14:56:20 +08:00
XiaoQiDigipen 87936f1e31
Merge pull request #259 from SHADE-DP/SP3-2-Physics
Fixed fatal bug where rigidbody masses was incorrectly computed when editor is enabled
2022-11-23 13:50:22 +08:00
XiaoQiDigipen 6161d81c4a
Merge pull request #256 from SHADE-DP/Fix-NoGPUClarity
Added explicit error check for when no supported GPUs are available to use
2022-11-23 13:48:37 +08:00
Diren D Bharwani db69cfb567 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-23 13:30:40 +08:00
Diren D Bharwani 1402139369 Fixed bug where colliders were not properly added with editor enabled 2022-11-23 13:30:28 +08:00
Xiao Qi 0edd2f24e3 Added VS and FS shaders to tile singular textures
Added shader stage flag bit for vertex shaders
2022-11-23 13:02:33 +08:00
Kah Wei 1a26b0ac70 When no GPU is detected, a proper exception describing it is now thrown instead of failing silently 2022-11-23 09:57:55 +08:00
Diren D Bharwani 2523613732 Fixed fatal bug that prevent scene changing while the editor is enabled 2022-11-23 01:01:29 +08:00
Diren D Bharwani fa83e2bc4c Modified Shape.Raycast functions to return RaycastResult 2022-11-23 01:01:12 +08:00
Diren D Bharwani 4277ba10d7 Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph 2022-11-22 22:11:42 +08:00
Xiao Qi cc2587a7bd Added recognition for material and prefab types when generating meta files 2022-11-22 21:54:51 +08:00
Xiao Qi bcd8b37fd7 Merge branch 'main' into SP3-13-Assets-Manager 2022-11-22 21:53:46 +08:00
Diren D Bharwani 82b92d45cf Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph 2022-11-22 21:31:45 +08:00
Diren D Bharwani 807ad54d7d Fixed Scene Node SetActive & SceneGraph CheckActiveInHierarchy 2022-11-22 21:31:37 +08:00
Sri Sham Haran f119acdb65 collider tag panel 2022-11-22 21:15:18 +08:00
maverickdgg 44733308f1 Merge branch 'main' into SP3-20-UI-System 2022-11-22 21:04:03 +08:00
maverickdgg 7c36886669 Fix for Canvas scaler 2022-11-22 21:03:53 +08:00
XiaoQiDigipen cecd8ab717
Merge pull request #251 from SHADE-DP/SP3-2-Physics
Fixed Rigidbodies not sleeping
2022-11-22 20:58:11 +08:00
maverickdgg 142f025692 Added check for editor camera. 2022-11-22 20:54:16 +08:00
Diren D Bharwani 72d70e4747 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-22 20:46:37 +08:00
Diren D Bharwani 62c4b3837d Fixed bug where transform dirty flags were not being properly cleared.
This was preventing bodies from going to sleep and transforms always updating.
2022-11-22 20:46:31 +08:00
maverickdgg a57145b510 Merge branch 'main' into SP3-20-UI-System 2022-11-22 20:39:39 +08:00
maverickdgg a612e71f0c Added Buttons, Added Canvas Scaling matrix, Added Serialization of buttons and camera arm 2022-11-22 20:39:15 +08:00
XiaoQiDigipen 720ccb6eab
Merge pull request #249 from SHADE-DP/SP3-2-Physics
Fixed various physics bugs and added Physics Material to Inspector
2022-11-22 20:14:31 +08:00
Xiao Qi 57a0bbdb8c Added entity count at the bottom bar of editor
Changed colour of bottom bar
2022-11-22 20:14:21 +08:00
Diren D Bharwani dab51ee4cf Readded testing function in physics routines for future use 2022-11-22 20:00:58 +08:00
Diren D Bharwani 053c3e04fd Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-22 19:26:47 +08:00
Diren D Bharwani c18d58cba3 Fixed various physics bugs
Fixed bug where world was prebuilt and entity IDs were wrongly synced
Fixed collider properties not being synced in the first frame during mass property computations
Fixed static objects being wrongly updated post world update
2022-11-22 19:26:17 +08:00
Kah Wei 9964d5dfce Fixed missing comments for SHEditorUI 2022-11-22 18:17:24 +08:00
Kah Wei 1bd19b90a8 Merge branch 'main' into SP3-6-c-scripting 2022-11-22 18:11:17 +08:00
Kah Wei 4478b6db62 Added editor support for FontAsset, MeshAsset and MaterialAsset. 2022-11-22 17:48:01 +08:00
Kah Wei 7d692061fb Reworked how Materials are handled on C# 2022-11-22 17:23:50 +08:00
Kah Wei 719d29dec3 Renamed Mesh and Font structs in Managed to MeshAsset and FontAsset and reworked them to be a abstraction for asset IDs 2022-11-22 16:51:07 +08:00
Glence 71e8ba6044 doing up the main menu 2022-11-22 16:18:16 +08:00
Kah Wei a78b3c0123 Reworked NativeAsset system 2022-11-22 15:52:55 +08:00
Xiao Qi 681e7f3506 Added invalid Asset ID Macro 2022-11-22 14:26:10 +08:00
maverickdgg 5d04149797 buttons WIP 2022-11-22 14:02:45 +08:00
Xiao Qi 5024956c04 Merge branch 'main' into SP3-13-Assets-Manager 2022-11-22 13:54:40 +08:00
maverickdgg cf10724f3a Update SHSerialization.cpp 2022-11-22 13:17:45 +08:00
maverickdgg 3e4ebaab7b Merge branch 'main' into SP3-20-UI-System 2022-11-22 13:16:04 +08:00
maverickdgg 080c2c70d5 Added canvas to serialization 2022-11-22 13:09:40 +08:00
XiaoQiDigipen 437cb075d3
Merge pull request #242 from SHADE-DP/SP3-141-Camera-System
FIxed major crashes caused by main camera retrieval and entity destroy
2022-11-22 12:55:17 +08:00
maverickdgg 858e200fb3 Bug fixes 2022-11-22 11:32:19 +08:00
Brandon Mak cf0b94e97d Merge branch 'main' into SP3-1-Rendering 2022-11-22 10:50:04 +08:00
Brandon Mak dfe86ce7db Fixed resizing bug 2022-11-22 10:43:59 +08:00
Brandon Mak 4377972315 Added functionality for graphics system to render to swapchain image
- Added functionality for graphics system to render to swapchain image when SHEDITOR is disabled. This is done via rendering a simple quad on screen and using an input attachment as a texture to the shader.
2022-11-22 10:10:26 +08:00
Brandon Mak 964b375ccd Write to swapchain image without SHEDITOR defined WIP 2022-11-22 09:05:56 +08:00
Diren D Bharwani 23bae3d515 Fixed bug with Bounciness failing to serialise 2022-11-22 00:46:32 +08:00
Diren D Bharwani f1ac689bb0 Added Physics Materials to Inspector 2022-11-22 00:37:09 +08:00
Kah Wei af2ad6cc80 Merge branch 'main' into SP3-6-c-scripting 2022-11-21 20:59:08 +08:00
Kah Wei 4172362790 Renamed SHTextRenderer to SHTextRenderable 2022-11-21 20:35:31 +08:00
Brandon Mak cd6edeeee4 Merge branch 'main' into SP3-1-Rendering 2022-11-21 20:29:10 +08:00
XiaoQiDigipen 6d8fba8e05
Merge pull request #238 from SHADE-DP/Fix-BatchPersistence
Fixed ghosts of a renderable being rendered when a material is changed
2022-11-21 20:27:48 +08:00
Xiao Qi 1ed0181c9e Reverted premake changes 2022-11-21 20:27:38 +08:00
XiaoQiDigipen 81043a5927
Merge pull request #237 from SHADE-DP/SP3-2-Physics
Added more debug drawing & Fixed Physics running without SHEDITOR
2022-11-21 20:24:05 +08:00
Kah Wei 9cc008eaf4 Fixed ghosts of a renderable being rendered when a material is changed 2022-11-21 20:21:08 +08:00
Diren D Bharwani 3baedd8ffa Merge branch 'main' into SP3-2-Physics 2022-11-21 20:15:58 +08:00
Diren D Bharwani 1d692d3301 Physics works without SHEDITOR defines. Mass is temporarily auto computed. 2022-11-21 19:59:32 +08:00
Kah Wei e3c573baa7 Added support for enabling and disabling scripts
OnEnable and OnDisable are not called on GameObject active toggling for now but will be added in future
2022-11-21 17:16:16 +08:00
Kah Wei 0a9dea1c83 Disabled xmldoc generation warnings for SHADE projects 2022-11-21 12:14:07 +08:00
Brandon Mak 485b60c6d8 Added debug check in SHGraphicsSystem to compile assets only in debug 2022-11-21 00:39:13 +08:00
Xiao Qi 1666a0113b Removed test lines for shader compile in graphics system 2022-11-21 00:29:46 +08:00
XiaoQiDigipen e10c1f518f
Merge pull request #234 from SHADE-DP/SP3-1-Rendering
Implemented serialization and editor inspector display for text renderer component
2022-11-20 22:41:06 +08:00
Brandon Mak 5d3603ac7d Text Renderer Component serialization 2022-11-20 22:24:24 +08:00
Diren D Bharwani d4ad60ea79 Fix compile error with collision tags 2022-11-20 20:12:20 +08:00
Brandon Mak c686954c77 Implemented Text Rendering
- The Text Renderer Component serialization and reflection onto inspector is not in yet, but there is basic functionality.
- Updated shaders
- Topology for text rendering is changed to triangle fan. Front facing for primitives is clockwise. Vertex state has both the positionOffset and glyphIndex attribute set as instanced.
-  Freetype instance is now initialized in InitBoilerplate
- SHCamera no longer calling SetPerspective/Ortho inside HandleResize
- Font Geometry is now loaded in SHFontLoader into SHFontAsset fontGeometry variable.
2022-11-20 19:03:12 +08:00
Diren D Bharwani cada3acb8a Collision tags should be referenced by pointers 2022-11-20 18:30:18 +08:00
Diren D Bharwani 5871f32547 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-20 17:23:38 +08:00
Diren D Bharwani 4ebc16564a Added collision matrix for configurating individual collision tags 2022-11-20 17:23:28 +08:00
XiaoQiDigipen 788ba22e0a
Merge pull request #232 from SHADE-DP/UI_Integration
Added UI functionality to the Graphics System
2022-11-20 15:43:34 +08:00
XiaoQiDigipen a355d9911a
Merge pull request #231 from SHADE-DP/SP3-4-Editor
Fix not being able to disable/enable Rigidbody freeze rotation through editor inspector panel
2022-11-20 15:36:02 +08:00
Diren D Bharwani 4198310b7a Missing implementation for updating all tag names through the physics system 2022-11-20 15:34:34 +08:00
Diren D Bharwani a0f4f3b00a Added collision tag names file 2022-11-20 15:32:33 +08:00
Sri Sham Haran 2b41394a74 Fix not being able to disable/enable Rigidbody freeze rotation through editor inspector panel 2022-11-20 15:30:14 +08:00
Diren D Bharwani 7226ccf279 Tested Collision Tags 2022-11-20 03:16:49 +08:00
Diren D Bharwani b8530dfc89 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-20 02:35:12 +08:00
Diren D Bharwani 62433d1a53 Added Collision Tags 2022-11-20 02:35:02 +08:00
Brandon Mak 575132c4bb Added UI Component check in SHBatch
- UI Component shader changes
- Fixed picking issue
2022-11-20 01:45:14 +08:00
Brandon Mak b323735ba8 Merge remote-tracking branch 'origin/SP3-1-VertexSwitch' into UI_Integration 2022-11-19 23:27:06 +08:00
Kah Wei a988c45d52 Vertex shader can now be modified in the material inspector 2022-11-19 23:22:54 +08:00
Brandon Mak d55adcdfe4 Merge remote-tracking branch 'origin/main' into UI_Integration 2022-11-19 22:08:16 +08:00
Brandon Mak 6d1f30e05b Merge branch 'SP3-1-Rendering' into UI_Integration 2022-11-19 21:45:21 +08:00
Brandon Mak 223276dd87 Created partial functionality to render a texture to swapchain image 2022-11-19 21:44:41 +08:00
Xiao Qi 5fb51511f6 Merge branch 'main' into SP3-13-Assets-Manager 2022-11-19 19:59:24 +08:00
Kah Wei 92b1c6676b Merge branch 'main' into Fix-BatchCrash 2022-11-19 18:26:37 +08:00
Kah Wei b2dc440d03 Fixed bug where moving objects stopped moving after chanigng their material's shader 2022-11-19 18:26:11 +08:00
Kah Wei 58e6a3c4c2 Re-aded ability to change shaders
Bugged, replacing shaders results in object being rendered in the old position
2022-11-19 17:30:48 +08:00
XiaoQiDigipen bd3b643c19
Merge pull request #228 from SHADE-DP/Fix-BatchCrash
Fixed crash caused when loading more than one graphics pipeline
2022-11-19 16:26:37 +08:00