Commit Graph

438 Commits

Author SHA1 Message Date
Brandon Mak 4fcb5e313b Added more objects + tested materials (still needs testing) 2022-09-28 18:03:46 +08:00
Brandon Mak 2df9252e17 Fixed material desc set binding 2022-09-28 15:31:37 +08:00
Kah Wei d9582cd0bd Fixed first instance in MDI call being wrong 2022-09-28 14:47:50 +08:00
Brandon Mak a2311a473e Auto stash before merge of "SP3-1-Rendering" and "origin/SP3-1-Rendering" 2022-09-28 10:29:42 +08:00
Brandon Mak a23f4f5218 Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering 2022-09-28 10:28:19 +08:00
Brandon Mak d9cdf26098 Changed depth buffer format 2022-09-28 10:28:12 +08:00
Xiao Qi d5cc923413 Hard coded to always load racoon mesh instead of bag 2022-09-27 22:37:49 +08:00
Kah Wei d71fbc22de Merge branch 'SP3-1-Rendering' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-1-Rendering
# Conflicts:
#	TempShaderFolder/TestCubeFs.glsl
#	TempShaderFolder/TestCubeFs.spv
2022-09-27 21:07:55 +08:00
Kah Wei 61219f5136 Added tests for material binding and fixed some crashes 2022-09-27 21:06:14 +08:00
Brandon Mak 70940534e1 Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering 2022-09-27 20:07:29 +08:00
Kah Wei 055a0a1711 Fixed textures not loading correctly 2022-09-27 19:52:36 +08:00
Brandon Mak b7adf8815b Fixed camera. Can see texture now 2022-09-27 19:18:45 +08:00
Kah Wei 14cd0b4be9 Fixed SHTextureLoader loading wrong mipmap offsets 2022-09-27 16:45:35 +08:00
Kah Wei ecd1c10fea Merge branch 'main' into SP3-1-Rendering 2022-09-27 16:13:31 +08:00
Xiao Qi e0ad6fbc71 Forked tinyddsloader into org
Updated dependencies.bat
2022-09-27 16:11:03 +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
Kah Wei b3417c2011 Made SHGraphicsGlobalData static and modified SHBatch to generate and bind material descriptor set 2022-09-27 15:44:36 +08:00
XiaoQiDigipen 4c23151a14
Merge pull request #57 from SHADE-DP/SP3-13-Assets-Manager
SP3-13 Assets Management

Changed texture struct to contain pre processed information ready for buffer
2022-09-27 14:27:28 +08:00
Kah Wei 76617ae571 Enabled Multi-Draw Indirect feature 2022-09-27 14:12:14 +08:00
Xiao Qi 5d022b7123 Fixed mipoffset 2022-09-27 14:12:05 +08:00
Kah Wei 65c67c14b7 Fixed crash if no textures were loaded 2022-09-27 14:11:56 +08:00
Xiao Qi 60540b1adc Temp function to retrieve all textures 2022-09-27 14:09:44 +08:00
XiaoQiDigipen 033414f7ea
Merge pull request #56 from SHADE-DP/SP3-10-input-management
Input Manager: Wheel Delta Poll and SH_API.h header
Minor changes. No new features.
2022-09-27 13:58:37 +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
Kah Wei e9496bead6 Fixed bug where different Renderables of different meshes are thrown into the same SubBatch 2022-09-27 13:43:59 +08:00
mushgunAX ce721b99e5 include SH_API.h 2022-09-27 13:37:52 +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 6f3c1ed97b Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering 2022-09-27 12:56:19 +08:00
Brandon Mak 187329c384 Fixed texture issues 2022-09-27 12:02:06 +08:00
Kah Wei 3e2bcf28b6 Added texture loading that is almost working 2022-09-26 20:59:20 +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
mushgunAX 3b0ea251f3 mouse wheel delta poll 2022-09-26 18:08:59 +08:00
Kah Wei a06c30266e Merge branch 'main' into SP3-1-Rendering 2022-09-26 17:56:30 +08:00
XiaoQiDigipen 728d615425
Merge pull request #55 from SHADE-DP/SP3-13-Assets-Manager
SP3-13 Assets Management
Added function in asset manager to retrieve all dds images
2022-09-26 17:49:06 +08:00
Xiao Qi 3800c01c4a Added function in asset manager to retrieve all dds images 2022-09-26 17:48:27 +08:00
Kah Wei 5ac90eebec Fixed compilation errors 2022-09-26 17:26:33 +08:00
Kah Wei 927944d55a Merge branch 'SP3-1-Rendering' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-1-Rendering 2022-09-26 17:18:55 +08:00
Kah Wei d938007d8a Added TextureLibrary updating of descriptor sets 2022-09-26 17:18:51 +08:00
Kah Wei 5e7ffd6028 Added SHVkSampler and SHVKSamplerCache 2022-09-26 16:41:57 +08:00
XiaoQiDigipen 5c2a799e83
Merge pull request #54 from SHADE-DP/SP3-4-editor_fix
Editor implementation
Add in Hierarchy Panel and Inspector Panel
Editor init
Editor backend
2022-09-26 16:02:04 +08:00
Sri Sham Haran de8c2ce630 Merge branch 'main' into SP3-4-editor_fix 2022-09-26 15:59:38 +08:00
Sri Sham Haran 2c16eb4393 Reflect transform component 2022-09-26 15:53:54 +08:00
Brandon Mak 6307369e7f Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-09-26 14:50:04 +08:00
Brandon Mak 0a024e1b2d Separated render graph contents into separate files 2022-09-26 14:49:48 +08:00
XiaoQiDigipen 0c8fdb4985
Merge pull request #53 from SHADE-DP/SP3-13-Assets-Manager
SP3-13 Assets Management
Asset Manager Integration
Load fbx files into meshes
Load dds into memory
2022-09-26 14:43:04 +08:00
Xiao Qi 1c45b49937 Merge branch 'main' into SP3-13-Assets-Manager 2022-09-26 14:40:57 +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