Merge pull request #3 from Hopson97/feature/select-multiple-copy-paste

* Adds shift + right click to select multiple objects
* Adds copy paste 
* Adds ability to move multiple objects
* Adds zoom in/out for 2d view
* Adds area selection, to select a large group of objects across multiple floors to be moved/ copy pasted
* Adds 3d mouse picking
* Makes moving objects around more efficient 
* General code improvements and refactoring

Author: Hopson97

assets/shaders/Scene/PickerFragment.glsl

@@ -0,0 +1,12 @@
+#version 460
+
+// The picker texture is just a single channel (red, GL_R32I) texture.
+// When the 3d view is right-clicked, each object's ID is written to the texture channel such that
+// the object ID can read-back via glReadPixels
+layout(location = 0) out int out_colour;
+
+uniform int object_id;
+
+void main() {
+    out_colour = object_id;
+}

assets/shaders/Scene/PickerVertex.glsl

@@ -0,0 +1,14 @@
+#version 450 core
+
+layout(location = 0) in vec3 in_position;
+
+layout(std430, binding = 0) readonly buffer Matrices 
+{
+    mat4 projection;
+    mat4 view;
+} matrices;
+
+void main() 
+{
+    gl_Position = matrices.projection * matrices.view * vec4(in_position, 1.0);
+}

classic-you.vcxproj

@@ -157,8 +157,10 @@
     <ClCompile Include="deps\imgui_sfml\imgui_impl_opengl3.cpp" />
     <ClCompile Include="src\Editor\Actions.cpp" />
     <ClCompile Include="src\Editor\DrawingPad.cpp" />
+    <ClCompile Include="src\Editor\EditorEventHandlers.cpp" />
     <ClCompile Include="src\Editor\EditorGUI.cpp" />
     <ClCompile Include="src\Editor\EditorLevel.cpp" />
+    <ClCompile Include="src\Editor\EditorState.cpp" />
     <ClCompile Include="src\Editor\FloorManager.cpp" />
     <ClCompile Include="src\Editor\InfiniteGrid.cpp" />
     <ClCompile Include="src\Editor\LegacyFileConverter.cpp" />
@@ -230,6 +232,7 @@
     <ClInclude Include="src\Editor\Actions.h" />
     <ClInclude Include="src\Editor\DrawingPad.h" />
     <ClInclude Include="src\Editor\EditConstants.h" />
+    <ClInclude Include="src\Editor\EditorEventHandlers.h" />
     <ClInclude Include="src\Editor\EditorGUI.h" />
     <ClInclude Include="src\Editor\EditorLevel.h" />
     <ClInclude Include="src\Editor\EditorState.h" />

imgui.ini

@@ -16,7 +16,7 @@ Pos=1701,201
 Size=163,126
 
 [Window][Camera]
-Pos=1450,864
+Pos=748,762
 Size=463,212
 
 [Window][Shadow map preview]
@@ -92,16 +92,16 @@ IsChild=1
 Size=200,100
 
 [Window][Editor]
-Pos=2,21
-Size=277,265
+Pos=33,530
+Size=289,373
 
 [Window][Floor]
 Pos=5,27
 Size=254,347
 
 [Window][Object Properties]
-Pos=1622,24
-Size=297,590
+Pos=1663,302
+Size=312,620
 
 [Window][3d]
 Pos=60,60
@@ -111,3 +111,15 @@ Size=346,134
 Pos=251,430
 Size=177,65
 
+[Window][Selection Options]
+Pos=1297,106
+Size=566,102
+
+[Window][My Popup]
+Pos=938,516
+Size=79,70
+
+[Window][picker bffer]
+Pos=1384,204
+Size=563,379
+

src/Editor/Actions.cpp

@@ -93,6 +93,9 @@ void ActionManager::clear()
     action_stack_.clear();
 }
 
+// =======================================
+//          AddObjectAction
+// =======================================
 AddObjectAction::AddObjectAction(const LevelObject& object, int floor)
     : object_(object)
     , floor_{floor}
