Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-13 16:32:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Playing around with using points to represent distant voxel surfaces.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-10-06 18:52:10 -07:00
parent 9fc0abe2b3
commit c9fb73ecf8
3 changed files with 89 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/resources/shaders/metavoxel_point.vert
View file

@ -13,16 +13,19 @@
uniform float pointScale;
void main(void) {
// the interpolated normal
varying vec4 normal;
// standard diffuse lighting
gl_FrontColor = vec4(gl_Color.rgb * (gl_LightModel.ambient.rgb + gl_LightSource[0].ambient.rgb +
gl_LightSource[0].diffuse.rgb * max(0.0, dot(gl_NormalMatrix * gl_Normal, gl_LightSource[0].position.xyz))),
0.0);
void main(void) {
// transform and store the normal for interpolation
normal = vec4(normalize(gl_NormalMatrix * gl_Normal), 0.0);
// extract the first three components of the vertex for position
gl_Position = gl_ModelViewProjectionMatrix * vec4(gl_Vertex.xyz, 1.0);
// the final component is the size in world space
gl_PointSize = pointScale * gl_Vertex.w / gl_Position.w;
// copy the color for interpolation
gl_FrontColor = vec4(gl_Color.rgb, 0.0);
}

72
interface/src/MetavoxelSystem.cpp
View file

@ -620,6 +620,22 @@ void PointBuffer::render(bool cursor) {
_buffer.release();
}
VoxelPointBuffer::VoxelPointBuffer(const BufferPointVector& points) :
PointBuffer(points) {
}
void VoxelPointBuffer::render(bool cursor) {
DefaultMetavoxelRendererImplementation::getPointProgram().bind();
glEnable(GL_VERTEX_PROGRAM_POINT_SIZE_ARB);
PointBuffer::render(cursor);
glDisable(GL_VERTEX_PROGRAM_POINT_SIZE_ARB);
DefaultMetavoxelRendererImplementation::getBaseVoxelProgram().bind();
}
const int HeightfieldBuffer::HEIGHT_BORDER = 1;
const int HeightfieldBuffer::SHARED_EDGE = 1;
const int HeightfieldBuffer::HEIGHT_EXTENSION = 2 * HeightfieldBuffer::HEIGHT_BORDER + HeightfieldBuffer::SHARED_EDGE;
@ -1117,7 +1133,10 @@ AttributeValue BufferDataAttribute::inherit(const AttributeValue& parentValue) c
void DefaultMetavoxelRendererImplementation::init() {
if (!_pointProgram.isLinked()) {
_pointProgram.addShaderFromSourceFile(QGLShader::Vertex, Application::resourcesPath() + "shaders/metavoxel_point.vert");
_pointProgram.addShaderFromSourceFile(QGLShader::Vertex, Application::resourcesPath() +
"shaders/metavoxel_point.vert");
_pointProgram.addShaderFromSourceFile(QGLShader::Fragment, Application::resourcesPath() +
"shaders/metavoxel_voxel_base.frag");
_pointProgram.link();
_pointProgram.bind();
@ -1560,11 +1579,11 @@ int VoxelAugmentVisitor::visit(MetavoxelInfo& info) {
if (!info.isLeaf) {
return DEFAULT_ORDER;
}
VoxelBuffer* buffer = NULL;
BufferData* buffer = NULL;
VoxelColorDataPointer color = info.inputValues.at(0).getInlineValue<VoxelColorDataPointer>();
VoxelMaterialDataPointer material = info.inputValues.at(1).getInlineValue<VoxelMaterialDataPointer>();
VoxelHermiteDataPointer hermite = info.inputValues.at(2).getInlineValue<VoxelHermiteDataPointer>();
if (color && hermite) {
if (color && hermite && material) {
QVector<VoxelPoint> vertices;
QVector<int> indices;
@ -2092,6 +2111,53 @@ int VoxelAugmentVisitor::visit(MetavoxelInfo& info) {
}
buffer = new VoxelBuffer(vertices, indices, material ? material->getMaterials() : QVector<SharedObjectPointer>());
} else if (color) {
BufferPointVector points;
const QVector<QRgb>& colorContents = color->getContents();
int size = color->getSize();
int area = size * size;
int limit = size - 1;
const QRgb* colorZ = colorContents.constData();
int offset3 = size + 1;
int offset5 = area + 1;
int offset6 = area + size;
int offset7 = offset6 + 1;
const int MAX_ALPHA_TOTAL = MetavoxelNode::CHILD_COUNT * EIGHT_BIT_MAXIMUM;
float step = info.size / limit;
glm::vec4 minimum(info.minimum.x + step * 0.5f, info.minimum.y + step * 0.5f, info.minimum.z + step * 0.5f, 0.0f);
for (int z = 0; z < limit; z++) {
const QRgb* colorY = colorZ;
for (int y = 0; y < limit; y++) {
const QRgb* colorX = colorY;
for (int x = 0; x < limit; x++) {
QRgb c0 = colorX[0], c1 = colorX[1], c2 = colorX[size], c3 = colorX[offset3], c4 = colorX[area],
c5 = colorX[offset5], c6 = colorX[offset6], c7 = colorX[offset7];
colorX++;
int a0 = qAlpha(c0), a1 = qAlpha(c1), a2 = qAlpha(c2), a3 = qAlpha(c3),
a4 = qAlpha(c4), a5 = qAlpha(c5), a6 = qAlpha(c6), a7 = qAlpha(c7);
int alphaTotal = a0 + a1 + a2 + a3 + a4 + a5 + a6 + a7;
if (alphaTotal == 0 || alphaTotal == MAX_ALPHA_TOTAL) {
continue;
}
BufferPoint point = { minimum + glm::vec4(x, y, z, 1.0f) * step,
{ (quint8)((qRed(c0) * a0 + qRed(c1) * a1 + qRed(c2) * a2 + qRed(c3) * a3 + qRed(c4) * a4 +
qRed(c5) * a5 + qRed(c6) * a6 + qRed(c7) * a7) / alphaTotal),
(quint8)((qGreen(c0) * a0 + qGreen(c1) * a1 + qGreen(c2) * a2 + qGreen(c3) * a3 + qGreen(c4) * a4 +
qGreen(c5) * a5 + qGreen(c6) * a6 + qGreen(c7) * a7) / alphaTotal),
(quint8)((qBlue(c0) * a0 + qBlue(c1) * a1 + qBlue(c2) * a2 + qBlue(c3) * a3 + qBlue(c4) * a4 +
qBlue(c5) * a5 + qBlue(c6) * a6 + qBlue(c7) * a7) / alphaTotal) },
{ 0, 127, 0 } };
points.append(point);
}
colorY += size;
}
colorZ += area;
}
buffer = new VoxelPointBuffer(points);
}
BufferDataPointer pointer(buffer);
info.outputValues[0] = AttributeValue(_outputs.at(0), encodeInline(pointer));

12
interface/src/MetavoxelSystem.h
View file

@ -140,6 +140,15 @@ private:
int _pointCount;
};
/// Contains the information necessary to render a group of voxels as points.
class VoxelPointBuffer : public PointBuffer {
public:
VoxelPointBuffer(const BufferPointVector& points);
virtual void render(bool cursor = false);
};
/// Contains the information necessary to render a heightfield block.
class HeightfieldBuffer : public BufferData {
public:
@ -272,6 +281,9 @@ public:
static void init();
static ProgramObject& getPointProgram() { return _pointProgram; }
static int getPointScaleLocation() { return _pointScaleLocation; }
static ProgramObject& getBaseHeightfieldProgram() { return _baseHeightfieldProgram; }
static int getBaseHeightScaleLocation() { return _baseHeightScaleLocation; }
static int getBaseColorScaleLocation() { return _baseColorScaleLocation; }