Commit Graph

1548 Commits

Author SHA1 Message Date
Diren D Bharwani 3faf3804aa Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-12 16:57:45 +08:00
Diren D Bharwani 45e549f9f1 .....small restructure.... 2022-11-12 16:56:58 +08:00
Kah Wei 24dcd77f32 Added tooltip and range attribute support for lists in scripts 2022-11-12 12:17:11 +08:00
Kah Wei 6dbda12f30 Adjusted design of list on scripts and all numbers now use sliders 2022-11-12 03:53:30 +08:00
Kah Wei d6764b4551 Added support for adding and removing elements from a list 2022-11-12 03:25:46 +08:00
Kah Wei 4c01d68f95 Added list editor tests 2022-11-12 02:33:12 +08:00
Kah Wei 543c199b03 Fixed lists undo not working 2022-11-12 02:33:00 +08:00
Kah Wei 2d2cc532a5 Fixed editing intermdiate list values not working 2022-11-11 22:59:45 +08:00
Kah Wei dfc03839db Renamed functions for clarity 2022-11-11 22:18:32 +08:00
Sri Sham Haran 7c7589ce8e idk why creation of new material is not working here send help. Change to popup for asset creation 2022-11-11 21:12:08 +08:00
Sri Sham Haran e96db99ee3 Merge branch 'main' into SP3-4-Editor 2022-11-11 20:41:14 +08:00
Sri Sham Haran 153f040c40 Refresh 2022-11-11 20:41:05 +08:00
Kah Wei d98d00b916 Wonky solution for array editor that doesn't work for elements outside of the first 2022-11-11 15:20:14 +08:00
Glence fbec2bf866 Auto stash before merge of "main" and "origin/main" 2022-11-11 14:17:47 +08:00
Sri Sham Haran c9db3b283d asset browser 2022-11-11 14:00:51 +08:00
Kah Wei 5d2aae3561 Made enum editor template specializations instead 2022-11-11 13:41:58 +08:00
Xiao Qi 3b22f95e29 Added font identifiers 2022-11-11 13:21:22 +08:00
Kah Wei ed3694bde1 Merge branch 'main' into SP3-6-ArraySerialization 2022-11-11 12:07:40 +08:00
Kah Wei fdc8965b62 Made String and GameObject editor template specializations instead 2022-11-11 12:07:26 +08:00
Kah Wei 85cc97ca27 Added implementation for ListElementAddCommand and ListElementRemoveCommand 2022-11-11 12:07:05 +08:00
XiaoQiDigipen 34dcc98a41
Merge pull request #191 from SHADE-DP/SP3-13-Assets-Manager
Filesystem directory features and bugfix
Fixed type from extension bug that results in null meta

Added compiled check for SHFiles
2022-11-11 10:56:44 +08:00
Xiao Qi 94b64e92dd Initialise files to not compiled 2022-11-11 10:55:19 +08:00
Xiao Qi 9fe5dc385b Implemented check for raw asset if compiled 2022-11-11 10:52:57 +08:00
Xiao Qi 6df3f3d417 Fixed get type from extension bug in asset handler 2022-11-11 10:47:03 +08:00
XiaoQiDigipen 6e98776165
Merge pull request #190 from SHADE-DP/SP3-13-Assets-Manager
Assets bugfix

