Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Edge fix.

Browse source
This commit is contained in:
Andrzej Kapolka 2015-01-18 00:26:43 -08:00
parent 61cbafadd4
commit 393d537c16
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/src/MetavoxelSystem.cpp
View file

@ -1747,33 +1747,33 @@ void HeightfieldNodeRenderer::render(const HeightfieldNodePointer& node, const g
stitchMinimumY = qMin(stitchMinimumY, (int)heightfieldHeight); stitchMinimumY = qMin(stitchMinimumY, (int)heightfieldHeight);
stitchMaximumY = qMax(stitchMaximumY, (int)heightfieldHeight); stitchMaximumY = qMax(stitchMaximumY, (int)heightfieldHeight);
} }
if (nextHeightfieldHeightX != 0.0f) { if (nextHeightfieldHeightX != 0.0f && x != stackWidth) {
corners |= UPPER_RIGHT_CORNER; corners |= UPPER_RIGHT_CORNER;
stitchMinimumY = qMin(stitchMinimumY, (int)nextHeightfieldHeightX); stitchMinimumY = qMin(stitchMinimumY, (int)nextHeightfieldHeightX);
stitchMaximumY = qMax(stitchMaximumY, (int)nextHeightfieldHeightX); stitchMaximumY = qMax(stitchMaximumY, (int)nextHeightfieldHeightX);
} }
if (nextHeightfieldHeightZ != 0.0f) { if (nextHeightfieldHeightZ != 0.0f && z != stackHeight) {
corners |= LOWER_LEFT_CORNER; corners |= LOWER_LEFT_CORNER;
stitchMinimumY = qMin(stitchMinimumY, (int)nextHeightfieldHeightZ); stitchMinimumY = qMin(stitchMinimumY, (int)nextHeightfieldHeightZ);
stitchMaximumY = qMax(stitchMaximumY, (int)nextHeightfieldHeightZ); stitchMaximumY = qMax(stitchMaximumY, (int)nextHeightfieldHeightZ);
} }
if (nextHeightfieldHeightXZ != 0.0f) { if (nextHeightfieldHeightXZ != 0.0f && x != stackWidth && z != stackHeight) {
corners |= LOWER_RIGHT_CORNER; corners |= LOWER_RIGHT_CORNER;
stitchMinimumY = qMin(stitchMinimumY, (int)nextHeightfieldHeightXZ); stitchMinimumY = qMin(stitchMinimumY, (int)nextHeightfieldHeightXZ);
stitchMaximumY = qMax(stitchMaximumY, (int)nextHeightfieldHeightXZ); stitchMaximumY = qMax(stitchMaximumY, (int)nextHeightfieldHeightXZ);
} }
bool stitchable = middleX && middleZ && !(corners == NO_CORNERS || corners == ALL_CORNERS); bool stitchable = x != 0 && z != 0 && !(corners == NO_CORNERS || corners == ALL_CORNERS);
bool stitched = false; bool stitched = false;
VoxelPoint cornerPoints[4]; VoxelPoint cornerPoints[4];
int clampedX = qMax(x - 1, 0), clampedZ = qMax(z - 1, 0); int clampedX = qMax(x - 1, 0), clampedZ = qMax(z - 1, 0);
if (stitchable) { if (stitchable) {
for (unsigned int i = 0; i < sizeof(cornerPoints) / sizeof(cornerPoints[0]); i++) { for (unsigned int i = 0; i < sizeof(cornerPoints) / sizeof(cornerPoints[0]); i++) {
if (!(corners & (1 << i))) {
continue;
}
int offsetX = (i & X_MAXIMUM_FLAG) ? 1 : 0; int offsetX = (i & X_MAXIMUM_FLAG) ? 1 : 0;
int offsetZ = (i & Y_MAXIMUM_FLAG) ? 1 : 0; int offsetZ = (i & Y_MAXIMUM_FLAG) ? 1 : 0;
const quint16* height = heightLineSrc + offsetZ * width + offsetX; const quint16* height = heightLineSrc + offsetZ * width + offsetX;
if (*height == 0) {
continue;
}
VoxelPoint& point = cornerPoints[i]; VoxelPoint& point = cornerPoints[i];
int clampedOffsetX = clampedX + offsetX, clampedOffsetZ = clampedZ + offsetZ; int clampedOffsetX = clampedX + offsetX, clampedOffsetZ = clampedZ + offsetZ;
point.vertex = glm::vec3(clampedOffsetX, *height * voxelScale, clampedOffsetZ) * step; point.vertex = glm::vec3(clampedOffsetX, *height * voxelScale, clampedOffsetZ) * step;