COMMAND: extracted new module out of core

.github/workflows/main.yml

@@ -24,6 +24,7 @@ jobs:
             ctest -V -R tests-animation$
             ctest -V -R tests-app$
             ctest -V -R tests-attrib$
+            ctest -V -R tests-command$
             ctest -V -R tests-computeshadertool$
             ctest -V -R tests-cooldown$
             ctest -V -R tests-core$
@@ -100,6 +101,7 @@ jobs:
             ctest -V -R tests-animation$
             ctest -V -R tests-app$
             ctest -V -R tests-attrib$
+            ctest -V -R tests-command$
             ctest -V -R tests-computeshadertool$
             ctest -V -R tests-cooldown$
             ctest -V -R tests-core$
@@ -160,6 +162,7 @@ jobs:
             ctest -V -C Release -R tests-animation$
             ctest -V -C Release -R tests-app$
             ctest -V -C Release -R tests-attrib$
+            ctest -V -C Release -R tests-command$
             ctest -V -C Release -R tests-computeshadertool$
             ctest -V -C Release -R tests-cooldown$
             ctest -V -C Release -R tests-core$

src/client/Client.cpp

@@ -10,7 +10,7 @@
 #include "video/TextureAtlasRenderer.h"
 #include "voxelformat/MeshCache.h"
 #include "voxelrender/CachedMeshRenderer.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "core/GLM.h"
 #include "io/Filesystem.h"
 #include "core/Color.h"

src/modules/CMakeLists.txt

@@ -9,6 +9,7 @@ endif()
 
 add_subdirectory(core)
 add_subdirectory(io)
+add_subdirectory(command)
 add_subdirectory(metric)
 add_subdirectory(app)
 add_subdirectory(uuid)

src/modules/app/App.cpp

@@ -6,8 +6,8 @@
 #include "app/AppCommand.h"
 #include "core/Var.h"
 #include "core/concurrent/ThreadPool.h"
-#include "core/command/Command.h"
-#include "core/command/CommandHandler.h"
+#include "command/Command.h"
+#include "command/CommandHandler.h"
 #include "io/Filesystem.h"
 #include "core/Common.h"
 #include "core/EventBus.h"

src/modules/app/AppCommand.cpp

@@ -3,7 +3,7 @@
  */
 
 #include "AppCommand.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "io/Filesystem.h"
 #include "util/VarUtil.h"
 #include "app/App.h"

src/modules/app/CMakeLists.txt

@@ -11,7 +11,7 @@ if (WINDOWS)
 	set_property(GLOBAL PROPERTY ${LIB}_NOUNITY TRUE)
 endif()
 
