Commit Graph

234 Commits

Author SHA1 Message Date
Sri Sham Haran 247930ea68 Merge branch 'main' into SP3-4-editor_fix 2022-09-26 14:04:02 +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
mushgunAX 8ab5afd3c4 first version of IM ready for PR 2022-09-25 16:39:01 +08:00
Xiao Qi a0a57e7c29 Added test assets
Test line to call asset manager temporary load
2022-09-25 00:13:17 +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
Kah Wei bb38246111 Added stress test code for 20000 objects 2022-09-23 18:49:04 +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 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 0250687e06 Instantiated Transform System & Update Routine 2022-09-22 20:25:23 +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
Kah Wei 1bede86ff6 Awake(), Start() and Update(), OnDestroy() for scripts now all run as intended 2022-09-22 17:25:43 +08:00
Kah Wei 21a3d6ecd7 Added test code for scripts 2022-09-22 11:22:51 +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
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
XiaoQiDigipen f52fa9463d
Merge pull request #39 from SHADE-DP/SP3-16-Math 2022-09-21 20:02:20 +08:00
Brandon Mak 270c8240c1 Shifted Graphics system to SBTestScene 2022-09-21 16:29:54 +08:00
Cocoa 34685e6726 Regenerated project files 2022-09-20 00:48:27 +08:00
Kah Wei 8ad0eee032 Fixed vertex data buffer being incorrect 2022-09-19 21:31:23 +08:00
Kah Wei 4023b9d136 Added tests for rendering and fixed bugs with Batching system 2022-09-19 18:37:57 +08:00
Cocoa ec3470c443 Merge branch 'main' into SP3-16-Math 2022-09-19 17:08:16 +08:00
Kah Wei a05ca41117 Fixed issue with SystemRoutines being created with the wrong version 2022-09-19 15:58:31 +08:00
Kah Wei f408247007 Linked MeshLibrary to RenderGraph 2022-09-19 15:52:51 +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
Brandon Mak 643efbe1bb WIP 2022-09-19 00:00:07 +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 1c8a434b26 Added Batcher classes and fixed errors 2022-09-17 23:37:22 +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
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
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
Brandon Mak eb975d96c6 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-09-16 14:08:36 +08:00
Sri Sham Haran 6f67c1acc7 Base Editor (WIP, no vulkan) 2022-09-16 13:55:29 +08:00
Kah Wei 382d75528a Removed and ignored VS project and solution files 2022-09-15 12:50:48 +08:00
Kah Wei 10c38a10a7 Merge branch 'DisableDllWarnings' into SP3-6-c-scripting
# Conflicts:
#	Dependencies.bat
#	SHADE_Application/SHADE_Application.vcxproj
#	SHADE_Application/premake5.lua
#	SHADE_Application/src/Application/SBApplication.cpp
#	SHADE_Engine/SHADE_Engine.vcxproj
2022-09-15 11:43:03 +08:00
Kah Wei 67290c03e7 Updated vcxproj files 2022-09-15 11:34:04 +08:00
Kah Wei c48a467e57 Disabled warnings for DLL export 2022-09-15 11:33:40 +08:00
Sri Sham Haran 20f4b59f41 Merge branch 'main' into SDLIntegration 2022-09-15 09:30:03 +08:00
Sri Sham Haran bd69c6043a SDL Updates 2022-09-15 09:26:43 +08:00
Kah Wei ad7df083bf Merge branch 'main' into SP3-6-c-scripting
# Conflicts:
#	Premake/premake5.exe
#	SHADE_Application/src/Application/SBApplication.cpp
#	SHADE_Engine/SHADE_Engine.vcxproj
#	SHADE_Engine/SHADE_Engine.vcxproj.filters
#	SHADE_Engine/premake5.lua
2022-09-15 09:17:17 +08:00
Brandon Mak 169822c221 Render graph execution fixed
GetVkQueue function deleted. More specific function implemented (Present).
2022-09-15 09:16:13 +08:00
Xiao Qi 8e601e60e5 Added SHCommonTypes header file
Changed C++ std from latest to 20
Updated premake program
2022-09-15 01:51:04 +08:00
XiaoQiDigipen 98d61f1ca7
Merge branch 'main' into SetWorkingDirectory 2022-09-15 01:39:10 +08:00
Sri Sham Haran 5e4eabc582 [WIP] SDL Window wrap 2022-09-15 00:48:43 +08:00
Kah Wei 7bc0dfb399 Set working directory of the application to be the executable location 2022-09-15 00:33:12 +08:00
Sri Sham Haran 599f1e4ffe add sdl to dependencies 2022-09-14 21:47:39 +08:00
Kah Wei 7e4c6a986a Merge branch 'CleanUpPremake' into SP3-6-c-scripting
# Conflicts:
#	SHADE_Engine/SHADE_Engine.vcxproj
#	SHADE_Engine/SHADE_Engine.vcxproj.filters
2022-09-14 20:10:10 +08:00
Kah Wei 7c64a12896 Moved spdlog lib link to SHADE_Engine and removed KTX references in Premake 2022-09-14 20:09:01 +08:00
Kah Wei e67b90c6a8 Added calls to SHScriptEngine in SBApplication 2022-09-14 20:07:13 +08:00
Kah Wei 08f3a52dab Merge branch 'main' into SP3-6-c-scripting
# Conflicts:
#	SHADE_Application/premake5.lua
#	SHADE_Engine/SHADE_Engine.vcxproj
#	SHADE_Engine/SHADE_Engine.vcxproj.filters
#	SHADE_Engine/premake5.lua
#	premake5.lua
2022-09-14 19:57:59 +08:00
Brandon Mak 44e529f06f Merge branch 'SP3-4-editor' into SP3-1-Rendering 2022-09-14 19:44:01 +08:00
XiaoQiDigipen b66e2cf3d1
Merge branch 'main' into UseSharedOutInterDirs 2022-09-14 19:40:33 +08:00
Cocoa 803b29146e Fixed memory error with SHLogger & spdlog
The logger needs to be registered outside the library. As such, a macro SHLOG_REGISTER has been added, as well as a variable to the actual logger. The logger needs to be passed into the macro anywhere outside the library after it has been initialised to work on the dll. This has already been done right before the application runs.
2022-09-14 17:57:36 +08:00
Kah Wei 44ef3a500f Added post build command to copy spdlog.dll to output 2022-09-14 13:29:23 +08:00
Sri Sham Haran a3e4b0a845 update premakes for spdlog changes 2022-09-14 09:14:18 +08:00
Cocoa 2332e5401f Merge branch 'main' into SP3-15-Tools 2022-09-13 23:29:44 +08:00
Cocoa e45e589ba9 Added functions that wrap around logging macros for C++/CLI integration 2022-09-13 23:29:20 +08:00
Kah Wei cba3aa0663 Converted SHADE_Engine to a DLL project and exported common use classes 2022-09-13 21:08:13 +08:00
Kah Wei 91709b16c3 Changed out and intermediatery directories for all projects to use shared directories 2022-09-13 20:35:30 +08:00
Kah Wei 60a51eb101 Converted projects to use MD instead of MT library 2022-09-13 18:24:39 +08:00
Kah Wei 0ed5cecbf3 Fixed ECS references in various files in SHADE_Managed 2022-09-13 15:18:56 +08:00
Sri Sham Haran a8d00a29ec [WIP] Editor: ImGui-Vulkan integration 2022-09-09 16:04:49 +08:00
Brandon Mak 94a358995a Window is rendering black screen 2022-09-09 13:32:55 +08:00
Brandon Mak bed017e539 Fixed some warnings and premake files now include hpp files 2022-09-09 13:28:57 +08:00
Brandon Mak fe6c5be8c6 Graphics System called in application 2022-09-09 11:20:38 +08:00
Brandon Mak 62c67909ee Rendering Integration 2022-09-08 19:11:25 +08:00
Diren D Bharwani 280ef33587 Added logging & exception handling tools into engine, modified premake5 on SHADE_Application to include spdlog 2022-09-08 12:51:23 +08:00
Xiao Qi ce37eb004c Removed GLFW window pointer, replaced with void pointer 2022-09-08 11:52:04 +08:00
Xiao Qi 8563ecb7e8 Imported Application, Engine, Scene Manager, Test Scene from 200 2022-09-08 11:48:32 +08:00
Xiao Qi aee5e3b4d6 Properly changed entrypoint to winmain 2022-09-05 15:29:02 +08:00
Xiao Qi 98bf020293 WinMain Entry point 2022-09-05 13:55:52 +08:00
Xiao Qi 0436ec45f6 Added dependencies into premake 2022-08-26 14:30:41 +08:00
Xiao Qi 3313127e8c Basic Project set up with premake 2022-08-26 14:04:03 +08:00