0373754e37
Merge branch 'main' into SP3-5-ECS
2022-09-16 14:06:05 +08:00
c89fe48182
Merge branch 'BackTo5.0' into SP3-6-c-scripting
2022-09-16 14:04:56 +08:00
aaf3d67eed
Downgraded back to .NET 5.0 due to lack of VS 2019 support
2022-09-16 14:02:55 +08:00
6f67c1acc7
Base Editor (WIP, no vulkan)
2022-09-16 13:55:29 +08:00
b933b0f7fc
Added SerializeField attribute
2022-09-16 13:13:38 +08:00
f0b9f19f4d
clear color value fix
2022-09-16 12:33:42 +08:00
1dde480a9f
Merge branch 'main' into SP3-18-Events
2022-09-15 18:38:11 +08:00
f9743f394d
Added some lines in comments for clarity
2022-09-15 18:37:05 +08:00
e1074887c8
Added instructions
2022-09-15 18:34:07 +08:00
5af0bf7d25
Instructions on how to use events
2022-09-15 18:33:36 +08:00
382d75528a
Removed and ignored VS project and solution files
2022-09-15 12:50:48 +08:00
e5b7742955
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# Dependencies.bat
2022-09-15 12:22:37 +08:00
7900c52984
Merge branch 'main' into SP3-5-ECS
2022-09-15 12:18:20 +08:00
a90c137445
#comment Completed System Routine Added Unit Test version 1
2022-09-15 12:10:06 +08:00
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
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
e1fb74f784
SHADE_Engine now copies the SDL2.dll to the out directory
2022-09-15 11:55:22 +08:00
9b25d909dd
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Engine/SHADE_Engine.vcxproj.filters
2022-09-15 11:43:30 +08:00
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
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
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
67290c03e7
Updated vcxproj files
2022-09-15 11:34:04 +08:00
c48a467e57
Disabled warnings for DLL export
2022-09-15 11:33:40 +08:00
12cfbb9952
Fixed SHDotNetRuntime::IsLoaded() giving incorrect data and updated qualifiers and comment formats
2022-09-15 11:25:58 +08:00
20f4b59f41
Merge branch 'main' into SDLIntegration
2022-09-15 09:30:03 +08:00
bd69c6043a
SDL Updates
2022-09-15 09:26:43 +08:00
79828740fd
Fixed hot reloading copying the wrong DLL
2022-09-15 09:21:51 +08:00
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
169822c221
Render graph execution fixed
...
GetVkQueue function deleted. More specific function implemented (Present).
2022-09-15 09:16:13 +08:00
196ef93fed
CSProj for SHADE_Scripting is now generated if a build is attempted without it existing
2022-09-15 09:11:02 +08:00
d62201367a
Merge branch 'main' into SP3-18-Events
2022-09-15 09:10:49 +08:00
8e601e60e5
Added SHCommonTypes header file
...
Changed C++ std from latest to 20
Updated premake program
2022-09-15 01:51:04 +08:00
a3b1660013
SP3-108 Removed old event register method
...
added new events define
2022-09-15 01:46:11 +08:00
98d61f1ca7
Merge branch 'main' into SetWorkingDirectory
2022-09-15 01:39:10 +08:00
5e4eabc582
[WIP] SDL Window wrap
2022-09-15 00:48:43 +08:00
7bc0dfb399
Set working directory of the application to be the executable location
2022-09-15 00:33:12 +08:00
a2353e4446
frc commit, not connected yet
2022-09-14 22:00:00 +08:00
599f1e4ffe
add sdl to dependencies
2022-09-14 21:47:39 +08:00
57393ad7e4
Updated projects to use .NET 6.0
2022-09-14 20:29:40 +08:00
95c3609d21
Removed all references to Plushie
2022-09-14 20:26:31 +08:00
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
7c64a12896
Moved spdlog lib link to SHADE_Engine and removed KTX references in Premake
2022-09-14 20:09:01 +08:00
e67b90c6a8
Added calls to SHScriptEngine in SBApplication
2022-09-14 20:07:13 +08:00
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
44e529f06f
Merge branch 'SP3-4-editor' into SP3-1-Rendering
2022-09-14 19:44:01 +08:00
b66e2cf3d1
Merge branch 'main' into UseSharedOutInterDirs
2022-09-14 19:40:33 +08:00
921680d472
Deleted editor folder
2022-09-14 19:19:54 +08:00
7459e19846
Changes
2022-09-14 19:19:24 +08:00
5a1abe6530
Auto stash before merge of "SP3-4-editor" and "origin/SP3-4-editor"
2022-09-14 19:18:54 +08:00
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
fdc8a61c1d
Added SHWindow to SHImguiWindow
2022-09-14 16:01:40 +08:00
44ef3a500f
Added post build command to copy spdlog.dll to output
2022-09-14 13:29:23 +08:00
b7cd1bed48
Added System Routines
2022-09-14 10:32:50 +08:00
a3e4b0a845
update premakes for spdlog changes
2022-09-14 09:14:18 +08:00
2332e5401f
Merge branch 'main' into SP3-15-Tools
2022-09-13 23:29:44 +08:00
e45e589ba9
Added functions that wrap around logging macros for C++/CLI integration
2022-09-13 23:29:20 +08:00
cba3aa0663
Converted SHADE_Engine to a DLL project and exported common use classes
2022-09-13 21:08:13 +08:00
91709b16c3
Changed out and intermediatery directories for all projects to use shared directories
2022-09-13 20:35:30 +08:00
0c28199acf
Converted SHScriptEngine to static and replaced json references with yaml
2022-09-13 20:30:32 +08:00
4ccfd399af
Renderpass execution and descriptor set writes
2022-09-13 19:46:51 +08:00
60a51eb101
Converted projects to use MD instead of MT library
2022-09-13 18:24:39 +08:00
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
f342fdcb95
changed more stuff to pragma once
2022-09-13 15:36:34 +08:00
8842269c6d
Changed everything to use pragma once
2022-09-13 15:36:03 +08:00
e9241feb69
moved all managers to their own folder
2022-09-13 15:26:23 +08:00
0ed5cecbf3
Fixed ECS references in various files in SHADE_Managed
2022-09-13 15:18:56 +08:00
d483916cc5
Changed SystemManager to use SystemID map instead of using a string map
2022-09-13 14:28:32 +08:00
3b9d14944e
SP3-102 Changed all previous references to updated versions. Removed function call to obsolete functons
2022-09-13 14:23:33 +08:00
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
51fc65b825
Added some typedefs
2022-09-13 14:07:40 +08:00
8b8f0a076d
Added const to some functions
2022-09-13 13:57:01 +08:00
9c5a705bef
Merge branch 'main' into SP3-5-ECS
2022-09-13 13:52:52 +08:00
b674805547
Added ECS and Component classes for SHADE_Managed
2022-09-13 13:51:11 +08:00
5f56344a74
Shifted ECS_Base out of Engine Folder
2022-09-13 13:49:24 +08:00
1cabcefe0f
SP3-102 Initial port of 200 resource manager into 300 Asset manager
2022-09-13 13:37:32 +08:00
88894d1c3c
Merge branch 'main' into SP3-5-ECS
2022-09-13 13:30:21 +08:00
4ed417cbea
Added EngineInterface
2022-09-13 11:43:49 +08:00
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
615d247722
Merge branch 'main' into SP3-12-SceneGraph
2022-09-13 11:40:08 +08:00
7b55f7fe3b
Merge branch 'main' into SP3-14-FileSystem
2022-09-13 11:36:11 +08:00
4aedf9f65a
Added new shaderc lib link
...
WALAO BRANDON
2022-09-13 11:35:36 +08:00
b6a6e9b3e5
Updated some const
2022-09-13 11:28:16 +08:00
47f716f72b
SP3-105 SP3-106
...
Folder tree building done
Location bit shift done
2022-09-13 11:27:51 +08:00
8f7d8cd8bc
Added vertex attributes
2022-09-13 09:13:39 +08:00
ccdb1d0e19
Added shlwapi.lib linker input for SHADE_Engine
2022-09-13 00:18:54 +08:00
506d3a1c35
WIP
2022-09-12 20:08:01 +08:00
1400a25c4d
Added SHADE_Managed project and added patched premake5.exe
2022-09-12 17:46:01 +08:00
548b09df06
Added SHScriptEngine and SHDotNetRuntime for managed code execution
2022-09-12 16:04:22 +08:00
ba5bea9d53
Added dotnet dependencies acquisition
2022-09-12 16:04:08 +08:00
d4944ef920
Added a scene graph
2022-09-11 22:47:30 +08:00
47e9e3d3f2
WIP
2022-09-11 22:34:55 +08:00
bf447c1d1d
Auto stash before merge of "SP3-4-editor" and "origin/SP3-4-editor"
2022-09-11 20:03:11 +08:00
4b8c842615
[WIP] SHADE ImGui Vulkan Backend
2022-09-09 21:46:30 +08:00
a8d00a29ec
[WIP] Editor: ImGui-Vulkan integration
2022-09-09 16:04:49 +08:00
09c1d2654d
WIP
2022-09-09 16:02:34 +08:00
4eb7e1f5f4
Merge branch 'SP3-1-Rendering' into SP3-4-editor
2022-09-09 14:38:28 +08:00
361237ede1
GETTER FOR RENDER GRAPH
2022-09-09 14:38:09 +08:00
122dc2f531
Merge branch 'SP3-1-Rendering' into SP3-4-editor
2022-09-09 14:35:23 +08:00
ae372f2917
Getter for renderpass in render node
2022-09-09 14:34:09 +08:00
8208e14fed
Merge branch 'SP3-1-Rendering' into SP3-4-editor
2022-09-09 14:21:42 +08:00
d7954245d6
Created a descriptor pool for Graphics System
2022-09-09 14:21:13 +08:00
8ab95e9a6d
Merge branch 'SP3-1-Rendering' into SP3-4-editor
2022-09-09 14:04:11 +08:00
fe954271cb
Getter for queue
2022-09-09 14:02:48 +08:00
03075ce738
Merge branch 'SP3-1-Rendering' into SP3-4-editor
2022-09-09 13:55:14 +08:00
78f8a9e455
Getter for physical device
2022-09-09 13:55:00 +08:00
b164ecbd16
Merge branch 'SP3-1-Rendering' into SP3-4-editor
2022-09-09 13:37:10 +08:00
bed017e539
Fixed some warnings and premake files now include hpp files
2022-09-09 13:28:57 +08:00
cce1d24374
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-09 11:20:46 +08:00
fe6c5be8c6
Graphics System called in application
2022-09-09 11:20:38 +08:00
f0b916b275
Added missing inverse function for Quaternions
2022-09-08 23:21:02 +08:00
392b51898a
Added more implementations for Quaternions
2022-09-08 22:46:51 +08:00
cecbca26c5
Fixed some warnings in ResourceLibrary and SparseSet
2022-09-08 20:55:56 +08:00
28ab89cf91
set up backend functions
2022-09-08 20:34:44 +08:00
01ff98b24f
Merge branch 'main' into SP3-16-Math
...
# Conflicts:
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/src/SHpch.h
2022-09-08 19:46:06 +08:00
407ac11753
Merge branch 'main' into SP3-4-editor
2022-09-08 19:38:09 +08:00
32dc894608
SHEditor Base
2022-09-08 19:37:49 +08:00
62c67909ee
Rendering Integration
2022-09-08 19:11:25 +08:00
8cdd8b4a25
Added Math helper functions & wrappers for Vectors, Matrix and Quaternion.
2022-09-08 14:18:26 +08:00
280ef33587
Added logging & exception handling tools into engine, modified premake5 on SHADE_Application to include spdlog
2022-09-08 12:51:23 +08:00
4c5c5f61e8
Merge branch 'main' into SP3-5-ECS
2022-09-08 12:17:10 +08:00
85a63cec1f
#comment removed two CreateEntity function overloads and added a default value to desired EID instead
2022-09-08 12:06:29 +08:00
8563ecb7e8
Imported Application, Engine, Scene Manager, Test Scene from 200
2022-09-08 11:48:32 +08:00
9a223098f6
Initial Commit
2022-09-08 11:17:25 +08:00
cfa7bb812a
#comment initial commit added use of SHpch
2022-09-08 11:15:43 +08:00
ead46d0ef1
Merge branch 'main' into SP3-5-ECS
2022-09-08 11:09:36 +08:00
04ee50bc6a
Generated solution
2022-09-08 11:08:46 +08:00
1105edb8c2
initial commit
2022-09-08 11:08:23 +08:00
060937344b
Update Dependencies and Premake
2022-09-06 10:39:12 +08:00
aee5e3b4d6
Properly changed entrypoint to winmain
2022-09-05 15:29:02 +08:00
d74ac7b8a4
Added dependencies to project
2022-09-05 14:37:29 +08:00
98bf020293
WinMain Entry point
2022-09-05 13:55:52 +08:00
0436ec45f6
Added dependencies into premake
2022-08-26 14:30:41 +08:00
3313127e8c
Basic Project set up with premake
2022-08-26 14:04:03 +08:00
Xiao Qi