Commit Graph

863 Commits

Author SHA1 Message Date
Diren D Bharwani 1a4b15feb2 Changed ColliderBound to CollisionShape because ColliderBound sounds weird 2022-10-28 14:29:05 +08:00
Diren D Bharwani 4fc87866ee Fixed compilation error 2022-10-28 14:23:11 +08:00
Diren D Bharwani d4f775843c Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-10-28 14:08:18 +08:00
XiaoQiDigipen c750bffd1d
Merge pull request #125 from SHADE-DP/SP3-1-SerialisedRenderable
Added Serialized Renderable
2022-10-27 23:27:00 +08:00
XiaoQiDigipen de1407f49e
Merge pull request #124 from SHADE-DP/SP3-6-c-scripting
Added Collider & RigidBody and Initial Implementation of CallbackActions and CallbackEvent
2022-10-27 23:26:02 +08:00
Kah Wei e733cd2e1c Fixed bug where changes to meshes were not saved by batching system 2022-10-27 23:18:02 +08:00
Kah Wei cc1fe71d4b Serialization and deserialization of SHRenderable to use default material for now 2022-10-27 19:31:00 +08:00
Kah Wei 003a99ae07 Merge branch 'main' into SP3-1-SerialisedRenderable
# Conflicts:
#	SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
#	SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderable.h
#	SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNode.cpp
#	SHADE_Engine/src/Graphics/RenderGraph/SHSubpass.cpp
#	SHADE_Engine/src/Graphics/RenderGraph/SHSubpass.h
2022-10-27 19:30:54 +08:00
Kah Wei 392ecae434 Merge branch 'main' into SP3-6-c-scripting 2022-10-27 17:52:52 +08:00
Kah Wei 623e964160 Fixed bug causing issues with debugging not working 2022-10-27 17:51:30 +08:00
Diren D Bharwani a354928e0d Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-10-27 17:41:01 +08:00
XiaoQiDigipen 1e95c9f7ba
Merge pull request #123 from SHADE-DP/SP3-13-Assets-Manager
Asset Manager restructure
Better distinction between loaders and compilers
Added shader compile and load
Temporary interface to compile shader based on file
2022-10-27 14:27:27 +08:00
Xiao Qi 2102835629 Added function to manually compile shaders by path 2022-10-27 14:24:03 +08:00
Xiao Qi b10da2d160 Merge branch 'main' into SP3-13-Assets-Manager 2022-10-27 14:19:22 +08:00
Xiao Qi e1de423483 Treat all shaders as built in for now to facilitate getting shader module by name 2022-10-27 14:12:53 +08:00
Xiao Qi b5a1d5ea88 SP3-282 Restructured loaders and compilers
Completed shader compiling and loading
2022-10-27 12:54:58 +08:00
Kah Wei 97432b8666 Accounted for updating collider storage when a collider is removed 2022-10-27 12:46:42 +08:00
Kah Wei d45d621701 Collider now will have it's sub collider list updated based on events 2022-10-27 12:32:06 +08:00
Kah Wei cd04132fd7 Merge branch 'main' into SP3-6-c-scripting 2022-10-27 11:41:14 +08:00
XiaoQiDigipen 41ef49a8d3
Merge pull request #122 from SHADE-DP/SP3-141-Camera-System
Sp3 141 camera system

Fixed weird camera movement,
Added clamping for camera pitch.
Added RTTR reflection for camera.
Editor inspector now draws camera component.
2022-10-27 10:39:33 +08:00
maverickdgg dee4e9acbd Fixed RTTR registration. Added back Camera Clamp 2022-10-27 10:33:54 +08:00
Kah Wei d2c7630af4 Merge branch 'main' into SP3-6-c-scripting 2022-10-27 10:12:52 +08:00
maverickdgg 0c2d020f89 Merge branch 'main' into SP3-141-Camera-System 2022-10-27 09:26:53 +08:00
maverickdgg 012070ba6d Added RTTR registration 2022-10-27 09:26:49 +08:00
Sri Sham Haran a854a50fb2 Fix error from shader graph preventing compilation on main 2022-10-27 09:22:42 +08:00
maverickdgg d8086edbe2 Merge branch 'main' into SP3-141-Camera-System 2022-10-27 08:55:06 +08:00
Diren D Bharwani 75fd02c08a small change to where forces are cleared (1 less comparison) 2022-10-27 03:35:32 +08:00
Diren D Bharwani 371ffc52da Colliders now use relative sizes 2022-10-27 03:14:46 +08:00
Xiao Qi 5154b579d7 Re-restructured compilers to be more self contained
Loaders only load internal binary asset files
2022-10-26 23:07:01 +08:00
XiaoQiDigipen 6189768e6f
Merge pull request #121 from SHADE-DP/SP3-2-Physics
SP3-2 Fixed another physics bug & added Collider Add/Remove events

