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

286 Commits

Author SHA1 Message Date
Diren D Bharwani e93eea6381 Cleaned up tools folder. Added debug only logging macros with _D suffix 2022-11-15 03:03:37 +08:00
Brandon Mak d95ed3f067 Text Rendering WIP 2022-11-14 18:36:26 +08:00
Kah Wei 5ccd2263c7 Documentation files are now generated for projects 2022-11-14 18:35:52 +08:00
Brandon Mak ac17721363 Merge branch 'main' into SP3-1-Rendering 2022-11-14 15:38:33 +08:00
Brandon Mak 898b7fbf2c Text Rendering WIP 2022-11-14 10:11:47 +08:00
Diren D Bharwani 45e549f9f1 .....small restructure.... 2022-11-12 16:56:58 +08:00
Diren D Bharwani 3efecd64e7 Added box & sphere debug draw for physics 2022-11-10 14:30:30 +08:00
Diren D Bharwani 99f41e947f Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-10 02:16:42 +08:00
Diren D Bharwani 4731df28f0 Skeleton for Reworked Physics Debug Draw 2022-11-10 02:16:33 +08:00
XiaoQiDigipen 7ac910149e
Merge pull request #185 from SHADE-DP/SP3-6-CSharpLights 
Add interface for C# light class and modified Color to match Unity's interface
 2022-11-08 21:51:04 +08:00
Kah Wei e89f5b4b9e Added OnDrawGizmos for debug draw for scripts 2022-11-08 20:49:07 +08:00
Diren D Bharwani 8fbd32a144 Added Relative Sizes to Shapes 2022-11-08 00:46:09 +08:00
Diren D Bharwani 70dcad1313 Changed Collider to CollisionShape for improved clarity 2022-11-07 18:19:39 +08:00
Sri Sham Haran b86f092f52 Merge branch 'main' into SP3-305-configurationsMerge 2022-11-04 18:37:19 +08:00
Xiao Qi f2b589071c Merge branch 'main' into SP3-13-Assets-Manager 2022-11-04 17:49:43 +08:00
Xiao Qi 6d0089ee12 Merge branch 'main' into SP3-13-Assets-Manager 2022-11-04 17:49:13 +08:00
Glence be16fbed19 added item script in the scene 2022-11-04 17:35:09 +08:00
Xiao Qi 9ef956029e Changed name check for hardcoded racoon mesh 2022-11-04 17:20:52 +08:00
Sri Sham Haran 4ee0294977 Scene loads correctly now 2022-11-04 14:44:18 +08:00
Kah Wei eea35600d3 Switched shaders to use multiply colour instead of additive 2022-11-04 14:04:59 +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
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
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
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 82e0e4df5c Added editor gridlines and cardinal axes 2022-11-02 10:33:17 +08:00
Kah Wei 41e1f01f29 Added support for persistent debug draw 2022-11-02 10:11:13 +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
Kah Wei dc8ed48be3 Fixed debug draw system cube rendering 2022-11-01 21:49:57 +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
Diren D Bharwani 6e604fe7e9 Fixed bug with relative collider sizes 2022-10-31 23:18:20 +08:00
maverickdgg acf52c77ce Merge branch 'main' into SP3-141-Camera-System 2022-10-31 16:55:56 +08:00
Sri Sham Haran 86e8415845 Merge branch 'main' into SP3-4-Editor 2022-10-30 11:28:01 +08:00
Xiao Qi d3b44f9c22 Merge branch 'main' into SP3-13-Assets-Manager 2022-10-30 03:08:36 +08:00
Brandon Mak 7c5a24b8e1 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-10-30 00:00:17 +08:00
Xiao Qi 70533b1712 Changed Application exit call to asset manager 2022-10-29 15:53:15 +08:00
Sri Sham Haran f9f818b49c Merge branch 'main' into SP3-4-Editor 2022-10-28 20:31:51 +08:00
XiaoQiDigipen ade24b904f
Merge pull request #127 from SHADE-DP/SP3-2-Physics 
SP3-2 Colliders use relative size

