Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 22:28:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

More render progress.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-12-31 17:33:43 -08:00
parent 08dfd28ec0
commit e242459ea2
3 changed files with 53 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
interface/src/MetavoxelSystem.cpp
View file

@ -2331,42 +2331,57 @@ void HeightfieldNodeRenderer::render(const HeightfieldNodePointer& node, const g
QVector<IndexVector> lastIndicesZ(stackWidth + 1); QVector<IndexVector> lastIndicesZ(stackWidth + 1);
for (int z = 0; z <= stackHeight; z++) { for (int z = 0; z <= stackHeight; z++) {
bool middleZ = (z != 0 && z != stackHeight);
const StackArray* lineSrc = src; const StackArray* lineSrc = src;
for (int x = 0; x <= stackWidth; x++) { for (int x = 0; x <= stackWidth; x++) {
if (!lineSrc->isEmpty()) { bool middleX = (x != 0 && x != stackWidth);
int position = lineSrc->getPosition();
int count = lineSrc->getEntryCount(); // find the y extents of this and the neighboring columns
int y = position; int minimumY = INT_MAX, maximumY = -1;
lineSrc->getExtents(minimumY, maximumY);
if (middleX) {
lineSrc[1].getExtents(minimumY, maximumY);
if (middleZ) {
lineSrc[stackWidth + 1].getExtents(minimumY, maximumY);
}
}
if (middleZ) {
lineSrc[stackWidth].getExtents(minimumY, maximumY);
}
if (maximumY >= minimumY) {
int position = minimumY;
int count = maximumY - minimumY + 1;
NormalIndex lastIndexY; NormalIndex lastIndexY;
indicesX.position = position; indicesX.position = position;
indicesX.resize(count); indicesX.resize(count);
indicesZ[x].position = position; indicesZ[x].position = position;
indicesZ[x].resize(count); indicesZ[x].resize(count);
for (const StackArray::Entry* entry = lineSrc->getEntryData(), *end = entry + lineSrc->getEntryCount(); for (int y = position, end = position + count; y < end; y++) {
entry != end; entry++, y++) { const StackArray::Entry& entry = lineSrc->getEntry(y);
int clampedX = qMax(x - 1, 0), clampedZ = qMax(z - 1, 0); int clampedX = qMax(x - 1, 0), clampedZ = qMax(z - 1, 0);
if (displayHermite && x != 0 && z != 0) { if (displayHermite && x != 0 && z != 0) {
glm::vec3 normal; glm::vec3 normal;
float distance = entry->getHermiteX(normal); float distance = entry.getHermiteX(normal);
if (normal != glm::vec3()) { if (normal != glm::vec3()) {
glm::vec3 start = glm::vec3(clampedX + distance, y, clampedZ) * step; glm::vec3 start = glm::vec3(clampedX + distance, y, clampedZ) * step;
hermiteSegments.append(start); hermiteSegments.append(start);
hermiteSegments.append(start + normal * step); hermiteSegments.append(start + normal * step);
} }
distance = entry->getHermiteY(normal); distance = entry.getHermiteY(normal);
if (normal != glm::vec3()) { if (normal != glm::vec3()) {
glm::vec3 start = glm::vec3(clampedX, y + distance, clampedZ) * step; glm::vec3 start = glm::vec3(clampedX, y + distance, clampedZ) * step;
hermiteSegments.append(start); hermiteSegments.append(start);
hermiteSegments.append(start + normal * step); hermiteSegments.append(start + normal * step);
} }
distance = entry->getHermiteZ(normal); distance = entry.getHermiteZ(normal);
if (normal != glm::vec3()) { if (normal != glm::vec3()) {
glm::vec3 start = glm::vec3(clampedX, y, clampedZ + distance) * step; glm::vec3 start = glm::vec3(clampedX, y, clampedZ + distance) * step;
hermiteSegments.append(start); hermiteSegments.append(start);
hermiteSegments.append(start + normal * step); hermiteSegments.append(start + normal * step);
} }
} }
int alpha0 = qAlpha(entry->color); int alpha0 = qAlpha(entry.color);
int alpha2 = lineSrc->getEntryAlpha(y + 1); int alpha2 = lineSrc->getEntryAlpha(y + 1);
int alpha1 = alpha0, alpha3 = alpha2, alpha4 = alpha0, alpha6 = alpha2; int alpha1 = alpha0, alpha3 = alpha2, alpha4 = alpha0, alpha6 = alpha2;
int alphaTotal = alpha0 + alpha2; int alphaTotal = alpha0 + alpha2;
@ -2374,8 +2389,6 @@ void HeightfieldNodeRenderer::render(const HeightfieldNodePointer& node, const g
// cubes on the edge are two-dimensional: this ensures that their vertices will be shared between // cubes on the edge are two-dimensional: this ensures that their vertices will be shared between
// neighboring blocks, which share only one layer of points // neighboring blocks, which share only one layer of points
bool middleX = (x != 0 && x != stackWidth);
bool middleZ = (z != 0 && z != stackHeight);
if (middleZ) { if (middleZ) {
alphaTotal += (alpha4 = lineSrc[stackWidth].getEntryAlpha(y)); alphaTotal += (alpha4 = lineSrc[stackWidth].getEntryAlpha(y));
possibleTotal += numeric_limits<uchar>::max(); possibleTotal += numeric_limits<uchar>::max();
@ -2411,8 +2424,8 @@ void HeightfieldNodeRenderer::render(const HeightfieldNodePointer& node, const g
const StackArray::Entry& nextEntryXY = lineSrc[1].getEntry(y + 1); const StackArray::Entry& nextEntryXY = lineSrc[1].getEntry(y + 1);
if (alpha0 != alpha1) { if (alpha0 != alpha1) {
EdgeCrossing& crossing = crossings[crossingCount++]; EdgeCrossing& crossing = crossings[crossingCount++];
crossing.point = glm::vec3(entry->getHermiteX(crossing.normal), 0.0f, 0.0f); crossing.point = glm::vec3(entry.getHermiteX(crossing.normal), 0.0f, 0.0f);
crossing.setColorMaterial(alpha0 == 0 ? nextEntryX : *entry); crossing.setColorMaterial(alpha0 == 0 ? nextEntryX : entry);
} }
if (alpha1 != alpha3) { if (alpha1 != alpha3) {
EdgeCrossing& crossing = crossings[crossingCount++]; EdgeCrossing& crossing = crossings[crossingCount++];
@ -2460,16 +2473,16 @@ void HeightfieldNodeRenderer::render(const HeightfieldNodePointer& node, const g
} }
if (alpha0 != alpha2) { if (alpha0 != alpha2) {
EdgeCrossing& crossing = crossings[crossingCount++]; EdgeCrossing& crossing = crossings[crossingCount++];
crossing.point = glm::vec3(0.0f, entry->getHermiteY(crossing.normal), 0.0f); crossing.point = glm::vec3(0.0f, entry.getHermiteY(crossing.normal), 0.0f);
crossing.setColorMaterial(alpha0 == 0 ? nextEntryY : *entry); crossing.setColorMaterial(alpha0 == 0 ? nextEntryY : entry);
} }
if (middleZ) { if (middleZ) {
const StackArray::Entry& nextEntryZ = lineSrc[stackWidth].getEntry(y); const StackArray::Entry& nextEntryZ = lineSrc[stackWidth].getEntry(y);
const StackArray::Entry& nextEntryYZ = lineSrc[stackWidth].getEntry(y + 1); const StackArray::Entry& nextEntryYZ = lineSrc[stackWidth].getEntry(y + 1);
if (alpha0 != alpha4) { if (alpha0 != alpha4) {
EdgeCrossing& crossing = crossings[crossingCount++]; EdgeCrossing& crossing = crossings[crossingCount++];
crossing.point = glm::vec3(0.0f, 0.0f, entry->getHermiteZ(crossing.normal)); crossing.point = glm::vec3(0.0f, 0.0f, entry.getHermiteZ(crossing.normal));
crossing.setColorMaterial(alpha0 == 0 ? nextEntryZ : *entry); crossing.setColorMaterial(alpha0 == 0 ? nextEntryZ : entry);
} }
if (alpha2 != alpha6) { if (alpha2 != alpha6) {
EdgeCrossing& crossing = crossings[crossingCount++]; EdgeCrossing& crossing = crossings[crossingCount++];
@ -2672,13 +2685,13 @@ void HeightfieldNodeRenderer::render(const HeightfieldNodePointer& node, const g
vertices.at(index1.indices[0]).vertex - first); vertices.at(index1.indices[0]).vertex - first);
if (alpha0 == 0) { // quad faces negative y if (alpha0 == 0) { // quad faces negative y
indices.append(index1.getClosestIndex(normal = -normal, vertices)); indices.append(index3.getClosestIndex(normal = -normal, vertices));
indices.append(index2.getClosestIndex(normal, vertices));
indices.append(index3.getClosestIndex(normal, vertices));
} else { // quad faces positive y
indices.append(index3.getClosestIndex(normal, vertices));
indices.append(index2.getClosestIndex(normal, vertices)); indices.append(index2.getClosestIndex(normal, vertices));
indices.append(index1.getClosestIndex(normal, vertices)); indices.append(index1.getClosestIndex(normal, vertices));
} else { // quad faces positive y
indices.append(index1.getClosestIndex(normal, vertices));
indices.append(index2.getClosestIndex(normal, vertices));
indices.append(index3.getClosestIndex(normal, vertices));
} }
indices.append(index.getClosestIndex(normal, vertices)); indices.append(index.getClosestIndex(normal, vertices));
} }
@ -2704,13 +2717,13 @@ void HeightfieldNodeRenderer::render(const HeightfieldNodePointer& node, const g
vertices.at(index3.indices[0]).vertex - first); vertices.at(index3.indices[0]).vertex - first);
if (alpha0 == 0) { // quad faces negative z if (alpha0 == 0) { // quad faces negative z
indices.append(index3.getClosestIndex(normal = -normal, vertices)); indices.append(index1.getClosestIndex(normal = -normal, vertices));
indices.append(index2.getClosestIndex(normal, vertices));
indices.append(index1.getClosestIndex(normal, vertices));
} else { // quad faces positive z
indices.append(index1.getClosestIndex(normal, vertices));
indices.append(index2.getClosestIndex(normal, vertices)); indices.append(index2.getClosestIndex(normal, vertices));
indices.append(index3.getClosestIndex(normal, vertices)); indices.append(index3.getClosestIndex(normal, vertices));
} else { // quad faces positive z
indices.append(index3.getClosestIndex(normal, vertices));
indices.append(index2.getClosestIndex(normal, vertices));
indices.append(index1.getClosestIndex(normal, vertices));
} }
indices.append(index.getClosestIndex(normal, vertices)); indices.append(index.getClosestIndex(normal, vertices));
} }

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

@ -1234,6 +1234,15 @@ const StackArray::Entry& StackArray::getEntry(int y) const {
return (relative < count) ? getEntryData()[qMax(relative, 0)] : emptyEntry; return (relative < count) ? getEntryData()[qMax(relative, 0)] : emptyEntry;
} }
void StackArray::getExtents(int& minimumY, int& maximumY) const {
int count = getEntryCount();
if (count > 0) {
int position = getPosition();
minimumY = qMin(minimumY, position);
maximumY = qMax(maximumY, position + count - 1);
}
}
HeightfieldStack::HeightfieldStack(int width, const QVector<StackArray>& contents, HeightfieldStack::HeightfieldStack(int width, const QVector<StackArray>& contents,
const QVector<SharedObjectPointer>& materials) : const QVector<SharedObjectPointer>& materials) :
HeightfieldData(width), HeightfieldData(width),
@ -2265,7 +2274,7 @@ HeightfieldNode* HeightfieldNode::setMaterial(const glm::vec3& translation, cons
if (stackX >= 0.0f && stackX <= innerStackWidth && stackZ >= 0.0f && stackZ <= innerStackHeight) { if (stackX >= 0.0f && stackX <= innerStackWidth && stackZ >= 0.0f && stackZ <= innerStackHeight) {
StackArray* stackDest = newStackContents.data() + (int)stackZ * stackWidth + (int)stackX; StackArray* stackDest = newStackContents.data() + (int)stackZ * stackWidth + (int)stackX;
if (stackDest->isEmpty() && *heightLineDest != 0) { if (stackDest->isEmpty() && *heightLineDest != 0 && false) {
// initialize from heightfield // initialize from heightfield
*stackDest = StackArray(1); *stackDest = StackArray(1);
float voxelHeight = *heightLineDest * voxelScale; float voxelHeight = *heightLineDest * voxelScale;

2
libraries/metavoxels/src/Spanner.h
View file

@ -523,6 +523,8 @@ public:
Entry& getEntry(int y); Entry& getEntry(int y);
const Entry& getEntry(int y) const; const Entry& getEntry(int y) const;
void getExtents(int& minimumY, int& maximumY) const;
void removeEntries(int position, int count) { remove(sizeof(quint16) + position * sizeof(Entry), count * sizeof(Entry)); } void removeEntries(int position, int count) { remove(sizeof(quint16) + position * sizeof(Entry), count * sizeof(Entry)); }
}; };