Debug Display Issue #13 (#14)

fix #13

Author: Seng-Jik

Core/DebugDisplay.h

@@ -1,10 +1,12 @@
 #pragma once
+#include <functional>
 #include "SMath.h"
 #include "Object.h"
 #include "FontRenderer.h"
 
 namespace Snowing::Scene
 {
+	
 	template <
 		typename TFontRenderer,
 		typename TFont,
@@ -13,9 +15,8 @@ namespace Snowing::Scene
 		typename TGraphics,
 		typename TBuffer,
 		typename TEngine,
-		typename TWindow,
-		typename TDataGetter>
-		class DebugDisplayInterface final : public Object
+		typename TWindow>
+	class DebugDisplayInterface final : public Object
 	{
 	private:
 		const Math::Coordinate2DRect screenCoord_ =
@@ -39,18 +40,22 @@ namespace Snowing::Scene
 
 		const std::map<wchar_t, Math::Vec2f> &fix_;
 		const std::wstring title_;
-		typename std::decay<TDataGetter>::type getter_;
+		std::function<std::wstring()> getter_;
+
+		constexpr static size_t MaxLines = 100;
+
+		static inline bool lineNums_[MaxLines];
+		size_t lineNum_;
 
 	public:
-		template <typename WString,typename TDataGetter>
+		template <typename WString>
 		DebugDisplayInterface(
 			TEffect *effect,
 			TTech *tech,
 			const TFont *font,
 			const std::map<wchar_t, Math::Vec2f> *fix,
 			WString &&title,
-			TDataGetter&& dataGetter,
-			size_t lineNum) :
+			const std::function<std::wstring()>& dataGetter) :
 			fr_{
 				&TGraphics::Get().MainContext(),
 				effect,
@@ -62,9 +67,22 @@ namespace Snowing::Scene
 			font_ { *font },
 			fix_ { *fix },
 			title_ { std::forward<WString>(title) },
-			getter_{ std::forward<TDataGetter>(dataGetter) }
+			getter_{ dataGetter }
+		{
+			for (lineNum_ = 0; lineNum_ < 100; ++lineNum_)
+			{
+				if (!lineNums_[lineNum_])
+				{
+					lineNums_[lineNum_] = true;
+					break;
+				}
+			}
+			box_.y -= 12.0f * lineNum_;
+		}
+
+		~DebugDisplayInterface()
 		{
-			box_.y -= 12.0f * lineNum;
+			lineNums_[lineNum_] = false;
 		}
 
 		DebugDisplayInterface(DebugDisplayInterface&&) = delete;
@@ -76,7 +94,7 @@ namespace Snowing::Scene
 		{
 			const std::wstring s =
 				title_ + L":" +
-				To<std::wstring>(getter_());
+				getter_();
 
 			Graphics::FontSprite::SetString(
 				s,
@@ -98,5 +116,13 @@ namespace Snowing::Scene
 
 			return true;
 		}
+
+		static const inline std::function<std::wstring()> FrameTimeGetter = [] {
+			return To<std::wstring>(TEngine::Get().DeltaTime() * 1000);
+		};
+
+		static const inline std::function<std::wstring()> FPSGetter = [] {
+			return To<std::wstring>(1 / TEngine::Get().DeltaTime());
+		};
 	};
 }

Snowing.sln

@@ -10,7 +10,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{21DD2D80-0749-4059-8515-34EFEF24DEBD}"
 	ProjectSection(SolutionItems) = preProject
 		License.md = License.md
-		README.md = README.md
+		Readme.md = Readme.md
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestWindowsInput", "TestWindowsInput\TestWindowsInput.vcxproj", "{AABB5086-262E-4DBE-AAD6-EFF23211272C}"

TestWindows/ObjectTest.cpp

@@ -416,18 +416,14 @@ static void TestDebugDisplay(Math::Vec2<int> size)
 		&Graphics::Device::MainContext(),
 		&Graphics::Device::MainRenderTarget());
 
-	auto timeShow = [] {
-		return Engine::Get().DeltaTime() * 1000;
-	};
-
-	auto fpsShow = [] {
-		return 1 / Engine::Get().DeltaTime();
-	};
+	
 
 	std::map<wchar_t, Math::Vec2f> fix{};
 
-	g.Emplace<Scene::DebugDisplay<decltype(timeShow)>>(&eff, &tech1, &font, &fix, L"Time", timeShow, 0);
-	g.Emplace<Scene::DebugDisplay<decltype(fpsShow)>>(&eff, &tech1, &font, &fix, L"FPS", fpsShow, 1);
+	g.Emplace<Scene::DebugDisplay>(
+		&eff, &tech1, &font, &fix, L"Time", Scene::DebugDisplay::FrameTimeGetter);
+	g.Emplace<Scene::DebugDisplay>(
+		&eff, &tech1, &font, &fix, L"FPS", Scene::DebugDisplay::FPSGetter);
 	g.Emplace<Scene::VirtualTask>(0.5f, [] {Engine::Get().Exit(); });
 
 	Engine::Get().RunObject(g);

WindowsImpl/Impls.h

@@ -65,17 +65,15 @@ namespace Snowing::Scene
 	using TextMenuItem = TextMenuItemInterface<
 		Graphics::FontRenderer<>>;
 
-	template <typename TDataGetter>
 	using DebugDisplay = DebugDisplayInterface <
-		Graphics::FontRenderer<Graphics::Sprite,Graphics::SpriteSheet,64>,
+		Graphics::FontRenderer<Graphics::Sprite, Graphics::SpriteSheet, 64>,
 		Graphics::Font,
 		Graphics::Effect,
 		Graphics::EffectTech,
 		Graphics::Device,
 		Graphics::Buffer,
 		Engine,
-		Graphics::Window,
-		TDataGetter>;
+		Graphics::Window>;
 
 	using RenderTargetCleaner = RenderTargetCleanerInterface<
 		Graphics::RenderTarget,