mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-04 09:59:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improved grid rendering for DU meshes.

Browse Source
This commit is contained in:
Jonathas Costa
2017-10-11 17:02:39 -04:00
parent a5243cf4d1
commit 7ff8064ef2
1 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/digitaluniverse/rendering/renderabledumeshes.cpp
+55 -5
View File
@@ -430,7 +430,7 @@ namespace openspace {
for (auto pair : _renderingMeshesMap) {
_program->setUniform("color", _meshColorMap[pair.second.colorIndex]);
for (int i = 0; i < pair.second.numU; ++i) {
for (int i = 0; i < pair.second.vaoArray.size(); ++i) {
glBindVertexArray(pair.second.vaoArray[i]);
switch (pair.second.style)
{
@@ -447,7 +447,6 @@ namespace openspace {
}
}
}
glBindVertexArray(0);
@@ -872,6 +871,7 @@ namespace openspace {
if (_dataIsDirty && _hasSpeckFile) {
LDEBUG("Creating planes");
std::unordered_map<int, RenderingMesh>::iterator it = _renderingMeshesMap.begin();
std::unordered_map<int, RenderingMesh>::iterator itEnd = _renderingMeshesMap.end();
@@ -904,7 +904,7 @@ namespace openspace {
for (int v = 0; v < it->second.vertices.size(); ++v) {
it->second.vertices[v] *= scale;
}
for (int i = 0; i < it->second.numU; ++i) {
GLuint vao, vbo;
glGenVertexArrays(1, &vao);
@@ -937,7 +937,7 @@ namespace openspace {
2,
GL_FLOAT,
GL_FALSE,
sizeof(GLfloat) * 6,
sizeof(GLfloat) * 7,
reinterpret_cast<GLvoid*>(sizeof(GLfloat) * 3 * i * it->second.numV)
);
}
@@ -950,8 +950,58 @@ namespace openspace {
0,
reinterpret_cast<GLvoid*>(sizeof(GLfloat) * 3 * i * it->second.numV)
);
}
}
}
// Grid: we need columns
if (it->second.numU > 1) {
for (int i = 0; i < it->second.numV; ++i) {
GLuint cvao, cvbo;
glGenVertexArrays(1, &cvao);
glGenBuffers(1, &cvbo);
it->second.vaoArray.push_back(cvao);
it->second.vboArray.push_back(cvbo);
glBindVertexArray(cvao);
glBindBuffer(GL_ARRAY_BUFFER, cvbo);
glBufferData(GL_ARRAY_BUFFER, it->second.vertices.size() * sizeof(GLfloat),
&it->second.vertices[0], GL_STATIC_DRAW);
// in_position
glEnableVertexAttribArray(0);
// U and V may not be given by the user
if (it->second.vertices.size() / (it->second.numU * it->second.numV) > 3) {
glVertexAttribPointer(
0,
3,
GL_FLOAT,
GL_FALSE,
it->second.numV * sizeof(GLfloat) * 5,
reinterpret_cast<GLvoid*>(sizeof(GLfloat) * i)
);
// texture coords
glEnableVertexAttribArray(1);
glVertexAttribPointer(
1,
2,
GL_FLOAT,
GL_FALSE,
it->second.numV * sizeof(GLfloat) * 7,
reinterpret_cast<GLvoid*>(sizeof(GLfloat) * 3 * i)
);
}
else { // no U and V:
glVertexAttribPointer(
0,
3,
GL_FLOAT,
GL_FALSE,
it->second.numV * sizeof(GLfloat) * 3,
reinterpret_cast<GLvoid*>(sizeof(GLfloat) * 3 * i)
);
}
}
}
}
glBindVertexArray(0);