Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 21:12:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Simplification.

Browse source
This commit is contained in:
Andrzej Kapolka 2015-01-21 12:57:24 -08:00
parent 87e3339791
commit 8636f0c48e
1 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
interface/src/MetavoxelSystem.cpp
View file

@ -1857,11 +1857,8 @@ void HeightfieldNodeRenderer::render(const HeightfieldNodePointer& node, const g
if (!(corners & (1 << i))) { if (!(corners & (1 << i))) {
continue; continue;
} }
int offsetX = (i & X_MAXIMUM_FLAG) ? 1 : 0; const EdgeCrossing& cornerCrossing = cornerCrossings[i];
int offsetZ = (i & Y_MAXIMUM_FLAG) ? 1 : 0; if (cornerCrossing.point.y >= y && cornerCrossing.point.y < y + 1) {
const quint16* height = heightLineSrc + offsetZ * width + offsetX;
float heightValue = *height * voxelScale;
if (heightValue >= y && heightValue < y + 1) {
crossedCorners |= (1 << i); crossedCorners |= (1 << i);
} }
} }
@ -1901,30 +1898,24 @@ void HeightfieldNodeRenderer::render(const HeightfieldNodePointer& node, const g
if (!(corners & (1 << i))) { if (!(corners & (1 << i))) {
continue; continue;
} }
int offsetX = (i & X_MAXIMUM_FLAG) ? 1 : 0;
int offsetZ = (i & Y_MAXIMUM_FLAG) ? 1 : 0;
const quint16* height = heightLineSrc + offsetZ * width + offsetX;
float heightValue = *height * voxelScale;
int nextIndex = NEXT_CORNERS[i]; int nextIndex = NEXT_CORNERS[i];
if (!(corners & (1 << nextIndex))) { if (!(corners & (1 << nextIndex))) {
continue; continue;
} }
int nextOffsetX = (nextIndex & X_MAXIMUM_FLAG) ? 1 : 0; const EdgeCrossing& cornerCrossing = cornerCrossings[i];
int nextOffsetZ = (nextIndex & Y_MAXIMUM_FLAG) ? 1 : 0; const EdgeCrossing& nextCornerCrossing = cornerCrossings[nextIndex];
const quint16* nextHeight = heightLineSrc + nextOffsetZ * width + nextOffsetX; float divisor = (nextCornerCrossing.point.y - cornerCrossing.point.y);
float nextHeightValue = *nextHeight * voxelScale;
float divisor = (nextHeightValue - heightValue);
if (divisor == 0.0f) { if (divisor == 0.0f) {
continue; continue;
} }
float t1 = (y - heightValue) / divisor; float t1 = (y - cornerCrossing.point.y) / divisor;
float t2 = (y + 1 - heightValue) / divisor; float t2 = (y + 1 - cornerCrossing.point.y) / divisor;
if (t1 >= 0.0f && t1 <= 1.0f) { if (t1 >= 0.0f && t1 <= 1.0f) {
crossings[crossingCount++].mix(cornerCrossings[i], cornerCrossings[nextIndex], t1); crossings[crossingCount++].mix(cornerCrossing, nextCornerCrossing, t1);
crossings[crossingCount - 1].point.y -= y; crossings[crossingCount - 1].point.y -= y;
} }
if (t2 >= 0.0f && t2 <= 1.0f) { if (t2 >= 0.0f && t2 <= 1.0f) {
crossings[crossingCount++].mix(cornerCrossings[i], cornerCrossings[nextIndex], t2); crossings[crossingCount++].mix(cornerCrossing, nextCornerCrossing, t2);
crossings[crossingCount - 1].point.y -= y; crossings[crossingCount - 1].point.y -= y;
} }
} }