Commit Graph

115 Commits

Author SHA1 Message Date
maverickdgg a57145b510 Merge branch 'main' into SP3-20-UI-System 2022-11-22 20:39:39 +08:00
maverickdgg a612e71f0c Added Buttons, Added Canvas Scaling matrix, Added Serialization of buttons and camera arm 2022-11-22 20:39:15 +08:00
Diren D Bharwani 053c3e04fd Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-22 19:26:47 +08:00
maverickdgg cf10724f3a Update SHSerialization.cpp 2022-11-22 13:17:45 +08:00
maverickdgg 3e4ebaab7b Merge branch 'main' into SP3-20-UI-System 2022-11-22 13:16:04 +08:00
maverickdgg 080c2c70d5 Added canvas to serialization 2022-11-22 13:09:40 +08:00
Diren D Bharwani 23bae3d515 Fixed bug with Bounciness failing to serialise 2022-11-22 00:46:32 +08:00
Kah Wei af2ad6cc80 Merge branch 'main' into SP3-6-c-scripting 2022-11-21 20:59:08 +08:00
Kah Wei 4172362790 Renamed SHTextRenderer to SHTextRenderable 2022-11-21 20:35:31 +08:00
Diren D Bharwani 3baedd8ffa Merge branch 'main' into SP3-2-Physics 2022-11-21 20:15:58 +08:00
Diren D Bharwani 1d692d3301 Physics works without SHEDITOR defines. Mass is temporarily auto computed. 2022-11-21 19:59:32 +08:00
Brandon Mak 5d3603ac7d Text Renderer Component serialization 2022-11-20 22:24:24 +08:00
Sri Sham Haran e170a5fca8 Added controls to editor viewport menu bar to adjust movement speed and turn speed for editor camera 2022-11-17 13:33:22 +08:00
Sri Sham Haran 93cded6ed9 Added serialization of component isActive 2022-11-15 17:04:52 +08:00
Diren D Bharwani e93eea6381 Cleaned up tools folder. Added debug only logging macros with _D suffix 2022-11-15 03:03:37 +08:00
XiaoQiDigipen 45ec617c3a
Merge pull request #203 from SHADE-DP/SP3-6-c-scripting
Script QoL Improvements
Added

GetComponentsInChildren() for GameObject
GetScriptsInChildren() for GameObject
GetComponentsInChildren() for Scripts
GetScriptsInChildren() for Scripts
Fixed

