Commit Graph

264 Commits

Author SHA1 Message Date
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
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
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 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 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
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
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 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
Brandon Mak 23fe51b483 Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering 2022-09-19 00:04:42 +08:00
Brandon Mak 643efbe1bb WIP 2022-09-19 00:00:07 +08:00
Kah Wei b9185eab18 Added Mesh Registration Functions to SHGraphicsSystem and a SHGraphicsSystem compatible version of mesh generation functions for SHPrimitiveGenerator 2022-09-18 23:23:48 +08:00
Kah Wei 41daaaba9c Added SHPrimitiveGenerator 2022-09-18 23:11:08 +08:00
Brandon Mak 28a5f8e4e5 Auto stash before merge of "SP3-1-Rendering" and "origin/SP3-1-Rendering" 2022-09-18 22:34:48 +08:00
Kah Wei 96ec1afcdd Changed batching system to use SHRenderable* instead of handles 2022-09-18 17:02:02 +08:00
maverickdgg f21aa8836c Merge branch 'main' into SP3-5-ECS 2022-09-18 16:50:10 +08:00
maverickdgg b3d9a54d8f Added entity creation event and entity destroyed events 2022-09-18 16:46:08 +08:00
Brandon Mak ec40754eb9 Render graph, graphics system and pipeline library changes lel
Solved errors
Graphics system AddMaterial now takes in a subpass
Pipeline library now stored in render graph node instead since pipelines have to be compatible with a renderpass.
Renderers now bind render graphs instead of storing them
2022-09-18 15:23:10 +08:00
Kah Wei 8c30e656f7 Modified AddMaterial() to take in a subpass 2022-09-18 14:58:32 +08:00
Kah Wei 7a126bf1fc SHViewport now takes in a RenderGraph instead of creating one 2022-09-18 14:49:15 +08:00
Kah Wei a3aa708b34 Fixed numerous template errors and warnings 2022-09-18 00:49:27 +08:00
Kah Wei 6e4d6abd1c Fixed Handle<> include issues 2022-09-17 23:37:22 +08:00
Kah Wei 1c8a434b26 Added Batcher classes and fixed errors 2022-09-17 23:37:22 +08:00
Brandon Mak c1a3a6acf1 Created global descriptor set layouts 2022-09-17 23:32:03 +08:00
Xiao Qi 6706f9acf0 SP3-108 Created templated derived classes for events to accommodate for automatic type sending ability 2022-09-17 22:33:11 +08:00
Brandon Mak bff27a7188 Added a bunch of KW's files for batching
Prepared Graphics system for merging with batcher
2022-09-17 22:29:22 +08:00
Kah Wei 5171ddd2bf Added SHLog class and changed Debug::Log to use SHLog 2022-09-17 03:20:24 +08:00
Brandon Mak 2f2567044a Submitted command buffer :D 2022-09-16 17:28:27 +08:00
Kah Wei c83a5a379e Added Awake, Start, Update, LateUpdate, OnDestroy calls via SystemRoutines 2022-09-16 17:02:36 +08:00
Sri Sham Haran eb8cbaeebb init vulkan for imgui 2022-09-16 16:40:42 +08:00
Kah Wei 0f63ee10d0 Converted SHScriptEngine into a SHSystem 2022-09-16 16:37:50 +08:00
Kah Wei 941f4a135f Merge branch 'main' into SP3-6-c-scripting 2022-09-16 16:21:58 +08:00
Sri Sham Haran 470e1f07f0 Merge branch 'main' into SP3-4-editor 2022-09-16 15:02:56 +08:00
Brandon Mak c1c5e70676 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-09-16 14:46:48 +08:00
Brandon Mak a42a8b0c46 SH_API EVERYWHERE 2022-09-16 14:20:21 +08:00
XiaoQiDigipen e976dee601
Merge pull request #27 from SHADE-DP/SP3-5-ECS
SP3-5 ECS

System manager rework. Added system routines
2022-09-16 14:15:23 +08:00
Brandon Mak 4b168fb2d7 Merge branch 'main' into SP3-1-Rendering 2022-09-16 14:09:14 +08:00
Brandon Mak eb975d96c6 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-09-16 14:08:36 +08:00
Xiao Qi 0373754e37 Merge branch 'main' into SP3-5-ECS 2022-09-16 14:06:05 +08:00
Kah Wei c89fe48182 Merge branch 'BackTo5.0' into SP3-6-c-scripting 2022-09-16 14:04:56 +08:00
Kah Wei aaf3d67eed Downgraded back to .NET 5.0 due to lack of VS 2019 support 2022-09-16 14:02:55 +08:00
Sri Sham Haran 6f67c1acc7 Base Editor (WIP, no vulkan) 2022-09-16 13:55:29 +08:00
Kah Wei b933b0f7fc Added SerializeField attribute 2022-09-16 13:13:38 +08:00
Brandon Mak f0b9f19f4d clear color value fix 2022-09-16 12:33:42 +08:00
Xiao Qi 1dde480a9f Merge branch 'main' into SP3-18-Events 2022-09-15 18:38:11 +08:00
Xiao Qi f9743f394d Added some lines in comments for clarity 2022-09-15 18:37:05 +08:00
Xiao Qi e1074887c8 Added instructions 2022-09-15 18:34:07 +08:00
Xiao Qi 5af0bf7d25 Instructions on how to use events 2022-09-15 18:33:36 +08:00
Kah Wei 382d75528a Removed and ignored VS project and solution files 2022-09-15 12:50:48 +08:00
Kah Wei e5b7742955 Merge branch 'main' into SP3-6-c-scripting
# Conflicts:
#	Dependencies.bat
2022-09-15 12:22:37 +08:00
maverickdgg 7900c52984 Merge branch 'main' into SP3-5-ECS 2022-09-15 12:18:20 +08:00
maverickdgg a90c137445 #comment Completed System Routine Added Unit Test version 1 2022-09-15 12:10:06 +08:00
Xiao Qi ddf6a7bee5 SP3-108
Removed singleton instance from event manager and changed it to static class instead.

WARNING: Might need to change back to singleton next time, I had to do it previously for some reason but I don't remember why
2022-09-15 12:06:09 +08:00
Kah Wei 972fe46ec2 Merge branch 'main' into SP3-6-c-scripting
# Conflicts:
#	SHADE_Engine/SHADE_Engine.vcxproj
#	SHADE_Engine/SHADE_Engine.vcxproj.filters
#	SHADE_Engine/premake5.lua
2022-09-15 12:05:12 +08:00
Kah Wei e1fb74f784 SHADE_Engine now copies the SDL2.dll to the out directory 2022-09-15 11:55:22 +08:00