xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity
275 Commits 81 Branches 9 Tags 86 MiB
Commit Graph

275 Commits

Author SHA1 Message Date
Glence 58cd71110a Merge remote-tracking branch 'origin/main' into main 2022-09-15 12:10:50 +08:00
Glence f6ad22530a fix dependencies.bat 2022-09-15 12:10:45 +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
XiaoQiDigipen e1b7cb05bf
Merge pull request #20 from SHADE-DP/CopySDLDLL 
SHADE_Engine now copies the SDL2.dll to the out directory
 2022-09-15 12:02:45 +08:00
Kah Wei e1fb74f784 SHADE_Engine now copies the SDL2.dll to the out directory 2022-09-15 11:55:22 +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
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
XiaoQiDigipen d680a07918
Merge pull request #19 from SHADE-DP/DisableDllWarnings 
Disable DLL Export Warnings (4251)

Might not be the 100% correct way but in existing usage in GAM 200, there were no issues at all.
 2022-09-15 11:38:27 +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 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
Kah Wei 12cfbb9952 Fixed SHDotNetRuntime::IsLoaded() giving incorrect data and updated qualifiers and comment formats 2022-09-15 11:25:58 +08:00
Xiao Qi ff3f5db397 Merge remote-tracking branch 'origin/main' into main 2022-09-15 09:32:23 +08:00
XiaoQiDigipen 96a844c9d8
Merge pull request #17 from SHADE-DP/SDLIntegration 
SDL integration (To Archive SDLIntegration Branch)

Integrate SDL into application (For editor usage)
 2022-09-15 09:31:51 +08:00
Xiao Qi 8f09c0b34c Replaced premake exe with custom compiled one 2022-09-15 09:31:37 +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 9a97d12d96 Fixed SHADE_Managed target and intermediate directory paths 2022-09-15 09:23:40 +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
XiaoQiDigipen 0cf4093b63
Merge pull request #16 from SHADE-DP/SetWorkingDirectory 
Set working directory of the application to be the executable location
 2022-09-15 01:39:33 +08:00
XiaoQiDigipen 98d61f1ca7
Merge branch 'main' into SetWorkingDirectory 2022-09-15 01:39:10 +08:00
XiaoQiDigipen cff0b29ce8
Merge pull request #15 from SHADE-DP/CleanUpPremake 
Moved spdlog lib link to SHADE_Engine and removed KTX references in Premake
 2022-09-15 01:37:32 +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
mushgunAX a2353e4446 frc commit, not connected yet 2022-09-14 22:00:00 +08:00
Sri Sham Haran 599f1e4ffe add sdl to dependencies 2022-09-14 21:47:39 +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 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 becce86160
Merge pull request #14 from SHADE-DP/UseSharedOutInterDirs 
Convert SHADE_Engine to a DLL and made all projects use a shared output and intermediate directory
 2022-09-14 19:40:50 +08:00
XiaoQiDigipen b66e2cf3d1
Merge branch 'main' into UseSharedOutInterDirs 2022-09-14 19:40:33 +08:00
XiaoQiDigipen 414b6204a5
Merge pull request #13 from SHADE-DP/SP3-15-Tools 
SP3-15 Tools
NEW

Added Logging Functions that wrap around logging macros for C++/CLI
 2022-09-14 19:29:12 +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
Kah Wei 44ef3a500f Added post build command to copy spdlog.dll to output 2022-09-14 13:29:23 +08:00