Commit Graph

1996 Commits

Author SHA1 Message Date
Brandon Mak 7b769057a2 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-10-30 13:18:15 +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
Brandon Mak 7c5a24b8e1 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-10-30 00:00:17 +08:00
Kah Wei cac93b7df9 Fixed indentation issue in SHGraphicsSystem 2022-10-29 23:56:37 +08:00
Brandon Mak 5da7638c0a Compute barriers 2022-10-29 22:52:15 +08:00
Brandon Mak 6f2ca54f7e WIP compute barriers 2022-10-29 21:36:11 +08:00
Brandon Mak 25db4db99a Catered to light comp deletion and solved minimize bugs
Editor can also now shift the viewport around without Vulkan vomiting validation layers
2022-10-29 17:00:35 +08:00
Diren D Bharwani 72cdbf55e5 Fixed boolean for updating entities in Transform system 2022-10-29 16:42:02 +08:00
Xiao Qi 70533b1712 Changed Application exit call to asset manager 2022-10-29 15:53:15 +08:00
Xiao Qi c71a84cc59 Simple file deletion 2022-10-29 15:50:26 +08:00
Xiao Qi 219492dedd Changed asset collection from vector to unordered_map for better id col check
Reduce use of for loops to iterate through asset collection
2022-10-29 15:36:34 +08:00
Diren D Bharwani 015b443e4e Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-10-29 14:54:54 +08:00
Diren D Bharwani 96bd982e4c Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph 2022-10-29 14:51:48 +08:00
Diren D Bharwani c9b116b8be Added skeleton functions to managed GameObject for scene graph interface 2022-10-29 14:51:34 +08:00
Xiao Qi 270205b0ba Added line to write asset meta into file when saving
Does check for data write before saving
2022-10-29 14:50:44 +08:00
Xiao Qi 0182c90a21 Interface to create and save new assets that are internal: Prefabs, Scenes, Materials 2022-10-29 14:42:38 +08:00
Xiao Qi cd62dbbb25 Material WIP 2022-10-29 11:58:14 +08:00
XiaoQiDigipen 6477617b1b
Merge pull request #128 from SHADE-DP/SP3-6-c-scripting
Added Renderable, Mesh, Material and Asset Interface for C#
2022-10-29 02:33:36 +08:00
Kah Wei dbf1b0b8de Merge branch 'main' into SP3-6-c-scripting
# Conflicts:
#	SHADE_Managed/src/Components/Collider.hxx
2022-10-29 02:32:21 +08:00
Kah Wei 19dc999e4f Added full implementation of Renderable script interface 2022-10-29 02:19:36 +08:00
Kah Wei 15e9aaa57d Modified SHSerialization to load Material using SHResourceManager 2022-10-29 01:54:43 +08:00
Kah Wei 3c2e51cb0b Built-in shaders are now fully loaded via the SHResourceManager 2022-10-29 01:38:29 +08:00
Kah Wei e4394b6170 Generalised SHResourceManager 2022-10-28 21:32:05 +08:00
Xiao Qi 22b0a2f97b Changed tabs/spacing 2022-10-28 21:20:59 +08:00
Xiao Qi 6ce143665a Added scene and prefab asset classes
Added scene and prefab text based loaders

Added write functions to all asset loaders to overwrite data
2022-10-28 20:48:50 +08:00
Sri Sham Haran 001c25f554 fix camera not updating when undock/dock 2022-10-28 20:47:28 +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
Kah Wei 9617ed3838 Added NativeAsset, Material and Mesh representations along with a stub for Renderable 2022-10-28 19:23:40 +08:00
Xiao Qi 017cbf90c5 Changed filesystem interface in preparation for asset browser functionalities 2022-10-28 19:07:48 +08:00
Kah Wei 7e5c819813 Fixed warning with Collider not being made abstract 2022-10-28 19:03:07 +08:00
Kah Wei 541f44c039 Fixed bugs in SHMaterial, SHMeshLibrary and removed unused functions in SHTextureLibrary 2022-10-28 19:02:54 +08:00
Kah Wei 199897adb4 Added GenericHandles to SHADE_Managed 2022-10-28 19:02:26 +08:00
Sri Sham Haran 04d372b9b8 Merge branch 'main' into SP3-8-serialization 2022-10-28 18:00:08 +08:00
Sri Sham Haran fa6e3cf1df Light Component Serialization & Inspector 2022-10-28 17:58:16 +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
XiaoQiDigipen f276595202
Merge pull request #126 from SHADE-DP/SP3-1-SerialisedRenderable
All Vec3 and Vec4s in materials are now automatically set to full 1.0 Vectors
2022-10-28 16:38:17 +08:00