mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 18:51:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Non-Windows compiler fix for empty initializer list

Browse Source
This commit is contained in:
Gene Payne
2023-09-22 11:35:10 -06:00
committed by GitHub
parent 30003ae20f
commit c6ffddd253
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/openspace/rendering/renderable.h
View File

@@ -160,7 +160,9 @@ protected:
* \return the resulting model transformation matrix in double precision
*/
glm::dmat4 calcModelTransform(const RenderData& data,
const AlternativeTransform& altTransform = {}) const;
const AlternativeTransform& altTransform = {
std::nullopt, std::nullopt, std::nullopt
}) const;
/**
* Calculates the model view transformation matrix with the given data and returns it
@@ -204,7 +206,9 @@ protected:
* model view projection transformation matrices
*/
std::tuple<glm::dmat4, glm::dmat4, glm::dmat4> calcAllTransforms(
const RenderData& data, const AlternativeTransform& altModelTransform = {}) const;
const RenderData& data, const AlternativeTransform& altModelTransform = {
std::nullopt, std::nullopt, std::nullopt
}) const;
private:
double _boundingSphere = 0.0;