Commit Graph

1600 Commits

Author SHA1 Message Date
Diren D Bharwani 374f1a961d Integrated rigidbodies into physics system 2022-10-01 16:50:50 +08:00
maverickdgg 5aee22a5e3 Revert "Changed some couts and asserts to use SHLOG"
This reverts commit 78d13c0ab8.
2022-10-01 16:37:47 +08:00
Brandon Mak b657ad8884 Handled resizing for the render graph resource (not tested) 2022-10-01 16:33:16 +08:00
Diren D Bharwani 4f56a32a9b Added physics system (untested) 2022-10-01 15:26:08 +08:00
XiaoQiDigipen f2b27b35fc
Merge pull request #73 from SHADE-DP/SP3-129-AudioSystem
added audiosystem back in
2022-10-01 15:13:42 +08:00
Glence 0c78eca1bc added audiosystem back in
added a button for the audio
2022-10-01 15:09:26 +08:00
Brandon Mak ec2ec82163 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-10-01 15:00:01 +08:00
XiaoQiDigipen 8ad315193d
Merge pull request #72 from SHADE-DP/SP3-6-c-scripting
Fixed MSIL warning when building scripts
2022-10-01 14:55:31 +08:00
Kah Wei b3b565454f Merge branch 'main' into SP3-6-c-scripting 2022-10-01 14:50:46 +08:00
mushgunAX 0360a8bfa1 made the Input Manager NOT be a System anymore 2022-10-01 14:34:30 +08:00
maverickdgg 78d13c0ab8 Changed some couts and asserts to use SHLOG 2022-10-01 14:28:13 +08:00
mushgunAX dc8d58d95c fix GetMouseWindowPosition() 2022-10-01 13:49:11 +08:00
Kah Wei af24ed78dc Fixed MSIL warning when building scripts 2022-10-01 13:43:34 +08:00
XiaoQiDigipen a011e9a795
Merge pull request #71 from SHADE-DP/SP3-13-Assets-Manager
SP3-13 Assets Management
SP3-103 SP3-104 SP3-237 GLTF/DDS Loading complete. Compilation/Loading of mesh and texture data into custom binary files implemented
2022-10-01 13:39:33 +08:00
Xiao Qi 0792979dff Moved some comments 2022-10-01 13:31:08 +08:00
Xiao Qi adbb77932c Merge branch 'main' into SP3-13-Assets-Manager 2022-10-01 13:29:51 +08:00
Xiao Qi c82d01631c SP3-237 Texture load/compile successfully 2022-10-01 13:27:51 +08:00
Xiao Qi 5069a42319 SP3-237 Mesh compile and load successfully. Although now path to load/compile is hardcoded. Flow will be done after MS1 2022-10-01 13:12:37 +08:00
Diren D Bharwani e956797441 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-10-01 01:13:13 +08:00
Xiao Qi 8a3d3c8d4e SP3-237 SP3-103 SP3-104 Implemented SHTexture and SHMesh binary file writing and loading. NOT TESTED
Added file level comments
2022-09-30 22:08:17 +08:00
XiaoQiDigipen e046dafced
Merge pull request #70 from SHADE-DP/SP3-5-ECS
Sp3 5 ecs
Added event manager include for added/removedComponentEvent
2022-09-30 20:36:02 +08:00
maverickdgg cbf4a1f5fd Merge branch 'main' into SP3-5-ECS 2022-09-30 20:35:12 +08:00
maverickdgg e4be5e0987 Added event manager include 2022-09-30 20:34:46 +08:00
XiaoQiDigipen 4647a94aa3
Merge pull request #68 from SHADE-DP/SP3-5-ECS
Sp3 5 ecs
Fixed SHFamilyID for SHSystem and SHComponent. It is still bugged for SHScene. For now we cant change SHScene.

