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

VOXELFORMAT: fixed saving vox files

master
Martin Gerhardy 2022-01-21 21:22:14 +01:00
parent e0a9e6afb5
commit 8c2e9429e3
10 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/tests/rgb.csv
View File

@ -1022,7 +1022,7 @@
#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000
#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000
#FFFFFFFF,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#FFFFFFFF
#EEEEEEFF,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#EEEEEEFF
#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000
#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000
#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000
@ -1053,5 +1053,5 @@
#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000
#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000
#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000
#FFFFFFFF,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#FFFFFFFF
#EEEEEEFF,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#EEEEEEFF

1 32,32,32
1022 #00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000
1023 #00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000
1024 #00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000
1025 #FFFFFFFF,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#FFFFFFFF #EEEEEEFF,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#00000000,#EEEEEEFF
1026
1027
1028
1053
1054
1055
1056
1057

BIN
data/tests/rgb.cub
View File

Binary file not shown.

BIN
data/tests/rgb.gox
View File

Binary file not shown.

BIN
data/tests/rgb.qb
View File

Binary file not shown.

8
data/tests/rgb.qef
View File

@ -259,8 +259,8 @@ www.minddesk.com
0.133333 0.133333 0.133333
0.066667 0.066667 0.066667
0.000000 0.000000 0.000000
0 0 0 0 126
0 31 0 0 126
0 0 0 245 126
0 31 0 245 126
0 0 31 1 126
0 31 31 1 126
9 4 0 37 126
@ -354,7 +354,7 @@ www.minddesk.com
20 21 0 197 126
20 22 0 197 126
20 23 0 197 126
31 0 0 0 126
31 31 0 0 126
31 0 0 245 126
31 31 0 245 126
31 0 31 1 126
31 31 31 1 126

BIN
data/tests/rgb.vox
View File

Binary file not shown.

BIN
data/tests/rgb.vxl
View File

Binary file not shown.

BIN
data/tests/rgb.vxm
View File

Binary file not shown.

22
src/modules/voxelformat/VoxFormat.cpp
View File

