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

More progress toward dual contour rendering.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-08-28 20:01:55 -07:00
parent f02f95c460
commit 78a03fb31a
3 changed files with 137 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

154
interface/src/MetavoxelSystem.cpp
View file

@ -1014,14 +1014,15 @@ void VoxelBuffer::render(bool cursor) {
_vertexBuffer.bind(); _vertexBuffer.bind();
_indexBuffer.bind(); _indexBuffer.bind();
} }
VoxelPoint* point = 0; VoxelPoint* point = 0;
glVertexPointer(3, GL_FLOAT, sizeof(VoxelPoint), &point->vertex); glVertexPointer(3, GL_FLOAT, sizeof(VoxelPoint), &point->vertex);
glColorPointer(3, GL_UNSIGNED_BYTE, sizeof(VoxelPoint), &point->color); glColorPointer(3, GL_UNSIGNED_BYTE, sizeof(VoxelPoint), &point->color);
glNormalPointer(GL_BYTE, sizeof(VoxelPoint), &point->normal); glNormalPointer(GL_BYTE, sizeof(VoxelPoint), &point->normal);
//glDrawRangeElements(GL_QUADS, 0, _vertexCount - 1, _indexCount, GL_UNSIGNED_INT, 0); // glDrawRangeElements(GL_QUADS, 0, _vertexCount - 1, _indexCount, GL_UNSIGNED_INT, 0);
glPointSize(5.0f); glPointSize(3.0f);
glDrawArrays(GL_POINTS, 0, _vertexCount); glDrawArrays(GL_POINTS, 0, _vertexCount);
@ -1569,7 +1570,6 @@ int VoxelAugmentVisitor::visit(MetavoxelInfo& info) {
const QVector<QRgb>& contents = color->getContents(); const QVector<QRgb>& contents = color->getContents();
int size = color->getSize(); int size = color->getSize();
int area = size * size; int area = size * size;
int highest = size - 1;
int offset3 = size + 1; int offset3 = size + 1;
int offset5 = area + 1; int offset5 = area + 1;
int offset6 = area + size; int offset6 = area + size;
@ -1577,31 +1577,136 @@ int VoxelAugmentVisitor::visit(MetavoxelInfo& info) {
const QRgb* src = contents.constData(); const QRgb* src = contents.constData();
int expanded = size + 1;
QVector<int> lineIndices(expanded, -1);
QVector<int> lastLineIndices(expanded, -1);
QVector<int> planeIndices(expanded * expanded, -1);
QVector<int> lastPlaneIndices(expanded * expanded, -1);
float highest = size - 1.0f;
float scale = info.size / highest; float scale = info.size / highest;
const int ALPHA_OFFSET = 24; const int ALPHA_OFFSET = 24;
const int MAX_ALPHA_TOTAL = EIGHT_BIT_MAXIMUM * 8; for (int z = 0; z < expanded; z++) {
for (int z = 0; z < highest; z++) { for (int y = 0; y < expanded; y++) {
for (int y = 0; y < highest; y++) { int lastIndex;
for (int x = 0; x < highest; x++, src++) { for (int x = 0; x < expanded; x++) {
int alpha0 = src[0] >> ALPHA_OFFSET; int alpha0 = src[0] >> ALPHA_OFFSET;
int alpha1 = src[1] >> ALPHA_OFFSET; int alpha1 = alpha0, alpha2 = alpha0, alpha4 = alpha0;
int alpha2 = src[size] >> ALPHA_OFFSET; int alphaTotal = alpha0;
int alpha3 = src[offset3] >> ALPHA_OFFSET; int possibleTotal = EIGHT_BIT_MAXIMUM;
int alpha4 = src[area] >> ALPHA_OFFSET; if (x != 0 && x != size) {
int alpha5 = src[offset5] >> ALPHA_OFFSET; alphaTotal += (alpha1 = src[1] >> ALPHA_OFFSET);
int alpha6 = src[offset6] >> ALPHA_OFFSET; possibleTotal += EIGHT_BIT_MAXIMUM;
int alpha7 = src[offset7] >> ALPHA_OFFSET;
int alphaTotal = alpha0 + alpha1 + alpha2 + alpha3 + alpha4 + alpha5 + alpha6 + alpha7; if (y != 0 && y != size) {
if (alphaTotal == 0 || alphaTotal == MAX_ALPHA_TOTAL) { alphaTotal += (src[offset3] >> ALPHA_OFFSET);
possibleTotal += EIGHT_BIT_MAXIMUM;
if (z != 0 && z != size) {
alphaTotal += (src[offset7] >> ALPHA_OFFSET);
possibleTotal += EIGHT_BIT_MAXIMUM;
}
}
if (z != 0 && z != size) {
alphaTotal += (src[offset5] >> ALPHA_OFFSET);
possibleTotal += EIGHT_BIT_MAXIMUM;
}
}
if (y != 0 && y != size) {
alphaTotal += (alpha2 = src[size] >> ALPHA_OFFSET);
possibleTotal += EIGHT_BIT_MAXIMUM;
if (z != 0 && z != size) {
alphaTotal += (src[offset6] >> ALPHA_OFFSET);
possibleTotal += EIGHT_BIT_MAXIMUM;
}
}
if (z != 0 && z != size) {
alphaTotal += (alpha4 = src[area] >> ALPHA_OFFSET);
possibleTotal += EIGHT_BIT_MAXIMUM;
}
bool generateQuad = (x != 0 && y != 0 && z != 0);
if (generateQuad) {
src++;
}
if (z == 0) {
qDebug() << "blerp" << x << y << z << alphaTotal << possibleTotal;
}
if (alphaTotal == 0 || alphaTotal == possibleTotal) {
continue; // no corners set/all corners set continue; // no corners set/all corners set
} }
VoxelPoint point = { info.minimum + glm::vec3(x + 0.5f, y + 0.5f, z + 0.5f) * scale, VoxelPoint point = { info.minimum + glm::vec3(glm::clamp(x - 0.5f, 0.0f, highest),
glm::clamp(y - 0.5f, 0.0f, highest), glm::clamp(z - 0.5f, 0.0f, highest)) * scale,
{ 0, 0, 0 }, { 0, 127, 0} }; { 0, 0, 0 }, { 0, 127, 0} };
int index = vertices.size();
vertices.append(point); vertices.append(point);
if (generateQuad) {
if (alpha0 != alpha1) {
indices.append(index);
int index1 = lastLineIndices.at(x);
int index2 = lastPlaneIndices.at((y - 1) * expanded + x);
int index3 = lastPlaneIndices.at(y * expanded + x);
if (index1 == -1 || index2 == -1 || index3 == -1) {
qDebug() << index1 << index2 << index3 << x << y << z;
}
if (alpha0 == 0) {
indices.append(index3);
indices.append(index2);
indices.append(index1);
} else {
indices.append(index1);
indices.append(index2);
indices.append(index3);
}
}
if (alpha0 != alpha2) {
indices.append(index);
int index1 = lastIndex;
int index2 = lastPlaneIndices.at(y * expanded + x - 1);
int index3 = lastPlaneIndices.at(y * expanded + x);
if (index1 == -1 || index2 == -1 || index3 == -1) {
qDebug() << index1 << index2 << index3 << x << y << z;
}
if (alpha0 == 0) {
indices.append(index1);
indices.append(index2);
indices.append(index3);
} else {
indices.append(index3);
indices.append(index2);
indices.append(index1);
}
}
if (alpha0 != alpha4) {
indices.append(index);
int index1 = lastIndex;
int index2 = lastLineIndices.at(x - 1);
int index3 = lastLineIndices.at(x);
if (index1 == -1 || index2 == -1 || index3 == -1) {
qDebug() << index1 << index2 << index3 << x << y << z;
}
if (alpha0 == 0) {
indices.append(index3);
indices.append(index2);
indices.append(index1);
} else {
indices.append(index1);
indices.append(index2);
indices.append(index3);
}
}
}
lastIndex = index;
lineIndices[x] = index;
planeIndices[y * expanded + x] = index;
} }
src++; lineIndices.swap(lastLineIndices);
} }
src += size; planeIndices.swap(lastPlaneIndices);
} }
buffer = new VoxelBuffer(vertices, indices, material->getMaterials()); buffer = new VoxelBuffer(vertices, indices, material->getMaterials());
@ -1630,6 +1735,13 @@ void DefaultMetavoxelRendererImplementation::augment(MetavoxelData& data, const
data.setRoot(heightfieldBufferAttribute, root); data.setRoot(heightfieldBufferAttribute, root);
root->incrementReferenceCount(); root->incrementReferenceCount();
} }
const AttributePointer& voxelBufferAttribute =
Application::getInstance()->getMetavoxels()->getVoxelBufferAttribute();
root = expandedPrevious.getRoot(voxelBufferAttribute);
if (root) {
data.setRoot(voxelBufferAttribute, root);
root->incrementReferenceCount();
}
PointAugmentVisitor pointAugmentVisitor(lod); PointAugmentVisitor pointAugmentVisitor(lod);
data.guideToDifferent(expandedPrevious, pointAugmentVisitor); data.guideToDifferent(expandedPrevious, pointAugmentVisitor);
@ -1833,9 +1945,13 @@ void DefaultMetavoxelRendererImplementation::render(MetavoxelData& data, Metavox
glEnableClientState(GL_COLOR_ARRAY); glEnableClientState(GL_COLOR_ARRAY);
glEnableClientState(GL_NORMAL_ARRAY); glEnableClientState(GL_NORMAL_ARRAY);
glEnable(GL_CULL_FACE);
BufferRenderVisitor voxelRenderVisitor(Application::getInstance()->getMetavoxels()->getVoxelBufferAttribute()); BufferRenderVisitor voxelRenderVisitor(Application::getInstance()->getMetavoxels()->getVoxelBufferAttribute());
data.guide(voxelRenderVisitor); data.guide(voxelRenderVisitor);
glDisable(GL_CULL_FACE);
glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_VERTEX_ARRAY);
glDisableClientState(GL_COLOR_ARRAY); glDisableClientState(GL_COLOR_ARRAY);
glDisableClientState(GL_NORMAL_ARRAY); glDisableClientState(GL_NORMAL_ARRAY);

2
libraries/metavoxels/src/AttributeRegistry.cpp
View file

@ -1926,7 +1926,7 @@ void VoxelHermiteData::writeDelta(Bitstream& out, const VoxelHermiteDataPointer&
sizeX = maxX - minX + 1; sizeX = maxX - minX + 1;
sizeY = maxY - minY + 1; sizeY = maxY - minY + 1;
sizeZ = maxZ - minZ + 1; sizeZ = maxZ - minZ + 1;
delta = QVector<QRgb>(sizeX * sizeY * sizeZ, 0); delta = QVector<QRgb>(sizeX * sizeY * sizeZ * EDGE_COUNT, 0);
QRgb* dest = delta.data(); QRgb* dest = delta.data();
int srcStride = _size * EDGE_COUNT; int srcStride = _size * EDGE_COUNT;
int srcStride2 = _size * srcStride; int srcStride2 = _size * srcStride;

2
libraries/metavoxels/src/MetavoxelMessages.cpp
View file

@ -683,7 +683,7 @@ int VoxelMaterialBoxEditVisitor::visit(MetavoxelInfo& info) {
int sizeY = (int)overlap.maximum.y - minY + 1; int sizeY = (int)overlap.maximum.y - minY + 1;
int sizeZ = (int)overlap.maximum.z - minZ + 1; int sizeZ = (int)overlap.maximum.z - minZ + 1;
QRgb rgb = _color.rgb(); QRgb rgb = _color.rgba();
for (QRgb* destZ = colorContents.data() + minZ * VOXEL_BLOCK_AREA + minY * VOXEL_BLOCK_SAMPLES + minX, for (QRgb* destZ = colorContents.data() + minZ * VOXEL_BLOCK_AREA + minY * VOXEL_BLOCK_SAMPLES + minX,
*endZ = destZ + sizeZ * VOXEL_BLOCK_AREA; destZ != endZ; destZ += VOXEL_BLOCK_AREA) { *endZ = destZ + sizeZ * VOXEL_BLOCK_AREA; destZ != endZ; destZ += VOXEL_BLOCK_AREA) {
for (QRgb* destY = destZ, *endY = destY + sizeY * VOXEL_BLOCK_SAMPLES; destY != endY; destY += VOXEL_BLOCK_SAMPLES) { for (QRgb* destY = destZ, *endY = destY + sizeY * VOXEL_BLOCK_SAMPLES; destY != endY; destY += VOXEL_BLOCK_SAMPLES) {