diff --git a/ext/ghoul b/ext/ghoul index 89cd93b9e5..8c041d702c 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 89cd93b9e5191e75e07395024f8b16ab20ae9f99 +Subproject commit 8c041d702c2992d0a3e248baa2aed42292d8426e diff --git a/include/openspace/properties/propertyowner.h b/include/openspace/properties/propertyowner.h index 16ec2057b6..70428667c8 100644 --- a/include/openspace/properties/propertyowner.h +++ b/include/openspace/properties/propertyowner.h @@ -153,11 +153,11 @@ public: Property* property(const std::string& uri) const; /** - * Retrieves a PropertyOwner identified by \p uri from this PropertyOwner. If \p uri + * Retrieves a PropertyOwner identified by \p uri from this PropertyOwner. If \p uri * does not contain a `.` it is an identifier and must refer to a PropertyOwner * directly owned by this PropertyOwner. If the uri contains one or more `.`, the * first part of the name will be recursively extracted and used as a name for a sub- - * owner and only the last part of the uri is referring to a PropertyOwner owned by a + * owner and only the last part of the uri is referring to a PropertyOwner owned by a * PropertyOwner named by the second-but-last name. * * \param uri The uri or identifier of the PropertyOwner that should be extracted @@ -170,8 +170,8 @@ public: * Returns a uri for this PropertyOwner. This is created by looking up all the owners * of this PropertyOwner. The owner identifiers are separated by ".", which make up * the uri of this PropertyOwner. - * - * \return The uri of this PropertyOwner + * + * \return The uri of this PropertyOwner */ std::string uri() const; diff --git a/include/openspace/rendering/labelscomponent.h b/include/openspace/rendering/labelscomponent.h index c729670534..93cc016401 100644 --- a/include/openspace/rendering/labelscomponent.h +++ b/include/openspace/rendering/labelscomponent.h @@ -56,8 +56,8 @@ public: void initialize(); /** - * Create the labels from an already loaded dataset. That dataset should have a comment - * per point to be used for the labels. + * Create the labels from an already loaded dataset. That dataset should have a + * comment per point to be used for the labels. * * This function should be called before the labels are initialized * diff --git a/modules/audio/audiomodule.h b/modules/audio/audiomodule.h index ee93f24424..7ff817124c 100644 --- a/modules/audio/audiomodule.h +++ b/modules/audio/audiomodule.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __OPENSPACE_MODULE_SPACE___AUDIOMODULE___H__ -#define __OPENSPACE_MODULE_SPACE___AUDIOMODULE___H__ +#ifndef __OPENSPACE_MODULE_AUDIO___AUDIOMODULE___H__ +#define __OPENSPACE_MODULE_AUDIO___AUDIOMODULE___H__ #include @@ -312,4 +312,4 @@ private: } // namespace openspace -#endif // __OPENSPACE_MODULE_SPACE___AUDIOMODULE___H__ +#endif // __OPENSPACE_MODULE_AUDIO___AUDIOMODULE___H__ diff --git a/modules/base/rendering/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp index 89f9f7af45..2353ef282c 100644 --- a/modules/base/rendering/grids/renderablegrid.cpp +++ b/modules/base/rendering/grids/renderablegrid.cpp @@ -76,7 +76,8 @@ namespace { constexpr openspace::properties::Property::PropertyInfo HighlightLineWidthInfo = { "HighlightLineWidth", "Highlight Line Width", - "The width of the highlighted grid lines. The larger number, the thicker the lines.", + "The width of the highlighted grid lines. The larger number, the thicker the " + "lines.", openspace::properties::Property::Visibility::User }; diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp index 9c16476f58..8cc051be28 100644 --- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp +++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp @@ -492,8 +492,8 @@ void RenderableInterpolatedPoints::initializeBufferData() { LDEBUG(std::format("Generating Vertex Buffer Object id '{}'", _vbo)); } - const int attibutesPerPoint = nAttributesPerPoint(); - const unsigned int bufferSize = attibutesPerPoint * _nDataPoints * sizeof(float); + const int attibsPerPoint = nAttributesPerPoint(); + const unsigned int bufferSize = attibsPerPoint * _nDataPoints * sizeof(float); // Allocate the memory for the buffer (we will want to upload the data quite often) glBindVertexArray(_vao); @@ -502,31 +502,31 @@ void RenderableInterpolatedPoints::initializeBufferData() { int offset = 0; - offset = bufferVertexAttribute("in_position0", 3, attibutesPerPoint, offset); - offset = bufferVertexAttribute("in_position1", 3, attibutesPerPoint, offset); + offset = bufferVertexAttribute("in_position0", 3, attibsPerPoint, offset); + offset = bufferVertexAttribute("in_position1", 3, attibsPerPoint, offset); if (useSplineInterpolation()) { - offset = bufferVertexAttribute("in_position_before", 3, attibutesPerPoint, offset); - offset = bufferVertexAttribute("in_position_after", 3, attibutesPerPoint, offset); + offset = bufferVertexAttribute("in_position_before", 3, attibsPerPoint, offset); + offset = bufferVertexAttribute("in_position_after", 3, attibsPerPoint, offset); } if (hasColorData()) { - offset = bufferVertexAttribute("in_colorParameter0", 1, attibutesPerPoint, offset); - offset = bufferVertexAttribute("in_colorParameter1", 1, attibutesPerPoint, offset); + offset = bufferVertexAttribute("in_colorParameter0", 1, attibsPerPoint, offset); + offset = bufferVertexAttribute("in_colorParameter1", 1, attibsPerPoint, offset); } if (hasSizeData()) { - offset = bufferVertexAttribute("in_scalingParameter0", 1, attibutesPerPoint, offset); - offset = bufferVertexAttribute("in_scalingParameter1", 1, attibutesPerPoint, offset); + offset = bufferVertexAttribute("in_scalingParameter0", 1, attibsPerPoint, offset); + offset = bufferVertexAttribute("in_scalingParameter1", 1, attibsPerPoint, offset); } if (useOrientationData()) { - offset = bufferVertexAttribute("in_orientation0", 4, attibutesPerPoint, offset); - offset = bufferVertexAttribute("in_orientation1", 4, attibutesPerPoint, offset); + offset = bufferVertexAttribute("in_orientation0", 4, attibsPerPoint, offset); + offset = bufferVertexAttribute("in_orientation1", 4, attibsPerPoint, offset); } if (_hasSpriteTexture) { - offset = bufferVertexAttribute("in_textureLayer", 1, attibutesPerPoint, offset); + offset = bufferVertexAttribute("in_textureLayer", 1, attibsPerPoint, offset); } glBindVertexArray(0); diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp index 21b462a132..4e3e7b5ea7 100644 --- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp +++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp @@ -189,13 +189,14 @@ namespace { constexpr openspace::properties::Property::PropertyInfo UseOrientationDataInfo = { "UseOrientationData", "Use Orientation Data", - "If true, the orientation data in the dataset is included when rendering the points, " - "if there is any. To see the rotation, you also need to set the \"Orientation " - "Render Option\" to \"Fixed Rotation\".", + "If true, the orientation data in the dataset is included when rendering the " + "points, if there is any. To see the rotation, you also need to set the " + "\"Orientation Render Option\" to \"Fixed Rotation\".", openspace::properties::Property::Visibility::AdvancedUser }; - constexpr openspace::properties::Property::PropertyInfo OrientationRenderOptionInfo = { + constexpr openspace::properties::Property::PropertyInfo OrientationRenderOptionInfo = + { "OrientationRenderOption", "Orientation Render Option", "Controls how the planes for the points will be oriented. \"Camera View " @@ -1116,7 +1117,14 @@ void RenderablePointCloud::generateArrayTextures() { unsigned int layer = 0; for (const size_t& i : textureListIndices) { ghoul::opengl::Texture* texture = _textures[i].get(); - fillAndUploadTextureLayer(arrayIndex, layer, i, res, useAlpha, texture->pixelData()); + fillAndUploadTextureLayer( + arrayIndex, + layer, + i, + res, + useAlpha, + texture->pixelData() + ); layer++; // At this point we don't need the keep the texture data around anymore. If @@ -1451,7 +1459,7 @@ int RenderablePointCloud::nAttributesPerPoint() const { } int RenderablePointCloud::bufferVertexAttribute(const std::string& name, GLint nValues, - int nAttributesPerPoint, int offset) const + int nAttributesPerPoint, int offset) const { GLint attrib = _program->attributeLocation(name); glEnableVertexAttribArray(attrib); @@ -1493,25 +1501,25 @@ void RenderablePointCloud::updateBufferData() { glBindBuffer(GL_ARRAY_BUFFER, _vbo); glBufferData(GL_ARRAY_BUFFER, size * sizeof(float), slice.data(), GL_STATIC_DRAW); - const int attibutesPerPoint = nAttributesPerPoint(); + const int attibsPerPoint = nAttributesPerPoint(); int offset = 0; - offset = bufferVertexAttribute("in_position", 3, attibutesPerPoint, offset); + offset = bufferVertexAttribute("in_position", 3, attibsPerPoint, offset); if (hasColorData()) { - offset = bufferVertexAttribute("in_colorParameter", 1, attibutesPerPoint, offset); + offset = bufferVertexAttribute("in_colorParameter", 1, attibsPerPoint, offset); } if (hasSizeData()) { - offset = bufferVertexAttribute("in_scalingParameter", 1, attibutesPerPoint, offset); + offset = bufferVertexAttribute("in_scalingParameter", 1, attibsPerPoint, offset); } if (useOrientationData()) { - offset = bufferVertexAttribute("in_orientation", 4, attibutesPerPoint, offset); + offset = bufferVertexAttribute("in_orientation", 4, attibsPerPoint, offset); } if (_hasSpriteTexture) { - offset = bufferVertexAttribute("in_textureLayer", 1, attibutesPerPoint, offset); + offset = bufferVertexAttribute("in_textureLayer", 1, attibsPerPoint, offset); } glBindVertexArray(0); @@ -1543,7 +1551,8 @@ void RenderablePointCloud::updateSpriteTexture() { initializeSingleTexture(); // Note that these are usually set when the data slice initialized. However, // we want to avoid reinitializing the data, and here we know that all points - // will be rendered using the same texture array and hence the data can stay fixed + // will be rendered using the same texture array and hence the data can stay + // fixed _textureArrays.front().nPoints = _nDataPoints; _textureArrays.front().startOffset = 0; _dataIsDirty = false; diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp index 27abcaf182..7881a8ddf5 100644 --- a/modules/base/rendering/renderablemodel.cpp +++ b/modules/base/rendering/renderablemodel.cpp @@ -130,9 +130,9 @@ namespace { constexpr openspace::properties::Property::PropertyInfo ModelScaleInfo = { "ModelScale", "Model Scale", - "The scale of the model. If a numeric value is provided in the asset file, the scale " - "will be that exact value. If instead a unit name is provided, this " - "is the value that that name represents. For example 'Centimeter' becomes 0.01.", + "The scale of the model. If a numeric value is provided in the asset file, the " + "scale will be that exact value. If instead a unit name is provided, this is the " + "value that that name represents. For example 'Centimeter' becomes 0.01.", openspace::properties::Property::Visibility::AdvancedUser }; diff --git a/modules/base/rendering/renderabletrail.h b/modules/base/rendering/renderabletrail.h index 525e8d9cfb..9130523d40 100644 --- a/modules/base/rendering/renderabletrail.h +++ b/modules/base/rendering/renderabletrail.h @@ -196,7 +196,7 @@ private: UniformCache(opacity, modelViewTransform, projectionTransform, color, useLineFade, lineLength, lineFadeAmount, vertexSortingMethod, idOffset, nVertices, stride, pointSize, renderPhase, useSplitRenderMode, floatingOffset, numberOfUniqueVertices - ) _uniformCache; + ) _uniformCache; #else UniformCache(opacity, modelViewTransform, projectionTransform, color, useLineFade, lineLength, lineFadeAmount, vertexSortingMethod, idOffset, nVertices, stride, diff --git a/modules/base/rendering/renderabletrailtrajectory.h b/modules/base/rendering/renderabletrailtrajectory.h index 9a4c69d3e4..baab782c9a 100644 --- a/modules/base/rendering/renderabletrailtrajectory.h +++ b/modules/base/rendering/renderabletrailtrajectory.h @@ -82,7 +82,7 @@ private: properties::IntProperty _timeStampSubsamplingFactor; /// Determines whether the full trail should be rendered or the future trail removed properties::BoolProperty _renderFullTrail; - /// Determines how many vertices around the object that will be + /// Determines how many vertices around the object that will be /// replaced during full trail rendering properties::IntProperty _numberOfReplacementPoints; @@ -114,7 +114,7 @@ private: /// Contains all timestamps corresponding to the positions in _vertexArray std::vector _timeVector; - + /// Keeps track of all double precision vertices of trails std::vector> _dVertexArray; diff --git a/modules/base/rotation/luarotation.cpp b/modules/base/rotation/luarotation.cpp index f432c3cb24..2e6124db18 100644 --- a/modules/base/rotation/luarotation.cpp +++ b/modules/base/rotation/luarotation.cpp @@ -43,9 +43,9 @@ namespace { "'rotation' that takes the current simulation time in seconds past the J2000 " "epoch as the first argument, the simulation time in seconds past the J2000 " "epoch of the last frame as the second argument, and the current wall time as " - "milliseconds past the J2000 epoch as the third argument. It computes the rotation " - "value factors returned as a table containing the 9 values that make up the " - "resulting rotation matrix.", + "milliseconds past the J2000 epoch as the third argument. It computes the " + "rotation value factors returned as a table containing the 9 values that make up " + "the resulting rotation matrix.", openspace::properties::Property::Visibility::AdvancedUser }; diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp index df02c5f4e1..c6c4ffa7f4 100644 --- a/modules/globebrowsing/globebrowsingmodule.cpp +++ b/modules/globebrowsing/globebrowsingmodule.cpp @@ -385,7 +385,9 @@ void GlobeBrowsingModule::goToGeo(const globebrowsing::RenderableGlobe& globe, glm::vec3 GlobeBrowsingModule::cartesianCoordinatesFromGeo( const globebrowsing::RenderableGlobe& globe, - double latitude, double longitude, std::optional altitude) + double latitude, + double longitude, + std::optional altitude) { using namespace globebrowsing; diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl index 8cdb4d64ed..b7d2fbdf29 100644 --- a/modules/globebrowsing/globebrowsingmodule_lua.inl +++ b/modules/globebrowsing/globebrowsingmodule_lua.inl @@ -460,7 +460,14 @@ void flyToGeoInternal(std::string globe, double latitude, altitude = global::navigationHandler->pathNavigator().defaultArrivalHeight(globe); } - flyToGeoInternal(globe, latitude, longitude, std::nullopt, duration, shouldUseUpVector); + flyToGeoInternal( + globe, + latitude, + longitude, + std::nullopt, + duration, + shouldUseUpVector + ); } /** diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp index dc327c3dc7..192c954366 100644 --- a/modules/space/rendering/renderableconstellationlines.cpp +++ b/modules/space/rendering/renderableconstellationlines.cpp @@ -72,9 +72,9 @@ namespace { "Colors", "Constellation Colors", "A list of colors to use for the constellations. A data file may include several " - "groups of constellations, where each group can have a distinct color. The index for " - "the color parameter for each constellation in the data file corresponds to the " - "order of the colors in this list.", + "groups of constellations, where each group can have a distinct color. The index " + "for the color parameter for each constellation in the data file corresponds to " + "the order of the colors in this list.", openspace::properties::Property::Visibility::User }; diff --git a/modules/space/rendering/renderableorbitalkepler.h b/modules/space/rendering/renderableorbitalkepler.h index d404806640..76560bc41d 100644 --- a/modules/space/rendering/renderableorbitalkepler.h +++ b/modules/space/rendering/renderableorbitalkepler.h @@ -115,7 +115,7 @@ private: UniformCache(modelView, projection, trailFadeExponent, colorFadeCutoffValue, inGameTime, color, opacity) _uniformTrailCache; - + // Point cache UniformCache(modelTransform, viewTransform, projectionTransform, cameraPositionWorld, cameraUpWorld, inGameTime, color, diff --git a/modules/space/rendering/renderabletravelspeed.cpp b/modules/space/rendering/renderabletravelspeed.cpp index b841bf3ea6..19eaa6fff6 100644 --- a/modules/space/rendering/renderabletravelspeed.cpp +++ b/modules/space/rendering/renderabletravelspeed.cpp @@ -74,7 +74,8 @@ namespace { "Indicator Length", "The length of the speed indicator line, given in seconds. The length will be " "computed as the speed times this value. For example, a value of 1 will make it " - "as long as the distance it would travel over one second with the specified speed.", + "as long as the distance it would travel over one second with the specified " + "speed.", openspace::properties::Property::Visibility::User }; diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp index 8dc0af50ee..78458622c7 100644 --- a/modules/spacecraftinstruments/util/projectioncomponent.cpp +++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp @@ -212,8 +212,6 @@ void ProjectionComponent::initialize(const std::string& identifier, return; } - //std::variant> s = *p.sequence; - std::vector sequenceSources; if (std::holds_alternative(*p.sequence)) { sequenceSources.push_back(absPath(std::get(*p.sequence))); diff --git a/src/data/csvloader.cpp b/src/data/csvloader.cpp index f29cdf061a..c68aa9ef27 100644 --- a/src/data/csvloader.cpp +++ b/src/data/csvloader.cpp @@ -262,7 +262,7 @@ std::vector loadTextureMapFile(std::filesystem::path path, std::vector res; std::string line; - while (std::getline(file, line)) { + while (ghoul::getline(file, line)) { ghoul::trimWhitespace(line); currentLineNumber++; diff --git a/src/data/speckloader.cpp b/src/data/speckloader.cpp index f47b2058a9..65a33fefac 100644 --- a/src/data/speckloader.cpp +++ b/src/data/speckloader.cpp @@ -185,7 +185,8 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional spe if (nNonEmptyTokens > 4) { throw ghoul::RuntimeError(std::format( - "Error loading speck file {}: Too many arguments for texture on line {}", + "Error loading speck file {}: Too many arguments for texture on line " + "{}", path, currentLineNumber )); } diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp index 6cb205ed9e..4e406eae29 100644 --- a/src/documentation/documentationengine.cpp +++ b/src/documentation/documentationengine.cpp @@ -196,7 +196,8 @@ namespace { using namespace openspace; nlohmann::json json; - json[NameKey] = !owner->guiName().empty() ? owner->guiName() : owner->identifier(); + json[NameKey] = + !owner->guiName().empty() ? owner->guiName() : owner->identifier(); json[DescriptionKey] = owner->description(); json[PropertiesKeys] = nlohmann::json::array(); @@ -332,14 +333,16 @@ nlohmann::json DocumentationEngine::generateLicenseGroupsJson() const { nlohmann::json json; if (global::profile->meta.has_value()) { + Profile::Meta meta = *global::profile->meta; + nlohmann::json metaJson; metaJson[NameKey] = ProfileName; - metaJson[ProfileNameKey] = global::profile->meta->name.value_or(NoDataName); - metaJson[VersionKey] = global::profile->meta->version.value_or(NoDataName); - metaJson[DescriptionKey] = global::profile->meta->description.value_or(NoDataName); - metaJson[AuthorKey] = global::profile->meta->author.value_or(NoDataName); - metaJson[UrlKey] = global::profile->meta->url.value_or(NoDataName); - metaJson[LicenseKey] = global::profile->meta->license.value_or(NoDataName); + metaJson[ProfileNameKey] = meta.name.value_or(NoDataName); + metaJson[VersionKey] = meta.version.value_or(NoDataName); + metaJson[DescriptionKey] = meta.description.value_or(NoDataName); + metaJson[AuthorKey] = meta.author.value_or(NoDataName); + metaJson[UrlKey] = meta.url.value_or(NoDataName); + metaJson[LicenseKey] = meta.license.value_or(NoDataName); json.push_back(std::move(metaJson)); } @@ -361,8 +364,8 @@ nlohmann::json DocumentationEngine::generateLicenseGroupsJson() const { assetJson[NameKey] = meta.has_value() ? meta->name : NoDataName; assetJson[VersionKey] = meta.has_value() ? meta->version : NoDataName; assetJson[DescriptionKey] = meta.has_value() ? meta->description : NoDataName; - assetJson[AuthorKey] = meta.has_value() ? meta->author : NoDataName; - assetJson[UrlKey] = meta.has_value() ? meta->url : NoDataName; + assetJson[AuthorKey] = meta.has_value() ? meta->author : NoDataName; + assetJson[UrlKey] = meta.has_value() ? meta->url : NoDataName; assetJson[LicenseKey] = licenseName; assetJson[PathKey] = asset->path().string(); assetJson[IdKey] = asset->path().string(); @@ -483,7 +486,7 @@ nlohmann::json DocumentationEngine::generateEventJson() const { return result; } -nlohmann::json DocumentationEngine::generateFactoryManagerJson() const { +nlohmann::json DocumentationEngine::generateFactoryManagerJson() const { nlohmann::json json; std::vector docs = _documentations; // Copy the documentations diff --git a/src/navigation/navigationhandler_lua.inl b/src/navigation/navigationhandler_lua.inl index 0a3be04c6a..d2b6e126cf 100644 --- a/src/navigation/navigationhandler_lua.inl +++ b/src/navigation/navigationhandler_lua.inl @@ -50,8 +50,8 @@ namespace { /** * Return the current [NavigationState](#core_navigation_state) as a Lua table. * - * By default, the reference frame will be picked based on whether the orbital navigator is - * currently following the anchor node rotation. If it is, the anchor will be chosen as + * By default, the reference frame will be picked based on whether the orbital navigator + * is currently following the anchor node rotation. If it is, the anchor will be chosen as * reference frame. If not, the reference frame will be set to the scene graph root. * * \param frame the identifier of an optional scene graph node to use as reference frame @@ -403,8 +403,8 @@ struct [[codegen::Dictionary(JoystickAxis)]] JoystickAxis { * `"Press"`, which means that the script is run when the user presses the * button. Alternatives are `"Idle"` (if the button is unpressed and has * been unpressed since the last frame), `"Repeat"` (if the button has been - * pressed since longer than the last frame), and `"Release"` (if the button was - * released since the last frame) + * pressed since longer than the last frame), and `"Release"` (if the button + * was released since the last frame) * \param isRemote a value saying whether the command is going to be executable * locally or remotely, where the latter is the default */ diff --git a/src/navigation/pathnavigator_lua.inl b/src/navigation/pathnavigator_lua.inl index 72d2e25128..9b7832ccb4 100644 --- a/src/navigation/pathnavigator_lua.inl +++ b/src/navigation/pathnavigator_lua.inl @@ -168,8 +168,9 @@ namespace { } /** - * Create a path to the navigation state described by the input table. Note that roll must be - * included for the target up direction in the navigation state to be taken into account. + * Create a path to the navigation state described by the input table. Note that roll must + * be included for the target up direction in the navigation state to be taken into + * account. * * \param navigationState A [NavigationState](#core_navigation_state) to fly to * \param duration An optional duration for the motion to take, in seconds. For example, @@ -410,8 +411,9 @@ namespace { /** * Create a camera path as described by the instruction in the input argument. * - * \param pathInstruction A table representing a [PathInstruction](#core_path_instruction), - * that describes a camera path to be created + * \param pathInstruction A table representing a + * [PathInstruction](#core_path_instruction) that describes a + * camera path to be created */ [[codegen::luawrap]] void createPath(ghoul::Dictionary pathInstruction) { using namespace openspace; diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp index f4b85bd084..5e7e7ccb78 100644 --- a/src/rendering/screenspacerenderable.cpp +++ b/src/rendering/screenspacerenderable.cpp @@ -100,9 +100,10 @@ namespace { constexpr openspace::properties::Property::PropertyInfo ScaleInfo = { "Scale", "Scale Value", - "A scale factor for the plane that can be used to increase or decrease the visual " - "size. The default size is determined separately for each screen space renderable " - "type and may for example be affected by the size of an image being displayed.", + "A scale factor for the plane that can be used to increase or decrease the " + "visual size. The default size is determined separately for each screen space " + "renderable type and may for example be affected by the size of an image being " + "displayed.", openspace::properties::Property::Visibility::NoviceUser };