-set(LIBS metric io sdl2 glm libuv backward)
+set(LIBS metric command sdl2 glm libuv backward)
 engine_add_module(TARGET ${LIB} SRCS ${SRCS} DEPENDENCIES ${LIBS})
 
 set(TEST_MODULE_SRCS

src/modules/app/benchmark/AbstractBenchmark.cpp

@@ -5,7 +5,7 @@
 #include "AbstractBenchmark.h"
 #include "core/Log.h"
 #include "core/Var.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "io/Filesystem.h"
 #include "metric/Metric.h"
 #include "core/EventBus.h"

src/modules/app/tests/AbstractTest.cpp

@@ -5,7 +5,7 @@
 #include "AbstractTest.h"
 #include "core/Log.h"
 #include "core/Var.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "metric/Metric.h"
 #include "core/EventBus.h"
 #include "core/TimeProvider.h"

src/modules/app/tests/CommandCompleterTest.cpp

@@ -3,7 +3,7 @@
  */
 
 #include "app/tests/AbstractTest.h"
-#include "core/command/CommandCompleter.h"
+#include "command/CommandCompleter.h"
 #include "io/Filesystem.h"
 #include "core/tests/TestHelper.h"
 

src/modules/audio/SoundManager.cpp

@@ -3,7 +3,7 @@
  */
 
 #include "SoundManager.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "core/Var.h"
 #include "core/Assert.h"
 #include "core/Log.h"

src/modules/backend/loop/ServerLoop.cpp

@@ -5,7 +5,7 @@
 #include "ClientMessages_generated.h"
 #include "ServerLoop.h"
 
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "core/Var.h"
 #include "core/Log.h"
 #include "app/App.h"
@@ -27,7 +27,7 @@
 #include "backend/network/MoveHandler.h"
 #include "persistence/PersistenceMgr.h"
 #include "backend/world/World.h"
-#include "core/command/CommandHandler.h"
+#include "command/CommandHandler.h"
 #include "voxel/MaterialColor.h"
 #include "voxelformat/VolumeCache.h"
 #include "eventmgr/EventMgr.h"

src/modules/backend/world/World.cpp

@@ -4,7 +4,7 @@
 
 #include "World.h"
 #include "network/ProtocolEnum.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "backend/spawn/SpawnMgr.h"
 #include "backend/world/MapProvider.h"
 #include "backend/world/Map.h"

src/modules/command/CMakeLists.txt

@@ -0,0 +1,21 @@
+set(SRCS
+	ActionButton.h ActionButton.cpp
+	CommandHandler.h CommandHandler.cpp
+	CommandCompleter.h CommandCompleter.cpp
+	Command.h Command.cpp
+)
+set(LIB command)
+engine_add_module(TARGET ${LIB} SRCS ${SRCS} DEPENDENCIES io)
+
+set(TEST_SRCS
+	tests/CommandTest.cpp
+	tests/CommandHandlerTest.cpp
+)
+
+gtest_suite_sources(tests ${TEST_SRCS})
+gtest_suite_deps(tests ${LIB})
+
+gtest_suite_begin(tests-${LIB} TEMPLATE ${ROOT_DIR}/src/modules/core/tests/main.cpp.in)
+gtest_suite_sources(tests-${LIB} ${TEST_SRCS})
+gtest_suite_deps(tests-${LIB} ${LIB})
+gtest_suite_end(tests-${LIB})

src/modules/command/Command.h

@@ -10,7 +10,7 @@
 #include "core/collection/StringMap.h"
 #include "core/collection/DynamicArray.h"
 #include "core/concurrent/ReadWriteLock.h"
-#include "ActionButton.h"
+#include "command/ActionButton.h"
 #include <memory>
 #include <functional>
 

src/modules/command/CommandHandler.cpp

@@ -4,7 +4,7 @@
 
 #include "CommandHandler.h"
 #include "core/collection/DynamicArray.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "core/Tokenizer.h"
 #include "core/Log.h"
 #include "core/Var.h"

src/modules/command/tests/CommandHandlerTest.cpp

@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include "core/command/CommandHandler.h"
+#include "command/CommandHandler.h"
 #include "core/Var.h"
 
 namespace core {

src/modules/command/tests/CommandTest.cpp

@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include "core/command/Command.h"
+#include "command/Command.h"
 
 namespace core {
 

src/modules/commonlua/LUAFunctions.cpp

@@ -4,7 +4,7 @@
 
 #include "LUAFunctions.h"
 #include "core/Log.h"
-#include "core/command/CommandHandler.h"
+#include "command/CommandHandler.h"
 #include "core/String.h"
 #include "core/Var.h"
 #include "app/App.h"

src/modules/console/Input.cpp

@@ -4,7 +4,7 @@
 
 #include "Input.h"
 #include "core/Log.h"
-#include "core/command/CommandHandler.h"
+#include "command/CommandHandler.h"
 #include <string.h>
 
 namespace console {

src/modules/core/CMakeLists.txt

@@ -1,9 +1,4 @@
 set(SRCS
-	command/ActionButton.h command/ActionButton.cpp
-	command/CommandHandler.h command/CommandHandler.cpp
-	command/CommandCompleter.h command/CommandCompleter.cpp
-	command/Command.h command/Command.cpp
-
 	collection/Array.h
 	collection/Buffer.h
 	collection/ConcurrentQueue.h
@@ -87,8 +82,6 @@ set(TEST_SRCS
 	tests/BufferTest.cpp
 	tests/ByteStreamTest.cpp
 	tests/ColorTest.cpp
-	tests/CommandTest.cpp
-	tests/CommandHandlerTest.cpp
 	tests/ConcurrentQueueTest.cpp
 	tests/CoreTest.cpp
 	tests/DynamicArrayTest.cpp

src/modules/core/Trace.cpp

@@ -6,7 +6,7 @@
 #include "core/Var.h"
 #include "core/Log.h"
 #include "core/Common.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 
 #ifdef USE_EMTRACE
 #include <emscripten/trace.h>

src/modules/frontend/PlayerAction.cpp

@@ -3,7 +3,7 @@
  */
 
 #include "PlayerAction.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "core/Trace.h"
 #include "frontend/ClientEntity.h"
 

src/modules/frontend/PlayerAction.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "core/command/ActionButton.h"
+#include "command/ActionButton.h"
 #include "core/IComponent.h"
 #include "core/SharedPtr.h"
 #include "Shared_generated.h"

src/modules/frontend/PlayerMovement.cpp

@@ -3,7 +3,7 @@
  */
 
 #include "PlayerMovement.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "core/Trace.h"
 
 namespace frontend {

src/modules/frontend/PlayerMovement.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "core/command/ActionButton.h"
+#include "command/ActionButton.h"
 #include "core/IComponent.h"
 #include "frontend/ClientEntity.h"
 #include "video/Camera.h"

src/modules/render/Gizmo.h

@@ -5,7 +5,7 @@
 #pragma once
 
 #include "core/IComponent.h"
-#include "core/command/ActionButton.h"
+#include "command/ActionButton.h"
 #include "Axis.h"
 #include "video/Ray.h"
 #include "video/Camera.h"

src/modules/testcore/Movement.cpp

@@ -3,7 +3,7 @@
  */
 
 #include "Movement.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "core/GLM.h"
 #define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/norm.hpp>

src/modules/testcore/Movement.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "core/command/ActionButton.h"
+#include "command/ActionButton.h"
 #include "core/IComponent.h"
 #include <glm/fwd.hpp>
 #include <glm/vec3.hpp>

src/modules/testcore/TestApp.cpp

@@ -5,7 +5,7 @@
 #include "TestApp.h"
 #include "ui/imgui/IMGUI.h"
 #include "core/Color.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "video/ScopedPolygonMode.h"
 #include "core/GameConfig.h"
 #include "core/Var.h"

src/modules/ui/imgui/IMGUIApp.cpp

@@ -6,7 +6,7 @@
 
 #include "io/Filesystem.h"
 #include "core/TimeProvider.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "core/Color.h"
 #include "core/UTF8.h"
 #include "core/Common.h"

src/modules/ui/nuklear/LUAFunctions.cpp

@@ -7,7 +7,7 @@
 #include "video/Texture.h"
 #include "core/ArrayLength.h"
 #include "video/Renderer.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "LUAUIApp.h"
 #include <SDL_stdinc.h>
 #include "Nuklear.h"

src/modules/ui/nuklear/LUAUIApp.cpp

@@ -7,7 +7,7 @@
 #include "commonlua/LUAFunctions.h"
 #include "io/Filesystem.h"
 #include "core/Log.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "core/Trace.h"
 
 namespace ui {

src/modules/ui/turbobadger/UIApp.cpp

@@ -8,7 +8,7 @@
 #include "FileDialogWindow.h"
 
 #include "io/Filesystem.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "core/collection/DynamicArray.h"
 #include "core/Color.h"
 #include "core/UTF8.h"

src/modules/ui/turbobadger/tb/tb_widgets.cpp

@@ -4,7 +4,7 @@
 
 #include "tb_widgets.h"
 #include "core/Assert.h"
-#include "core/command/CommandHandler.h"
+#include "command/CommandHandler.h"
 #include "tb_font_renderer.h"
 #include "tb_renderer.h"
 #include "tb_scroller.h"

src/modules/ui/turbobadger/tb/tb_widgets_common.cpp

@@ -5,8 +5,8 @@
 #include "tb_widgets_common.h"
 #include "core/Assert.h"
 #include "core/Var.h"
-#include "core/command/Command.h"
-#include "core/command/CommandHandler.h"
+#include "command/Command.h"
+#include "command/CommandHandler.h"
 #include "tb_font_renderer.h"
 #include "tb_system.h"
 #include "tb_widgets_listener.h"

src/modules/util/Console.cpp

@@ -9,12 +9,12 @@
 #include "core/String.h"
 #include "core/collection/DynamicArray.h"
 #include "io/Filesystem.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "core/collection/Set.h"
 #include "core/Common.h"
 #include "core/Color.h"
 #include "core/Tokenizer.h"
-#include "core/command/CommandHandler.h"
+#include "command/CommandHandler.h"
 #include "VarUtil.h"
 #include <SDL.h>
 

src/modules/util/KeybindingHandler.cpp

@@ -2,7 +2,7 @@
  * @file
  */
 
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "KeybindingHandler.h"
 #include "CustomButtonNames.h"
 #include "app/App.h"

src/modules/util/MessageQueue.cpp

@@ -3,7 +3,7 @@
  */
 
 #include "MessageQueue.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include <algorithm>
 
 namespace {

src/modules/util/tests/ConsoleTest.cpp

@@ -5,7 +5,7 @@
 #include "app/tests/AbstractTest.h"
 #include "util/Console.h"
 #include "core/Var.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 
 namespace util {
 

src/modules/util/tests/KeybindingHandlerTest.cpp

@@ -4,7 +4,7 @@
 
 #include "app/tests/AbstractTest.h"
 #include "util/KeybindingHandler.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include <SDL.h>
 
 namespace util {

src/modules/video/WindowedApp.cpp

@@ -15,7 +15,7 @@
 #include "core/ArrayLength.h"
 #include "core/Log.h"
 #include "core/Color.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "ShaderManager.h"
 #include "util/KeybindingHandler.h"
 #include "util/KeybindingParser.h"

src/modules/voxelformat/VolumeCache.cpp

@@ -7,7 +7,7 @@
 #include "voxelformat/VoxFileFormat.h"
 #include "io/Filesystem.h"
 #include "app/App.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "core/Log.h"
 
 namespace voxelformat {

src/modules/voxelgenerator/LUAGenerator.h

@@ -8,7 +8,7 @@
 #include "core/IComponent.h"
 #include "core/String.h"
 #include "core/collection/DynamicArray.h"
-#include "core/command/CommandCompleter.h"
+#include "command/CommandCompleter.h"
 
 struct lua_State;
 

src/modules/voxelworldrender/PlayerCamera.cpp

@@ -4,7 +4,7 @@
 
 #include "PlayerCamera.h"
 #include "voxel/PagedVolume.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "core/Trace.h"
 
 namespace voxelworldrender {

src/modules/voxelworldrender/PlayerCamera.h

@@ -6,7 +6,7 @@
 
 #include "video/Camera.h"
 #include "WorldRenderer.h"
-#include "core/command/ActionButton.h"
+#include "command/ActionButton.h"
 #include "core/BindingContext.h"
 
 namespace voxelworldrender {

src/server/Server.cpp

@@ -6,7 +6,7 @@
 
 #include "io/Filesystem.h"
 #include "core/Var.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "cooldown/CooldownProvider.h"
 #include "network/ServerNetwork.h"
 #include "network/ServerMessageSender.h"

src/tests/testanimation/TestAnimation.cpp

@@ -10,7 +10,7 @@
 #include "animation/chr/Character.h"
 #include "animation/animal/bird/Bird.h"
 #include "stock/ContainerData.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "core/ArrayLength.h"
 #include "core/collection/Array.h"
 #include "testcore/TestAppMain.h"

src/tests/testtraze/TestTraze.cpp

@@ -3,7 +3,7 @@
  */
 #include "TestTraze.h"
 #include "core/SharedPtr.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "testcore/TestAppMain.h"
 #include "voxel/MaterialColor.h"
 #include "voxel/Region.h"

src/tools/mapview/MapView.cpp

@@ -13,7 +13,7 @@
 #include "metric/Metric.h"
 #include "core/TimeProvider.h"
 #include "core/EventBus.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "voxel/Voxel.h"
 #include "compute/Compute.h"
 #include "io/Filesystem.h"

src/tools/thumbnailer/Thumbnailer.cpp

@@ -4,7 +4,7 @@
 
 #include "Thumbnailer.h"
 #include "core/Color.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "io/Filesystem.h"
 #include "metric/Metric.h"
 #include "core/EventBus.h"

src/tools/voxconvert/VoxConvert.cpp

@@ -5,7 +5,7 @@
 #include "VoxConvert.h"
 #include "core/Color.h"
 #include "core/Var.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "io/Filesystem.h"
 #include "metric/Metric.h"
 #include "core/EventBus.h"

src/tools/voxedit/VoxEdit.cpp

@@ -10,8 +10,8 @@
 #include "metric/Metric.h"
 #include "core/TimeProvider.h"
 #include "core/EventBus.h"
-#include "core/command/Command.h"
-#include "core/command/CommandCompleter.h"
+#include "command/Command.h"
+#include "command/CommandCompleter.h"
 #include "video/Renderer.h"
 #include "voxedit-ui/VoxEditWindow.h"
 #include "io/Filesystem.h"

src/tools/voxedit/modules/voxedit-ui/VoxEditWindow.cpp

@@ -15,7 +15,7 @@
 #include "video/WindowedApp.h"
 #include "core/Var.h"
 #include "core/StringUtil.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "editorscene/Viewport.h"
 #include "settings/SceneSettingsWindow.h"
 #include "layer/LayerWidget.h"

src/tools/voxedit/modules/voxedit-ui/layer/LayerWidget.cpp

@@ -4,8 +4,8 @@
 
 #include "LayerWidget.h"
 #include "app/App.h"
-#include "core/command/Command.h"
-#include "core/command/CommandHandler.h"
+#include "command/Command.h"
+#include "command/CommandHandler.h"
 #include "io/Filesystem.h"
 #include "voxedit-util/SceneManager.h"
 #include "LayerRenameWindow.h"

src/tools/voxedit/modules/voxedit-util/MementoHandler.cpp

@@ -7,7 +7,7 @@
 #include "voxel/Voxel.h"
 #include "voxel/RawVolume.h"
 #include "voxel/Region.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "core/Assert.h"
 #include "core/StandardLib.h"
 #include "core/Log.h"

src/tools/voxedit/modules/voxedit-util/SceneManager.cpp

@@ -30,8 +30,8 @@
 #include "video/Ray.h"
 #include "math/Random.h"
 #include "math/Axis.h"
-#include "core/command/Command.h"
-#include "core/command/CommandCompleter.h"
+#include "command/Command.h"
+#include "command/CommandCompleter.h"
 #include "core/ArrayLength.h"
 #include "app/App.h"
 #include "core/Log.h"

src/tools/voxedit/modules/voxedit-util/SceneManager.h

@@ -22,7 +22,7 @@
 #include "render/Gizmo.h"
 #include "core/Var.h"
 #include "core/Singleton.h"
-#include "core/command/ActionButton.h"
+#include "command/ActionButton.h"
 #include "math/Axis.h"
 #include "MementoHandler.h"
 #include "EditorLUAGenerator.h"

src/tools/voxedit/modules/voxedit-util/layer/LayerManager.cpp

@@ -4,7 +4,7 @@
 
 #include "LayerManager.h"
 #include "core/StringUtil.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "voxelutil/VolumeMerger.h"
 #include "core/Log.h"
 #include "core/Trace.h"

src/tools/voxedit/modules/voxedit-util/modifier/Modifier.cpp

@@ -6,7 +6,7 @@
 #include "math/Axis.h"
 #include "core/Color.h"
 #include "core/StringUtil.h"
-#include "core/command/Command.h"
+#include "command/Command.h"
 #include "voxel/MaterialColor.h"
 #include "voxel/Region.h"
 #include "video/ScopedPolygonMode.h"

src/tools/voxedit/modules/voxedit-util/modifier/ModifierButton.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "core/command/ActionButton.h"
+#include "command/ActionButton.h"
 #include "ModifierType.h"
 
 namespace voxedit {