Commit Graph

204 Commits

Author SHA1 Message Date
Xiao Qi a867ecbcbf SP3-108 Shifted definitions for functions in Event Manager from cpp to hpp 2022-09-19 17:08:08 +08:00
XiaoQiDigipen 37fde32e7c
Merge pull request #30 from SHADE-DP/SP3-5-ECS
Sp3-5-ECS
Added Entity Creation/Destroyed events
2022-09-18 16:51:54 +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
XiaoQiDigipen 02b17095d0
Merge pull request #29 from SHADE-DP/SP3-18-Events
SP3-18 Event/Messaging System
2022-09-18 13:42:52 +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
XiaoQiDigipen 5ff765c6b9
Merge pull request #28 from SHADE-DP/SP3-1-Rendering
Rendering system updates 

SH_APIed appropriate classes
Routine class for graphics created but not called via RunRoutines (Daniel needs to call this in application I believe)
2022-09-16 15:02:34 +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
Xiao Qi 7315d3038f Fixed outdated header includes in cxx files
Changed references to isActive to function calls
2022-09-16 14:14:51 +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
XiaoQiDigipen 7a7807b7fa
Merge pull request #26 from SHADE-DP/BackTo5.0
Downgraded back to .NET 5.0 due to lack of VS 2019 support
2022-09-16 14:05:30 +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
XiaoQiDigipen cf3f74e47d
Merge pull request #25 from SHADE-DP/SP3-18-Events
SP3-18 SP3-108 Event/Messaging System

Ported over Events Manager from 200
Removed singleton design pattern
Removed event package design
Implemented event dynamic data

Instructions to use are in SHEventManager.h
2022-09-16 01:33:47 +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
XiaoQiDigipen 415451535c
Merge pull request #24 from SHADE-DP/IgnoreVcxProjSln
Removed and ignored VS project and solution files
2022-09-15 17:10:33 +08:00
Kah Wei 382d75528a Removed and ignored VS project and solution files 2022-09-15 12:50:48 +08:00
XiaoQiDigipen ae570969ad
Merge pull request #23 from SHADE-DP/SP3-6-c-scripting
Integration of .NET Scripting Backend 

After this is merged, the following tools need to be installed in Visual Studio:

C++/CLI support for v142 build tools
.NET 6.0 Runtime
2022-09-15 12:31:30 +08:00
Kah Wei 2714503efa Fixed warnings 2022-09-15 12:28:53 +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 6da2fa9c4e
Merge pull request #22 from SHADE-DP/SP3-209-System-Manager-Rework
Sp3 209 system manager rework
2022-09-15 12:14:14 +08:00
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