Commit Graph

312 Commits

Author SHA1 Message Date
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
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
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
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
Kah Wei af1d24d874 Fixed certain DLLs and includes missing when copying 2022-09-22 10:52:07 +08:00
Kah Wei c1b7c7ded8 Merge branch 'main' into SP3-6-c-scripting
# Conflicts:
#	SHADE_Application/src/Application/SBApplication.cpp
#	SHADE_Engine/src/Scene/SHSceneManager.h
2022-09-22 09:55:31 +08:00
Brandon Mak ba181eb9c9 Shifted Command buffers outside of render graph
Command buffers now exist in renderer instead
Graphics system that calls the renderer, begins and ends the renderer recording in it's main loop as well
2022-09-22 09:23:40 +08:00
Kah Wei 3d9abcf19c Implemented image creation for textures in the texture bank 2022-09-22 09:19:18 +08:00
Xiao Qi 4446d0a60d Merge branch 'main' into SP3-13-Assets-Manager 2022-09-21 22:54:53 +08:00
Xiao Qi d2e2e85726 Added build path ignore
Readded output dir and removed interdir from premake
Added DEBUG guards in SHVkPhysicalDeviceLibrary when using SHLOG_TRACE
2022-09-21 22:54:15 +08:00
Xiao Qi ae3fb448d4 Merge branch 'main' into SP3-13-Assets-Manager 2022-09-21 22:28:31 +08:00
Xiao Qi 124b367413 Fixed SHTransform compile error
Include header in math path wrong
Added proj and filter ignore into git (again)
2022-09-21 22:24:52 +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
Brandon Mak 7acf25a770 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-09-21 20:09:48 +08:00
Kah Wei 791c4cd0d0 Merge branch 'SP3-1-Rendering' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-1-Rendering 2022-09-21 20:03:03 +08:00
XiaoQiDigipen f52fa9463d
Merge pull request #39 from SHADE-DP/SP3-16-Math 2022-09-21 20:02:20 +08:00
XiaoQiDigipen 67d673ff80
Merge pull request #38 from SHADE-DP/SP3-12-SceneGraph 2022-09-21 20:01:44 +08:00
Diren D Bharwani 14eed4c726 Added missing active check in transform system 2022-09-21 18:30:20 +08:00
Diren D Bharwani ac379e3ef3 Added method to scene graph to easily traverse and execute a unary function 2022-09-21 18:23:01 +08:00
Brandon Mak 270c8240c1 Shifted Graphics system to SBTestScene 2022-09-21 16:29:54 +08:00
Brandon Mak 80dc8d0a71 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-09-21 15:41:36 +08:00
Brandon Mak 8d2b6aec46 Descriptor set fix and camera descriptor set
Fixed SHVkDescriptorSetGroup bug with vkLayouts inside the ctor
Added descriptor set to renderer for camera
Logical Device now stores a buffer alignment variable for UBOs
2022-09-21 15:41:30 +08:00
Diren D Bharwani 415e47780c Completed Transform System 2022-09-21 14:54:57 +08:00
Diren D Bharwani 0db7392eed Merge remote-tracking branch 'origin/main' into SP3-16-Math 2022-09-21 14:06:36 +08:00
Cocoa 9c69d41a4e Added 90% of transform component & transform system. 2022-09-21 00:49:52 +08:00
Cocoa 3cd538562c More Scene Graph Fixes 2022-09-20 19:32:28 +08:00
Kah Wei 5f305f9609 Added SHTextureLibrary stub 2022-09-20 18:13:13 +08:00
Cocoa cc6d1dd95b Added Transform Component 2022-09-20 17:20:57 +08:00
Brandon Mak c194765889 More warnings fixed. More graphics constants. 2022-09-20 16:12:47 +08:00
Cocoa 7f173b3207 Added SH_API to Math Classes 2022-09-20 16:10:47 +08:00
Cocoa 7b7a4788e4 Merge branch 'main' into SP3-16-Math 2022-09-20 15:42:53 +08:00
Cocoa b5f3ec85aa Merge branch 'main' into SP3-16-Math 2022-09-20 15:37:28 +08:00
Cocoa f4bf895e45 Fixed constness of functions in scene graph 2022-09-20 15:35:10 +08:00
Brandon Mak 0bc3a23161 Fixed the fence with high quality wood 2022-09-20 14:15:09 +08:00
Brandon Mak 147292f91c Fence is broken. The neighbour's kids went to knock it down again. 2022-09-20 12:15:06 +08:00
Brandon Mak d9213fe35d Moved a bunch of global data from Graphics System to new class
New class in SHGraphicsGlobalData
2022-09-20 10:39:52 +08:00
Brandon Mak 77330511ee Fixed pipeline default color blend state
Remember to switch winding back to CCW after rendering in world space
2022-09-20 09:27:13 +08:00
Cocoa c0290b7185 Added fixes to scene graph. Read description for details.
1. Scene graph creates a root on construction. EntityID is set to MaxEID. The root is not intended to be modified.
2. When adding a node, if the 2nd arg (parent) is omitted, the node will be a child of the root.
2022-09-20 01:31:59 +08:00
Cocoa 34685e6726 Regenerated project files 2022-09-20 00:48:27 +08:00
Kah Wei 8772ce0cea Fixed SHSceneManager not SH_API-ed 2022-09-20 00:03:29 +08:00
Kah Wei 95b01fb96d Merge branch 'main' into SP3-6-c-scripting 2022-09-19 23:12:52 +08:00
Kah Wei 8ad0eee032 Fixed vertex data buffer being incorrect 2022-09-19 21:31:23 +08:00
Kah Wei 9e09896984 Fixed SHVkBuffer move and reworked batching buffers to be host visible 2022-09-19 20:15:39 +08:00
Xiao Qi c6e1ba7f15 Added tinyddsloader to dependencies 2022-09-19 18:40:27 +08:00
Kah Wei 4023b9d136 Added tests for rendering and fixed bugs with Batching system 2022-09-19 18:37:57 +08:00
maverickdgg ceb96938fb Added SHAPI to Scene graph 2022-09-19 17:28:59 +08:00
Cocoa e51a3688af Merge branch 'main' into SP3-16-Math 2022-09-19 17:17:40 +08:00
Kah Wei 308aa35e00 Merge branch 'main' into SP3-6-c-scripting 2022-09-19 17:17:28 +08:00
Xiao Qi 620f8a01ac Merge branch 'main' into SP3-13-Assets-Manager 2022-09-19 17:16:51 +08:00
Xiao Qi 52efdcf65e Merge branch 'main' into SP3-5-ECS 2022-09-19 17:12:54 +08:00
Cocoa ec3470c443 Merge branch 'main' into SP3-16-Math 2022-09-19 17:08:16 +08:00
Xiao Qi a867ecbcbf SP3-108 Shifted definitions for functions in Event Manager from cpp to hpp 2022-09-19 17:08:08 +08:00
Cocoa 471ec27a6d Added Bounding Box 2022-09-19 16:50:06 +08:00
Kah Wei f408247007 Linked MeshLibrary to RenderGraph 2022-09-19 15:52:51 +08:00
maverickdgg 44611115fe Added Scene graph functionality (un tested) 2022-09-19 15:41:52 +08:00
Brandon Mak d025abe43a Render graph execution now takes in graph scope buffers 2022-09-19 15:32:03 +08:00
Cocoa f1e6031d2e Added Transform, adjusted alignment in math files for better readability on smaller screens 2022-09-19 14:32:01 +08:00
Kah Wei 8070b2dafa Accounted for Shaders with no SHShaderBlockInterface 2022-09-19 00:11:57 +08:00