Pantyhose-X
/
vengi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VOXELFORMAT: allow to crop the volumes while splitting them

master
Martin Gerhardy 2022-04-23 14:08:39 +02:00
parent 8c2e622111
commit 057f35b12c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/voxelformat/Format.cpp
View File

@ -12,7 +12,9 @@
#include "core/Color.h"
#include "math/Math.h"
#include "voxel/Mesh.h"
#include "voxel/RawVolume.h"
#include "voxelformat/SceneGraph.h"
#include "voxelutil/VolumeCropper.h"
#include "voxelutil/VolumeSplitter.h"
#include "voxelutil/VoxelUtil.h"
#include <limits>
@ -69,7 +71,7 @@ voxel::RawVolume* Format::transformVolume(const SceneGraphTransform &t, const vo
return v;
}
void Format::splitVolumes(const SceneGraph& srcSceneGraph, SceneGraph& destSceneGraph, const glm::ivec3 &maxSize) {
void Format::splitVolumes(const SceneGraph& srcSceneGraph, SceneGraph& destSceneGraph, const glm::ivec3 &maxSize, bool crop) {
destSceneGraph.reserve(srcSceneGraph.size());
for (SceneGraphNode &node : srcSceneGraph) {
const voxel::Region& region = node.region();
@ -86,6 +88,11 @@ void Format::splitVolumes(const SceneGraph& srcSceneGraph, SceneGraph& destScene
voxelutil::splitVolume(node.volume(), maxSize, rawVolumes);
for (voxel::RawVolume *v : rawVolumes) {
SceneGraphNode newNode;
if (crop) {
voxel::RawVolume *cv = voxelutil::cropVolume(v);
delete v;
v = cv;
}
newNode.setVolume(v, true);
destSceneGraph.emplace(core::move(newNode));
}

2
src/modules/voxelformat/Format.h
View File

@ -78,7 +78,7 @@ protected:
* @brief Split volumes according to their max size into several smaller volumes
* Some formats only support small volumes sizes per object - but multiple objects.
*/
void splitVolumes(const SceneGraph& srcSceneGraph, SceneGraph& destSceneGraph, const glm::ivec3 &maxSize);
void splitVolumes(const SceneGraph& srcSceneGraph, SceneGraph& destSceneGraph, const glm::ivec3 &maxSize, bool crop = false);
voxel::RawVolume* transformVolume(const SceneGraphTransform &t, const voxel::RawVolume *in) const;
public: