VOXELUTIL: moved voxel::resize into voxelutil

src/modules/voxelutil/CMakeLists.txt

@@ -11,6 +11,7 @@ set(SRCS
 	VolumeMover.h
 	VolumeRescaler.h
 	VolumeRotator.h VolumeRotator.cpp
+	VolumeResizer.h VolumeResizer.cpp
 	VolumeCropper.h
 	VolumeSplitter.h VolumeSplitter.cpp
 	VolumeVisitor.h

src/modules/voxelutil/VolumeResizer.cpp

@@ -2,12 +2,11 @@
  * @file
  */
 
-#include "Resize.h"
+#include "VolumeResizer.h"
 #include "voxelutil/VolumeMerger.h"
 #include "voxel/RawVolumeWrapper.h"
 
-namespace voxedit {
-namespace tool {
+namespace voxel {
 
 voxel::RawVolume* resize(const voxel::RawVolume* source, const glm::ivec3& size) {
 	voxel::Region region = source->region();
@@ -24,4 +23,3 @@ voxel::RawVolume* resize(const voxel::RawVolume* source, const glm::ivec3& size)
 }
 
 }
-}

src/modules/voxelutil/VolumeResizer.h

@@ -6,10 +6,8 @@
 
 #include "voxel/RawVolume.h"
 
-namespace voxedit {
-namespace tool {
+namespace voxel {
 
 extern voxel::RawVolume* resize(const voxel::RawVolume* source, const glm::ivec3& size);
 
 }
-}

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

@@ -21,7 +21,6 @@ set(SRCS
 	layer/LayerSettings.h
 
 	tool/Clipboard.h tool/Clipboard.cpp
-	tool/Resize.h tool/Resize.cpp
 )
 set(LIB voxedit-util)
 engine_add_module(TARGET ${LIB} SRCS ${SRCS} DEPENDENCIES voxelrender voxelgenerator animation)

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

@@ -14,6 +14,7 @@
 #include "voxelformat/SceneGraphNode.h"
 #include "voxelutil/VolumeMerger.h"
 #include "voxelutil/VolumeCropper.h"
+#include "voxelutil/VolumeResizer.h"
 #include "voxelutil/VolumeRotator.h"
 #include "voxelutil/VolumeMover.h"
 #include "voxelutil/VolumeRescaler.h"
@@ -51,7 +52,6 @@
 #include "CustomBindingContext.h"
 #include "Config.h"
 #include "tool/Clipboard.h"
-#include "tool/Resize.h"
 #include "voxelutil/ImageUtils.h"
 #include "anim/AnimationLuaSaver.h"
 #include "core/TimeProvider.h"
@@ -413,7 +413,7 @@ void SceneManager::crop() {
 }
 
 void SceneManager::resize(int nodeId, const glm::ivec3& size) {
-	voxel::RawVolume* newVolume = voxedit::tool::resize(volume(nodeId), size);
+	voxel::RawVolume* newVolume = voxel::resize(volume(nodeId), size);
 	if (newVolume == nullptr) {
 		return;
 	}