xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity
1,536 Commits 81 Branches 9 Tags 86 MiB
Commit Graph

106 Commits

Author SHA1 Message Date
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
Xiao Qi 017cbf90c5 Changed filesystem interface in preparation for asset browser functionalities 2022-10-28 19:07:48 +08:00
Xiao Qi 2102835629 Added function to manually compile shaders by path 2022-10-27 14:24:03 +08:00
Xiao Qi e1de423483 Treat all shaders as built in for now to facilitate getting shader module by name 2022-10-27 14:12:53 +08:00
Xiao Qi b5a1d5ea88 SP3-282 Restructured loaders and compilers 
Completed shader compiling and loading
 2022-10-27 12:54:58 +08:00
Xiao Qi 5154b579d7 Re-restructured compilers to be more self contained 
Loaders only load internal binary asset files
 2022-10-26 23:07:01 +08:00
Xiao Qi 4eaa15d999 Added function to compile built in shaders 2022-10-26 17:16:09 +08:00
Xiao Qi 54796773b2 Added built in shader extension 
Collision check for asset IDs
 2022-10-26 01:53:26 +08:00
Xiao Qi 84ce369607 Changed shader module library to Import shaders and reflect all on its own 
Preparation for separation for built in shaders distinction
 2022-10-25 21:04:21 +08:00
Xiao Qi b4726ae992 Removed Shader source library, changed header and enum type locations 2022-10-25 15:43:36 +08:00
Xiao Qi 2dbd2f6030 Split asset into 2 categories for internal assets to be loaded and external assets to be compiled 2022-10-24 22:46:01 +08:00
Xiao Qi 8a01065641 Moved original shader source library 
Added functions to asset manager to get all by type
 2022-10-24 04:17:51 +08:00
Xiao Qi 254fc4e641 SP3-284 Restructured Shader source loader into asset manager to follow design pattern for loaders and asset data 2022-10-24 03:54:28 +08:00
Xiao Qi a83d1f8f04 Removed line that loaded all assets 
Separated template function in asset manager into hpp file
Fixed bug in checking map contains
 2022-10-23 16:55:57 +08:00
Xiao Qi 44833d22c6 Merge branch 'main' into SP3-13-Assets-Manager 2022-10-21 20:52:28 +08:00
Xiao Qi 9df517f3b3 SP3-170 SP3-238 Restructured asset and asset loading library types to be derived from common base class. 
Storage of assets and loaders based on pointers. 

Created general templated calls to get data from asset manager based on asset type passed in as template argument. 

More concise internal interface when loading and storing assets with libraries
 2022-10-21 20:28:54 +08:00
Kah Wei 7e15edb052 Completed initial implementation of SHResourceManager 2022-10-21 13:58:27 +08:00
Xiao Qi 51eba31ad4 Added animation asset class 
Added animation reading from assimp scene

Separated assimp loading from mesh loader in preparation for exe use
 2022-10-19 18:38:11 +08:00
Xiao Qi 013bb71325 Functions to retrieve mesh and texture data 2022-10-17 15:04:38 +08:00
Xiao Qi b10f490e45 SP3-102 SP3-248 Saving of SHMETA files with asset IDs, retrieval of asset data under works, currently all assets are loaded into memory automatically 2022-10-16 23:15:11 +08:00
Xiao Qi 61e353164b Fixed all asset related warnings 2022-10-01 23:57:26 +08:00
Xiao Qi c82d01631c SP3-237 Texture load/compile successfully 2022-10-01 13:27:51 +08:00
Xiao Qi 5069a42319 SP3-237 Mesh compile and load successfully. Although now path to load/compile is hardcoded. Flow will be done after MS1 2022-10-01 13:12:37 +08:00
Xiao Qi 8a3d3c8d4e SP3-237 SP3-103 SP3-104 Implemented SHTexture and SHMesh binary file writing and loading. NOT TESTED 
Added file level comments
 2022-09-30 22:08:17 +08:00
Xiao Qi 584b7e425f WIP Write meta files to track whether raw asset (fbx/gltf/dds) have been compiled into custom binary 2022-09-30 08:57:25 +08:00
Xiao Qi a51cbb7e70 Merge branch 'main' into SP3-13-Assets-Manager 2022-09-29 10:55:49 +08:00
Brandon Mak 78f216e445 Rendered multiple racoons 2022-09-28 20:33:29 +08:00
Xiao Qi 219aaa1707 Split texture loader into 2 paths for dds and shtexture format. 
SHTexture binary load half done
 2022-09-28 18:35:59 +08:00
