Commit Graph

1185 Commits

Author SHA1 Message Date
Kah Wei 4721a133e1 Added a way to retrieve texture handles from texture indices 2022-11-02 17:43:28 +08:00
XiaoQiDigipen c7f7254ff8
Merge pull request #167 from SHADE-DP/PlayerController
PlayerController and PickAndThrow
PlayerController is done with movement and jump
PickAndThrow is done , can throw and pick up an object
Added getright in camera.cxx/.hxx
2022-11-02 17:40:50 +08:00
Glence 4f70b543b2 Merge branch 'main' into PlayerController 2022-11-02 17:36:04 +08:00
Glence fc56973645 added getright in camera.cxx/.hxx
PickandThrow is done
adjusted thirdPersonCamera and PlayerController to work with each other
2022-11-02 17:31:57 +08:00
XiaoQiDigipen 062a6c8c10
Merge pull request #166 from SHADE-DP/SP3-1-Rendering
SSAO and lighting changes
2022-11-02 17:22:39 +08:00
Kah Wei 976c220145 Deserialization of SHMaterialSpec will return an empty SHMaterialSpec on failure now instead 2022-11-02 17:19:18 +08:00
Brandon Mak 53397e884d Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-11-02 17:18:44 +08:00
Brandon Mak ebc94225e7 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-11-02 17:04:31 +08:00
Kah Wei d207042fec Reworked SHMaterialSpec and SHMaterial loading system 2022-11-02 16:56:38 +08:00
XiaoQiDigipen 8495175bd8
Merge pull request #163 from SHADE-DP/SP3-2-Physics
SP3-2 Integrated some Debug Draw, Added Trigger checkbox
NEW

Debug Draw can be toggled for colliders. Hardcoded to space for now in Application until I have a menu to toggle it. (Feel free to change or remove it).
Trigger Checkbox added to Collider Inspector View
2022-11-02 16:31:26 +08:00
XiaoQiDigipen 3175d4c3a4
Merge pull request #162 from SHADE-DP/SP3-1-DebugDraw2
Added editor gridlines and fixed SHDebugDraw::DrawPoly()
2022-11-02 16:30:53 +08:00
mushgunAX 6ab6cc15a9 Zero out arrays for input manager 2022-11-02 16:14:26 +08:00
Diren D Bharwani 27526dfd92 Fixed relative size for sphere colliders 2022-11-02 16:12:47 +08:00
Diren D Bharwani 02c79b4cc4 Added Debug Drawing for Colliders (wonk) and Trigger checkbox to Colldiers
Press space to toggle debug draw. Does not work until you press play, then it can be toggled on and off.
2022-11-02 15:44:24 +08:00
Kah Wei d818adf2a2 Fixed DrawPoly() 2022-11-02 15:34:35 +08:00
Kah Wei f0ef9fc0cf Fixed validation errors due to debug draw 2022-11-02 15:13:12 +08:00
Brandon Mak 73be299aae new SHMETA 2022-11-02 15:05:34 +08:00
mushgunAX 901e49cf1c Merge branch 'main' into SP3-10-input-management 2022-11-02 14:50:56 +08:00
Brandon Mak eb569a4263 Shader updates 2022-11-02 14:21:27 +08:00
XiaoQiDigipen be53244a00
Merge pull request #161 from SHADE-DP/SP3-6-c-scripting
Added IsInterpolating to RigidBody in C#
2022-11-02 13:53:28 +08:00
Kah Wei 7bda8b3998 Added IsInterpolating to RigidBody in C# 2022-11-02 13:48:53 +08:00
Kah Wei 93c684fbb1 Merge branch 'main' into SP3-6-c-scripting 2022-11-02 13:42:41 +08:00
mushgunAX f513603479 AI Prototype implemented 2022-11-02 13:14:17 +08:00
mushgunAX 3826406f55 Merge branch 'main' into SP3-10-input-management 2022-11-02 11:37:23 +08:00
mushgunAX 4eb7879bf2 Revert "Create AIPrototype.cs"
This reverts commit b0054d62c6.
2022-11-02 11:37:03 +08:00
Kah Wei 82e0e4df5c Added editor gridlines and cardinal axes 2022-11-02 10:33:17 +08:00
Glence 218fc89fc8 Merge branch 'main' into PlayerController 2022-11-02 10:24:09 +08:00
Glence 8df82cae09 Merge remote-tracking branch 'origin/PlayerController' into PlayerController 2022-11-02 10:22:13 +08:00
Kah Wei 41e1f01f29 Added support for persistent debug draw 2022-11-02 10:11:13 +08:00
Kah Wei 1371302a40 Generalised Draw functions in SHDebugDrawSystem for potentially any number of draw queues 2022-11-02 09:34:36 +08:00
XiaoQiDigipen 8c666ef236
Merge pull request #160 from SHADE-DP/SP3-1-DebugDraw2
Added Debug Draw System
2022-11-02 02:29:33 +08:00
XiaoQiDigipen b8e4c2b1bb
Merge pull request #159 from SHADE-DP/SP3-16-Math
SP3-16 Slight rework to SHColour for compatibility
UPDATES
*SHColour is now compatible with SHVec4
2022-11-02 02:29:06 +08:00
Kah Wei 5f7b28e8a0 Added SHDebugDraw convenience static class for debug drawing 2022-11-02 01:11:28 +08:00
Kah Wei ed446002aa Merge branch 'SP3-16-Math' into SP3-1-DebugDraw2 2022-11-02 01:05:29 +08:00
Diren D Bharwani b9ada6a5be Reworked SHColour to be compatible with SHVec4 2022-11-02 00:47:19 +08:00
Glence 4eef6143dc base for pick and throw 2022-11-02 00:25:43 +08:00
Diren D Bharwani 07bfb2f485 Merge remote-tracking branch 'origin/main' into SP3-16-Math 2022-11-02 00:22:36 +08:00
Glence 97a39d62c6 player controller done for now 2022-11-01 23:28:31 +08:00
Glence dd0d336ccb Merge branch 'main' into PlayerController 2022-11-01 22:03:52 +08:00
Kah Wei dc8ed48be3 Fixed debug draw system cube rendering 2022-11-01 21:49:57 +08:00
Sri Sham Haran 129f92e4b6 mat inspector properties handling (WIP) 2022-11-01 21:49:42 +08:00
Kah Wei 904d6be6b0 Merge branch 'main' into SP3-1-DebugDraw2
# Conflicts:
#	SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
#	SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h
2022-11-01 21:00:55 +08:00
Xiao Qi e2778da955 WIP Rewrite flow from compiling to loading to recognising assets 2022-11-01 20:54:51 +08:00
Kah Wei 0096bc4975 Debug Draw fixes 2022-11-01 20:32:35 +08:00
Kah Wei 674b4d5155 Fixed extra # appearing on all names of script variables 2022-11-01 20:29:03 +08:00
Brandon Mak b0d08d27fd SSAO is fully implemented 2022-11-01 20:10:59 +08:00
XiaoQiDigipen 5fe81932e1
Merge pull request #158 from SHADE-DP/SP3-12-SceneGraph
SP3-12 Hierarchy Interface for C#
UPDATES

Setting & Getting of Parent has been moved from Transform to GameObject
2022-11-01 19:03:16 +08:00
Sri Sham Haran 26591e8c24 material inspector 2022-11-01 19:03:08 +08:00
Diren D Bharwani 72dc07bbd9 Shifted Hierarchy interface from Transform to GameObject 2022-11-01 19:00:31 +08:00
Diren D Bharwani 40be8a7962 Merge branch 'main' into SP3-12-SceneGraph 2022-11-01 19:00:12 +08:00