mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-06 20:38:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into issue/1626

Browse Source
This commit is contained in:
Malin Ejdbo
2021-06-11 08:47:28 +02:00
parent 4dce07032a 4d02b02081
commit cb0cd207a5
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/ghoul

Submodule ext/ghoul updated: fcb8e8b964...a3fc819d8f

11
modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
View File

@@ -1024,9 +1024,14 @@ std::vector<float> RenderableBillboardsCloud::createDataSlice() {
float minColorIdx = std::numeric_limits<float>::max();
float maxColorIdx = -std::numeric_limits<float>::max();
for (const speck::Dataset::Entry& e : _dataset.entries) {
float color = e.data[colorMapInUse];
minColorIdx = std::min(color, minColorIdx);
maxColorIdx = std::max(color, maxColorIdx);
if (e.data.size() > 0) {
float color = e.data[colorMapInUse];
minColorIdx = std::min(color, minColorIdx);
maxColorIdx = std::max(color, maxColorIdx);
} else {
minColorIdx = 0;
maxColorIdx = 0;
}
}
double maxRadius = 0.0;

6
src/util/spicemanager.cpp
View File

@@ -683,7 +683,7 @@ glm::dmat3 SpiceManager::frameTransformationMatrix(const std::string& from,
ghoul_assert(!to.empty(), "To must not be empty");
// get rotation matrix from frame A - frame B
glm::dmat3 transform;
glm::dmat3 transform = glm::dmat3(1.0);
pxform_c(
from.c_str(),
to.c_str(),
@@ -856,7 +856,7 @@ glm::dmat3 SpiceManager::positionTransformMatrix(const std::string& sourceFrame,
ghoul_assert(!sourceFrame.empty(), "sourceFrame must not be empty");
ghoul_assert(!destinationFrame.empty(), "destinationFrame must not be empty");
glm::dmat3 result;
glm::dmat3 result = glm::dmat3(1.0);
pxform_c(
sourceFrame.c_str(),
destinationFrame.c_str(),
@@ -888,7 +888,7 @@ glm::dmat3 SpiceManager::positionTransformMatrix(const std::string& sourceFrame,
ghoul_assert(!sourceFrame.empty(), "sourceFrame must not be empty");
ghoul_assert(!destinationFrame.empty(), "destinationFrame must not be empty");
glm::dmat3 result;
glm::dmat3 result = glm::dmat3(1.0);
pxfrm2_c(
sourceFrame.c_str(),