From 24ba6d5c7e4b8b4541a4acdee9ef0e16cbbcf622 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 4 Mar 2023 21:12:35 -0700
Subject: [PATCH] Adjust to new Ghoul update

---
 ext/ghoul                                        |  2 +-
 .../openspace/properties/templateproperty.inl    | 16 ++++++++++++----
 src/properties/matrix/dmat2property.cpp          |  2 +-
 src/properties/matrix/dmat3property.cpp          |  2 +-
 src/properties/matrix/dmat4property.cpp          |  2 +-
 src/properties/matrix/mat2property.cpp           |  2 +-
 src/properties/matrix/mat3property.cpp           |  2 +-
 src/properties/matrix/mat4property.cpp           |  2 +-
 src/properties/vector/dvec2property.cpp          |  2 +-
 src/properties/vector/dvec3property.cpp          |  2 +-
 src/properties/vector/dvec4property.cpp          |  2 +-
 src/properties/vector/ivec2property.cpp          |  2 +-
 src/properties/vector/ivec3property.cpp          |  2 +-
 src/properties/vector/ivec4property.cpp          |  2 +-
 src/properties/vector/uvec2property.cpp          |  2 +-
 src/properties/vector/uvec3property.cpp          |  2 +-
 src/properties/vector/uvec4property.cpp          |  2 +-
 src/properties/vector/vec2property.cpp           |  2 +-
 src/properties/vector/vec3property.cpp           |  2 +-
 src/properties/vector/vec4property.cpp           |  2 +-
 support/coding/codegen                           |  2 +-
 21 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index 8fc0ae3d16..d8304d5127 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 8fc0ae3d165c3a33542e2f81ae1202770d2833a6
+Subproject commit d8304d5127ac1e3748930c4c39627f5a857d16cf
diff --git a/include/openspace/properties/templateproperty.inl b/include/openspace/properties/templateproperty.inl
index 7ec9ea57dc..e5604037b1 100644
--- a/include/openspace/properties/templateproperty.inl
+++ b/include/openspace/properties/templateproperty.inl
@@ -22,6 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
+#include <ghoul/lua/lua_helper.h>
+
 namespace openspace::properties {
 
 template <typename T>
@@ -84,12 +86,18 @@ bool TemplateProperty<T>::getLuaValue(lua_State* state) const {
 
 template <typename T>
 bool TemplateProperty<T>::setLuaValue(lua_State* state) {
-    bool success = false;
-    T thisValue = fromLuaConversion(state, success);
-    if (success) {
+    try {
+        bool success;
+        T thisValue = fromLuaConversion(state, success);
+        if (!success) {
+            return false;
+        }
         set(std::any(thisValue));
+        return true;
+    }
+    catch (const ghoul::lua::LuaFormatException&) {
+        return false;
     }
-    return success;
 }
 
 template <typename T>
diff --git a/src/properties/matrix/dmat2property.cpp b/src/properties/matrix/dmat2property.cpp
index bf85fb0af9..5dc81751cf 100644
--- a/src/properties/matrix/dmat2property.cpp
+++ b/src/properties/matrix/dmat2property.cpp
@@ -50,7 +50,7 @@ int DMat2Property::typeLua() const {
 }
 
 glm::dmat2x2 DMat2Property::fromLuaConversion(lua_State* state, bool& success) const {
-    return ghoul::lua::tryGetValue<glm::dmat2x2>(state, success);
+    return ghoul::lua::value<glm::dmat2x2>(state);
 }
 
 }  // namespace openspace::properties
diff --git a/src/properties/matrix/dmat3property.cpp b/src/properties/matrix/dmat3property.cpp
index b81f3ddda9..00922058fa 100644
--- a/src/properties/matrix/dmat3property.cpp
+++ b/src/properties/matrix/dmat3property.cpp
@@ -50,7 +50,7 @@ int DMat3Property::typeLua() const {
 }
 
 glm::dmat3x3 DMat3Property::fromLuaConversion(lua_State* state, bool& success) const {
-    return ghoul::lua::tryGetValue<glm::mat3x3>(state, success);
+    return ghoul::lua::value<glm::mat3x3>(state);
 }
 
 }  // namespace openspace::properties
diff --git a/src/properties/matrix/dmat4property.cpp b/src/properties/matrix/dmat4property.cpp
index 6ceda69248..34775c28a8 100644
--- a/src/properties/matrix/dmat4property.cpp
+++ b/src/properties/matrix/dmat4property.cpp
@@ -50,7 +50,7 @@ int DMat4Property::typeLua() const {
 }
 
 glm::dmat4x4 DMat4Property::fromLuaConversion(lua_State* state, bool& success) const {
-    return ghoul::lua::tryGetValue<glm::dmat4x4>(state, success);
+    return ghoul::lua::value<glm::dmat4x4>(state);
 }
 
 }  // namespace openspace::properties
