From a42a8b0c4626bfbe2e128aa9d17c542c7fd6cfd2 Mon Sep 17 00:00:00 2001 From: Brandon Mak Date: Fri, 16 Sep 2022 14:20:21 +0800 Subject: [PATCH] SH_API EVERYWHERE --- SHADE_Application/src/Application/SBApplication.cpp | 2 +- SHADE_Engine/src/ECS_Base/System/SHSystemManager.h | 3 ++- .../src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h | 2 +- .../src/Graphics/MiddleEnd/PerFrame/SHRenderContext.h | 3 ++- SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.h | 9 +++++---- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/SHADE_Application/src/Application/SBApplication.cpp b/SHADE_Application/src/Application/SBApplication.cpp index 61be1ae0..a378ff36 100644 --- a/SHADE_Application/src/Application/SBApplication.cpp +++ b/SHADE_Application/src/Application/SBApplication.cpp @@ -1,6 +1,6 @@ #include "SBpch.h" #include "SBApplication.h" -#include "Engine/ECS_Base/System/SHSystemManager.h" +#include "ECS_Base/System/SHSystemManager.h" #define SHEDITOR #ifdef SHEDITOR diff --git a/SHADE_Engine/src/ECS_Base/System/SHSystemManager.h b/SHADE_Engine/src/ECS_Base/System/SHSystemManager.h index d5a4866d..d4b960f9 100644 --- a/SHADE_Engine/src/ECS_Base/System/SHSystemManager.h +++ b/SHADE_Engine/src/ECS_Base/System/SHSystemManager.h @@ -20,12 +20,13 @@ #include #include #include "../System/SHSystem.h" +#include "SH_API.h" namespace SHADE { - class SHSystemManager + class SH_API SHSystemManager { //type definition for the container we use to store our system using SystemContainer = std::unordered_map>; diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h index eeaf6b12..f0a14930 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h +++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h @@ -63,7 +63,7 @@ namespace SHADE portions of the screen. */ /***********************************************************************************/ - class SHGraphicsSystem : public SHSystem + class SH_API SHGraphicsSystem : public SHSystem { public: /*-----------------------------------------------------------------------------*/ diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/PerFrame/SHRenderContext.h b/SHADE_Engine/src/Graphics/MiddleEnd/PerFrame/SHRenderContext.h index 7ed8cb82..04cea4e4 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/PerFrame/SHRenderContext.h +++ b/SHADE_Engine/src/Graphics/MiddleEnd/PerFrame/SHRenderContext.h @@ -3,6 +3,7 @@ #include #include "SHPerFrameData.h" +#include "SH_API.h" namespace SHADE { @@ -16,7 +17,7 @@ namespace SHADE //! render context in SHADE engine has is that it requires users to call these explicitly in the middle end. While there //! is little reason the flow of the render context should deviate from its intended usage, we want to leave it up to //! users to explicitly call functions from here so we don't risk losing opportunities for different usage. - class SHRenderContext + class SH_API SHRenderContext { private: //! container of frame data. Note that the manager owns the data, but the frame data themselves do not own anything. diff --git a/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.h b/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.h index 91f3f2ca..719c2d46 100644 --- a/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.h +++ b/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.h @@ -3,6 +3,7 @@ #include "Graphics/Renderpass/SHVkRenderpass.h" #include "Resource/ResourceLibrary.h" +#include "SH_API.h" #include #include @@ -28,7 +29,7 @@ namespace SHADE DEPTH_STENCIL, }; - class SHRenderGraphResource + class SH_API SHRenderGraphResource { private: /*-----------------------------------------------------------------------*/ @@ -74,11 +75,11 @@ namespace SHADE friend class SHRenderGraph; }; - class SHRenderGraphNode : public ISelfHandle + class SH_API SHRenderGraphNode : public ISelfHandle { public: - class SHSubpass + class SH_API SHSubpass { public: /*-----------------------------------------------------------------------*/ @@ -218,7 +219,7 @@ namespace SHADE friend class SHRenderGraph; }; - class SHRenderGraph + class SH_API SHRenderGraph { private: /*-----------------------------------------------------------------------*/