Rename map_editor classes to visual_registry_editor

It doesn't seem specific to maps. Since it's expected a lot of the functionality will be reused for archetype and pose editors, its name should reflect this.

Author: Lawrencemm

lmeditor/CMakeLists.txt

@@ -42,25 +42,25 @@ add_library(
 
   src/controller/viewport/viewport.cpp
 
-  src/controller/map_editor/map_editor_controller.cpp
-  src/controller/map_editor/move_selection.cpp
-  src/controller/map_editor/viewport_commands.cpp
-  src/controller/map_editor/move_selection_commands.cpp
-
-  src/controller/map_editor/states/add_adjacent.cpp
-  src/controller/map_editor/states/translate.cpp
-  src/controller/map_editor/states/select.cpp
-  src/controller/map_editor/states/copy_object.cpp
-  src/controller/map_editor/states/scale.cpp
-  src/controller/map_editor/states/rotate.cpp
-  src/controller/map_editor/states/reparent.cpp
+  src/controller/visual_registry_editor/visual_registry_controller.cpp
+  src/controller/visual_registry_editor/move_selection.cpp
+  src/controller/visual_registry_editor/viewport_commands.cpp
+  src/controller/visual_registry_editor/move_selection_commands.cpp
+
+  src/controller/visual_registry_editor/states/add_adjacent.cpp
+  src/controller/visual_registry_editor/states/translate.cpp
+  src/controller/visual_registry_editor/states/select.cpp
+  src/controller/visual_registry_editor/states/copy_object.cpp
+  src/controller/visual_registry_editor/states/scale.cpp
+  src/controller/visual_registry_editor/states/rotate.cpp
+  src/controller/visual_registry_editor/states/reparent.cpp
 
   src/controller/entity_list/entity_list_controller.cpp
 
   src/controller/inspector/inspector_controller.cpp
 
-  src/component/map_editor/rendering.cpp
-  src/component/map_editor/map_editor_component.cpp
+  src/component/visuial_registry_editor/rendering.cpp
+  src/component/visuial_registry_editor/visual_registry_editor.cpp
 
   src/component/inspector/inspector_component.cpp
 
@@ -157,8 +157,8 @@ add_executable(
 
   test/test_lmeditor.cpp
   test/test_trimesh.cpp
-  test/map_editor/test.cpp
-  test/map_editor/test_move_selection.cpp
+  test/visual_registry_editor/test.cpp
+  test/visual_registry_editor/test_move_selection.cpp
   test/test_entity_list.cpp
 )
 

…/include/lmeditor/component/map_editor.h …ditor/component/visual_registry_editor.hlmeditor/include/lmeditor/component/map_editor.h renamed to lmeditor/include/lmeditor/component/visual_registry_editor.h lmeditor/include/lmeditor/component/map_editor.h renamed to lmeditor/include/lmeditor/component/visual_registry_editor.h

@@ -7,7 +7,7 @@
 
 namespace lmeditor
 {
-struct map_editor_init
+struct visual_registry_editor_init
 {
     entt::registry &registry;
     orbital_camera_init camera_init;

lmeditor/src/app/app.cpp

@@ -3,9 +3,9 @@
 #include <lmeditor/component/asset_list.h>
 #include <lmeditor/component/command_help.h>
 #include <lmeditor/component/entity_list.h>
-#include <lmeditor/component/map_editor.h>
 #include <lmeditor/component/player.h>
 #include <lmeditor/component/saver.h>
+#include <lmeditor/component/visual_registry_editor.h>
 #include <lmeditor/model/orbital_camera.h>
 #include <lmlib/variant_visitor.h>
 #include <lmng/animation.h>
@@ -75,7 +75,7 @@ editor_app::editor_app(const std::filesystem::path &project_dir)
       window_size.height,
     };
 
-    auto map_editor = map_editor_init{
+    auto map_editor = visual_registry_editor_init{
       .registry = map,
       .camera_init =
         orbital_camera_init{

lmeditor/src/app/app.h

@@ -3,7 +3,7 @@
 #include <boost/dll/shared_library.hpp>
 #include <filesystem>
 #include <lmeditor/component/inspector.h>
-#include <lmeditor/component/map_editor.h>
+#include <lmeditor/component/visual_registry_editor.h>
 #include <lmeditor/model/trimesh.h>
 #include <lmeditor/project_plugin.h>
 #include <lmeditor/simulation_plugin.h>

…r/src/component/map_editor/rendering.cpp …nt/visuial_registry_editor/rendering.cpplmeditor/src/component/map_editor/rendering.cpp renamed to lmeditor/src/component/visuial_registry_editor/rendering.cpp lmeditor/src/component/map_editor/rendering.cpp renamed to lmeditor/src/component/visuial_registry_editor/rendering.cpp

@@ -1,5 +1,5 @@
 #include "../../model/trimesh/util.h"
-#include "map_editor_component.h"
+#include "visual_registry_editor.h"
 
 #include <Resource.h>
 #include <lmeditor/model/selection.h>
@@ -18,15 +18,15 @@ struct selection_ubuffer_data
 namespace lmeditor
 {
 lmgl::buffer
-  map_editor_component::create_selection_ubuffer(lmgl::irenderer *renderer)
+  visual_registry_editor::create_selection_ubuffer(lmgl::irenderer *renderer)
 {
     return renderer->create_buffer(lmgl::buffer_init{
       .usage = lmgl::render_buffer_usage::uniform,
       .data = {nullptr, sizeof(selection_ubuffer_data)},
     });
 }
 
-lmgl::material map_editor_component::create_selection_stencil_material(
+lmgl::material visual_registry_editor::create_selection_stencil_material(
   lmgl::irenderer *renderer)
 {
     return renderer->create_material(lmgl::material_init{
@@ -43,7 +43,7 @@ lmgl::material map_editor_component::create_selection_stencil_material(
 }
 
 lmgl::material
-  map_editor_component::create_outline_material(lmgl::irenderer *renderer)
+  visual_registry_editor::create_outline_material(lmgl::irenderer *renderer)
 {
     return renderer->create_material(lmgl::material_init{
       .vshader_spirv = lm::raw_array_proxy(stencil_vshader_data),
@@ -61,7 +61,7 @@ lmgl::material
     });
 }
 
-void map_editor_component::render_selection_outline(
+void visual_registry_editor::render_selection_outline(
   lmgl::iframe *frame,
   entt::registry const &map) const
 {
@@ -99,7 +99,7 @@ void map_editor_component::render_selection_outline(
     frame->add({selection_outline_geometry.get()}, viewport);
 }
 
-void map_editor_component::render_state_text(lmgl::iframe *frame)
+void visual_registry_editor::render_state_text(lmgl::iframe *frame)
 {
     state_text_layout.render(frame, position, size);
 }

…nent/map_editor/map_editor_component.cpp …gistry_editor/visual_registry_editor.cpplmeditor/src/component/map_editor/map_editor_component.cpp renamed to lmeditor/src/component/visuial_registry_editor/visual_registry_editor.cpp lmeditor/src/component/map_editor/map_editor_component.cpp renamed to lmeditor/src/component/visuial_registry_editor/visual_registry_editor.cpp

@@ -1,4 +1,4 @@
-#include "map_editor_component.h"
+#include "visual_registry_editor.h"
 #include <fmt/format.h>
 #include <lmhuv/box.h>
 #include <lmlib/enumerate.h>
@@ -8,12 +8,13 @@
 
 namespace lmeditor
 {
-component map_editor_init::operator()()
+component visual_registry_editor_init::operator()()
 {
-    return std::make_unique<map_editor_component>(*this);
+    return std::make_unique<visual_registry_editor>(*this);
 }
 
-map_editor_component::map_editor_component(map_editor_init const &init)
+visual_registry_editor::visual_registry_editor(
+  visual_registry_editor_init const &init)
     : controller{init.registry, init.camera_init},
       visual_view{
         lmhuv::create_visual_view(lmhuv::visual_view_init{
@@ -32,7 +33,7 @@ map_editor_component::map_editor_component(map_editor_init const &init)
         .resource_cache = init.resource_cache,
         .colour = state_text_colour,
         .position = init.position + state_text_position,
-        .text = map_editor_controller::select_state::label,
+        .text = visual_registry_controller::select_state::label,
       }},
       selection_outline_colour{init.selection_outline_colour},
       position{init.position},
@@ -56,7 +57,7 @@ map_editor_component::map_editor_component(map_editor_init const &init)
     selection_outline_geometry->set_line_width(6.f);
 }
 
-lmgl::geometry map_editor_component::create_box_geometry(
+lmgl::geometry visual_registry_editor::create_box_geometry(
   lmgl::irenderer *renderer,
   lmgl::material box_material,
   lmgl::ibuffer *ubuffer)
@@ -74,7 +75,7 @@ lmgl::geometry map_editor_component::create_box_geometry(
     return geometry;
 }
 
-void map_editor_component::set_state_text(
+void visual_registry_editor::set_state_text(
   lmgl::irenderer *renderer,
   std::string new_text,
   lmgl::resource_sink &resource_sink,
@@ -84,7 +85,7 @@ void map_editor_component::set_state_text(
       *renderer, resource_cache.body_font.get(), new_text, resource_sink);
 }
 
-component_interface &map_editor_component::update(
+component_interface &visual_registry_editor::update(
   lmgl::irenderer *renderer,
   lmgl::resource_sink &resource_sink,
   lmtk::resource_cache const &resource_cache,
@@ -97,7 +98,7 @@ component_interface &map_editor_component::update(
     return *this;
 }
 
-bool map_editor_component::add_to_frame(lmgl::iframe *frame)
+bool visual_registry_editor::add_to_frame(lmgl::iframe *frame)
 {
     visual_view->add_to_frame(
       *controller.map, frame, lmgl::viewport{position, size});
@@ -107,7 +108,7 @@ bool map_editor_component::add_to_frame(lmgl::iframe *frame)
 }
 
 lmtk::widget_interface &
-  map_editor_component::move_resources(lmgl::resource_sink &resource_sink)
+  visual_registry_editor::move_resources(lmgl::resource_sink &resource_sink)
 {
     resource_sink.add(
       selection_stencil_material,
@@ -123,8 +124,8 @@ lmtk::widget_interface &
     return *this;
 }
 
-map_editor_component &
-  map_editor_component::set_rect(lm::point2i pos, lm::size2i size)
+visual_registry_editor &
+  visual_registry_editor::set_rect(lm::point2i pos, lm::size2i size)
 {
     position = pos;
     this->size = size;
@@ -133,16 +134,16 @@ map_editor_component &
     return *this;
 }
 
-lm::size2i map_editor_component::get_size() { return size; }
+lm::size2i visual_registry_editor::get_size() { return size; }
 
-lm::point2i map_editor_component::get_position() { return position; }
+lm::point2i visual_registry_editor::get_position() { return position; }
 
-bool map_editor_component::handle(const lmtk::input_event &input_event)
+bool visual_registry_editor::handle(const lmtk::input_event &input_event)
 {
     return controller.handle(input_event);
 }
 std::vector<command_description>
-  map_editor_component::get_command_descriptions()
+  visual_registry_editor::get_command_descriptions()
 {
     return controller.get_command_descriptions();
 }

…ponent/map_editor/map_editor_component.h …registry_editor/visual_registry_editor.hlmeditor/src/component/map_editor/map_editor_component.h renamed to lmeditor/src/component/visuial_registry_editor/visual_registry_editor.h lmeditor/src/component/map_editor/map_editor_component.h renamed to lmeditor/src/component/visuial_registry_editor/visual_registry_editor.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "../../controller/map_editor/map_editor_controller.h"
+#include "../../controller/visual_registry_editor/visual_registry_controller.h"
 #include <chrono>
 #include <entt/entt.hpp>
 #include <filesystem>
 #include <lmeditor/component/command_help.h>
-#include <lmeditor/component/map_editor.h>
+#include <lmeditor/component/visual_registry_editor.h>
 #include <lmgl/lmgl.h>
 #include <lmhuv.h>
 #include <lmlib/variant_visitor.h>
@@ -20,12 +20,12 @@
 
 namespace lmeditor
 {
-class map_editor_component : public component_interface
+class visual_registry_editor : public component_interface
 {
   public:
-    explicit map_editor_component(map_editor_init const &init);
-    map_editor_component(map_editor_component const &) = delete;
-    map_editor_component(map_editor_component &&) = delete;
+    explicit visual_registry_editor(visual_registry_editor_init const &init);
+    visual_registry_editor(visual_registry_editor const &) = delete;
+    visual_registry_editor(visual_registry_editor &&) = delete;
 
     component_interface &update(
       lmgl::irenderer *renderer,
@@ -38,7 +38,7 @@ class map_editor_component : public component_interface
     widget_interface &
       move_resources(lmgl::resource_sink &resource_sink) override;
 
-    map_editor_component &set_rect(lm::point2i pos, lm::size2i size) override;
+    visual_registry_editor &set_rect(lm::point2i pos, lm::size2i size) override;
     lm::size2i get_size() override;
     lm::point2i get_position() override;
     std::vector<command_description> get_command_descriptions() override;
@@ -68,7 +68,7 @@ class map_editor_component : public component_interface
     lmgl::buffer create_selection_ubuffer(lmgl::irenderer *renderer);
     lmgl::material create_outline_material(lmgl::irenderer *renderer);
 
-    map_editor_controller controller;
+    visual_registry_controller controller;
     lmhuv::pvisual_view visual_view;
     lmgl::material selection_stencil_material, selection_outline_material;
     lmgl::buffer box_vpositions, box_vnormals, box_indices;

lmeditor/src/controller/map_editor/states/reparent.cpp

@@ -1,4 +1,4 @@
-#include "map_editor_controller.h"
+#include "visual_registry_controller.h"
 
 #include <range/v3/algorithm/min_element.hpp>
 
@@ -7,7 +7,7 @@
 
 namespace lmeditor
 {
-entt::entity map_editor_controller::nearest_entity(
+entt::entity visual_registry_controller::nearest_entity(
   entt::registry const &map,
   entt::entity entity,
   const Eigen::Vector3f &direction)
@@ -44,7 +44,7 @@ entt::entity map_editor_controller::nearest_entity(
     return nearest_entity;
 }
 
-entt::entity map_editor_controller::farthest_entity(
+entt::entity visual_registry_controller::farthest_entity(
   entt::registry const &map,
   const Eigen::Vector3f &direction)
 {
@@ -72,7 +72,7 @@ entt::entity map_editor_controller::farthest_entity(
     return farthest;
 }
 
-bool map_editor_controller::move_selection(
+bool visual_registry_controller::move_selection(
   entt::registry const &map,
   Eigen::Vector3f const &direction)
 {
@@ -95,14 +95,14 @@ bool map_editor_controller::move_selection(
     return true;
 }
 
-bool map_editor_controller::move_selection_view(
+bool visual_registry_controller::move_selection_view(
   entt::registry const &map,
   const Eigen::Vector3f &view_axis)
 {
     return move_selection(map, lm::snap_to_axis(camera.rotation * view_axis));
 }
 
-void map_editor_controller::set_map(const entt::registry &registry)
+void visual_registry_controller::set_map(const entt::registry &registry)
 {
     state.emplace<select_state>(*this);
     clear_selection();