Commit Graph

109 Commits

Author SHA1 Message Date
Xiao Qi cc2587a7bd Added recognition for material and prefab types when generating meta files 2022-11-22 21:54:51 +08:00
Xiao Qi bcd8b37fd7 Merge branch 'main' into SP3-13-Assets-Manager 2022-11-22 21:53:46 +08:00
Glence 71e8ba6044 doing up the main menu 2022-11-22 16:18:16 +08:00
Xiao Qi 681e7f3506 Added invalid Asset ID Macro 2022-11-22 14:26:10 +08:00
Xiao Qi 5024956c04 Merge branch 'main' into SP3-13-Assets-Manager 2022-11-22 13:54:40 +08:00
Brandon Mak c686954c77 Implemented Text Rendering
- The Text Renderer Component serialization and reflection onto inspector is not in yet, but there is basic functionality.
- Updated shaders
- Topology for text rendering is changed to triangle fan. Front facing for primitives is clockwise. Vertex state has both the positionOffset and glyphIndex attribute set as instanced.
-  Freetype instance is now initialized in InitBoilerplate
- SHCamera no longer calling SetPerspective/Ortho inside HandleResize
- Font Geometry is now loaded in SHFontLoader into SHFontAsset fontGeometry variable.
2022-11-20 19:03:12 +08:00
Xiao Qi 5fb51511f6 Merge branch 'main' into SP3-13-Assets-Manager 2022-11-19 19:59:24 +08:00
Brandon Mak 03ce142137 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-11-18 16:37:06 +08:00
Sri Sham Haran 920e977232 Merge branch 'main' into SP3-4-Editor 2022-11-17 13:34:34 +08:00
Sri Sham Haran 1bd7183231 Added validation for Renderable drag drop fields 2022-11-16 17:30:19 +08:00
Brandon Mak 292fdf4ee2 Fixed some bugs but SHFont constructor still breaks
the vkImage is not loading correctly
2022-11-15 20:40:43 +08:00
Kah Wei c69ad04f1e Added functions to get name of a backing asset from SHResourceManager 2022-11-15 18:15:49 +08:00
Xiao Qi f7cca42e59 Added shlog information source 2022-11-15 13:53:15 +08:00
Xiao Qi 786e15771c Addedo control paths for font compilation and loading 2022-11-15 13:44:39 +08:00
Xiao Qi 3dcb6f26c2 Merge branch 'main' into SP3-1-Rendering 2022-11-15 13:21:28 +08:00
Xiao Qi 16e357acb0 Accounted for texture compilation
Changed refresh, doesnt clear asset collection anymore
Checks for preexisting sub assets and asset meta in collection
2022-11-14 21:18:36 +08:00
Brandon Mak 4eb5fa64e0 Text Rendering WIP 2022-11-14 19:31:26 +08:00
Brandon Mak 2a05d821d5 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-11-14 18:36:33 +08:00
Xiao Qi 3cc5ed0dec Added meta generation recognisation for scene and font extension types on load up
Check for std::optional value exist
2022-11-14 18:31:56 +08:00
Brandon Mak ac17721363 Merge branch 'main' into SP3-1-Rendering 2022-11-14 15:38:33 +08:00
Brandon Mak 898b7fbf2c Text Rendering WIP 2022-11-14 10:11:47 +08:00
Xiao Qi a8d4f9c756 On building of asset file directory, check for recognised assets without meta file and generate 2022-11-13 19:51:19 +08:00
Xiao Qi 3b22f95e29 Added font identifiers 2022-11-11 13:21:22 +08:00
Xiao Qi 6df3f3d417 Fixed get type from extension bug in asset handler 2022-11-11 10:47:03 +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
Xiao Qi 03f9c593b6 Function to call to refresh asset directory 2022-11-10 17:09:55 +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
Brandon Mak 67f7d0ea2e Text Rendering WIP 2022-11-10 00:19:38 +08:00
Brandon Mak 572700fbb3 Text Rendering WIP 2022-11-08 10:57:07 +08:00
Brandon Mak 1165b9fa47 Text Rendering WIP 2022-11-07 19:38:08 +08:00
Brandon Mak cc5c764307 Text Rendering WIP 2022-11-07 02:32:38 +08:00
Brandon Mak 88530e9909 Text Rendering WIP 2022-11-07 00:10:57 +08:00
Xiao Qi 6d0089ee12 Merge branch 'main' into SP3-13-Assets-Manager 2022-11-04 17:49:13 +08:00
Xiao Qi 1f0d54486d Added sub asset data members
Changed some control flow in asset manager to accommodate for subassets
Read/Write meta files for assets with sub assets
2022-11-04 17:20:42 +08:00
Xiao Qi 6984653b64 Renamed and restructured model asset members
Added mesh asset vector for model asset to contain
2022-11-04 17:18:40 +08:00
Xiao Qi f24346a6fd Revert "TEMPORARY Push with all relative paths changed for building exe"
This reverts commit 0979ee93e6.
2022-11-03 00:11:56 +08:00
Xiao Qi 0979ee93e6 TEMPORARY Push with all relative paths changed for building exe 2022-11-02 22:44:27 +08:00
Sri Sham Haran e609b5634a Material Inspector
Can set material
2022-11-02 21:31:27 +08:00
Xiao Qi d1f624b2eb Removed SHMeshData declaration/definition in graphics middle end
Renamed some data members in SHMeshData
Replaced calls and references to mesh data in Primitive Generator
2022-11-02 21:09:53 +08:00
Xiao Qi 2beae24924 Removed Original mesh compiler, rewriting mesh loader to reflect ModelCompiler format 2022-11-02 20:50:51 +08:00
Xiao Qi e2778da955 WIP Rewrite flow from compiling to loading to recognising assets 2022-11-01 20:54:51 +08:00
Xiao Qi a8f5d021d3 Switch case initialisation error fix 2022-11-01 00:50:57 +08:00
Xiao Qi 220e1a7d8b Fixed asset creation broken logic loop 2022-11-01 00:44:37 +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
Xiao Qi 087cbcabaf Forgot function to actually retrieve root folder pointer hehe 2022-10-30 04:41:24 +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
Xiao Qi 00d4d5d910 Removed code that accidentally calls delete on freed memory for asset loaders 2022-10-30 03:06:18 +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
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