Fixed asset type conversion bug when loading from meta files
Removed compile all function
Set parent id to 0 for non sub assets
2022-11-11 10:07:19 +08:00
Xiao Qi e824c17405 Fixed asset type conversion bug when loading from meta files
Removed compile all function
Set parent id to 0 for non sub assets
2022-11-11 10:06:26 +08:00
Glence 4f9015995c Merge branch 'main' into PlayerController 2022-11-11 09:21:36 +08:00
Brandon Mak 25841c6899 Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering 2022-11-11 02:40:14 +08:00
Brandon Mak 95d2836c94 God I felt so much pain writing this
- Thank god this botchy/hacky resource linking feature between graphs will only be used for a couple of resources. 
- Setup environment for UI rendering
- "Scene" resource is now used in BOTH world render graph and screen render graph. Layouts are setup accordingly. 
- A very horrible result of this is that linked resources have to be resized in their original graph and it has to be resized BEFORE the graphs linked to it since the framebuffers use their image views. 
- sigh.
2022-11-11 02:40:02 +08:00
Brandon Mak 71619d0159 God I felt so much pain writing this
- Thank god this botchy/hacky resource linking feature between graphs will only be used for a couple of resources. 
- Setup environment for UI rendering
- "Scene" resource is now used in BOTH world render graph and screen render graph. Layouts are setup accordingly.
2022-11-11 02:38:05 +08:00
XiaoQiDigipen 6fc9f804b5
Merge pull request #189 from SHADE-DP/SP3-6-c-scripting
GameObjects now provide access to children
2022-11-11 01:14:48 +08:00
Kah Wei 80db641b6f Added ListElementChangeCommand 2022-11-11 00:49:20 +08:00
Brandon Mak d17a83ab77 From last commit. Whoops. 2022-11-11 00:02:18 +08:00
Brandon Mak c78aade245 Resource manager for render graph is the one in Graphics System
- Renamed SH_ATT_DESC_TYPE_FLAGS to SH_RENDER_GRAPH_RESOURCE_FLAGS and added SHARED flag to represent that a resource is shared between graphs
- Allowed linking of resources between graphs (unideal implementation)
- Added info tracker for the render graph resources. Right now only layouts are being tracked.
2022-11-11 00:02:07 +08:00
Kah Wei 5875107ce2 Merge branch 'main' into SP3-6-ArraySerialization 2022-11-10 23:44:07 +08:00
Kah Wei d93ea8e49b Child caches are now updated when scene hierarchy changes 2022-11-10 23:34:53 +08:00
Sri Sham Haran aad83d9e32 Revert "Asset browser is wonky now"
This reverts commit 2fdff77420.
2022-11-10 23:02:29 +08:00
Sri Sham Haran 57941cd2dc Merge remote-tracking branch 'origin/main' into main 2022-11-10 23:02:17 +08:00
Sri Sham Haran 3d848118b2 Revert "Asset browser is wonky now"
This reverts commit 2fdff77420.
2022-11-10 23:02:01 +08:00
Sri Sham Haran 2fdff77420 Asset browser is wonky now
Refresh asset browser
Compile asset
2022-11-10 23:01:09 +08:00
Kah Wei 8670b419d0 Merge branch 'main' into SP3-6-c-scripting 2022-11-10 22:25:58 +08:00
Kah Wei cf5cc41a3f Reworked Undo-Redo system to be more flexible and stable 2022-11-10 18:10:15 +08:00
Xiao Qi c95a6a2492 Added open modes for ofstream when building csharp project 2022-11-10 17:37:59 +08:00
Xiao Qi ed1bc7c62d Changed scripting project relative path to managed and csharp dlls 2022-11-10 17:34:33 +08:00
XiaoQiDigipen 7da61f4a22
Merge pull request #188 from SHADE-DP/SP3-13-Assets-Manager
SP3-13 Assets Management
Added data member to SHFile to indicate whether file can be compiled
Added asset directory refresh (rebuilds asset collection and directory)

Fixed File link to meta
Fixed extension to type conversion
2022-11-10 17:11:27 +08:00
Xiao Qi 03f9c593b6 Function to call to refresh asset directory 2022-11-10 17:09:55 +08:00
Brandon Mak 9d367a359a Text Rendering WIP 2022-11-10 16:59:26 +08:00
Xiao Qi 0e5609995f Added data member to signal whether asset file can be compiled
Properly linked meta file to file in directory

Fixed extension to type conversion bug
2022-11-10 16:44:16 +08:00
Kah Wei bdc7297937 Converted macros for script field inspectors to use templates 2022-11-10 16:20:04 +08:00
Diren D Bharwani 901c007cb2 Added Transform Matrix method to SHMatrix 2022-11-10 14:55:28 +08:00