NEW

Colliders have materials. The material system is intended to emulate Unity's physics materials.
UPDATE

Colliders now show relative size on the Editor. This change has not been reflected in Scripting.
Colliders will deep copy the shape in case it was not already doing so.
If this doesn't compile, beat me. I swear I just compiled, ran and tested for functionality.
 2022-10-28 16:38:44 +08:00
Diren D Bharwani d4f775843c Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-10-28 14:08:18 +08:00
Kah Wei 621dae4c40 All Vec3 and Vec4s in materials are now automatically set to full 1.0 vectors 2022-10-28 13:32:13 +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
Brandon Mak 09c5843cdb Ambient lighting added 2022-10-27 19:02:55 +08:00
Diren D Bharwani a354928e0d Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-10-27 17:41:01 +08:00
maverickdgg b0f28f98c5 WIP camera arm component 2022-10-27 15:01:18 +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 2108d9e1f6 Added triple buffering to SHDebugDrawSystem 2022-10-27 10:12:30 +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
Kah Wei 57027da80b Integrated into SBApplication and accounted for case where number of points to draw is 0. 2022-10-26 16:27:58 +08:00
Sri Sham Haran 51489ecb3b Merge branch 'main' into SP3-4-editor_fix 2022-10-26 16:07:01 +08:00
Brandon Mak 43ea33cabf Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-10-26 15:26:41 +08:00
Sri Sham Haran d9584a0e39 Changed SHEditor.hpp to .h 
Handle editor camera update when interacting with viewport window only
 2022-10-26 14:32:00 +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
Sri Sham Haran 26eb4ad18c Fix command registrations and mouse pick polling when using transform gizmo 2022-10-24 16:18:18 +08:00
Diren D Bharwani bf0c068cc7 Merge remote-tracking branch 'origin/main' into SP3-16-Math 2022-10-23 18:23:06 +08:00
Xiao Qi f9a28c81d4 Fixed vulkan breaking error 2022-10-23 17:18:46 +08:00
Diren D Bharwani 8559f7d27c Merge remote-tracking branch 'origin/main' into SP3-16-Math 2022-10-23 16:59:11 +08:00
Diren D Bharwani 33a6d3798c Added orientation interface and fixed compatibility between physics and transform 2022-10-23 16:55:01 +08:00
Brandon Mak 982f2de286 Merge remote-tracking branch 'origin/main' into Rendering-Camera-Integration 2022-10-23 16:36:22 +08:00
Brandon Mak 64002c6f2b Camera Director integrated 
Still has bug
 2022-10-23 16:04:58 +08:00