diff --git a/src/properties/matrix/mat2property.cpp b/src/properties/matrix/mat2property.cpp
index 8da1b032f4..043202389f 100644
--- a/src/properties/matrix/mat2property.cpp
+++ b/src/properties/matrix/mat2property.cpp
@@ -50,7 +50,7 @@ int Mat2Property::typeLua() const {
 }
 
 glm::mat2x2 Mat2Property::fromLuaConversion(lua_State* state, bool& success) const {
-    return ghoul::lua::tryGetValue<glm::mat2x2>(state, success);
+    return ghoul::lua::value<glm::mat2x2>(state);
 }
 
 }  // namespace openspace::properties
diff --git a/src/properties/matrix/mat3property.cpp b/src/properties/matrix/mat3property.cpp
index 68bdfe9f05..bd5e456429 100644
--- a/src/properties/matrix/mat3property.cpp
+++ b/src/properties/matrix/mat3property.cpp
@@ -50,7 +50,7 @@ int Mat3Property::typeLua() const {
 }
 
 glm::mat3x3 Mat3Property::fromLuaConversion(lua_State* state, bool& success) const {
-    return ghoul::lua::tryGetValue<glm::mat3x3>(state, success);
+    return ghoul::lua::value<glm::mat3x3>(state);
 }
 
 }  // namespace openspace::properties
diff --git a/src/properties/matrix/mat4property.cpp b/src/properties/matrix/mat4property.cpp
index 9affdad963..13ceb4cc9c 100644
--- a/src/properties/matrix/mat4property.cpp
+++ b/src/properties/matrix/mat4property.cpp
@@ -50,7 +50,7 @@ int Mat4Property::typeLua() const {
 }
 
 glm::mat4x4 Mat4Property::fromLuaConversion(lua_State* state, bool& success) const {
-    return ghoul::lua::tryGetValue<glm::mat4x4>(state, success);
+    return ghoul::lua::value<glm::mat4x4>(state);
 }
 
 }  // namespace openspace::properties
