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

Fix constellation bounds render issue

Browse Source
This commit is contained in:
Malin E
2022-08-05 16:59:04 +02:00
parent a2938c8384
commit 6efb99e551
4 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/space/rendering/renderableconstellationbounds.cpp
+8 -5
View File
@@ -139,6 +139,9 @@ void RenderableConstellationBounds::deinitializeGL() {
}
bool RenderableConstellationBounds::isReady() const {
if (!_hasLabel) {
return _program && _vao != 0 && _vbo != 0;
}
return _program && _vao != 0 && _vbo != 0 && !_labelset.entries.empty();
}
@@ -214,8 +217,8 @@ bool RenderableConstellationBounds::loadVertexFile() {
float dec;
s >> dec;
std::string constellationName;
s >> constellationName;
std::string abbreviation;
s >> abbreviation;
if (!s.good()) {
// If this evaluates to true, the stream was not completely filled, which
@@ -230,7 +233,7 @@ bool RenderableConstellationBounds::loadVertexFile() {
}
// Did we arrive at a new constellation?
if (constellationName != currentBound.constellationAbbreviation) {
if (abbreviation != currentBound.constellationAbbreviation) {
// Store how many vertices we read during the active time of the constellation
currentBound.nVertices = static_cast<GLsizei>(
_vertexValues.size() - currentBound.startIndex
@@ -239,8 +242,8 @@ bool RenderableConstellationBounds::loadVertexFile() {
_constellationBounds.push_back(currentBound);
currentBound = ConstellationBound();
currentBound.isEnabled = true;
currentBound.constellationAbbreviation = constellationName;
currentBound.constellationFullName = constellationName;
currentBound.constellationAbbreviation = abbreviation;
currentBound.constellationFullName = constellationFullName(abbreviation);
currentBound.startIndex = static_cast<GLsizei>(_vertexValues.size());
}