Diren D Bharwani ebfcf1c6bb Transform now stores orientation as Quaternions. Interface unchanged 2022-10-22 20:16:38 +08:00
Diren D Bharwani db751bd141 Editor & Scripts can now override Physics-Based objects' Transforms 2022-10-22 18:22:26 +08:00
Sri Sham Haran d6123c8ed7 Merge branch 'main' into SP3-4-editor_fix 2022-10-21 20:45:16 +08:00
Sri Sham Haran b3ed320f9b Transform Gizmo done. (Commands for it are wonky) 2022-10-21 18:39:50 +08:00
Kah Wei 43c2680a82 Added generic Handles and fixed bugs with SHResourceManager 2022-10-21 15:38:39 +08:00
Kah Wei 7e15edb052 Completed initial implementation of SHResourceManager 2022-10-21 13:58:27 +08:00
Sri Sham Haran bf0e7ab256 Merge branch 'main' into SP3-4-editor_fix 2022-10-21 08:57:25 +08:00
Diren D Bharwani fda33f7461 Fixed multi-level transform updates 2022-10-20 22:55:59 +08:00
Diren D Bharwani 314d497b66 Reparenting objects maintain world transforms 2022-10-20 18:35:57 +08:00
Kah Wei 323a95e5d5 Merge branch 'main' into SP3-6-c-scripting 2022-10-20 11:08:41 +08:00
Kah Wei 4f177bc455 Reworked script serialization and deserialization functions (WIP) 2022-10-19 20:43:22 +08:00
Sri Sham Haran 125ce7b564 Merge branch 'main' into SP3-4-editor_fix 2022-10-19 17:43:22 +08:00
Brandon Mak 284ee12205 Broken Camera 2022-10-19 15:32:07 +08:00
Sri Sham Haran 5bd5cec9d4 Merge branch 'main' into SP3-4-editor_fix 2022-10-19 09:49:10 +08:00
Sri Sham Haran da99a5559e Merge branch 'main' into RenderingEditorVPIntegration 2022-10-18 19:09:08 +08:00
Sri Sham Haran 15a17deaf0 select picked entity in hierarchy panel 2022-10-18 19:08:31 +08:00
Xiao Qi b10f490e45 SP3-102 SP3-248 Saving of SHMETA files with asset IDs, retrieval of asset data under works, currently all assets are loaded into memory automatically 2022-10-16 23:15:11 +08:00
Sri Sham Haran 228868604a Editor fixes 
Integration of mouse pick
Add editor state
Add editor layout
 2022-10-16 14:20:35 +08:00
Sri Sham Haran 22cad78728 Clean up 2022-10-14 15:53:29 +08:00
Sri Sham Haran 20cedbb4ec Merge branch 'main' into SP3-4-editor_fix 2022-10-14 15:53:12 +08:00
Sri Sham Haran 49575893fe Made Editor a system and create editor routine so that the editor routine will run between graphics routines 2022-10-14 15:39:43 +08:00
Brandon Mak 682a5a6cbf bug fix 2022-10-14 00:10:56 +08:00
Brandon Mak d265aa4541 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-10-14 00:10:45 +08:00
Brandon Mak ab09d78e42 removed routines for graphics from application (remember to add back after ingui update routine is added). 
Scene graph and physics system had some extra couts
input system bug fix (this change is now in main)
Mouse pick system wip
 2022-10-14 00:08:14 +08:00
Diren D Bharwani acd3174c39 Merge branch 'SP3-16-Math' into SP3-2-Physics 2022-10-13 18:15:52 +08:00
Diren D Bharwani ff9b504bc5 Moved collider interface into physics object. Added support for removing rigidbodies 2022-10-11 01:26:12 +08:00
Brandon Mak d432822608 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-10-02 01:13:43 +08:00
Kah Wei 201ce17a40 Fixed validation errors when closing the app 2022-10-02 00:56:34 +08:00
Xiao Qi 40bcea133d Changed texture index to 0 for both racoons 2022-10-02 00:09:38 +08:00
Brandon Mak e2b86545bb Window resize working 2022-10-01 23:57:08 +08:00
Diren D Bharwani 4007120dbd Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-10-01 22:06:50 +08:00
Diren D Bharwani e4a6877ed3 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-10-01 20:43:18 +08:00
XiaoQiDigipen 48413bdc1f
Merge pull request #75 from SHADE-DP/ProjectWarningDisables 
Warning disables
 2022-10-01 19:44:17 +08:00
Sri Sham Haran a6e17847bf Warning disables 
Remove SDL hint that gave warning (it was unnecessary anyway)
 2022-10-01 18:58:13 +08:00
mushgunAX 3c58a538ae Mouse Vel & UpdateInput called from SBApplication 2022-10-01 18:02:27 +08:00
mushgunAX aef3e4ef1a Update SBApplication.cpp 2022-10-01 17:04:07 +08:00
mushgunAX 857f88c4a8 Merge branch 'main' into SP3-10-input-management 2022-10-01 17:03:58 +08:00
Diren D Bharwani 374f1a961d Integrated rigidbodies into physics system 2022-10-01 16:50:50 +08:00