@@ -101,28 +104,26 @@ AddObjectAction::AddObjectAction(const LevelObject& object, int floor)
 
 void AddObjectAction::execute(EditorState& state, EditorLevel& level)
 {
-
     // When redoing the action, this prevents using the default for this object type
     if (!executed_)
     {
-
         auto& level_object = level.add_object(object_, floor_);
         id_ = level_object.object_id;
 
         executed_ = true;
-        state.p_active_object = &level_object;
+        state.selection.set_selection(&level_object);
     }
     else
     {
         auto& level_object = level.add_object(object_, floor_);
         level.set_object_id(level_object.object_id, id_);
-        state.p_active_object = &level_object;
+        state.selection.set_selection(&level_object);
     }
 }
 
 void AddObjectAction::undo(EditorState& state, EditorLevel& level)
 {
-    state.p_active_object = nullptr;
+    state.selection.clear_selection();
     level.remove_object(id_);
 }
 
@@ -134,6 +135,71 @@ ActionStrings AddObjectAction::to_string() const
     };
 }
 
+// =======================================
+//          AddBulkObjectsAction
+// =======================================
+AddBulkObjectsAction::AddBulkObjectsAction(const std::vector<LevelObject>& objects,
+                                           const std::vector<int>& floors)
+    : objects_(objects)
+    , floors_{floors}
+{
+}
+
+void AddBulkObjectsAction::execute(EditorState& state, EditorLevel& level)
+{
+    // New objects are selected - so clear the old selection
+
+    state.selection.clear_selection();
+    // When redoing the action, this prevents using the default for this object type
+    if (!executed_)
+    {
+        state.selection.clear_selection();
+        object_ids.clear();
+        for (int i = 0; i < objects_.size(); i++)
+        {
+            auto& level_object = level.add_object(objects_[i], floors_[i]);
+            object_ids.push_back(level_object.object_id);
+            state.selection.add_to_selection(level_object.object_id);
+        }
+        executed_ = true;
+    }
+    else
+    {
+        state.selection.clear_selection();
+        for (int i = 0; i < objects_.size(); i++)
+        {
+            auto& level_object = level.add_object(objects_[i], floors_[i]);
+            state.selection.add_to_selection(level_object.object_id);
+            level.set_object_id(level_object.object_id, object_ids[i]);
+        }
+    }
+}
+
+void AddBulkObjectsAction::undo(EditorState& state, EditorLevel& level)
+{
+    state.selection.clear_selection();
+    for (auto id : object_ids)
+    {
+        level.remove_object(id);
+    }
+}
+
+ActionStrings AddBulkObjectsAction::to_string() const
+{
+    std::string body;
+    for (auto& object : objects_)
+    {
+        body += object.to_string();
+    }
+    return {
+        .title = std::format("Adding bulk {}", objects_.size()),
+        .body = body,
+    };
+}
+
+// =======================================
+//          UpdateObjectAction
+// =======================================
 UpdateObjectAction::UpdateObjectAction(const LevelObject& old_object, const LevelObject& new_object,
                                        int floor)
     : old_object_(old_object)
@@ -161,34 +227,91 @@ ActionStrings UpdateObjectAction::to_string() const
     };
 }
 