diff --git a/src/properties/vector/dvec2property.cpp b/src/properties/vector/dvec2property.cpp
index 8fa8dc4358..88f03759b8 100644
--- a/src/properties/vector/dvec2property.cpp
+++ b/src/properties/vector/dvec2property.cpp
@@ -50,7 +50,7 @@ int DVec2Property::typeLua() const {
 }
 
 glm::dvec2 DVec2Property::fromLuaConversion(lua_State* state, bool& success) const {
-    return ghoul::lua::tryGetValue<glm::dvec2>(state, success);
+    return ghoul::lua::value<glm::dvec2>(state);
 }
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/dvec3property.cpp b/src/properties/vector/dvec3property.cpp
index 9b6a922e99..32567d53ba 100644
--- a/src/properties/vector/dvec3property.cpp
+++ b/src/properties/vector/dvec3property.cpp
@@ -50,7 +50,7 @@ int DVec3Property::typeLua() const {
 }
 
 glm::dvec3 DVec3Property::fromLuaConversion(lua_State* state, bool& success) const {
-    return ghoul::lua::tryGetValue<glm::dvec3>(state, success);
+    return ghoul::lua::value<glm::dvec3>(state);
 }
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/dvec4property.cpp b/src/properties/vector/dvec4property.cpp
index ec48b32402..f4ea6770b4 100644
--- a/src/properties/vector/dvec4property.cpp
+++ b/src/properties/vector/dvec4property.cpp
@@ -50,7 +50,7 @@ int DVec4Property::typeLua() const {
 }
 
 glm::dvec4 DVec4Property::fromLuaConversion(lua_State* state, bool& success) const {
-    return ghoul::lua::tryGetValue<glm::dvec4>(state, success);
+    return ghoul::lua::value<glm::dvec4>(state);
 }
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/ivec2property.cpp b/src/properties/vector/ivec2property.cpp
index 71a4918b53..5b1423e8da 100644
--- a/src/properties/vector/ivec2property.cpp
+++ b/src/properties/vector/ivec2property.cpp
@@ -50,7 +50,7 @@ int IVec2Property::typeLua() const {
 }
 
 glm::ivec2 IVec2Property::fromLuaConversion(lua_State* state, bool& success) const {
-    return ghoul::lua::tryGetValue<glm::ivec2>(state, success);
+    return ghoul::lua::value<glm::ivec2>(state);
 }
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/ivec3property.cpp b/src/properties/vector/ivec3property.cpp
index 2304dc34fb..8fc3b48d2f 100644
--- a/src/properties/vector/ivec3property.cpp
+++ b/src/properties/vector/ivec3property.cpp
@@ -50,7 +50,7 @@ int IVec3Property::typeLua() const {
 }
 
 glm::ivec3 IVec3Property::fromLuaConversion(lua_State* state, bool& success) const {
-    return ghoul::lua::tryGetValue<glm::ivec3>(state, success);
+    return ghoul::lua::value<glm::ivec3>(state);
 }
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/ivec4property.cpp b/src/properties/vector/ivec4property.cpp
index d9a7106fe1..1ec75782db 100644
--- a/src/properties/vector/ivec4property.cpp
+++ b/src/properties/vector/ivec4property.cpp
@@ -50,7 +50,7 @@ int IVec4Property::typeLua() const {
 }
 
 glm::ivec4 IVec4Property::fromLuaConversion(lua_State* state, bool& success) const {
-    return ghoul::lua::tryGetValue<glm::ivec4>(state, success);
+    return ghoul::lua::value<glm::ivec4>(state);
 }
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/uvec2property.cpp b/src/properties/vector/uvec2property.cpp
index 3892c3d6ac..7adeda9865 100644
--- a/src/properties/vector/uvec2property.cpp
+++ b/src/properties/vector/uvec2property.cpp
@@ -50,7 +50,7 @@ int UVec2Property::typeLua() const {
 }
 
 glm::uvec2 UVec2Property::fromLuaConversion(lua_State* state, bool& success) const {
-    return ghoul::lua::tryGetValue<glm::uvec2>(state, success);
+    return ghoul::lua::value<glm::uvec2>(state);
 }
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/uvec3property.cpp b/src/properties/vector/uvec3property.cpp
index 93239cb8ac..650b57a37a 100644
--- a/src/properties/vector/uvec3property.cpp
+++ b/src/properties/vector/uvec3property.cpp
@@ -50,7 +50,7 @@ int UVec3Property::typeLua() const {
 }
 
 glm::uvec3 UVec3Property::fromLuaConversion(lua_State* state, bool& success) const {
-    return ghoul::lua::tryGetValue<glm::uvec3>(state, success);
+    return ghoul::lua::value<glm::uvec3>(state);
 }
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/uvec4property.cpp b/src/properties/vector/uvec4property.cpp
index 28a6121c58..63f42ae8b5 100644
--- a/src/properties/vector/uvec4property.cpp
+++ b/src/properties/vector/uvec4property.cpp
@@ -50,7 +50,7 @@ int UVec4Property::typeLua() const {
 }
 
 glm::uvec4 UVec4Property::fromLuaConversion(lua_State* state, bool& success) const {
-    return ghoul::lua::tryGetValue<glm::uvec4>(state, success);
+    return ghoul::lua::value<glm::uvec4>(state);
 }
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/vec2property.cpp b/src/properties/vector/vec2property.cpp
index 222f5f7f8f..1fd7355d22 100644
--- a/src/properties/vector/vec2property.cpp
+++ b/src/properties/vector/vec2property.cpp
@@ -49,7 +49,7 @@ int Vec2Property::typeLua() const {
 }
 
 glm::vec2 Vec2Property::fromLuaConversion(lua_State* state, bool& success) const {
-    return ghoul::lua::tryGetValue<glm::vec2>(state, success);
+    return ghoul::lua::value<glm::vec2>(state);
 }
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/vec3property.cpp b/src/properties/vector/vec3property.cpp
index 14ab57e185..3fe98ef71d 100644
--- a/src/properties/vector/vec3property.cpp
+++ b/src/properties/vector/vec3property.cpp
@@ -49,7 +49,7 @@ int Vec3Property::typeLua() const {
 }
 
 glm::vec3 Vec3Property::fromLuaConversion(lua_State* state, bool& success) const {
-    return ghoul::lua::tryGetValue<glm::vec3>(state, success);
+    return ghoul::lua::value<glm::vec3>(state);
 }
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/vec4property.cpp b/src/properties/vector/vec4property.cpp
index a188424a3e..431f210fc5 100644
--- a/src/properties/vector/vec4property.cpp
+++ b/src/properties/vector/vec4property.cpp
@@ -49,7 +49,7 @@ int Vec4Property::typeLua() const {
 }
 
 glm::vec4 Vec4Property::fromLuaConversion(lua_State* state, bool& success) const {
-    return ghoul::lua::tryGetValue<glm::vec4>(state, success);
+    return ghoul::lua::value<glm::vec4>(state);
 }
 
 } // namespace openspace::properties
diff --git a/support/coding/codegen b/support/coding/codegen
index c078531087..2906c06cc5 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit c07853108775739727d837fb4974763f798d0b2c
+Subproject commit 2906c06cc5b822e9513bc571df85ee7afb3e1345