mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-07 03:49:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge-in all updates from master

Browse Source
This commit is contained in:
Gene Payne
2024-03-25 18:35:57 -06:00
parent 05231c705f 49fc538c17
commit 6146cf16b2
634 changed files with 13476 additions and 9937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/space/rendering/renderableconstellationsbase.cpp
+4 -4
View File
@@ -64,7 +64,7 @@ namespace {
openspace::properties::Property::Visibility::NoviceUser
};
const static openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
"Labels",
"Labels",
"The labels for the constellations"
@@ -140,7 +140,7 @@ std::string RenderableConstellationsBase::constellationFullName(
return _namesTranslation.at(identifier);
}
throw ghoul::RuntimeError(fmt::format(
throw ghoul::RuntimeError(std::format(
"Identifier '{}' could not be found in list of constellations", identifier
));
}
@@ -198,7 +198,7 @@ void RenderableConstellationsBase::initialize() {
if (!entry.identifier.empty()) {
std::string fullName = constellationFullName(entry.identifier);
if (!fullName.empty()) {
entry.text = fullName;
entry.text = std::move(fullName);
}
}
}
@@ -228,7 +228,7 @@ void RenderableConstellationsBase::render(const RenderData& data, RendererTasks&
);
if (orthoRight == glm::vec3(0.f)) {
glm::vec3 otherVector(lookup.y, lookup.x, lookup.z);
const glm::vec3 otherVector = glm::vec3(lookup.y, lookup.x, lookup.z);
right = glm::cross(viewDirection, otherVector);
orthoRight = glm::normalize(
glm::vec3(worldToModelTransform * glm::vec4(right, 0.f))