editor mode switch with pressing P

YasirNacak · Oct 22, 2018 · 498a4f4 · 498a4f4 · YasirNacak · Oct 22, 2018
1 parent 5e4de95
commit 498a4f4
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 14 deletions.
diff --git a/src/Engine.cpp b/src/Engine.cpp
@@ -4,7 +4,7 @@
 namespace s3d {
 	bool Engine::Initialize(HINSTANCE hInstance, std::string windowTitle, std::string windowClass, int width, int height)
 	{
-		_keyboard.DisableAutoRepeatChars();
+		_keyboard.DisableAutoRepeatKeys();
 		width = GetSystemMetrics(SM_CXSCREEN);
 		height = GetSystemMetrics(SM_CYSCREEN);
 
@@ -13,6 +13,8 @@ namespace s3d {
 
 		_timer.Start();
 
+		IsInDebugMode = false;
+
 		if(!this->_renderWindow.Initialize(
 			this,
 			hInstance,
@@ -42,6 +44,9 @@ namespace s3d {
 		float dt = static_cast<float>(_timer.GetMillisecondsElapsed());
 		_timer.Restart();
 
+		_entityManager.Refresh();
+		_entityManager.Update(dt);
+
 		while(!_keyboard.IsCharBufferEmpty())
 		{
 			const auto ch = _keyboard.ReadChar();
@@ -51,6 +56,11 @@ namespace s3d {
 		{
 			auto kbe = _keyboard.ReadKey();
 			const auto keycode = kbe.GetKeyCode();
+
+			if(keycode == '0' && kbe.IsPress())
+			{
+				IsInDebugMode = !IsInDebugMode;
+			}
 		}
 
 		/*

diff --git a/src/Engine.h b/src/Engine.h
@@ -20,6 +20,8 @@ namespace s3d {
 
 		void ShowDebugPanels();
 
+		bool IsInDebugMode;
+
 	private:
 		utility::Timer _timer;
 		entitysystem::Manager _entityManager;

diff --git a/src/graphics/Graphics.cpp b/src/graphics/Graphics.cpp
@@ -382,22 +382,33 @@ namespace s3d { namespace graphics {
 
 			this->_deviceContext->DrawIndexed(_indexBuffer.GetBufferSize(), 0, 0);
 		}
-#if _DEBUG
-		static int fpsCounter = 0;
-		static std::string fpsString = "FPS: 0";
-		fpsCounter += 1;
-		if (_fpsTimer.GetMillisecondsElapsed() > 1000.0)
+		if(engine.IsInDebugMode)
 		{
-			fpsString = "FPS: " + std::to_string(fpsCounter);
-			fpsCounter = 0;
-			_fpsTimer.Restart();
+			static int fpsCounter = 0;
+			static std::string fpsString = "FPS: 0";
+			fpsCounter += 1;
+
+			if (_fpsTimer.GetMillisecondsElapsed() > 1000.0)
+			{
+				fpsString = "FPS: " + std::to_string(fpsCounter);
+				fpsCounter = 0;
+				_fpsTimer.Restart();
+			}
+
+			engine.ShowDebugPanels();
+
+			_spriteBatch->Begin();
+			_spriteFont->DrawString(
+				_spriteBatch.get(),
+				utility::StringConverter::StringToWide(fpsString).c_str(),
+				DirectX::XMFLOAT2(_windowWidth - 100, -2.5f),
+				DirectX::Colors::White, 0.0f,
+				DirectX::XMFLOAT2(0.0f, 0.0f),
+				DirectX::XMFLOAT2(1.0f, 1.0f));
+			_spriteBatch->End();
 		}
-		engine.ShowDebugPanels();
-#endif
+
 		_spriteBatch->Begin();
-#if _DEBUG
-		_spriteFont->DrawString(_spriteBatch.get(), utility::StringConverter::StringToWide(fpsString).c_str(), DirectX::XMFLOAT2(_windowWidth - 100, 0), DirectX::Colors::Lime, 0.0f, DirectX::XMFLOAT2(0.0f, 0.0f), DirectX::XMFLOAT2(1.0f, 1.0f));
-#endif
 		_spriteBatch->End();
 
 		this->_swapChain->Present(0, NULL);