[NEW]

Added events when adding/removing colliders
[BUGFIX]

Multiple colliders are now properly deleted.
2022-10-26 18:44:07 +08:00
Xiao Qi f2e2b21d47 Merge branch 'main' into SP3-13-Assets-Manager 2022-10-26 18:40:10 +08:00
Diren D Bharwani 19ceab84df Added events for adding and removing colliders 2022-10-26 18:35:41 +08:00
Xiao Qi 4eaa15d999 Added function to compile built in shaders 2022-10-26 17:16:09 +08:00
Diren D Bharwani 12758878c5 Fixed bug with multiple collider removals 2022-10-26 16:55:28 +08:00
XiaoQiDigipen 29dccf77b3
Merge pull request #120 from SHADE-DP/SP3-2-Physics
SP3-2 Physics Bugfixes
NEW

Forces can be added to the rigid body.
BUGFIXES

Rigidbody transforms can be modified while the editor is in play.
Deleting a rigid body no longer causes a crash (please let me know if it does happen again and how to replicate it)
Deleting a collider actually gets rid of the collider
On editor stop, forces and velocities are cleared from rigid bodies.
2022-10-26 16:40:31 +08:00
Diren D Bharwani 4f28161e45 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-10-26 16:30:36 +08:00
Diren D Bharwani 58491fcbff Fixed physics bugs
1. Colliders are now properly deleted along with its component.
2. Forces and velocities are reset on stop.
2022-10-26 16:17:22 +08:00
Sri Sham Haran 7c0bcd8a3e
Delete UserLayout.ini
@Xenosas1337 stop pushing this please
2022-10-26 16:09:54 +08:00
XiaoQiDigipen b49bfa4a25
Merge pull request #119 from SHADE-DP/SP3-1-Rendering
Lighting WIP. Some bug fixes.
2022-10-26 15:36:13 +08:00
Brandon Mak 43ea33cabf Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-10-26 15:26:41 +08:00
Brandon Mak 5637fb707f Tested light component. Values reflected in renderdoc correctly
- Added pure copy compute shader (used instead of kirsch)
- Created sparse set for lights
- Note that while the instanced attribute contains both EID and layer light index and in the future potentially more, the objects still write to a uint framebuffer. 
- Light layer index is in a different frame buffer than the eid one.
- Updated shaders to accommodate light layer index.
2022-10-26 02:14:43 +08:00
Xiao Qi 54796773b2 Added built in shader extension
Collision check for asset IDs
2022-10-26 01:53:26 +08:00
Xiao Qi c0c6d35b29 Split function in shader module library to get vk flag conversion
Changed some calls to get build in modules
2022-10-26 01:53:08 +08:00
Diren D Bharwani 7ba02aeb0f Removed unused functions, fixed RigidBody 2022-10-26 01:46:13 +08:00
Diren D Bharwani fbb613b859 m dumb. it work. 2022-10-26 01:16:49 +08:00
Brandon Mak 4b7a837469 Fixed some bugs in render graph
- Changed the eid buffer for instanced rendering to a vec2 (potentially vec3 or 4), to pass other types of data like light layer index. 
- Renamed some render graph nodes and subpasses. Added a dummy render pass to transition the scene to read only optimal.
- offscreen buffer resource now transitions to eShaderReadOnlyOptimal instead of eGeneral
2022-10-26 01:08:02 +08:00
Brandon Mak 5016600397 Lights WIP 2022-10-25 23:39:35 +08:00
Diren D Bharwani 0defa58c77 Physics Component Synchronisation is now done through events 2022-10-25 23:09:46 +08:00
Diren D Bharwani 3c5a1b73d6 Fixed bug with destroying a rigidbody component 2022-10-25 22:26:07 +08:00
Diren D Bharwani 024ad44e84 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-10-25 22:14:04 +08:00