basic undo/redo for moving actors

Author: Astral-C

include/history/Mat4HistoryItem.hpp

@@ -0,0 +1,20 @@
+#pragma once
+
+#include "DOM.hpp"
+#include "glm/glm.hpp"
+#include "history/EditorHistory.hpp"
+
+struct LMat4HistoryItem : public LEditorHistoryItem
+{
+private:
+	// The node that this history item affects.
+	std::shared_ptr<LBGRenderDOMNode> mAffectedNode;
+	// The delta that will be applied on undo/redo.
+	glm::mat4 mDelta;
+
+public:
+	LMat4HistoryItem(std::shared_ptr<LBGRenderDOMNode> node, glm::mat4 delta);
+
+	virtual void Undo() override;
+	virtual void Redo() override;
+};

include/modes/ActorMode.hpp

@@ -12,7 +12,9 @@ class LActorMode : public LEditorModeBase
 	std::weak_ptr<LRoomDOMNode> mManualRoomSelect;
 
 	bool mRoomChanged { false };
-	
+	bool mGizmoWasUsing { false };
+	glm::mat4 mGizmoDelta { 1.0f };
+
 public:
 	LActorMode();
 

src/history/Mat4HistoryItem.cpp

@@ -0,0 +1,16 @@
+#include "history/Mat4HistoryItem.hpp"
+
+LMat4HistoryItem::LMat4HistoryItem(std::shared_ptr<LBGRenderDOMNode> node, glm::mat4 delta) : mAffectedNode(node), mDelta(delta)
+{
+    std::cout << "Added mat4 undo item" << std::endl;
+}
+
+void LMat4HistoryItem::Undo()
+{
+	if(mAffectedNode != nullptr) (*mAffectedNode->GetMat()) *= glm::inverse(mDelta);
+}
+
+void LMat4HistoryItem::Redo()
+{
+    if(mAffectedNode != nullptr) (*mAffectedNode->GetMat()) *= mDelta;
+}

src/modes/ActorMode.cpp

@@ -5,6 +5,7 @@
 #include "IconsForkAwesome.h"
 #include "UIUtil.hpp"
 #include "Options.hpp"
+#include "history/Mat4HistoryItem.hpp"
 
 //#include <DiscordIntegration.hpp>
 
@@ -138,8 +139,21 @@ void LActorMode::RenderDetailsWindow()
 	ImGui::Separator();
 
 	if(mPreviousSelection == mSelectionManager.GetPrimarySelection()){
-		if (mSelectionManager.IsMultiSelection())
+		if (mSelectionManager.IsMultiSelection()){
 			ImGui::Text("[Multiple Selection]");
+			/* Some WIP multi selection
+			ImGui::BeginTabBar("##multiSelectionTabs");
+
+			for(auto item : mSelectionManager.GetSelection()){
+				if(ImGui::BeginTabItem(std::format("{}##{}", item->GetName(), item->GetID()).c_str())){
+					std::static_pointer_cast<LUIRenderDOMNode>(item)->RenderDetailsUI(0);
+					ImGui::EndTabItem();
+				}
+			}
+
+			ImGui::EndTabBar();
+			*/
+		}
 		else if (mSelectionManager.GetPrimarySelection() != nullptr)
 			std::static_pointer_cast<LUIRenderDOMNode>(mSelectionManager.GetPrimarySelection())->RenderDetailsUI(0);
 	} else if(mPreviousSelection != nullptr){
@@ -197,19 +211,28 @@ void LActorMode::RenderGizmo(LEditorScene* renderer_scene){
 
 		if(mSelectionManager.GetPrimarySelection()->GetNodeType() != EDOMNodeType::Room){
 			glm::mat4* m = static_cast<LBGRenderDOMNode*>(mSelectionManager.GetPrimarySelection().get())->GetMat();
-			glm::mat4 delta(1.0);
+			glm::mat4 delta(1.0f);
 			if(ImGuizmo::Manipulate(&view[0][0], &proj[0][0], mGizmoMode, ImGuizmo::WORLD, &(*m)[0][0], &delta[0][0], NULL)){
+				mGizmoDelta *= delta;
 				for(auto node : mSelectionManager.GetSelection()){
 					if(node != mSelectionManager.GetPrimarySelection()){
-						(*dynamic_pointer_cast<LBGRenderDOMNode>(node)->GetMat()) = (*dynamic_pointer_cast<LBGRenderDOMNode>(node)->GetMat()) * delta;
+						(*dynamic_pointer_cast<LBGRenderDOMNode>(node)->GetMat()) = (*dynamic_pointer_cast<LBGRenderDOMNode>(node)->GetMat()) * mGizmoDelta;
 					}
 					EDOMNodeType type = node->GetNodeType();
 					if(type == EDOMNodeType::PathPoint || type == EDOMNodeType::Event  || type == EDOMNodeType::Observer || type == EDOMNodeType::Object){
 						renderer_scene->UpdateRenderers();
 						break;
 					}
 				}
+				mGizmoWasUsing = true;
+			}
+
+			if(!ImGuizmo::IsUsing() && mGizmoWasUsing){
+				mHistoryManager.AddUndoItem(std::make_shared<LMat4HistoryItem>(std::static_pointer_cast<LBGRenderDOMNode>(mSelectionManager.GetPrimarySelection()), mGizmoDelta));
+				mGizmoDelta = glm::mat4(1.0f);
+				mGizmoWasUsing = false;
 			}
+
 		} else {
 			std::shared_ptr<LRoomDOMNode> curRoom = dynamic_pointer_cast<LRoomDOMNode>(mSelectionManager.GetPrimarySelection());
 			if(prevRoom != curRoom){
@@ -261,6 +284,16 @@ void LActorMode::RenderGizmo(LEditorScene* renderer_scene){
 
 		}
 	}
+
+	if(!ImGui::GetIO().WantTextInput){
+		if(ImGui::IsKeyDown(ImGuiKey_LeftCtrl) && ImGui::IsKeyPressed(ImGuiKey_Z)){
+			mHistoryManager.PerformUndo();
+		}
+
+		if(ImGui::IsKeyDown(ImGuiKey_LeftCtrl) && ImGui::IsKeyPressed(ImGuiKey_Y)){
+			mHistoryManager.PerformRedo();
+		}
+	}
 }
 
 void LActorMode::OnBecomeActive()

src/modes/PathMode.cpp

@@ -157,10 +157,14 @@ void LPathMode::RenderDetailsWindow()
 	// Show path details
 	else
 	{
-		if (mSelectionManager.IsMultiSelection())
-			ImGui::Text("[Multiple Selection]");
-		else if (mSelectionManager.GetPrimarySelection() != nullptr)
-			std::static_pointer_cast<LUIRenderDOMNode>(mSelectionManager.GetPrimarySelection())->RenderDetailsUI(0);
+		if(mPreviousSelection == mSelectionManager.GetPrimarySelection()){
+			if (mSelectionManager.IsMultiSelection())
+				ImGui::Text("[Multiple Selection]");
+			else if (mSelectionManager.GetPrimarySelection() != nullptr)
+				std::static_pointer_cast<LUIRenderDOMNode>(mSelectionManager.GetPrimarySelection())->RenderDetailsUI(0);
+		} else if(mPreviousSelection != nullptr){
+			std::static_pointer_cast<LUIRenderDOMNode>(mPreviousSelection)->RenderDetailsUI(0);
+		}
 	}
 
 	ImGui::End();