From c38eda579961f0c6961055cc139df0ef98484ae1 Mon Sep 17 00:00:00 2001 From: Wojciech Figat Date: Wed, 14 Dec 2022 14:04:14 +0100 Subject: [PATCH] Fixes for compilation --- Source/Engine/Content/AssetInfo.h | 5 +---- Source/Engine/Content/Content.cpp | 5 +++++ Source/Engine/Engine/Base/GameBase.h | 2 ++ Source/Engine/Render2D/FontTextureAtlas.cpp | 1 + Source/Engine/Renderer/Utils/MultiScaler.h | 1 + 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Source/Engine/Content/AssetInfo.h b/Source/Engine/Content/AssetInfo.h index 7cb44b0f8..169352e62 100644 --- a/Source/Engine/Content/AssetInfo.h +++ b/Source/Engine/Content/AssetInfo.h @@ -54,8 +54,5 @@ public: /// Gets the string. /// /// The string. - String ToString() const - { - return String::Format(TEXT("ID: {0}, TypeName: {1}, Path: \'{2}\'"), ID, TypeName, Path); - } + String ToString() const; }; diff --git a/Source/Engine/Content/Content.cpp b/Source/Engine/Content/Content.cpp index e0910f48f..1e1f81e09 100644 --- a/Source/Engine/Content/Content.cpp +++ b/Source/Engine/Content/Content.cpp @@ -34,6 +34,11 @@ TimeSpan Content::AssetsUnloadInterval = TimeSpan::FromSeconds(10); Delegate Content::AssetDisposing; Delegate Content::AssetReloading; +String AssetInfo::ToString() const +{ + return String::Format(TEXT("ID: {0}, TypeName: {1}, Path: \'{2}\'"), ID, TypeName, Path); +} + namespace { // Assets diff --git a/Source/Engine/Engine/Base/GameBase.h b/Source/Engine/Engine/Base/GameBase.h index 31396490b..b883d76d6 100644 --- a/Source/Engine/Engine/Base/GameBase.h +++ b/Source/Engine/Engine/Base/GameBase.h @@ -2,6 +2,8 @@ #pragma once +#include "Engine/Core/Types/BaseTypes.h" + /// /// Build game header flags. /// diff --git a/Source/Engine/Render2D/FontTextureAtlas.cpp b/Source/Engine/Render2D/FontTextureAtlas.cpp index 75e63dda0..84d3efd16 100644 --- a/Source/Engine/Render2D/FontTextureAtlas.cpp +++ b/Source/Engine/Render2D/FontTextureAtlas.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2012-2022 Wojciech Figat. All rights reserved. #include "FontTextureAtlas.h" +#include "Engine/Core/Log.h" #include "Engine/Core/Types/DataContainer.h" #include "Engine/Content/Factories/BinaryAssetFactory.h" #include "Engine/Graphics/PixelFormat.h" diff --git a/Source/Engine/Renderer/Utils/MultiScaler.h b/Source/Engine/Renderer/Utils/MultiScaler.h index 2e9fe2a26..9b2031c73 100644 --- a/Source/Engine/Renderer/Utils/MultiScaler.h +++ b/Source/Engine/Renderer/Utils/MultiScaler.h @@ -3,6 +3,7 @@ #pragma once #include "../RendererPass.h" +#include "Engine/Graphics/GPUContext.h" #include "Engine/Graphics/GPUPipelineStatePermutations.h" ///