Xiao Qi 201b19e8a6 SP3-237 
Renamed MeshWriter to MeshCompiler
Implemented texture compiler
 2022-09-28 18:35:22 +08:00
Kah Wei 055a0a1711 Fixed textures not loading correctly 2022-09-27 19:52:36 +08:00
Kah Wei 14cd0b4be9 Fixed SHTextureLoader loading wrong mipmap offsets 2022-09-27 16:45:35 +08:00
Kah Wei 04b452543c Modified TextureLibrary to use SHTextureAsset instead of SHDDSAsset 2022-09-27 16:05:47 +08:00
Kah Wei 10b22374c0 Merge branch 'main' into SP3-1-Rendering 
# Conflicts:
#	SHADE_Application/src/Scenes/SBTestScene.cpp
 2022-09-27 15:48:51 +08:00
Xiao Qi 5d022b7123 Fixed mipoffset 2022-09-27 14:12:05 +08:00
Xiao Qi 60540b1adc Temp function to retrieve all textures 2022-09-27 14:09:44 +08:00
Xiao Qi a7badba8b9 Copied over function from Texture Library to Texture loader to convert dds format to vk format 2022-09-27 13:58:19 +08:00
Xiao Qi 7487602151 SP3-104 
Renamed DDS to Texture in most places
Prepared SHTextureAsset for ease of load into buffer and compilation
Added Copy constructor for SHTextureAsset
 2022-09-27 13:02:12 +08:00
Brandon Mak 187329c384 Fixed texture issues 2022-09-27 12:02:06 +08:00
Xiao Qi 1ea4689a89 SP3-237 Mesh write to binary file 2022-09-26 19:10:32 +08:00
Xiao Qi caab2c37ab Added GLTF extension recognisation 2022-09-26 19:10:12 +08:00
Xiao Qi 4dd2335fb8 Removed assimp post processing flag that was removing animations 2022-09-26 19:09:45 +08:00
Xiao Qi 3800c01c4a Added function in asset manager to retrieve all dds images 2022-09-26 17:48:27 +08:00
Xiao Qi 99534c1613 SP3-103 SP3-104 Separated mesh and texture loading 
Added in lines in SBApplication to load racoon fbx and dds textures

Racoon shows up in renderdoc hehe
 2022-09-26 14:38:12 +08:00
Xiao Qi 18eca1897e Added in post build command to copy assimp dll 
Added in SH_API to asset manager class
 2022-09-24 22:52:42 +08:00
Xiao Qi a39230ce42 More setting up for testing of gltf loading 2022-09-24 16:07:51 +08:00
Xiao Qi 78a20173e0 Changed AssetType underlying type 
Added mesh name to mesh asset object
Added in static token for LoadGLTF function
Fixed warning in GetTypeFromExtension
 2022-09-24 16:07:26 +08:00
Xiao Qi a907c7c575 SP3-103 SP3-104 Testing set up for loading gltf and dds 2022-09-24 13:37:12 +08:00
Xiao Qi a8a2e90c26 SP3-237 Added header data type into mesh asset in preparation for compilation of mesh 2022-09-24 13:36:43 +08:00
Xiao Qi 8cfe58a3ad SP3-103 SP3-104 Implemented DDS loading and error reporting 
Not tested
 2022-09-22 12:29:30 +08:00
Xiao Qi 6f1592e16f SP3-103 SP3-102 Added call to mesh loader in asset manager. Removed old references to previous maps and vectors. 2022-09-22 11:40:24 +08:00
Xiao Qi 8ac6ef95d6 SP3-103 Implemented library to load GLTF with assimp and processmesh 2022-09-22 11:26:06 +08:00
Xiao Qi ba4d85a4e1 SP3-103 SP3-104 Implementing Mesh Loader for asset manager to use assimp to load gltf 
Loading of dds from gltf file planned ahead
 2022-09-21 22:20:52 +08:00
Xiao Qi c6e1ba7f15 Added tinyddsloader to dependencies 2022-09-19 18:40:27 +08:00
Xiao Qi 3b9d14944e SP3-102 Changed all previous references to updated versions. Removed function call to obsolete functons 2022-09-13 14:23:33 +08:00
Xiao Qi 1cabcefe0f SP3-102 Initial port of 200 resource manager into 300 Asset manager 2022-09-13 13:37:32 +08:00