From 6042c2f7f231a557f53740f57d3b528ec4e4f8d9 Mon Sep 17 00:00:00 2001 From: Self Denial Date: Sun, 28 Jan 2024 20:37:40 -0700 Subject: [PATCH 1/3] Define GLM_ENABLE_EXPERIMENTAL so we can build with GLM release 1.0.0 --- CalcMySky/data.hpp | 1 + CalcMySky/interpolation-guides.hpp | 1 + CalcMySky/shaders.hpp | 1 + CalcMySky/util.hpp | 1 + ShowMySky/AtmosphereRenderer.hpp | 1 + ShowMySky/GLWidget.cpp | 1 + cmake/check-glm-constexpr-ctor.cpp | 1 + common/AtmosphereParameters.hpp | 1 + common/EclipsedDoubleScatteringPrecomputer.cpp | 1 + common/EclipsedDoubleScatteringPrecomputer.hpp | 1 + common/TextureAverageComputer.hpp | 1 + common/cie-xyzw-functions.hpp | 1 + common/util.hpp | 1 + 13 files changed, 13 insertions(+) diff --git a/CalcMySky/data.hpp b/CalcMySky/data.hpp index b31347db..bdbbb7e6 100644 --- a/CalcMySky/data.hpp +++ b/CalcMySky/data.hpp @@ -8,6 +8,7 @@ #include #include #include +#define GLM_ENABLE_EXPERIMENTAL #include #include "const.hpp" #include "../common/AtmosphereParameters.hpp" diff --git a/CalcMySky/interpolation-guides.hpp b/CalcMySky/interpolation-guides.hpp index 3e61d23a..d2a25b24 100644 --- a/CalcMySky/interpolation-guides.hpp +++ b/CalcMySky/interpolation-guides.hpp @@ -1,5 +1,6 @@ #include #include +#define GLM_ENABLE_EXPERIMENTAL #include void generateInterpolationGuides2D(glm::vec4 const* data, unsigned vecIndex, diff --git a/CalcMySky/shaders.hpp b/CalcMySky/shaders.hpp index 5af708a4..821be527 100644 --- a/CalcMySky/shaders.hpp +++ b/CalcMySky/shaders.hpp @@ -3,6 +3,7 @@ #include #include +#define GLM_ENABLE_EXPERIMENTAL #include #include "../common/util.hpp" diff --git a/CalcMySky/util.hpp b/CalcMySky/util.hpp index 796e1468..59b63ec2 100644 --- a/CalcMySky/util.hpp +++ b/CalcMySky/util.hpp @@ -6,6 +6,7 @@ #include #include #include +#define GLM_ENABLE_EXPERIMENTAL #include #include "data.hpp" #include "../common/util.hpp" diff --git a/ShowMySky/AtmosphereRenderer.hpp b/ShowMySky/AtmosphereRenderer.hpp index 539cc665..34da75c8 100644 --- a/ShowMySky/AtmosphereRenderer.hpp +++ b/ShowMySky/AtmosphereRenderer.hpp @@ -5,6 +5,7 @@ #include #include #include +#define GLM_ENABLE_EXPERIMENTAL #include #include #include diff --git a/ShowMySky/GLWidget.cpp b/ShowMySky/GLWidget.cpp index 140eaf2a..9d71e209 100644 --- a/ShowMySky/GLWidget.cpp +++ b/ShowMySky/GLWidget.cpp @@ -5,6 +5,7 @@ #include #include #include +#define GLM_ENABLE_EXPERIMENTAL #include #include "../common/util.hpp" #include "../common/const.hpp" diff --git a/cmake/check-glm-constexpr-ctor.cpp b/cmake/check-glm-constexpr-ctor.cpp index 07f283d7..2e9aaf13 100644 --- a/cmake/check-glm-constexpr-ctor.cpp +++ b/cmake/check-glm-constexpr-ctor.cpp @@ -1,3 +1,4 @@ +#define GLM_ENABLE_EXPERIMENTAL #include int main() diff --git a/common/AtmosphereParameters.hpp b/common/AtmosphereParameters.hpp index a175046f..b3dbaabc 100644 --- a/common/AtmosphereParameters.hpp +++ b/common/AtmosphereParameters.hpp @@ -2,6 +2,7 @@ #define INCLUDE_ONCE_D1C5F1EB_B6E7_4260_8AC3_57C35BB9B0DF #include +#define GLM_ENABLE_EXPERIMENTAL #include #include #include "types.hpp" diff --git a/common/EclipsedDoubleScatteringPrecomputer.cpp b/common/EclipsedDoubleScatteringPrecomputer.cpp index e8d54261..dd5642d2 100644 --- a/common/EclipsedDoubleScatteringPrecomputer.cpp +++ b/common/EclipsedDoubleScatteringPrecomputer.cpp @@ -3,6 +3,7 @@ #include #include +#define GLM_ENABLE_EXPERIMENTAL #include #include diff --git a/common/EclipsedDoubleScatteringPrecomputer.hpp b/common/EclipsedDoubleScatteringPrecomputer.hpp index d0a42e7c..5e73fa18 100644 --- a/common/EclipsedDoubleScatteringPrecomputer.hpp +++ b/common/EclipsedDoubleScatteringPrecomputer.hpp @@ -4,6 +4,7 @@ #include #include #include +#define GLM_ENABLE_EXPERIMENTAL #include #include #include "AtmosphereParameters.hpp" diff --git a/common/TextureAverageComputer.hpp b/common/TextureAverageComputer.hpp index 3681eb46..d00fceec 100644 --- a/common/TextureAverageComputer.hpp +++ b/common/TextureAverageComputer.hpp @@ -2,6 +2,7 @@ #define INCLUDE_ONCE_386B7A49_CC0D_40CF_AC50_73493DF4B289 #include +#define GLM_ENABLE_EXPERIMENTAL #include #include #include diff --git a/common/cie-xyzw-functions.hpp b/common/cie-xyzw-functions.hpp index 1e3a17e0..ff0beba9 100644 --- a/common/cie-xyzw-functions.hpp +++ b/common/cie-xyzw-functions.hpp @@ -1,3 +1,4 @@ +#define GLM_ENABLE_EXPERIMENTAL #include inline glm::vec4 wavelengthToXYZW(const float wavelength) diff --git a/common/util.hpp b/common/util.hpp index 8699589f..cd19fac3 100644 --- a/common/util.hpp +++ b/common/util.hpp @@ -2,6 +2,7 @@ #define INCLUDE_ONCE_E28E88C6_7992_4205_828C_8E04CC339B83 #include +#define GLM_ENABLE_EXPERIMENTAL #include #include #include From 48daab4b613fff6bdaaba403ff327cf617617199 Mon Sep 17 00:00:00 2001 From: Self Denial Date: Sun, 28 Jan 2024 23:42:17 -0700 Subject: [PATCH 2/3] Revert "Define GLM_ENABLE_EXPERIMENTAL so we can build with GLM release 1.0.0" This is only requried for transform. This reverts commit 6042c2f7f231a557f53740f57d3b528ec4e4f8d9. --- CalcMySky/data.hpp | 1 - CalcMySky/interpolation-guides.hpp | 1 - CalcMySky/shaders.hpp | 1 - CalcMySky/util.hpp | 1 - ShowMySky/AtmosphereRenderer.hpp | 1 - ShowMySky/GLWidget.cpp | 1 - cmake/check-glm-constexpr-ctor.cpp | 1 - common/AtmosphereParameters.hpp | 1 - common/EclipsedDoubleScatteringPrecomputer.cpp | 1 - common/EclipsedDoubleScatteringPrecomputer.hpp | 1 - common/TextureAverageComputer.hpp | 1 - common/cie-xyzw-functions.hpp | 1 - common/util.hpp | 1 - 13 files changed, 13 deletions(-) diff --git a/CalcMySky/data.hpp b/CalcMySky/data.hpp index bdbbb7e6..b31347db 100644 --- a/CalcMySky/data.hpp +++ b/CalcMySky/data.hpp @@ -8,7 +8,6 @@ #include #include #include -#define GLM_ENABLE_EXPERIMENTAL #include #include "const.hpp" #include "../common/AtmosphereParameters.hpp" diff --git a/CalcMySky/interpolation-guides.hpp b/CalcMySky/interpolation-guides.hpp index d2a25b24..3e61d23a 100644 --- a/CalcMySky/interpolation-guides.hpp +++ b/CalcMySky/interpolation-guides.hpp @@ -1,6 +1,5 @@ #include #include -#define GLM_ENABLE_EXPERIMENTAL #include void generateInterpolationGuides2D(glm::vec4 const* data, unsigned vecIndex, diff --git a/CalcMySky/shaders.hpp b/CalcMySky/shaders.hpp index 821be527..5af708a4 100644 --- a/CalcMySky/shaders.hpp +++ b/CalcMySky/shaders.hpp @@ -3,7 +3,6 @@ #include #include -#define GLM_ENABLE_EXPERIMENTAL #include #include "../common/util.hpp" diff --git a/CalcMySky/util.hpp b/CalcMySky/util.hpp index 59b63ec2..796e1468 100644 --- a/CalcMySky/util.hpp +++ b/CalcMySky/util.hpp @@ -6,7 +6,6 @@ #include #include #include -#define GLM_ENABLE_EXPERIMENTAL #include #include "data.hpp" #include "../common/util.hpp" diff --git a/ShowMySky/AtmosphereRenderer.hpp b/ShowMySky/AtmosphereRenderer.hpp index 34da75c8..539cc665 100644 --- a/ShowMySky/AtmosphereRenderer.hpp +++ b/ShowMySky/AtmosphereRenderer.hpp @@ -5,7 +5,6 @@ #include #include #include -#define GLM_ENABLE_EXPERIMENTAL #include #include #include diff --git a/ShowMySky/GLWidget.cpp b/ShowMySky/GLWidget.cpp index 9d71e209..140eaf2a 100644 --- a/ShowMySky/GLWidget.cpp +++ b/ShowMySky/GLWidget.cpp @@ -5,7 +5,6 @@ #include #include #include -#define GLM_ENABLE_EXPERIMENTAL #include #include "../common/util.hpp" #include "../common/const.hpp" diff --git a/cmake/check-glm-constexpr-ctor.cpp b/cmake/check-glm-constexpr-ctor.cpp index 2e9aaf13..07f283d7 100644 --- a/cmake/check-glm-constexpr-ctor.cpp +++ b/cmake/check-glm-constexpr-ctor.cpp @@ -1,4 +1,3 @@ -#define GLM_ENABLE_EXPERIMENTAL #include int main() diff --git a/common/AtmosphereParameters.hpp b/common/AtmosphereParameters.hpp index b3dbaabc..a175046f 100644 --- a/common/AtmosphereParameters.hpp +++ b/common/AtmosphereParameters.hpp @@ -2,7 +2,6 @@ #define INCLUDE_ONCE_D1C5F1EB_B6E7_4260_8AC3_57C35BB9B0DF #include -#define GLM_ENABLE_EXPERIMENTAL #include #include #include "types.hpp" diff --git a/common/EclipsedDoubleScatteringPrecomputer.cpp b/common/EclipsedDoubleScatteringPrecomputer.cpp index dd5642d2..e8d54261 100644 --- a/common/EclipsedDoubleScatteringPrecomputer.cpp +++ b/common/EclipsedDoubleScatteringPrecomputer.cpp @@ -3,7 +3,6 @@ #include #include -#define GLM_ENABLE_EXPERIMENTAL #include #include diff --git a/common/EclipsedDoubleScatteringPrecomputer.hpp b/common/EclipsedDoubleScatteringPrecomputer.hpp index 5e73fa18..d0a42e7c 100644 --- a/common/EclipsedDoubleScatteringPrecomputer.hpp +++ b/common/EclipsedDoubleScatteringPrecomputer.hpp @@ -4,7 +4,6 @@ #include #include #include -#define GLM_ENABLE_EXPERIMENTAL #include #include #include "AtmosphereParameters.hpp" diff --git a/common/TextureAverageComputer.hpp b/common/TextureAverageComputer.hpp index d00fceec..3681eb46 100644 --- a/common/TextureAverageComputer.hpp +++ b/common/TextureAverageComputer.hpp @@ -2,7 +2,6 @@ #define INCLUDE_ONCE_386B7A49_CC0D_40CF_AC50_73493DF4B289 #include -#define GLM_ENABLE_EXPERIMENTAL #include #include #include diff --git a/common/cie-xyzw-functions.hpp b/common/cie-xyzw-functions.hpp index ff0beba9..1e3a17e0 100644 --- a/common/cie-xyzw-functions.hpp +++ b/common/cie-xyzw-functions.hpp @@ -1,4 +1,3 @@ -#define GLM_ENABLE_EXPERIMENTAL #include inline glm::vec4 wavelengthToXYZW(const float wavelength) diff --git a/common/util.hpp b/common/util.hpp index cd19fac3..8699589f 100644 --- a/common/util.hpp +++ b/common/util.hpp @@ -2,7 +2,6 @@ #define INCLUDE_ONCE_E28E88C6_7992_4205_828C_8E04CC339B83 #include -#define GLM_ENABLE_EXPERIMENTAL #include #include #include From 70f6b9af5423f7cf8b257de448dfd242bf327501 Mon Sep 17 00:00:00 2001 From: Self Denial Date: Sun, 28 Jan 2024 23:46:32 -0700 Subject: [PATCH 3/3] Define GLM_ENABLE_EXPERIMENTAL for glm/gtx/transform.hpp so we can build with GLM release 1.0.0 --- ShowMySky/GLWidget.cpp | 1 + common/EclipsedDoubleScatteringPrecomputer.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/ShowMySky/GLWidget.cpp b/ShowMySky/GLWidget.cpp index 140eaf2a..9d71e209 100644 --- a/ShowMySky/GLWidget.cpp +++ b/ShowMySky/GLWidget.cpp @@ -5,6 +5,7 @@ #include #include #include +#define GLM_ENABLE_EXPERIMENTAL #include #include "../common/util.hpp" #include "../common/const.hpp" diff --git a/common/EclipsedDoubleScatteringPrecomputer.cpp b/common/EclipsedDoubleScatteringPrecomputer.cpp index e8d54261..dd5642d2 100644 --- a/common/EclipsedDoubleScatteringPrecomputer.cpp +++ b/common/EclipsedDoubleScatteringPrecomputer.cpp @@ -3,6 +3,7 @@ #include #include +#define GLM_ENABLE_EXPERIMENTAL #include #include