-DeleteObjectAction::DeleteObjectAction(const LevelObject& object, int floor)
-    : object_(object)
-    , floor_{floor}
+BulkUpdateObjectAction::BulkUpdateObjectAction(const std::vector<LevelObject>& old_objects,
+                                               const std::vector<LevelObject>& new_objects)
+    : old_objects_(old_objects)
+    , new_objects_(new_objects)
+{
+}
+
+void BulkUpdateObjectAction::execute([[maybe_unused]] EditorState& state, EditorLevel& level)
+{
+    for (auto& object : new_objects_)
+    {
+        level.update_object(object, 0);
+    }
+}
+
+void BulkUpdateObjectAction::undo([[maybe_unused]] EditorState& state, EditorLevel& level)
+{
+    for (auto& object : old_objects_)
+    {
+        level.update_object(object, 0);
+    }
+}
+
+ActionStrings BulkUpdateObjectAction::to_string() const
+{
+    std::string before;
+    std::string after;
+
+    for (auto& object : old_objects_)
+    {
+        before += object.to_string();
+    }
+    for (auto& object : new_objects_)
+    {
+        after += object.to_string();
+    }
+    return {.title = std::format("Update {}", old_objects_.size()), // to_type_string()),
+            .body = std::format("Before:\n{}\n\nAfter:\n{}", before, after)};
+}
+
+// =======================================
+//      DeleteObjectAction
+// =======================================
+DeleteObjectAction::DeleteObjectAction(const std::vector<LevelObject>& objects,
+                                       const std::vector<int>& floors)
+    : objects_(objects)
+    , floors_{floors}
 {
 }
 
 void DeleteObjectAction::execute(EditorState& state, EditorLevel& level)
 {
-    state.p_active_object = nullptr;
-    level.remove_object(object_.object_id);
+    state.selection.clear_selection();
+    for (auto& object : objects_)
+    {
+        level.remove_object(object.object_id);
+    }
 }
 
 void DeleteObjectAction::undo(EditorState& state, EditorLevel& level)
 {
-    auto& new_object = level.add_object(object_, floor_);
-
-    // new_object.p = object_.props;
+    state.selection.clear_selection();
+    for (int i = 0; i < objects_.size(); i++)
+    {
+        auto& new_object = level.add_object(objects_[i], floors_[i]);
 
-    state.p_active_object = &new_object;
+        level.set_object_id(new_object.object_id, objects_[i].object_id);
+        assert(new_object.object_id == objects_[i].object_id);
 
-    level.set_object_id(new_object.object_id, object_.object_id);
-    object_ = new_object;
+        objects_[i] = new_object;
+        state.selection.add_to_selection(new_object.object_id);
+    }
 }
 
 ActionStrings DeleteObjectAction::to_string() const
 {
+    std::string body;
+
+    for (auto& object : objects_)
+    {
+        body += object.to_string();
+    }
+
     return {
-        .title = std::format("Delete {}", object_.to_type_string()),
-        .body = std::format("ID: {} ", object_.object_id),
+        .title = std::format("Deleted {}", objects_.size()),
+        .body = body,
     };
-}
+}

src/Editor/Actions.h

@@ -50,7 +50,29 @@ class AddObjectAction final : public Action
     const int floor_;
 };
 
-/// Action to update an existing object in the level.
+// For copy-paste functionality
+class AddBulkObjectsAction final : public Action
+{
+  public:
+    AddBulkObjectsAction(const std::vector<LevelObject>& objects, const std::vector<int>& floors);
+
+    void execute(EditorState& state, EditorLevel& level) override;
+    void undo(EditorState& state, EditorLevel& level) override;
+
+    ActionStrings to_string() const override;
+
+  private:
+    /// The objects to add
+    std::vector<LevelObject> objects_;
+    std::vector<int> floors_;
+
+    /// The ID of the object added to the level. This for undo/redo to ensure the ID is preserved.
+    std::vector<ObjectId> object_ids;
+
+    // Flag for when re-doing this action, it uses the stored props rather than the default
+    bool executed_ = false;
+};
+
 class UpdateObjectAction final : public Action
 {
   public:
@@ -70,12 +92,30 @@ class UpdateObjectAction final : public Action
 
     const int floor_;
 };
+class BulkUpdateObjectAction final : public Action
+{
+  public:
+    BulkUpdateObjectAction(const std::vector<LevelObject>& old_objects,
+                           const std::vector<LevelObject>& new_objects);
+
+    void execute(EditorState& state, EditorLevel& level) override;
+    void undo(EditorState& state, EditorLevel& level) override;
+
+    ActionStrings to_string() const override;
+
+  private:
+    /// The object before the update
+    const std::vector<LevelObject> old_objects_;
+
+    /// The object after the update
+    const std::vector<LevelObject> new_objects_;
+};
 
 /// Action to delete an existing object from the level.
 class DeleteObjectAction final : public Action
 {
   public:
-    DeleteObjectAction(const LevelObject& object, int floor);
+    DeleteObjectAction(const std::vector<LevelObject>& objects, const std::vector<int>& floors);
 
     void execute(EditorState& state, EditorLevel& level) override;
     void undo(EditorState& state, EditorLevel& level) override;
@@ -84,8 +124,8 @@ class DeleteObjectAction final : public Action
 
   private:
     /// The object to delete
-    LevelObject object_;
-    const int floor_;
+    std::vector<LevelObject> objects_;
+    std::vector<int> floors_;
 };
 
 /// Manager for storing the actions and handling undo/redo functionality.