Zylann/godot_voxel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use signed integers when decoding SDF

Browse Source
This commit is contained in:
Marc Gilleron 2022-02-27 04:08:01 +00:00
parent 9adf996c2e
commit 284c763a57
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
meshers/transvoxel/transvoxel.cpp
View File

@ -107,11 +107,11 @@ inline Vector3i dir_to_prev_vec(uint8_t dir) {
return Vector3i(-(dir & 1), -((dir >> 1) & 1), -((dir >> 2) & 1));
}
inline float sdf_as_float(uint8_t v) {
inline float sdf_as_float(int8_t v) {
return -s8_to_snorm_noclamp(v);
}
inline float sdf_as_float(uint16_t v) {
inline float sdf_as_float(int16_t v) {
return -s16_to_snorm_noclamp(v);
}
@ -166,7 +166,7 @@ struct CellTextureDatas {
};
template <unsigned int NVoxels, typename WeightSampler_T>
CellTextureDatas<NVoxels> select_textures(const FixedArray<unsigned int, NVoxels> &voxel_indices,
CellTextureDatas<NVoxels> select_textures_4_per_voxel(const FixedArray<unsigned int, NVoxels> &voxel_indices,
Span<const uint16_t> indices_data, const WeightSampler_T &weights_sampler) {
// TODO Optimization: this function takes almost half of the time when polygonizing non-empty cells.
// I wonder how it can be optimized further?
@ -257,7 +257,7 @@ inline void get_cell_texture_data(CellTextureDatas<NVoxels> &cell_textures,
} else {
// There can be more than 4 indices or they are not known, so we have to select them
cell_textures = select_textures(voxel_indices, texture_indices_data.buffer, weights_data);
cell_textures = select_textures_4_per_voxel(voxel_indices, texture_indices_data.buffer, weights_data);
}
}
@ -265,13 +265,13 @@ template <typename Sdf_T>
inline Sdf_T get_isolevel() = delete;
template <>
inline uint8_t get_isolevel<uint8_t>() {
return 128;
inline int8_t get_isolevel<int8_t>() {
return 0;
}
template <>
inline uint16_t get_isolevel<uint16_t>() {
return 32768;
inline int16_t get_isolevel<int16_t>() {
return 0;
}
template <>
@ -323,7 +323,8 @@ void build_regular_mesh(Span<const Sdf_T> sdf_data, TextureIndicesData texture_i
{
const bool s = sdf_data[data_index] < isolevel;
if ((sdf_data[data_index + n010] < isolevel) == s &&
if ( //
(sdf_data[data_index + n010] < isolevel) == s &&
(sdf_data[data_index + n100] < isolevel) == s &&
(sdf_data[data_index + n110] < isolevel) == s &&
(sdf_data[data_index + n001] < isolevel) == s &&
@ -1259,14 +1260,14 @@ DefaultTextureIndicesData build_regular_mesh(const VoxelBufferInternal &voxels,
// which would otherwise harm performance in tight iterations
switch (voxels.get_channel_depth(sdf_channel)) {
case VoxelBufferInternal::DEPTH_8_BIT: {
Span<const uint8_t> sdf_data = sdf_data_raw.reinterpret_cast_to<const uint8_t>();
build_regular_mesh<uint8_t>(
Span<const int8_t> sdf_data = sdf_data_raw.reinterpret_cast_to<const int8_t>();
build_regular_mesh<int8_t>(
sdf_data, indices_data, weights_data, voxels.get_size(), lod_index, texturing_mode, cache, output);
} break;
case VoxelBufferInternal::DEPTH_16_BIT: {
Span<const uint16_t> sdf_data = sdf_data_raw.reinterpret_cast_to<const uint16_t>();
build_regular_mesh<uint16_t>(
Span<const int16_t> sdf_data = sdf_data_raw.reinterpret_cast_to<const int16_t>();
build_regular_mesh<int16_t>(
sdf_data, indices_data, weights_data, voxels.get_size(), lod_index, texturing_mode, cache, output);
} break;
@ -1349,14 +1350,14 @@ void build_transition_mesh(const VoxelBufferInternal &voxels, unsigned int sdf_c
switch (voxels.get_channel_depth(sdf_channel)) {
case VoxelBufferInternal::DEPTH_8_BIT: {
Span<const uint8_t> sdf_data = sdf_data_raw.reinterpret_cast_to<const uint8_t>();
build_transition_mesh<uint8_t>(sdf_data, indices_data, weights_data, voxels.get_size(), direction,
lod_index, texturing_mode, cache, output);
Span<const int8_t> sdf_data = sdf_data_raw.reinterpret_cast_to<const int8_t>();
build_transition_mesh<int8_t>(sdf_data, indices_data, weights_data, voxels.get_size(), direction, lod_index,
texturing_mode, cache, output);
} break;
case VoxelBufferInternal::DEPTH_16_BIT: {
Span<const uint16_t> sdf_data = sdf_data_raw.reinterpret_cast_to<const uint16_t>();
build_transition_mesh<uint16_t>(sdf_data, indices_data, weights_data, voxels.get_size(), direction,
Span<const int16_t> sdf_data = sdf_data_raw.reinterpret_cast_to<const int16_t>();
build_transition_mesh<int16_t>(sdf_data, indices_data, weights_data, voxels.get_size(), direction,
lod_index, texturing_mode, cache, output);
} break;