Commit Graph

86 Commits

Author SHA1 Message Date
Brandon Mak a42a8b0c46 SH_API EVERYWHERE 2022-09-16 14:20:21 +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
Kah Wei aaf3d67eed Downgraded back to .NET 5.0 due to lack of VS 2019 support 2022-09-16 14:02:55 +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
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 9b25d909dd Merge branch 'main' into SP3-6-c-scripting
# Conflicts:
#	SHADE_Engine/SHADE_Engine.vcxproj.filters
2022-09-15 11:43:30 +08:00
XiaoQiDigipen 5ebdf87714
Merge pull request #18 from SHADE-DP/SP3-19-frame-rate-controller
FRC implemented
Handles the main game loop, which includes:

Handling restarting of scenes by freeing and initializing again
Handling changes of scenes by unloading previous scene and loading the next
Calling to update on a fixed time basis and reducing the accumulator
Calling to render on a variable time basis and adding to the accumulator
Measuring of variable time elapsed per frame
Ready for integration. Anticipating much change from this implementation during integration.
2022-09-15 11:34:53 +08:00
Kah Wei 12cfbb9952 Fixed SHDotNetRuntime::IsLoaded() giving incorrect data and updated qualifiers and comment formats 2022-09-15 11:25:58 +08:00
Kah Wei 79828740fd Fixed hot reloading copying the wrong DLL 2022-09-15 09:21:51 +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
Kah Wei 196ef93fed CSProj for SHADE_Scripting is now generated if a build is attempted without it existing 2022-09-15 09:11:02 +08:00
Xiao Qi d62201367a Merge branch 'main' into SP3-18-Events 2022-09-15 09:10:49 +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
Xiao Qi a3b1660013 SP3-108 Removed old event register method
added new events define
2022-09-15 01:46:11 +08:00
Kah Wei 7bc0dfb399 Set working directory of the application to be the executable location 2022-09-15 00:33:12 +08:00
mushgunAX a2353e4446 frc commit, not connected yet 2022-09-14 22:00:00 +08:00
Kah Wei 57393ad7e4 Updated projects to use .NET 6.0 2022-09-14 20:29:40 +08:00
Kah Wei 95c3609d21 Removed all references to Plushie 2022-09-14 20:26:31 +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
Brandon Mak 921680d472 Deleted editor folder 2022-09-14 19:19:54 +08:00
Brandon Mak 7459e19846 Changes 2022-09-14 19:19:24 +08:00
Brandon Mak 5a1abe6530 Auto stash before merge of "SP3-4-editor" and "origin/SP3-4-editor" 2022-09-14 19:18:54 +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
Sri Sham Haran fdc8a61c1d Added SHWindow to SHImguiWindow 2022-09-14 16:01:40 +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 0c28199acf Converted SHScriptEngine to static and replaced json references with yaml 2022-09-13 20:30:32 +08:00
Brandon Mak 4ccfd399af Renderpass execution and descriptor set writes 2022-09-13 19:46:51 +08:00
Xiao Qi 23a599abe8 SP3-107 SP3-108
Initial port from 200
Removed unused classes
Changing Event package for better ease of use
2022-09-13 16:34:05 +08:00
Kah Wei 0ed5cecbf3 Fixed ECS references in various files in SHADE_Managed 2022-09-13 15:18:56 +08:00
Kah Wei 04cae0fad9 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-13 14:09:32 +08:00
Kah Wei b674805547 Added ECS and Component classes for SHADE_Managed 2022-09-13 13:51:11 +08:00
Xiao Qi 5f56344a74 Shifted ECS_Base out of Engine Folder 2022-09-13 13:49:24 +08:00
Kah Wei 4ed417cbea Added EngineInterface 2022-09-13 11:43:49 +08:00
XiaoQiDigipen cc2adcb2ab
Merge pull request #11 from SHADE-DP/SP3-14-FileSystem
File system base Implementation

Basic tree structure for file system created
Directory traversal with tree building
2022-09-13 11:42:30 +08:00
Xiao Qi 7b55f7fe3b Merge branch 'main' into SP3-14-FileSystem 2022-09-13 11:36:11 +08:00
Xiao Qi b6a6e9b3e5 Updated some const 2022-09-13 11:28:16 +08:00
Xiao Qi 47f716f72b SP3-105 SP3-106
Folder tree building done
Location bit shift done
2022-09-13 11:27:51 +08:00
Brandon Mak 8f7d8cd8bc Added vertex attributes 2022-09-13 09:13:39 +08:00
Brandon Mak 506d3a1c35 WIP 2022-09-12 20:08:01 +08:00
Kah Wei 548b09df06 Added SHScriptEngine and SHDotNetRuntime for managed code execution 2022-09-12 16:04:22 +08:00