Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 01:46:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Increment fix.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-12-17 20:38:10 -08:00
parent 8629f7d00a
commit c7cae28c07
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/metavoxels/src/Spanner.cpp
View file

@ -1888,10 +1888,10 @@ void HeightfieldNode::getRangeAfterHeightPaint(const glm::vec3& translation, con
// make sure we increment in multiples of the voxel size
float voxelStep = scale.x / innerHeightWidth;
float newScaleY = (maximum - minimum + 1.0f) * scale.y / numeric_limits<quint16>::max();
float newSteps = newScaleY / voxelStep;
if (glm::abs(newSteps - glm::round(newSteps)) > HERMITE_GRANULARITY) {
minimum -= (voxelStep * glm::ceil(newSteps) - newScaleY) * numeric_limits<quint16>::max() / scale.y;
float heightIncrement = (1.0f - minimum) * scale.y / numeric_limits<quint16>::max();
float incrementSteps = heightIncrement / voxelStep;
if (glm::abs(incrementSteps - glm::round(incrementSteps)) > HERMITE_GRANULARITY) {
minimum = 1.0f - voxelStep * glm::ceil(incrementSteps) * numeric_limits<quint16>::max() / scale.y;
}
}
@ -2023,10 +2023,10 @@ void HeightfieldNode::getRangeAfterEdit(const glm::vec3& translation, const glm:
// make sure we increment in multiples of the voxel size
float voxelStep = scale.x / innerHeightWidth;
float newScaleY = (maximum - minimum + 1.0f) * scale.y / numeric_limits<quint16>::max();
float newSteps = newScaleY / voxelStep;
if (glm::abs(newSteps - glm::round(newSteps)) > HERMITE_GRANULARITY) {
minimum -= (voxelStep * glm::ceil(newSteps) - newScaleY) * numeric_limits<quint16>::max() / scale.y;
float heightIncrement = (1.0f - minimum) * scale.y / numeric_limits<quint16>::max();
float incrementSteps = heightIncrement / voxelStep;
if (glm::abs(incrementSteps - glm::round(incrementSteps)) > HERMITE_GRANULARITY) {
minimum = 1.0f - voxelStep * glm::ceil(incrementSteps) * numeric_limits<quint16>::max() / scale.y;
}
}