Commit Graph

1023 Commits

Author SHA1 Message Date
maverickdgg 883c5460bc Added a boolean for CameraArm to lock and unlock camera look at 2022-10-31 17:23:03 +08:00
maverickdgg acf52c77ce Merge branch 'main' into SP3-141-Camera-System 2022-10-31 16:55:56 +08:00
Diren D Bharwani 3d53a7cd40 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-10-31 16:53:41 +08:00
Diren D Bharwani c6cc327141 M dumb. 2022-10-31 16:53:34 +08:00
Diren D Bharwani f863f57466 Triggers were being stored in the wrong container 2022-10-31 16:49:09 +08:00
maverickdgg 65013969a8 Added Camera LookAt and CameraArmComponent works now 2022-10-31 16:39:06 +08:00
XiaoQiDigipen 75e073d45b
Merge pull request #138 from SHADE-DP/SP3-6-c-scripting
Added proper implementation of IsActiveInHierarchy()
2022-10-31 16:32:53 +08:00
XiaoQiDigipen ef506a2ffe
Merge pull request #137 from SHADE-DP/SP3-2-Physics
SP3-2 Added Contact & Trigger Events + Bugfixes

NEW

Contacts & Trigger events are now reported (not implemented on scripting)
BUGFIXES

Fixed desync of rigidbody velocities
2022-10-31 16:32:34 +08:00
Kah Wei a9b9695155 Merge branch 'main' into SP3-1-SerialisedRenderable 2022-10-31 16:31:22 +08:00
Kah Wei 2ffba202f7 Added proper implementation of IsActiveInHierarchy() 2022-10-31 16:29:29 +08:00
Diren D Bharwani c47c5653b4 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-10-31 16:04:48 +08:00
Diren D Bharwani 3638828541 Fixed desync of rigid body velocities 2022-10-31 16:04:40 +08:00
Diren D Bharwani b7abfde310 Added Collision and Trigger Events 2022-10-31 15:54:54 +08:00
maverickdgg 0e2b017716 View matrix decomposition and set view matrix
View matrix decomposition does not decompose roll yet but there isn't much use case
2022-10-31 15:39:04 +08:00
XiaoQiDigipen 69fbd4167d
Merge pull request #136 from SHADE-DP/SP3-6-c-scripting
Added Application, GameObject.Find(), implicit null checks for scripts and components and fixed bugs with Script retrieval and deletion
2022-10-31 15:32:57 +08:00
Kah Wei 42a80bfc3b Merge branch 'main' into SP3-1-SerialisedRenderable 2022-10-31 15:31:38 +08:00
Kah Wei f91b1f00ad Added implementation for GameObject.Find() 2022-10-31 15:28:28 +08:00
Kah Wei d03780a9b3 Merge branch 'main' into SP3-6-c-scripting 2022-10-31 15:20:23 +08:00
Kah Wei 1d2b23d762 Fixed script deletion and OnDestroy never being called 2022-10-31 15:19:57 +08:00
XiaoQiDigipen 2a31ea6798
Merge pull request #135 from SHADE-DP/SP3-5-ECS
Sp3 5 ecs
Added GetEntityByName to EntityManager.
Defaults to MAX_EID if none are found.
2022-10-31 15:10:53 +08:00
Kah Wei b04565c9dc Added implementation for scripts and component functions for scripts 2022-10-31 15:07:10 +08:00
maverickdgg f5f9b80490 Added GetEntityByName to EntityManager 2022-10-31 15:06:08 +08:00
maverickdgg 7c59fb16bd Merge branch 'main' into SP3-5-ECS 2022-10-31 15:03:21 +08:00
maverickdgg ab46d0a96a Decompose matrix WIP 2022-10-31 15:02:28 +08:00
Kah Wei 66529474cd Added Application class equivalent to SHADE_Managed 2022-10-31 14:51:50 +08:00
Diren D Bharwani ea516189d2 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-10-31 13:14:38 +08:00
Kah Wei 5eaf2b55aa Added WIP Application class and adjustments to how ScriptStore destroys scripts (SpdLog errors) 2022-10-31 12:20:46 +08:00
XiaoQiDigipen 18093433fa
Merge pull request #134 from SHADE-DP/SP3-4-Editor
asset browser
added asset browser
shortcuts for copy/paste and select all
fix checkbox bug
fix entity parenting bug
2022-10-31 00:38:16 +08:00
Sri Sham Haran d3dc87accb can assign mesh
add bigobj option to command line till we find a better solution
2022-10-30 23:15:41 +08:00
Sri Sham Haran 0aebc3053f Asset browser (currently only displays asset and can drag drop for setting of mesh. except setting mesh in inspector doesnt work) 2022-10-30 18:26:49 +08:00
Kah Wei b1a933a2c3 Merge branch 'main' into SP3-1-SerialisedRenderable
# Conflicts:
#	Assets/Shaders/TestCube_FS.shshaderb
#	Assets/Shaders/TestCube_VS.shshaderb
#	SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
2022-10-30 17:14:28 +08:00
Sri Sham Haran 13ad7d46c6 Fix crash when entity w no transform being set as child of entity w transform
Add select all
2022-10-30 15:19:42 +08:00
Sri Sham Haran ca659e272b Designate keys for Copy/Paste of entities in hierarchy panel
Change default brush for SHWindow so we don't flashbang everytime we run engine
2022-10-30 15:01:36 +08:00
Sri Sham Haran f21f501d5a Merge branch 'main' into SP3-4-Editor 2022-10-30 14:23:39 +08:00
Sri Sham Haran dd8d913071 Add widget for drag drop read only
field
Editor tweaks
2022-10-30 14:22:55 +08:00
XiaoQiDigipen ca0ecc1641
Merge pull request #133 from SHADE-DP/SP3-8-serialization
Resolve serialization errors 
All components are serialized/deserialized
2022-10-30 14:14:27 +08:00
Sri Sham Haran 86e8415845 Merge branch 'main' into SP3-4-Editor 2022-10-30 11:28:01 +08:00
Sri Sham Haran 04d3c6c9bb Merge branch 'main' into SP3-8-serialization 2022-10-30 11:26:23 +08:00
Xiao Qi 087cbcabaf Forgot function to actually retrieve root folder pointer hehe 2022-10-30 04:41:24 +08:00
XiaoQiDigipen ffc55c5e0c
Filesystem builds directory tree of asset folder to show all files and subfolders 2022-10-30 04:40:02 +08:00
Xiao Qi 2ebcd3fd47 Filesystem builds directory tree of asset folder to show all files and subfolders 2022-10-30 04:39:16 +08:00
XiaoQiDigipen 06ab0e1fb9
Merge pull request #131 from SHADE-DP/SP3-13-Assets-Manager
SP3-13 Assets Management
Added Scene, Prefab, Material loaders and savers
Added function to compile single asset, currently only for shaders
Changed vector to unordered_map to store asset meta classes
2022-10-30 03:10:10 +08:00
Xiao Qi d3b44f9c22 Merge branch 'main' into SP3-13-Assets-Manager 2022-10-30 03:08:36 +08:00
Xiao Qi 00d4d5d910 Removed code that accidentally calls delete on freed memory for asset loaders 2022-10-30 03:06:18 +08:00
XiaoQiDigipen ad19cd145d
Merge pull request #130 from SHADE-DP/SP3-6-c-scripting
Fixed script error and added support for static functions in CallbackAction
2022-10-30 02:57:05 +08:00
XiaoQiDigipen b0b9b3eebf
Merge pull request #129 from SHADE-DP/SP3-1-Rendering
Ambient and directional lighting implemented
Also solved some bugs
2022-10-30 02:56:29 +08:00
Kah Wei 47df3efae3 Merge branch 'main' into SP3-6-c-scripting 2022-10-30 02:38:31 +08:00
Kah Wei da05cb3edc Fixed script error and added support for static functions in CallbackAction 2022-10-30 02:37:58 +08:00
Brandon Mak b46b6b0b85 CompileAll uncommented and asset manager metadata writes commented
SHmeta files should now be identical to what's on main
Shaders themselves have some changes (binaries also updated)
2022-10-30 00:25:49 +08:00
Brandon Mak 5db9299699 Reverted back to old asset IDs 2022-10-30 00:07:02 +08:00