Added ComponentAdded and ComponentRemoved events. (untested).
2022-09-30 20:27:44 +08:00
maverickdgg 2d07fb0afc Added component added and removed events 2022-09-30 20:25:26 +08:00
maverickdgg 9930b002c6
Merge pull request #67 from SHADE-DP/SHFamilyID-BugFix
Sh family id bug fix
2022-09-30 20:15:03 +08:00
maverickdgg 114ae86a9f Fixed SHFamilyID for SHSystem and SHComponent but still have issues with SHScene 2022-09-30 20:13:18 +08:00
Xiao Qi 584b7e425f WIP Write meta files to track whether raw asset (fbx/gltf/dds) have been compiled into custom binary 2022-09-30 08:57:25 +08:00
Brandon Mak 00695950d9 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-09-29 10:59:18 +08:00
Xiao Qi a51cbb7e70 Merge branch 'main' into SP3-13-Assets-Manager 2022-09-29 10:55:49 +08:00
maverickdgg b1a799cf05 Attempt using dllimport/dllexport 2022-09-29 07:59:04 +08:00
XiaoQiDigipen a9ff693646
Merge pull request #66 from SHADE-DP/SP3-6-c-scripting
Added script inspector, added Transform component for C# and added hot reloading options into editor
2022-09-29 00:11:51 +08:00
Kah Wei 70559204bf Added spinning raccoons and fixed TRansform component bug 2022-09-28 23:55:44 +08:00
Kah Wei 566c12a922 Merge branch 'main' into SP3-6-c-scripting
# Conflicts:
#	SHADE_Application/src/Scenes/SBTestScene.cpp
#	SHADE_Engine/src/Editor/SHEditorWidgets.hpp
2022-09-28 23:27:48 +08:00
Diren D Bharwani 0e07960938 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-09-28 21:30:57 +08:00
Diren D Bharwani 561f2b091f Added PhysicsObject to handle interface between components and physics system 2022-09-28 21:09:27 +08:00
XiaoQiDigipen c963f1d978
Merge pull request #65 from SHADE-DP/SP3-1-Rendering
Rendering merge
2022-09-28 20:42:03 +08:00
Brandon Mak 363e09bd55 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-09-28 20:39:42 +08:00
Brandon Mak 78f216e445 Rendered multiple racoons 2022-09-28 20:33:29 +08:00
XiaoQiDigipen 238ed1665c
Merge pull request #64 from SHADE-DP/SP3-4-editor_fix
New editor widgets and windows
Add new editor widgets
Handle remaining reflected types for component view (arithmetic and enumerations)
Add simple profiler
2022-09-28 19:53:02 +08:00
Sri Sham Haran 371f8e5e6f Add simple profiler 2022-09-28 19:45:40 +08:00
Sri Sham Haran 10f5817c15 Merge branch 'main' into SP3-4-editor_fix 2022-09-28 19:01:18 +08:00
XiaoQiDigipen 9909cfaa96
Merge pull request #63 from SHADE-DP/SP3-129-AudioSystem
change engine premake to copy fmod over from its lib
2022-09-28 18:56:08 +08:00
Glence 551853084b Merge branch 'main' into SP3-129-AudioSystem 2022-09-28 18:54:21 +08:00
Glence a96ef67ec4 change engine premake to copy fmod lib over 2022-09-28 18:53:53 +08:00
XiaoQiDigipen 9a774508a8
Merge pull request #62 from SHADE-DP/SP3-129-AudioSystem
added fmod to dependencies.bat
2022-09-28 18:42:29 +08:00
Glence f83b40c96c added fmod to dependencies.bat 2022-09-28 18:40:45 +08:00
Sri Sham Haran a1775db60b Merge branch 'main' into SP3-4-editor_fix 2022-09-28 18:36:44 +08:00
Sri Sham Haran 02ec5d88e8 Add remaining controls to component view 2022-09-28 18:36:22 +08:00
XiaoQiDigipen fa6175256f
Merge pull request #61 from SHADE-DP/SP3-129-AudioSystem
Added AudioSystem

added audio system with banks
change the Dependencies to clone fmod
change premake to include fmode
space to play sound
Currently audiosystem is commented out due to causing the raccoon to not be rendered
2022-09-28 18:36:13 +08:00