mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 11:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Prevent point cloud from never getting ready if no dataset was added

Browse Source 
Fixes issue that Voids were not begin rendered
This commit is contained in:
Emma Broman
2024-01-15 16:32:19 +01:00
parent 15aaae3007
commit 385d23303d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/base/rendering/pointcloud/renderablepointcloud.cpp
View File

@@ -589,7 +589,7 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
}
bool RenderablePointCloud::isReady() const {
bool isReady = _program && !_dataset.entries.empty();
bool isReady = _program;
// If we have labels, they also need to be loaded
if (_hasLabels) {
@@ -691,6 +691,10 @@ void RenderablePointCloud::renderBillboards(const RenderData& data,
const glm::dvec3& orthoUp,
float fadeInVariable)
{
if (!_hasDataFile || _dataset.entries.empty()) {
return;
}
glEnablei(GL_BLEND, 0);
if (_useAdditiveBlending) {
@@ -861,7 +865,7 @@ int RenderablePointCloud::nAttributesPerPoint() const {
}
void RenderablePointCloud::updateBufferData() {
if (!_hasDataFile) {
if (!_hasDataFile || _dataset.entries.empty()) {
return;
}