@ -86,17 +86,16 @@ bool VoxFormat::addInstance(const ogt_vox_scene *scene, uint32_t ogt_instanceIdx
const glm::vec4 ogtCol1(ogtTransform.m10, ogtTransform.m11, ogtTransform.m12, ogtTransform.m13);
const glm::vec4 ogtCol2(ogtTransform.m20, ogtTransform.m21, ogtTransform.m22, ogtTransform.m23);
const glm::vec4 ogtCol3(ogtTransform.m30, ogtTransform.m31, ogtTransform.m32, ogtTransform.m33);
bool applyTransformation = scene->num_instances > 1;
const glm::mat4 ogtMat = glm::mat4{ogtCol0, ogtCol1, ogtCol2, ogtCol3};
const ogt_vox_model *ogtModel = scene->models[ogtInstance.model_index];
const uint8_t *ogtVoxels = ogtModel->voxel_data;
const uint8_t *ogtVoxel = ogtVoxels;
const glm::ivec3 maxs(ogtModel->size_x - 1, ogtModel->size_y - 1, ogtModel->size_z - 1);
const glm::vec4 pivot((float)maxs.x / 2.0f + 0.5f, (float)maxs.y / 2.0f + 0.5f, (float)maxs.z / 2.0f + 0.5f, 0.0f);
const glm::ivec3 transformedMins = applyTransformation ? transform(ogtMat, glm::ivec3(0), pivot) : glm::ivec3(0);
const glm::ivec3 transformedMaxs = applyTransformation ? transform(ogtMat, maxs, pivot) : glm::ivec3(maxs.x, maxs.z, maxs.y);
const glm::ivec3 zUpMins = applyTransformation ? transform(zUpMat, transformedMins, glm::ivec4(0)) : transformedMins;
const glm::ivec3 zUpMaxs = applyTransformation ? transform(zUpMat, transformedMaxs, glm::ivec4(0)) : transformedMaxs;
const glm::ivec3& transformedMins = transform(ogtMat, glm::ivec3(0), pivot);
const glm::ivec3& transformedMaxs = transform(ogtMat, maxs, pivot);
const glm::ivec3& zUpMins = transform(zUpMat, transformedMins, glm::ivec4(0));
const glm::ivec3& zUpMaxs = transform(zUpMat, transformedMaxs, glm::ivec4(0));
const voxel::Region region(glm::min(zUpMins, zUpMaxs), glm::max(zUpMins, zUpMaxs));
voxel::RawVolume *v = new voxel::RawVolume(region);
@ -107,8 +106,8 @@ bool VoxFormat::addInstance(const ogt_vox_scene *scene, uint32_t ogt_instanceIdx
continue;
}
const voxel::Voxel voxel = voxel::createVoxel(voxel::VoxelType::Generic, _palette[ogtVoxel[0]]);
const glm::ivec3 pos = applyTransformation ? transform(ogtMat, glm::ivec3(i, j, k), pivot) : glm::ivec3(i, k, j);
const glm::ivec3 poszUp = applyTransformation ? transform(zUpMat, pos, glm::ivec4(0)) : pos;
const glm::ivec3& pos = transform(ogtMat, glm::ivec3(i, j, k), pivot);
const glm::ivec3& poszUp = transform(zUpMat, pos, glm::ivec4(0));
v->setVoxel(poszUp, voxel);
}
}
@ -276,7 +275,7 @@ bool VoxFormat::saveGroups(const SceneGraph &sceneGraph, const core::String &fil
} else {
*dataptr++ = voxel.getColor();
}
}, voxelutil::VisitAll(), voxelutil::VisitorOrder::YZX);
}, voxelutil::VisitAll(), voxelutil::VisitorOrder::YZmX);
models.push_back(model);
modelPtrs.push_back(&models[models.size() - 1]);
@ -291,10 +290,13 @@ bool VoxFormat::saveGroups(const SceneGraph &sceneGraph, const core::String &fil
instance.layer_index = layers.size() - 1;
instance.name = node.name().c_str();
instance.hidden = !node.visible();
const glm::vec3 transform = glm::floor(node.region().getCenterf());
const glm::vec3 &mins = region.getLowerCornerf();
const glm::vec3 &maxs = region.getUpperCornerf();
const glm::vec3 width = maxs - mins + 1.0f;
const glm::vec3 transform = mins + width / 2.0f;
// y and z are flipped here
instance.transform = ogt_identity_transform;
instance.transform.m30 = transform.x;
instance.transform.m30 = -glm::floor(transform.x + 0.5f);
instance.transform.m31 = transform.z;
instance.transform.m32 = transform.y;
instances.push_back(instance);

8
src/modules/voxelformat/tests/AbstractVoxFormatTest.cpp
View File

@ -59,10 +59,10 @@ void AbstractVoxFormatTest::testRGB(RawVolume* volume) {
EXPECT_EQ(VoxelType::Generic, volume->voxel( 9, 0, 12).getMaterial());
EXPECT_EQ(VoxelType::Generic, volume->voxel( 9, 0, 19).getMaterial());
EXPECT_EQ( 0, volume->voxel( 0, 0, 0).getColor()) << "Expected to get the palette index 0";
EXPECT_EQ( 0, volume->voxel(31, 0, 0).getColor()) << "Expected to get the palette index 0";
EXPECT_EQ( 0, volume->voxel(31, 0, 31).getColor()) << "Expected to get the palette index 0";
EXPECT_EQ( 0, volume->voxel( 0, 0, 31).getColor()) << "Expected to get the palette index 0";
EXPECT_EQ(245, volume->voxel( 0, 0, 0).getColor()) << "Expected to get the palette index 0";
EXPECT_EQ(245, volume->voxel(31, 0, 0).getColor()) << "Expected to get the palette index 0";
EXPECT_EQ(245, volume->voxel(31, 0, 31).getColor()) << "Expected to get the palette index 0";
EXPECT_EQ(245, volume->voxel( 0, 0, 31).getColor()) << "Expected to get the palette index 0";
EXPECT_EQ( 1, volume->voxel( 0, 31, 0).getColor()) << "Expected to get the palette index 1";
EXPECT_EQ( 1, volume->voxel(31, 31, 0).getColor()) << "Expected to get the palette index 1";