From e2c1414ba621fee1fc70e1488c1ed55057823aba Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Wed, 17 Mar 2021 21:26:57 +0100 Subject: [PATCH] Update to newest codegen, replace std::monostate with ghoul::Dictionary --- modules/base/rendering/renderabletrail.cpp | 3 ++- modules/base/timeframe/timeframeunion.cpp | 3 ++- modules/globebrowsing/src/layer.cpp | 2 +- modules/space/rotation/spicerotation.cpp | 3 ++- support/coding/codegen | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp index 42147ba54e..daab021b50 100644 --- a/modules/base/rendering/renderabletrail.cpp +++ b/modules/base/rendering/renderabletrail.cpp @@ -148,7 +148,8 @@ namespace { struct [[codegen::Dictionary(RenderableTrail)]] Parameters { // This object is used to compute locations along the path. Any Translation object // can be used here - std::monostate translation [[codegen::reference("core_transform_translation")]]; + ghoul::Dictionary translation + [[codegen::reference("core_transform_translation")]]; // [[codegen::verbatim(LineColorInfo.description)]] glm::vec3 color [[codegen::color()]]; diff --git a/modules/base/timeframe/timeframeunion.cpp b/modules/base/timeframe/timeframeunion.cpp index 05f7da7028..b630f940ea 100644 --- a/modules/base/timeframe/timeframeunion.cpp +++ b/modules/base/timeframe/timeframeunion.cpp @@ -41,7 +41,8 @@ namespace { struct [[codegen::Dictionary(TimeFrameUnion)]] Parameters { // [[codegen::verbatim(TimeFramesInfo.description)]] - std::vector timeFrames [[codegen::reference("core_time_frame")]]; + std::vector timeFrames + [[codegen::reference("core_time_frame")]]; }; #include "timeframeunion_codegen.cpp" } // namespace diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp index 7cc2745cb3..43039ef251 100644 --- a/modules/globebrowsing/src/layer.cpp +++ b/modules/globebrowsing/src/layer.cpp @@ -172,7 +172,7 @@ namespace { std::optional blendMode; // If the primary layer creation fails, this layer is used as a fallback - std::optional + std::optional fallback [[codegen::reference("globebrowsing_layer")]]; }; #include "layer_codegen.cpp" diff --git a/modules/space/rotation/spicerotation.cpp b/modules/space/rotation/spicerotation.cpp index 02b1b025c0..927c1c7ceb 100644 --- a/modules/space/rotation/spicerotation.cpp +++ b/modules/space/rotation/spicerotation.cpp @@ -64,7 +64,8 @@ namespace { std::optional, std::string>> kernels; // [[codegen::verbatim(TimeFrameInfo.description)]] - std::optional timeFrame [[codegen::reference("core_time_frame")]]; + std::optional timeFrame + [[codegen::reference("core_time_frame")]]; }; #include "spicerotation_codegen.cpp" } // namespace diff --git a/support/coding/codegen b/support/coding/codegen index 1251be9728..b3c0a745fa 160000 --- a/support/coding/codegen +++ b/support/coding/codegen @@ -1 +1 @@ -Subproject commit 1251be972816ef313dfb0f6f8ede7c3d7abc3bc1 +Subproject commit b3c0a745fa68e5f762de8a06732038e3a6fd5e02