VOXEDIT: restructured source layout

CMakeLists.txt

@@ -151,7 +151,7 @@ endforeach()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SCRIPTS_CMAKE_DIR})
 set(CMAKE_VERBOSE_MAKEFILE ${VERBOSE})
-SET(CMAKE_COLOR_MAKEFILE ON)
+set(CMAKE_COLOR_MAKEFILE ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 if (${CMAKE_GENERATOR} MATCHES "Eclipse CDT4")

src/tools/voxedit/CMakeLists.txt

@@ -1,103 +1,17 @@
-add_subdirectory(voxedit-util)
+include_directories(modules)
+add_subdirectory(modules)
 
 project(voxedit)
 set(SRCS
-	ui/editorscene/Viewport.h ui/editorscene/Viewport.cpp
-
-	ui/palette/PaletteWidget.h ui/palette/PaletteWidget.cpp
-	ui/palette/PaletteSelector.h ui/palette/PaletteSelector.cpp
-
-	ui/settings/SceneSettingsWindow.h ui/settings/SceneSettingsWindow.cpp
-
-	ui/layer/AbstractLayerPopupWindow.h ui/layer/AbstractLayerPopupWindow.cpp
-	ui/layer/LayerWidget.h ui/layer/LayerWidget.cpp
-	ui/layer/LayerWindow.h ui/layer/LayerWindow.cpp
-	ui/layer/LayerMoveWindow.h
-	ui/layer/LayerRenameWindow.h
-
-	ui/VoxEditWindow.h ui/VoxEditWindow.cpp
-
 	VoxEdit.h VoxEdit.cpp
 )
 
-set(UI_WINDOWS
-	voxedit/ui/window/voxedit-layer-rename.tb.txt
-	voxedit/ui/window/voxedit-layer-move.tb.txt
-	voxedit/ui/window/voxedit-layer.tb.txt
-	voxedit/ui/window/voxedit-main.tb.txt
-	voxedit/ui/window/voxedit-palette-selector.tb.txt
-	voxedit/ui/window/voxedit-scene-settings.tb.txt
-)
-
-set(IMAGES
-	voxedit/ui/skin/voxedit-add
-	voxedit/ui/skin/voxedit-anim-play
-	voxedit/ui/skin/voxedit-anim-play-selected
-	voxedit/ui/skin/voxedit-animation
-	voxedit/ui/skin/voxedit-animation-selected
-	voxedit/ui/skin/voxedit-axis-x
-	voxedit/ui/skin/voxedit-axis-y
-	voxedit/ui/skin/voxedit-axis-z
-	voxedit/ui/skin/voxedit-color-picker
-	voxedit/ui/skin/voxedit-color
-	voxedit/ui/skin/voxedit-colors
-	voxedit/ui/skin/voxedit-crop
-	voxedit/ui/skin/voxedit-delete
-	voxedit/ui/skin/voxedit-export
-	voxedit/ui/skin/voxedit-extend
-	voxedit/ui/skin/voxedit-flip-horizontal
-	voxedit/ui/skin/voxedit-flip-vertical
-	voxedit/ui/skin/voxedit-import-palette
-	voxedit/ui/skin/voxedit-load
-	voxedit/ui/skin/voxedit-lock-layer
-	voxedit/ui/skin/voxedit-lock-layer-selected
-	voxedit/ui/skin/voxedit-move
-	voxedit/ui/skin/voxedit-new
-	voxedit/ui/skin/voxedit-options
-	voxedit/ui/skin/voxedit-override
-	voxedit/ui/skin/voxedit-quadview
-	voxedit/ui/skin/voxedit-quadview-selected
-	voxedit/ui/skin/voxedit-quit
-	voxedit/ui/skin/voxedit-undo-redo
-	voxedit/ui/skin/voxedit-reset-camera
-	voxedit/ui/skin/voxedit-rotate
-	voxedit/ui/skin/voxedit-save
-	voxedit/ui/skin/voxedit-shift
-	voxedit/ui/skin/voxedit-show-grid
-	voxedit/ui/skin/voxedit-show-grid-selected
-	voxedit/ui/skin/voxedit-tree_pine
-	voxedit/ui/skin/voxedit-tree
-	voxedit/ui/skin/voxedit-up
-	voxedit/ui/skin/voxedit-visible
-	voxedit/ui/skin/voxedit-visible-selected
-	voxedit/ui/skin/voxedit-voxel
-)
-
 set(FILES
-	${UI_WINDOWS}
-	voxedit/ui/skin/voxedit-skin.tb.txt
-	voxedit/ui/widget/voxedit-layer-item.tb.txt
-	voxedit/ui/widget/voxedit-layer.tb.txt
-	voxedit/ui/lang/en.tb.txt
-
 	voxedit/voxedit-keybindings.cfg
-
 	voxedit/scripts/test-import-plane.cfg
 	voxedit/scripts/test-layers.cfg
 	voxedit/scripts/test-animate.cfg
 )
 
-foreach(IMAGE ${IMAGES})
-	list(APPEND FILES ${IMAGE}.png)
-endforeach()
-set(DPIS "@288")
-foreach(DPI ${DPIS})
-	foreach(IMAGE ${IMAGES})
-		list(APPEND FILES ${IMAGE}${DPI}.png)
-	endforeach()
-endforeach()
-
 engine_add_executable(TARGET ${PROJECT_NAME} SRCS ${SRCS} FILES ${FILES} WINDOWED)
-engine_target_link_libraries(TARGET ${PROJECT_NAME} DEPENDENCIES turbobadger voxedit-util)
-include_directories(.)
-check_ui_turbobadger(${PROJECT_NAME} ${UI_WINDOWS})
+engine_target_link_libraries(TARGET ${PROJECT_NAME} DEPENDENCIES voxedit-ui voxedit-util)

src/tools/voxedit/VoxEdit.cpp

@@ -4,6 +4,7 @@
 
 #include "VoxEdit.h"
 #include "core/Color.h"
+#include "voxedit-util/SceneManager.h"
 #include "voxel/MaterialColor.h"
 #include "core/metric/Metric.h"
 #include "core/TimeProvider.h"
@@ -11,12 +12,12 @@
 #include "core/command/Command.h"
 #include "core/command/CommandCompleter.h"
 #include "video/Renderer.h"
-#include "ui/VoxEditWindow.h"
+#include "voxedit-ui/VoxEditWindow.h"
 #include "core/io/Filesystem.h"
 #include "voxedit-util/CustomBindingContext.h"
 
 VoxEdit::VoxEdit(const metric::MetricPtr& metric, const io::FilesystemPtr& filesystem, const core::EventBusPtr& eventBus, const core::TimeProviderPtr& timeProvider) :
-		Super(metric, filesystem, eventBus, timeProvider), _mainWindow(nullptr), _sceneMgr(voxedit::sceneMgr()) {
+		Super(metric, filesystem, eventBus, timeProvider) {
 	init(ORGANISATION, "voxedit");
 	_allowRelativeMouseMode = false;
 }
@@ -78,7 +79,7 @@ bool VoxEdit::newFile(bool force) {
 }
 
 core::AppState VoxEdit::onCleanup() {
-	_sceneMgr.shutdown();
+	voxedit::sceneMgr().shutdown();
 	return Super::onCleanup();
 }
 
@@ -87,11 +88,11 @@ void VoxEdit::onDropFile(const core::String& file) {
 		return;
 	}
 	if (_mainWindow->isPaletteWidgetDropTarget()) {
-		if (_sceneMgr.importPalette(file)) {
+		if (voxedit::sceneMgr().importPalette(file)) {
 			return;
 		}
 	}
-	if (_sceneMgr.prefab(file)) {
+	if (voxedit::sceneMgr().prefab(file)) {
 		return;
 	}
 	Log::warn("Failed to handle %s as drop file event", file.c_str());
@@ -102,7 +103,7 @@ core::AppState VoxEdit::onConstruct() {
 
 	_framesPerSecondsCap->setVal(60.0f);
 
-	_sceneMgr.construct();
+	voxedit::sceneMgr().construct();
 
 #define COMMAND_FILE(command, help) \
 	core::Command::registerCommand(#command, [this] (const core::CmdArgs& args) { \
@@ -165,7 +166,7 @@ core::AppState VoxEdit::onInit() {
 		return state;
 	}
 
-	if (!_sceneMgr.init()) {
+	if (!voxedit::sceneMgr().init()) {
 		Log::error("Failed to initialize the scene manager");
 		return core::AppState::InitFailure;
 	}
@@ -192,7 +193,7 @@ core::AppState VoxEdit::onInit() {
 		const char *file = _argv[_argc - 1];
 		const io::FilePtr& filePtr = filesystem()->open(file);
 		if (filePtr->exists()) {
-			_sceneMgr.load(filePtr->name());
+			voxedit::sceneMgr().load(filePtr->name());
 		}
 	}
 

src/tools/voxedit/VoxEdit.h

@@ -5,7 +5,7 @@
 #pragma once
 
 #include "ui/turbobadger/UIApp.h"
-#include "ui/VoxEditWindow.h"
+#include "voxedit-ui/VoxEditWindow.h"
 #include "voxedit-util/SceneManager.h"
 #include "core/ArrayLength.h"
 
@@ -17,8 +17,7 @@
 class VoxEdit: public ui::turbobadger::UIApp {
 private:
 	using Super = ui::turbobadger::UIApp;
-	voxedit::VoxEditWindow* _mainWindow;
-	voxedit::SceneManager& _sceneMgr;
+	voxedit::VoxEditWindow* _mainWindow = nullptr;
 
 public:
 	VoxEdit(const metric::MetricPtr& metric, const io::FilesystemPtr& filesystem, const core::EventBusPtr& eventBus, const core::TimeProviderPtr& timeProvider);

src/tools/voxedit/modules/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_subdirectory(voxedit-util)
+add_subdirectory(voxedit-ui)

src/tools/voxedit/modules/voxedit-ui/CMakeLists.txt

@@ -0,0 +1,92 @@
+set(LIB voxedit-ui)
+
+set(SRCS
+	editorscene/Viewport.h editorscene/Viewport.cpp
+
+	palette/PaletteWidget.h palette/PaletteWidget.cpp
+	palette/PaletteSelector.h palette/PaletteSelector.cpp
+
+	settings/SceneSettingsWindow.h settings/SceneSettingsWindow.cpp
+
+	layer/AbstractLayerPopupWindow.h layer/AbstractLayerPopupWindow.cpp
+	layer/LayerWidget.h layer/LayerWidget.cpp
+	layer/LayerWindow.h layer/LayerWindow.cpp
+	layer/LayerMoveWindow.h
+	layer/LayerRenameWindow.h
+
+	VoxEditWindow.h VoxEditWindow.cpp
+)
+
+set(UI_WINDOWS
+	voxedit-ui/ui/window/voxedit-layer-rename.tb.txt
+	voxedit-ui/ui/window/voxedit-layer-move.tb.txt
+	voxedit-ui/ui/window/voxedit-layer.tb.txt
+	voxedit-ui/ui/window/voxedit-main.tb.txt
+	voxedit-ui/ui/window/voxedit-palette-selector.tb.txt
+	voxedit-ui/ui/window/voxedit-scene-settings.tb.txt
+)
+
+set(IMAGES
+	voxedit-ui/ui/skin/voxedit-add
+	voxedit-ui/ui/skin/voxedit-anim-play
+	voxedit-ui/ui/skin/voxedit-anim-play-selected
+	voxedit-ui/ui/skin/voxedit-animation
+	voxedit-ui/ui/skin/voxedit-animation-selected
+	voxedit-ui/ui/skin/voxedit-axis-x
+	voxedit-ui/ui/skin/voxedit-axis-y
+	voxedit-ui/ui/skin/voxedit-axis-z
+	voxedit-ui/ui/skin/voxedit-color-picker
+	voxedit-ui/ui/skin/voxedit-color
+	voxedit-ui/ui/skin/voxedit-colors
+	voxedit-ui/ui/skin/voxedit-crop
+	voxedit-ui/ui/skin/voxedit-delete
+	voxedit-ui/ui/skin/voxedit-export
+	voxedit-ui/ui/skin/voxedit-extend
+	voxedit-ui/ui/skin/voxedit-flip-horizontal
+	voxedit-ui/ui/skin/voxedit-flip-vertical
+	voxedit-ui/ui/skin/voxedit-import-palette
+	voxedit-ui/ui/skin/voxedit-load
+	voxedit-ui/ui/skin/voxedit-lock-layer
+	voxedit-ui/ui/skin/voxedit-lock-layer-selected
+	voxedit-ui/ui/skin/voxedit-move
+	voxedit-ui/ui/skin/voxedit-new
+	voxedit-ui/ui/skin/voxedit-options
+	voxedit-ui/ui/skin/voxedit-override
+	voxedit-ui/ui/skin/voxedit-quadview
+	voxedit-ui/ui/skin/voxedit-quadview-selected
+	voxedit-ui/ui/skin/voxedit-quit
+	voxedit-ui/ui/skin/voxedit-undo-redo
+	voxedit-ui/ui/skin/voxedit-reset-camera
+	voxedit-ui/ui/skin/voxedit-rotate
+	voxedit-ui/ui/skin/voxedit-save
+	voxedit-ui/ui/skin/voxedit-shift
+	voxedit-ui/ui/skin/voxedit-show-grid
+	voxedit-ui/ui/skin/voxedit-show-grid-selected
+	voxedit-ui/ui/skin/voxedit-tree_pine
+	voxedit-ui/ui/skin/voxedit-tree
+	voxedit-ui/ui/skin/voxedit-up
+	voxedit-ui/ui/skin/voxedit-visible
+	voxedit-ui/ui/skin/voxedit-visible-selected
+	voxedit-ui/ui/skin/voxedit-voxel
+)
+
+set(FILES
+	${UI_WINDOWS}
+	voxedit-ui/ui/skin/voxedit-skin.tb.txt
+	voxedit-ui/ui/widget/voxedit-layer-item.tb.txt
+	voxedit-ui/ui/widget/voxedit-layer.tb.txt
+	voxedit-ui/ui/lang/en.tb.txt
+)
+
+foreach(IMAGE ${IMAGES})
+	list(APPEND FILES ${IMAGE}.png)
+endforeach()
+set(DPIS "@288")
+foreach(DPI ${DPIS})
+	foreach(IMAGE ${IMAGES})
+		list(APPEND FILES ${IMAGE}${DPI}.png)
+	endforeach()
+endforeach()
+
+engine_add_module(TARGET ${LIB} SRCS ${SRCS} FILES ${FILES} DEPENDENCIES turbobadger voxedit-util)
+check_ui_turbobadger(${LIB} ${UI_WINDOWS})