Bug causing crash if a Renderable is added without any mesh or materials
Serialization failure caused by null objects in Scripts
2022-11-14 17:57:54 +08:00
Kah Wei 9e8674859c Fixed script serialization for objects with no default values set 2022-11-14 17:05:54 +08:00
Diren D Bharwani 9515fcca4f Renames & Bugfixes
Renamed BoundingBox & BoundingSphere to Box & Sphere
Forces are forcefully cleared
2022-11-14 15:35:02 +08:00
Diren D Bharwani c953931f4f Merge branch 'main' into SP3-2-Physics 2022-11-13 17:57:30 +08:00
Sri Sham Haran 19f0c0ea70 Copy/Paste of entities can now be undone
Fixed bug where Shift Select would reset in a duplicate entity selection
Moved editor window manager to its own file.
2022-11-13 11:43:08 +08:00
Diren D Bharwani 45e549f9f1 .....small restructure.... 2022-11-12 16:56:58 +08:00
Diren D Bharwani c40992b48c Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-10 14:44:18 +08:00
Xiao Qi 35bcdc5239 Missed out path for config 2022-11-10 11:14:40 +08:00
Diren D Bharwani 4731df28f0 Skeleton for Reworked Physics Debug Draw 2022-11-10 02:16:33 +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 de38b29f25 small fixes for ms2 submission 2022-11-05 18:15:18 +08:00
Sri Sham Haran b30da7e495 Fixes 2022-11-04 19:16:32 +08:00
Sri Sham Haran 1267442210 Deserialization flow is now as follows:
Create entities and components >> Fetch Assets needed >> Load assets needed >> Initialize entities
Some other bug fixes
2022-11-04 18:27:25 +08:00
Sri Sham Haran 4ee0294977 Scene loads correctly now 2022-11-04 14:44:18 +08:00
Sri Sham Haran e609b5634a Material Inspector
Can set material
2022-11-02 21:31:27 +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
Kah Wei d207042fec Reworked SHMaterialSpec and SHMaterial loading system 2022-11-02 16:56:38 +08:00
Kah Wei 5bb728663c Materials are now serializable and deserializable 2022-10-31 17:47:38 +08:00
Kah Wei 42a80bfc3b Merge branch 'main' into SP3-1-SerialisedRenderable 2022-10-31 15:31:38 +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
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 f21f501d5a Merge branch 'main' into SP3-4-Editor 2022-10-30 14:23:39 +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
Brandon Mak 7c5a24b8e1 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-10-30 00:00:17 +08:00
Kah Wei 15e9aaa57d Modified SHSerialization to load Material using SHResourceManager 2022-10-29 01:54:43 +08:00
Sri Sham Haran f9f818b49c Merge branch 'main' into SP3-4-Editor 2022-10-28 20:31:51 +08:00
Sri Sham Haran ea9f90f60d Serialize Collider Component done 2022-10-28 19:39:39 +08:00
Sri Sham Haran fa6e3cf1df Light Component Serialization & Inspector 2022-10-28 17:58:16 +08:00
Sri Sham Haran a04e57d048 Merge branch 'main' into SP3-8-serialization 2022-10-28 13:17:22 +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
Kah Wei cc1fe71d4b Serialization and deserialization of SHRenderable to use default material for now 2022-10-27 19:31:00 +08:00
Sri Sham Haran 1018454f2e Add Win32 MessageBox
Add Prefab Manager
2022-10-26 20:21:47 +08:00
Sri Sham Haran 8466309e2f Serialize/Deserialize SHCollider & SHColliderComponent 2022-10-25 15:09:45 +08:00
Sri Sham Haran f64f13521b SHVec to yaml node convert 2022-10-25 08:42:51 +08:00
Kah Wei 6ea5ae7707 Added serialization and deserialization of pipeline on the material (no shader loading yet) 2022-10-22 21:36:02 +08:00
Kah Wei 9d8dfd334f Added serialization interfaces for Material (missing Shader) 2022-10-22 19:38:02 +08:00
Kah Wei bc8b5f8167 Merge branch 'main' into SP3-8-RenderableSerialization 2022-10-21 22:48:50 +08:00
Kah Wei 1ea482ff38 Added serialization of SHRenderable (only Mesh) 2022-10-21 18:36:56 +08:00
Sri Sham Haran bf0e7ab256 Merge branch 'main' into SP3-4-editor_fix 2022-10-21 08:57:25 +08:00
Kah Wei 166a036142 Completed script serialization in YAML 2022-10-20 11:08:20 +08:00
Kah Wei 4f177bc455 Reworked script serialization and deserialization functions (WIP) 2022-10-19 20:43:22 +08:00
Sri Sham Haran a7e8320008 Copy/Paste Entities 2022-10-19 17:23:25 +08:00
Sri Sham Haran 96f5b29418 Serialization/Deserialization 2022-10-19 01:03:32 +08:00
Sri Sham Haran 01f648ceb6 Serialize/Deserialize [WIP] 2022-10-01 23:43:00 +08:00
Sri Sham Haran cebb1a2cf8 Deserialization WIP 2022-09-27 21:06:25 +08:00
Sri Sham Haran c4ed199165 Serialize Vec 2/3/4 2022-09-27 07:03:31 +08:00
Sri Sham Haran 233e7a0e8f Serialization fix 2022-09-26 23:51:20 +08:00
Sri Sham Haran 7247faee73 Serialization [WIP] 2022-09-26 21:08:59 +08:00