Commit Graph

366 Commits

Author SHA1 Message Date
Brandon Mak 187329c384 Fixed texture issues 2022-09-27 12:02:06 +08:00
Glence 69041980f5 added the base for bank 2022-09-26 23:27:55 +08:00
Glence eeaf86e968 Merge branch 'main' into SP3-129-AudioSystem 2022-09-26 23:21:01 +08:00
Sri Sham Haran b375ab9a50 device wait idle 2022-09-26 23:14:10 +08:00
Kah Wei b5f7ff1106 Merge branch 'main' into SP3-6-c-scripting 2022-09-26 22:40:35 +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
Glence 240e5e9394 Merge branch 'main' into Editor_widgets 2022-09-26 18:55:31 +08:00
Glence 3d7876c987 added fix for closing editor windows 2022-09-26 18:33:37 +08:00
Glence 1f45b0ceca added all the widgets helper 2022-09-26 18:09:21 +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
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
Glence ac7ab83c16 Merge branch 'main' into SP3-129-AudioSystem 2022-09-26 15:51:59 +08:00
Glence d0d796781b remove audiosourcecomponent 2022-09-26 15:50:07 +08:00
Brandon Mak 0a024e1b2d Separated render graph contents into separate files 2022-09-26 14:49:48 +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
Glence 65a6014b1c Merge branch 'main' into SP3-129-AudioSystem 2022-09-26 14:08:43 +08:00
Sri Sham Haran 247930ea68 Merge branch 'main' into SP3-4-editor_fix 2022-09-26 14:04:02 +08:00
Brandon Mak a6f7ffab43 Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering 2022-09-26 09:48:48 +08:00
Brandon Mak 9fe5793dd7 Split the render graph into multiple files
doesn't compile
2022-09-26 09:37:59 +08:00
Kah Wei 7cbb127937 Merge branch 'main' into SP3-6-c-scripting 2022-09-26 09:09:19 +08:00
XiaoQiDigipen 8d32d76381
Merge pull request #52 from SHADE-DP/SP3-1-Rendering
Render graph fixes with attachment layouts
Render graph node was not moving batcher (this is now fixed)
2022-09-26 00:53:08 +08:00
Brandon Mak 6d68e6cb5e FIXED MY SHIT WHEE
(render graph color present attachment now have correct layout)
2022-09-26 00:38:36 +08:00
Kah Wei a5c804ca8b Fixed SHRenderGraph not moving the batcher 2022-09-26 00:08:32 +08:00
Brandon Mak 8649833604 subpass not null anymore 2022-09-25 23:45:05 +08:00
Brandon Mak dc6289e8cf WIP 2022-09-25 23:25:51 +08:00
Brandon Mak 8ac2c39e2b Fixed some render graph ctors and added if checks for buffers 2022-09-25 23:13:37 +08:00
Kah Wei fc5ff763f3 Added SHMaterialInstanceCache 2022-09-25 22:55:14 +08:00
Sri Sham Haran 335c19cfc7 Editor 2022-09-25 22:33:07 +08:00
Kah Wei a197ae842c Fixed crash on AMD GPUs resulting from Nvidia treating UniformBuffers and UniformBuffersDynamic as the same 2022-09-25 21:46:57 +08:00
Kah Wei 4e60b3495a Handles will now properly show up automatically dereferenced or NULL in Visual Studio's debug views 2022-09-25 20:28:01 +08:00
Kah Wei dd46881b67 Merge branch 'main' into SP3-1-Rendering 2022-09-25 18:57:14 +08:00
mushgunAX 8ab5afd3c4 first version of IM ready for PR 2022-09-25 16:39:01 +08:00
mushgunAX ef36ae462e Merge branch 'main' into SP3-10-input-management 2022-09-25 11:36:01 +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
Glence d7b5ae9f02 audiosystem base level done along with its components 2022-09-24 19:13:23 +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 cb73a8c5d1 Added file list in filesystem 2022-09-24 13:36:09 +08:00
Xiao Qi 225c247a85 Added missing SDL line back into engine premake 2022-09-24 12:59:21 +08:00
Xiao Qi cf4f905d91 Merge branch 'main' into SP3-13-Assets-Manager 2022-09-24 12:40:31 +08:00
Kah Wei 15f12a2608 Fixed warnings in SHBatch.cpp 2022-09-24 02:13:09 +08:00
Kah Wei 759c87e2a1 Material data on the GPU is now updated when material data changes 2022-09-24 02:07:47 +08:00
Glence c4105510b8 Merge branch 'main' into SP3-129-AudioSystem 2022-09-23 23:01:22 +08:00
Kah Wei 187142d5c3 Added Transform Component C# interface 2022-09-23 19:57:29 +08:00
Brandon Mak 32278e1564 Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering 2022-09-23 18:50:52 +08:00
Brandon Mak bd54b16e01 Ctor for compute pipelines 2022-09-23 18:50:40 +08:00
Kah Wei bb38246111 Added stress test code for 20000 objects 2022-09-23 18:49:04 +08:00
mushgunAX 3ed1034e62 Merge branch 'main' into SP3-10-input-management 2022-09-23 17:59:30 +08:00
mushgunAX 800732706e input pch move, init, exit, etc definitions 2022-09-23 17:42:31 +08:00
Kah Wei f8391d6c9e Modified TestScene space bar input to not destroy the object, only remove scripts 2022-09-23 16:45:06 +08:00
Kah Wei 77cccd63be Renderables now use TransformComponent's matrix 2022-09-23 16:41:44 +08:00
Kah Wei 04cdb25ddd Merge branch 'main' into SP3-1-Rendering
# Conflicts:
#	SHADE_Application/src/Application/SBApplication.cpp
#	SHADE_Application/src/Scenes/SBTestScene.cpp
2022-09-23 16:41:29 +08:00
Kah Wei 23f0f9f77e Triple buffered the batching buffers 2022-09-23 16:24:35 +08:00
Diren D Bharwani c2e948a100 Fixed active state checks in transform system
Apparently entity and scene node active states do not sync....
2022-09-23 15:48:00 +08:00
mushgunAX ed56ad99df Merge branch 'main' into SP3-10-input-management 2022-09-23 13:41:50 +08:00
mushgunAX a0c29c666f progress on input manager, near ready for PR 2022-09-23 13:14:46 +08:00
Glence f6bab2165c Merge branch 'main' into SP3-129-AudioSystem 2022-09-23 09:59:52 +08:00
Diren D Bharwani c77d9b2ff5 Changed editor pause for transform system to true 2022-09-22 22:58:14 +08:00
Kah Wei 5c4384b589 Fixed SHVkBuffer initial copy data for mapped buffers and made the cube spin 2022-09-22 20:53:03 +08:00
Kah Wei c4ab45ad34 Merge branch 'main' into SP3-1-Rendering
# Conflicts:
#	SHADE_Application/src/Scenes/SBTestScene.cpp
#	SHADE_Application/src/Scenes/SBTestScene.h
#	SHADE_Engine/SHADE_Engine.vcxproj
#	SHADE_Engine/SHADE_Engine.vcxproj.filters
2022-09-22 20:51:33 +08:00
Diren D Bharwani 6d646851e2 Added missing transpose to transform update and a test component to application 2022-09-22 20:39:46 +08:00
Diren D Bharwani 2c0fa3a6b2 Fixed warning from scene graph when adding new nodes to root. 2022-09-22 20:25:42 +08:00
Diren D Bharwani 0250687e06 Instantiated Transform System & Update Routine 2022-09-22 20:25:23 +08:00
Kah Wei 495d2b4b66 Added per-frame update of gpu transforms buffer 2022-09-22 20:04:53 +08:00
Brandon Mak cb31628e66 Dummy pipeline layout ctor created
Renderer now can update and bind descriptor set
2022-09-22 19:38:43 +08:00
XiaoQiDigipen 3457759ed3
Merge pull request #44 from SHADE-DP/SP3-6-c-scripting
Script lifecycle functions now run and ScriptEngine has been made a ECS System
2022-09-22 17:39:40 +08:00
Xiao Qi 3a908b717b Merge remote-tracking branch 'origin/SP3-6-c-scripting' into SP3-6-c-scripting 2022-09-22 17:08:11 +08:00
Xiao Qi 5bd35cec61 Fixed SHEventReceiver constructor callback return signature. 2022-09-22 17:07:59 +08:00
Kah Wei 2051d485eb Merge branch 'main' into SP3-6-c-scripting 2022-09-22 17:04:18 +08:00
Kah Wei 3b533ac03d Added faulty registration to entityDestroyed event 2022-09-22 16:40:49 +08:00
Diren D Bharwani 38dbd0c217 Removed static data member...again... 2022-09-22 15:49:00 +08:00
Diren D Bharwani d648fc8645 Merge remote-tracking branch 'origin/main' into SP3-16-Math 2022-09-22 15:42:09 +08:00
Diren D Bharwani cda7330c5b Removed static data member for transform update routine 2022-09-22 14:56:58 +08:00
Diren D Bharwani 2d93c9559d Restructured Transform system to match intended system structure 2022-09-22 14:54:06 +08:00
Diren D Bharwani ed143661b3 Scene node active states propagate down the hierarchy
Vulkan is throwing an exception...
2022-09-22 14:26:07 +08:00
Glence 8066c3cd6a added audioSystem(the base not working yet)
added components to use the audioSystme
2022-09-22 14:05:53 +08:00
Kah Wei f28d966ebb Merge branch 'SP3-1-Rendering' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-1-Rendering 2022-09-22 12:40:25 +08:00
Kah Wei e87c4c8dc8 Fixed SHTextureLibrary compiler errors 2022-09-22 12:39:05 +08:00
Kah Wei 5bc24b09d4 Added generalisation of csproj file location 2022-09-22 12:32:15 +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
Brandon Mak 1290e99dda Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering 2022-09-22 12:12:47 +08:00
Brandon Mak 7ddf665460 Updated Descriptor sets
Descriptor set layouts now have set index stored in them
It should be noted that when passed into a pipeline layout as global descriptor sets, these don't matter since the pipeline layout will use these in the order that they are passed in.
2022-09-22 12:12:44 +08:00
Xiao Qi a13e8f43fd Merge branch 'main' into SP3-13-Assets-Manager 2022-09-22 11:41:44 +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
Kah Wei b04789945f Merge branch 'main' into SP3-6-c-scripting 2022-09-22 11:06:26 +08:00