Reworking usage of keys in DasherCore and adding keyboard input for UI

Author: Sebastian Pape

DasherCore

@@ -110,11 +110,11 @@ void DasherController::Render(long deltaTime, ImVec2 canvasPos, ImVec2 canvasSiz
 	//Handle Input
 	if (ImGui::IsMouseClicked(ImGuiMouseButton_Left) && ImGui::IsMouseHoveringRect(canvasPos, canvasPos + canvasSize))
 	{
-		KeyDown(Time, 100); //100 is the keycode for LMB
+		KeyDown(Time, Dasher::Keys::Primary_Input); //100 is the keycode for LMB
 	}
 
 	if(ImGui::IsMouseReleased(ImGuiMouseButton_Left))
 	{
-		KeyUp(Time, 100); //100 is the keycode for LMB
+		KeyUp(Time, Dasher::Keys::Primary_Input); //100 is the keycode for LMB
 	}
 }

src/DasherController.cpp

@@ -21,6 +21,45 @@ MainWindow::MainWindow()
 
 }
 
+#define FORWARD_KEY(ImGui_Key, DasherKey) { \
+	if(ImGui::IsKeyPressed(ImGui_Key, false)) Controller->KeyDown(time, DasherKey); \
+	if(ImGui::IsKeyReleased(ImGui_Key, false)) Controller->KeyUp(time, DasherKey); \
+}
+void MainWindow::HandleInput(const std::unique_ptr<DasherController>& controller, long time)
+{
+	// Space
+	FORWARD_KEY(ImGuiKey_Space, Dasher::Keys::Big_Start_Stop_Key)
+
+	// Button 1
+	FORWARD_KEY(ImGuiKey_LeftArrow, Dasher::Keys::Button_1)
+	FORWARD_KEY(ImGuiKey_Keypad4, Dasher::Keys::Button_1)
+	FORWARD_KEY(ImGuiKey_A, Dasher::Keys::Button_1)
+	FORWARD_KEY(ImGuiKey_J, Dasher::Keys::Button_1)
+	FORWARD_KEY(ImGuiKey_1, Dasher::Keys::Button_1)
+
+	// Button 2
+	FORWARD_KEY(ImGuiKey_UpArrow, Dasher::Keys::Button_2)
+	FORWARD_KEY(ImGuiKey_Keypad8, Dasher::Keys::Button_2)
+	FORWARD_KEY(ImGuiKey_W, Dasher::Keys::Button_2)
+	FORWARD_KEY(ImGuiKey_I, Dasher::Keys::Button_2)
+	FORWARD_KEY(ImGuiKey_2, Dasher::Keys::Button_2)
+
+	// Button 3
+	FORWARD_KEY(ImGuiKey_RightArrow, Dasher::Keys::Button_3)
+	FORWARD_KEY(ImGuiKey_Keypad6, Dasher::Keys::Button_3)
+	FORWARD_KEY(ImGuiKey_S, Dasher::Keys::Button_3)
+	FORWARD_KEY(ImGuiKey_K, Dasher::Keys::Button_3)
+	FORWARD_KEY(ImGuiKey_3, Dasher::Keys::Button_3)
+
+	// Button 4
+	FORWARD_KEY(ImGuiKey_DownArrow, Dasher::Keys::Button_4)
+	FORWARD_KEY(ImGuiKey_Keypad2, Dasher::Keys::Button_4)
+	FORWARD_KEY(ImGuiKey_Z, Dasher::Keys::Button_4)
+	FORWARD_KEY(ImGuiKey_M, Dasher::Keys::Button_4)
+	FORWARD_KEY(ImGuiKey_4, Dasher::Keys::Button_4)
+}
+#undef FORWARD_KEY
+
 bool MainWindow::render(float DeltaTime)
 {
     static ImGuiWindowFlags flags = ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoBackground ;
@@ -29,7 +68,7 @@ bool MainWindow::render(float DeltaTime)
 	const ImVec2 spacing = ImGui::GetStyle().ItemSpacing;
     ImGui::SetNextWindowPos(viewport->WorkPos);
     ImGui::SetNextWindowSize(viewport->WorkSize);
-
+	
     if (ImGui::Begin("MainWindow", nullptr, flags))
     {
 	    if(ImGui::BeginMainMenuBar())
@@ -105,7 +144,7 @@ bool MainWindow::render(float DeltaTime)
 			}
 		ImGui::EndGroup();
 
-	    const ImVec2 canvasPos = ImGui::GetCursorScreenPos();
+		const ImVec2 canvasPos = ImGui::GetCursorScreenPos();
 	    const ImVec2 canvasSize = ImGui::GetContentRegionAvail();
 
 		ImGui::PushClipRect(canvasPos, canvasPos + canvasSize, false);
@@ -120,6 +159,8 @@ bool MainWindow::render(float DeltaTime)
 		Controller->Render(static_cast<long>(DeltaTime * 1000.0f), canvasPos, canvasSize); //convert to millis
 
 		ImGui::PopClipRect();
+
+		HandleInput(Controller, static_cast<long>(DeltaTime * 1000.0f));
     }
     ImGui::End();
 

src/MainWindow.cpp

@@ -14,6 +14,7 @@ class MainWindow : public Dasher::CommandlineErrorDisplay
 	MainWindow();
 	~MainWindow() = default;
 
+	void HandleInput(const std::unique_ptr<DasherController>& controller, long time);
 	bool render(float DeltaTime);
 
 	void CopyTextToClipboard(const std::string& text) const;

src/MainWindow.h

@@ -76,7 +76,7 @@ int main(int, char**)
     IMGUI_CHECKVERSION();
     ImGui::CreateContext();
     ImGuiIO& io = ImGui::GetIO(); (void)io;
-    //io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;     // Enable Keyboard Controls
+    io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;     // Enable Keyboard Controls
     //io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;      // Enable Gamepad Controls
 
     // Setup Dear ImGui style