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

2701 Commits

Author SHA1 Message Date
Kah Wei eea35600d3 Switched shaders to use multiply colour instead of additive 2022-11-04 14:04:59 +08:00
XiaoQiDigipen 74b9882024
Merge pull request #169 from SHADE-DP/ScriptingAI 
AI Capture Mechanic
AI will set player's state to 'CAUGHT' if close enough. This threshold distance can be set in the editor.
 2022-11-04 10:34:50 +08:00
mushgunAX ecd1efee56 AI Capture Mechanic 2022-11-03 21:25:43 +08:00
Xiao Qi 544716547e Added preprocessor check for debug to turn off renderdoc 2022-11-03 02:37:38 +08:00
Glence 5fe10ce8d1 Changes to main for presentation 
Change TestCube_FS.glsl
Change debugdraw Key input to F10
TestScene changes
AI waypoint changed
playercontroller camera axis change
 2022-11-03 01:50:02 +08:00
Xiao Qi f24346a6fd Revert "TEMPORARY Push with all relative paths changed for building exe" 
This reverts commit 0979ee93e6.
 2022-11-03 00:11:56 +08:00
Xiao Qi 0979ee93e6 TEMPORARY Push with all relative paths changed for building exe 2022-11-02 22:44:27 +08:00
Xiao Qi c96eeb7c5b Removed xml 2022-11-02 22:36:44 +08:00
XiaoQiDigipen 09792d23ad
Merge pull request #165 from SHADE-DP/ScriptingAI 
AI Prototype implemented
Runs about four fixed corners in the scene. Chases an object called "Player" if it exists and is close enough. Stops chasing and resumes patrol if player is far enough.
 2022-11-02 22:36:16 +08:00
XiaoQiDigipen 02e9df4df7
Merge pull request #164 from SHADE-DP/SP3-10-input-management 
Zero out arrays in input manager
Properly zero out arrays in input manager so that it works in Release Mode, where arrays are not zeroed-out to save time.
 2022-11-02 22:35:57 +08:00
XiaoQiDigipen 4b09f42adc
Merge pull request #168 from SHADE-DP/SP3-4-Editor 
Added material inspector and setting of materials
Fixed imgui breaking in release
Added material inspector
Allow setting of materials to renderable component
 2022-11-02 21:48:07 +08:00
Sri Sham Haran 86254a5bf3 Merge branch 'main' into SP3-4-Editor 2022-11-02 21:41:38 +08:00
Sri Sham Haran e609b5634a Material Inspector 
Can set material
 2022-11-02 21:31:27 +08:00
Xiao Qi d1f624b2eb Removed SHMeshData declaration/definition in graphics middle end 
Renamed some data members in SHMeshData
Replaced calls and references to mesh data in Primitive Generator
 2022-11-02 21:09:53 +08:00
Xiao Qi 2beae24924 Removed Original mesh compiler, rewriting mesh loader to reflect ModelCompiler format 2022-11-02 20:50:51 +08:00
Kah Wei c68c5adc0d Added GetTextureHandle() to SHGraphicsSystem 2022-11-02 17:51:07 +08:00
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