diff --git a/ext/ghoul b/ext/ghoul index 42fbc6cc49..06d72a031c 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 42fbc6cc49993893e840f25da1ca505244779005 +Subproject commit 06d72a031c1b56769ab8eb06ea25231471b3ee9c diff --git a/include/openspace/rendering/colormappingcomponent.h b/include/openspace/rendering/colormappingcomponent.h index 308d79344e..6443a46975 100644 --- a/include/openspace/rendering/colormappingcomponent.h +++ b/include/openspace/rendering/colormappingcomponent.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __OPENSPACE_MODULE_BASE___COLORMAPCOMPONENT___H__ -#define __OPENSPACE_MODULE_BASE___COLORMAPCOMPONENT___H__ +#ifndef __OPENSPACE_CORE___COLORMAPCOMPONENT___H__ +#define __OPENSPACE_CORE___COLORMAPCOMPONENT___H__ #include @@ -120,4 +120,4 @@ private: } // namespace openspace -#endif // __OPENSPACE_MODULE_BASE___COLORMAPCOMPONENT___H__ +#endif // __OPENSPACE_CORE___COLORMAPCOMPONENT___H__ diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h index c7b05d2c4a..5c2a362275 100644 --- a/include/openspace/util/spicemanager.h +++ b/include/openspace/util/spicemanager.h @@ -678,8 +678,8 @@ public: * Struct that is used as the return value from the #surfaceIntercept method. */ struct SurfaceInterceptResult { - /// The closest surface intercept point on the target body in Cartesian Coordinates - /// relative to the reference frame + /// The closest surface intercept point on the target body in Cartesian + /// Coordinates relative to the reference frame glm::dvec3 surfaceIntercept = glm::dvec3(0.0); /// If the aberration correction is not AberrationCorrection::Type::None, this diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp index 0b953186c4..a360b3f91b 100644 --- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp +++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp @@ -717,7 +717,10 @@ void RenderablePointCloud::bindDataForPointRendering() { _program->setUniform(_uniformCache.scaleExponent, _sizeSettings.scaleExponent); _program->setUniform(_uniformCache.scaleFactor, _sizeSettings.scaleFactor); - _program->setUniform(_uniformCache.enableMaxSizeControl, _sizeSettings.useMaxSizeControl); + _program->setUniform( + _uniformCache.enableMaxSizeControl, + _sizeSettings.useMaxSizeControl + ); _program->setUniform(_uniformCache.maxAngularSize, _sizeSettings.maxAngularSize); _program->setUniform(_uniformCache.hasDvarScaling, _sizeSettings.sizeMapping.enabled); diff --git a/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp b/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp index 534e28b59f..9797bce49c 100644 --- a/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp +++ b/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp @@ -110,7 +110,17 @@ void RenderablePolygonCloud::createPolygonTexture() { glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); // Stopped using a buffer object for GL_PIXEL_UNPACK_BUFFER glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, TexSize, TexSize, 0, GL_RGBA, GL_BYTE, nullptr); + glTexImage2D( + GL_TEXTURE_2D, + 0, + GL_RGBA8, + TexSize, + TexSize, + 0, + GL_RGBA, + GL_BYTE, + nullptr + ); renderToTexture(_pTexture, TexSize, TexSize); } diff --git a/modules/base/rendering/renderablenodearrow.cpp b/modules/base/rendering/renderablenodearrow.cpp index 3780fe35e3..77103a9955 100644 --- a/modules/base/rendering/renderablenodearrow.cpp +++ b/modules/base/rendering/renderablenodearrow.cpp @@ -438,7 +438,9 @@ void RenderableNodeArrow::updateShapeTransforms(const RenderData& data) { // Create transformation matrices to reshape to size and position _cylinderTranslation = glm::translate(glm::dmat4(1.0), startPos); - glm::dvec3 cylinderScale = glm::dvec3(s * glm::dvec4(_width, _width, cylinderLength, 0.0)); + glm::dvec3 cylinderScale = glm::dvec3( + s * glm::dvec4(_width, _width, cylinderLength, 0.0) + ); _cylinderScale = glm::scale(glm::dmat4(1.0), cylinderScale); // Adapt arrow head start to scaled size diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp index bd73a1141d..fba2b8627f 100644 --- a/modules/base/rendering/renderablesphere.cpp +++ b/modules/base/rendering/renderablesphere.cpp @@ -245,7 +245,10 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) { glm::dmat3 modelRotation = glm::dmat3(data.modelTransform.rotation); _shader->setUniform(_uniformCache.modelViewTransform, glm::mat4(modelViewTransform)); - _shader->setUniform(_uniformCache.modelViewProjection, glm::mat4(modelViewProjectionTransform)); + _shader->setUniform( + _uniformCache.modelViewProjection, + glm::mat4(modelViewProjectionTransform) + ); glm::mat3 modelViewRotation = glm::mat3( glm::dmat3(data.camera.viewRotationMatrix()) * modelRotation diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp index 9992b738ea..7c4a801dc0 100644 --- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp +++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp @@ -469,7 +469,13 @@ void RenderablePlanesCloud::render(const RenderData& data, RendererTasks&) { glm::dvec3(invMVPParts * glm::dvec4(0.0, 1.0, 0.0, 0.0)) ); - _labels->render(data, modelViewProjectionTransform, orthoRight, orthoUp, fadeInVariable); + _labels->render( + data, + modelViewProjectionTransform, + orthoRight, + orthoUp, + fadeInVariable + ); } } diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp index 1d37af2be1..e713c95154 100644 --- a/modules/exoplanets/exoplanetsmodule.cpp +++ b/modules/exoplanets/exoplanetsmodule.cpp @@ -113,9 +113,9 @@ namespace { constexpr openspace::properties::Property::PropertyInfo ComparisonCircleColorInfo = { "ComparisonCircleColor", "Comparison Circle Color", - "Decides the color of the 1 AU size comparison circles that are generated as part " - "of an exoplanet system. Changing the color will not modify already existing " - "circles", + "Decides the color of the 1 AU size comparison circles that are generated as " + "part of an exoplanet system. Changing the color will not modify already " + "existing circles", openspace::properties::Property::Visibility::NoviceUser }; diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl index 7d91656439..4d78edbf45 100644 --- a/modules/exoplanets/exoplanetsmodule_lua.inl +++ b/modules/exoplanets/exoplanetsmodule_lua.inl @@ -748,7 +748,9 @@ listOfExoplanetsDeprecated() LINFO(fmt::format("Reading data for planet: '{}' ", planetData.name)); if (!hasSufficientData(planetData.dataEntry)) { - LWARNING(fmt::format("Insufficient data for exoplanet: '{}'", planetData.name)); + LWARNING(fmt::format( + "Insufficient data for exoplanet: '{}'", planetData.name + )); continue; } @@ -774,7 +776,9 @@ listOfExoplanetsDeprecated() } // Add all the added exoplanet systems - for (const std::pair& entry : hostNameToSystemDataMap) { + using K = const std::string; + using V = ExoplanetSystem; + for (const std::pair& entry : hostNameToSystemDataMap) { const std::string& hostName = entry.first; const ExoplanetSystem& data = entry.second; createExoplanetSystem(hostName, data); diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp index 78bbe46a5e..746b422d91 100644 --- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp +++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp @@ -442,7 +442,7 @@ ExoplanetsDataPreparationTask::parseDataRow(std::string row, } glm::vec3 ExoplanetsDataPreparationTask::starPosition(const std::string& starName, - const std::filesystem::path& sourceFile) + const std::filesystem::path& sourceFile) { glm::vec3 position = glm::vec3(std::numeric_limits::quiet_NaN()); diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp index c912b640c8..7abd7f820f 100644 --- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp +++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp @@ -168,8 +168,9 @@ namespace { constexpr openspace::properties::Property::PropertyInfo DeleteInfo = { "Delete", "Delete", - "Triggering this will remove this GeoJson component from its globe. Note that the " - "GUI may have to be reloaded for the change to be reflect in the user interface.", + "Triggering this will remove this GeoJson component from its globe. Note that " + "the GUI may have to be reloaded for the change to be reflect in the user " + "interface.", openspace::properties::Property::Visibility::User }; diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.cpp b/modules/globebrowsing/src/geojson/geojsonproperties.cpp index 1effefdcbe..50aa4c9f8c 100644 --- a/modules/globebrowsing/src/geojson/geojsonproperties.cpp +++ b/modules/globebrowsing/src/geojson/geojsonproperties.cpp @@ -409,7 +409,8 @@ GeoJsonProperties::GeoJsonProperties() altitudeModeOption.addOptions({ { static_cast(AltitudeMode::Absolute), "Absolute" }, { static_cast(AltitudeMode::RelativeToGround), "Relative to Ground" } - //{ static_cast(AltitudeMode::ClampToGround), "Clamp to Ground" } / TODO: add ClampToGround + // TODO: add ClampToGround + //{ static_cast(AltitudeMode::ClampToGround), "Clamp to Ground" } }); addProperty(altitudeModeOption); @@ -642,7 +643,9 @@ GeoJsonProperties::AltitudeMode PropertySet::altitudeMode() const { } bool PropertySet::tessellationEnabled() const { - return overrideValues.tessellationEnabled.value_or(defaultValues.tessellation.enabled); + return overrideValues.tessellationEnabled.value_or( + defaultValues.tessellation.enabled + ); } bool PropertySet::useTessellationLevel() const { diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp index 05bc83d9ef..165a901d37 100644 --- a/modules/globebrowsing/src/renderableglobe.cpp +++ b/modules/globebrowsing/src/renderableglobe.cpp @@ -1897,7 +1897,8 @@ bool RenderableGlobe::testIfCullable(const Chunk& chunk, ZoneScoped; return (PreformHorizonCulling && isCullableByHorizon(chunk, renderData, heights)) || - (_debugProperties.performFrustumCulling && isCullableByFrustum(chunk, renderData, mvp)); + (_debugProperties.performFrustumCulling && + isCullableByFrustum(chunk, renderData, mvp)); } int RenderableGlobe::desiredLevel(const Chunk& chunk, const RenderData& renderData, @@ -2363,9 +2364,11 @@ int RenderableGlobe::desiredLevelByAvailableTileData(const Chunk& chunk) const { const std::vector& lyrs = _layerManager.layerGroup(gi.id).activeLayers(); for (Layer* layer : lyrs) { Tile::Status status = layer->tileStatus(chunk.tileIndex); - // Ensure that the current tile is OK and that the tileprovider for the current - // layer has enough data to support an additional level. - if (status == Tile::Status::OK && layer->tileProvider()->maxLevel() > currLevel + 1) { + // Ensure that the current tile is OK and that the tileprovider for the + // current layer has enough data to support an additional level. + if (status == Tile::Status::OK && + layer->tileProvider()->maxLevel() > currLevel + 1) + { return UnknownDesiredLevel; } } diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp index 14eed03d9a..4ec427d2f9 100644 --- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp +++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp @@ -524,7 +524,10 @@ void RenderablePlanetProjection::render(const RenderData& data, RendererTasks&) // Model transform and view transform needs to be in double precision const glm::dmat4 modelTransform = calcModelTransform(data); - _programObject->setUniform(_mainUniformCache.modelTransform, glm::mat4(modelTransform)); + _programObject->setUniform( + _mainUniformCache.modelTransform, + glm::mat4(modelTransform) + ); _programObject->setUniform( _mainUniformCache.modelViewProjectionTransform, glm::mat4(calcModelViewProjectionTransform(data, modelTransform)) diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp index 0525bfdc41..6c4c493d91 100644 --- a/modules/sync/syncs/httpsynchronization.cpp +++ b/modules/sync/syncs/httpsynchronization.cpp @@ -121,7 +121,7 @@ void HttpSynchronization::start() { for (const std::string& url : _syncRepositories) { const SynchronizationState syncState = trySyncFromUrl(url + q); - // Could not get this sync repository list of files. + // Could not get this sync repository list of files. if (syncState == SynchronizationState::ListDownloadFail) { continue; } @@ -131,7 +131,7 @@ void HttpSynchronization::start() { createSyncFile(true); } else if (syncState == SynchronizationState::FileDownloadFail) { - // If it was not successful we should add any files that were + // If it was not successful we should add any files that were // potentially downloaded to avoid downloading from other repositories _existingSyncedFiles.insert( _existingSyncedFiles.end(), @@ -143,7 +143,7 @@ void HttpSynchronization::start() { } break; } - + if (!isResolved() && !_shouldCancel) { _state = State::Rejected; } @@ -424,7 +424,7 @@ HttpSynchronization::trySyncFromUrl(std::string listUrl) { } if (failed) { for (const std::unique_ptr& d : downloads) { - // Store all files that were synced to the ossync + // Store all files that were synced to the ossync if (d->hasSucceeded()) { _newSyncedFiles.push_back(d->url()); } diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp index 631d8711b9..b4fe997eb8 100644 --- a/modules/sync/syncs/urlsynchronization.cpp +++ b/modules/sync/syncs/urlsynchronization.cpp @@ -67,8 +67,8 @@ namespace { // parameter only only contain exactly one URL std::optional filename; - // This variable determines the validity period of a file(s) in seconds before it - // needs to be re-downloaded. The default value keeps the file permanently cached, + // This variable determines the validity period of a file(s) in seconds before it + // needs to be re-downloaded. The default value keeps the file permanently cached, // while a value of 0 forces the file to be downloaded on every startup. std::optional secondsUntilResync [[codegen::greaterequal(0.0)]]; }; diff --git a/src/data/dataloader.cpp b/src/data/dataloader.cpp index 6926df0853..bc7fb74543 100644 --- a/src/data/dataloader.cpp +++ b/src/data/dataloader.cpp @@ -79,7 +79,10 @@ namespace { if (specs.has_value()) { info = openspace::dataloader::generateHashString(*specs); } - std::filesystem::path cached = FileSys.cacheManager()->cachedFilename(filePath, info); + std::filesystem::path cached = FileSys.cacheManager()->cachedFilename( + filePath, + info + ); if (std::filesystem::exists(cached)) { LINFOC( @@ -321,10 +324,14 @@ void saveCachedFile(const Dataset& dataset, std::filesystem::path path) { // // Store max data point variable - file.write(reinterpret_cast(&dataset.maxPositionComponent), sizeof(float)); + file.write( + reinterpret_cast(&dataset.maxPositionComponent), + sizeof(float) + ); } -Dataset loadFileWithCache(std::filesystem::path filePath, std::optional specs) +Dataset loadFileWithCache(std::filesystem::path filePath, + std::optional specs) { return internalLoadFileWithCache( filePath, diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp index b18fe245dd..b646709333 100644 --- a/src/engine/configuration.cpp +++ b/src/engine/configuration.cpp @@ -421,15 +421,27 @@ ghoul::Dictionary Configuration::createDictionary() { { ghoul::Dictionary openGLDebugContextDict; openGLDebugContextDict.setValue("IsActive", openGLDebugContext.isActive); - openGLDebugContextDict.setValue("PrintStacktrace", openGLDebugContext.printStacktrace); - openGLDebugContextDict.setValue("IsSynchronous", openGLDebugContext.isSynchronous); + openGLDebugContextDict.setValue( + "PrintStacktrace", + openGLDebugContext.printStacktrace + ); + openGLDebugContextDict.setValue( + "IsSynchronous", + openGLDebugContext.isSynchronous + ); ghoul::Dictionary identifierFiltersDict; for (size_t i = 0; i < openGLDebugContext.severityFilters.size(); ++i) { { ghoul::Dictionary identifierFilterDict; - identifierFilterDict.setValue("Type", openGLDebugContext.identifierFilters[i].type); - identifierFilterDict.setValue("Source", openGLDebugContext.identifierFilters[i].source); + identifierFilterDict.setValue( + "Type", + openGLDebugContext.identifierFilters[i].type + ); + identifierFilterDict.setValue( + "Source", + openGLDebugContext.identifierFilters[i].source + ); identifierFilterDict.setValue( "Identifier", static_cast(openGLDebugContext.identifierFilters[i].identifier) diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp index cce0561c76..9cb631505c 100644 --- a/src/interaction/sessionrecording.cpp +++ b/src/interaction/sessionrecording.cpp @@ -827,7 +827,6 @@ void SessionRecording::saveCameraKeyframeAscii(Timestamps& times, file << HeaderCommentAscii << ' ' << ghoul::to_string(modelTransform) << '\n'; } - std::stringstream keyframeLine = std::stringstream(); saveHeaderAscii(times, HeaderCameraAscii, keyframeLine); diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp index 192c76ce87..429c315351 100644 --- a/src/navigation/navigationhandler.cpp +++ b/src/navigation/navigationhandler.cpp @@ -400,12 +400,12 @@ void NavigationHandler::updateCameraTransitions() { } else { if (_inAnchorApproachSphere && !wasInApproachSphere) { - // Transitioned into the approach sphere from somewhere further away => approach + // Transitioned to the approach sphere from somewhere further away => approach triggerApproachEvent(anchorNode()); } if (_inAnchorReachSphere && !wasInReachSphere) { - // Transitioned into the reach sphere from somewhere further away => reach + // Transitioned to the reach sphere from somewhere further away => reach triggerReachEvent(anchorNode()); } diff --git a/src/navigation/waypoint.cpp b/src/navigation/waypoint.cpp index c4722c44ad..155a0852f8 100644 --- a/src/navigation/waypoint.cpp +++ b/src/navigation/waypoint.cpp @@ -224,7 +224,8 @@ Waypoint computeWaypointFromNodeInfo(const NodeCameraStateSpec& spec, // Compute rotation so the camera is looking at the targetted node glm::dvec3 lookAtPos = targetNode->worldPosition(); - // Check if we can distinguish between targetpos and lookAt pos. Otherwise, move it further away + // Check if we can distinguish between targetpos and lookAt pos. Otherwise, move it + // further away const glm::dvec3 diff = targetPos - lookAtPos; double distSquared = glm::dot(diff, diff); if (std::isnan(distSquared) || distSquared < LengthEpsilon) { diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp index f82d732da4..c2ce901d4a 100644 --- a/src/rendering/colormappingcomponent.cpp +++ b/src/rendering/colormappingcomponent.cpp @@ -334,7 +334,8 @@ void ColorMappingComponent::initialize(const dataloader::Dataset& dataset) { if (_colorMap.nanColor.has_value() && !_hasNanColorInAsset) { nanColor = *_colorMap.nanColor; - useNanColor = true; // @ TODO: Avoid overriding value set in asset? (also for useBelow and useAbove) + // @ TODO: Avoid overriding value set in asset? (also for useBelow and useAbove) + useNanColor = true; } if (_colorMap.belowRangeColor.has_value() && !_hasBelowRangeColorInAsset) { diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp index 45e5e9d12c..0d650e91f4 100644 --- a/src/rendering/framebufferrenderer.cpp +++ b/src/rendering/framebufferrenderer.cpp @@ -511,17 +511,15 @@ void FramebufferRenderer::applyFXAA(const glm::ivec4& viewport) { } void FramebufferRenderer::updateDownscaleTextures() { + float cdf = _downscaleVolumeRendering.currentDownscaleFactor; + glBindTexture(GL_TEXTURE_2D, _downscaleVolumeRendering.colorTexture); glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA32F, - static_cast( - glm::max(_resolution.x * _downscaleVolumeRendering.currentDownscaleFactor, 1.f) - ), - static_cast( - glm::max(_resolution.y * _downscaleVolumeRendering.currentDownscaleFactor, 1.f) - ), + static_cast(glm::max(_resolution.x * cdf, 1.f)), + static_cast(glm::max(_resolution.y * cdf, 1.f)), 0, GL_RGBA, GL_FLOAT, @@ -537,12 +535,8 @@ void FramebufferRenderer::updateDownscaleTextures() { GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT32F, - static_cast( - glm::max(_resolution.x * _downscaleVolumeRendering.currentDownscaleFactor, 1.f) - ), - static_cast( - glm::max(_resolution.y * _downscaleVolumeRendering.currentDownscaleFactor, 1.f) - ), + static_cast(glm::max(_resolution.x * cdf, 1.f)), + static_cast(glm::max(_resolution.y * cdf, 1.f)), 0, GL_DEPTH_COMPONENT, GL_FLOAT, @@ -839,18 +833,16 @@ void FramebufferRenderer::updateResolution() { glObjectLabel(GL_TEXTURE, _fxaaBuffers.fxaaTexture, -1, "FXAA"); } + float cdf = _downscaleVolumeRendering.currentDownscaleFactor; + // Downscale Volume Rendering glBindTexture(GL_TEXTURE_2D, _downscaleVolumeRendering.colorTexture); glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA32F, - static_cast( - glm::max(_resolution.x * _downscaleVolumeRendering.currentDownscaleFactor, 1.f) - ), - static_cast( - glm::max(_resolution.y * _downscaleVolumeRendering.currentDownscaleFactor, 1.f) - ), + static_cast(glm::max(_resolution.x * cdf, 1.f)), + static_cast(glm::max(_resolution.y * cdf, 1.f)), 0, GL_RGBA, GL_FLOAT, @@ -877,12 +869,8 @@ void FramebufferRenderer::updateResolution() { GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT32F, - static_cast( - glm::max(_resolution.x * _downscaleVolumeRendering.currentDownscaleFactor, 1.f) - ), - static_cast( - glm::max(_resolution.y * _downscaleVolumeRendering.currentDownscaleFactor, 1.f) - ), + static_cast(glm::max(_resolution.x * cdf, 1.f)), + static_cast(glm::max(_resolution.y * cdf, 1.f)), 0, GL_DEPTH_COMPONENT, GL_FLOAT, diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp index 09c66e63f6..24c918ba88 100644 --- a/src/rendering/loadingscreen.cpp +++ b/src/rendering/loadingscreen.cpp @@ -319,7 +319,7 @@ void LoadingScreen::render() { rectOverlaps(messageLl, messageUr, ll, ur) : false; - const bool logOverlap = _showLog ? + const bool logOverlap = _showLog ? rectOverlaps(logLl, logUr,ll, ur) : false; diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp index 3f3dd2e469..cb7e8624e2 100644 --- a/src/rendering/luaconsole.cpp +++ b/src/rendering/luaconsole.cpp @@ -307,7 +307,9 @@ bool LuaConsole::keyboardCallback(Key key, KeyModifier modifier, KeyAction actio if (_shouldSendToRemote) { _shouldSendToRemote = false; } - else if (global::parallelPeer->status() == ParallelConnection::Status::Host) { + else if (global::parallelPeer->status() == + ParallelConnection::Status::Host) + { _shouldSendToRemote = true; } } diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp index fa07e6e520..1b26510b9a 100644 --- a/src/scene/scene.cpp +++ b/src/scene/scene.cpp @@ -548,9 +548,10 @@ void Scene::updateInterpolations() { if (i.isExpired) { if (!i.postScript.empty()) { - // No sync or send because this is already inside a Lua script that was triggered - // when the interpolation of the property was triggered, therefor it has already been - // synced and sent to the connected nodes and peers + // No sync or send because this is already inside a Lua script that was + // triggered when the interpolation of the property was triggered, + // therefore it has already been synced and sent to the connected nodes + // and peers global::scriptEngine->queueScript( std::move(i.postScript), scripting::ScriptEngine::ShouldBeSynchronized::No, diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp index c2fa3fa44b..c67685baab 100644 --- a/src/scene/scenegraphnode.cpp +++ b/src/scene/scenegraphnode.cpp @@ -122,10 +122,10 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EvalInteractionSphereInfo = { "EvaluatedInteractionSphere", "Evaluated Interaction Sphere", - "This read-only property contains the evaluated value for the interaction sphere. " - "This is the actual value that is used internally within the software. If the " - "InteractionSphere property is set to -1, it is the computed value, otherwise it " - "matches the one set in the property", + "This read-only property contains the evaluated value for the interaction " + "sphere. This is the actual value that is used internally within the software. " + "If the InteractionSphere property is set to -1, it is the computed value, " + "otherwise it matches the one set in the property", openspace::properties::Property::Visibility::AdvancedUser }; diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp index e8a0630c33..454b263ffe 100644 --- a/src/util/spicemanager.cpp +++ b/src/util/spicemanager.cpp @@ -1379,19 +1379,19 @@ Modifications: 2012, Jan. 5 NJB Modified file to account for the leapsecond that will occur on June 30, 2012. - + 2008, Jul. 7 NJB Modified file to account for the leapsecond that will occur on December 31, 2008. - + 2005, Aug. 3 NJB Modified file to account for the leapsecond that will occur on December 31, 2005. - + 1998, Jul 17 WLT Modified file to account for the leapsecond that will occur on December 31, 1998. - + 1997, Feb 22 WLT Modified file to account for the leapsecond that will occur on June 30, 1997. - + 1995, Dec 14 KSZ Corrected date of last leapsecond from 1-1-95 to 1-1-96. @@ -1407,19 +1407,19 @@ Modifications: 1992, Mar. 6 HAN Modified file to account for the leapsecond on June 30, 1992. -1990, Oct. 8 HAN Modified file to account for the leapsecond on - Dec. 31, 1990. +1990, Oct. 8 HAN Modified file to account for the leapsecond on + Dec. 31, 1990. Explanation: ------------ -The contents of this file are used by the routine DELTET to compute the +The contents of this file are used by the routine DELTET to compute the time difference -[1] DELTA_ET = ET - UTC - -the increment to be applied to UTC to give ET. +[1] DELTA_ET = ET - UTC + +the increment to be applied to UTC to give ET. The difference between UTC and TAI, @@ -1435,17 +1435,17 @@ is declared. Combining [1] and [2] gives The difference (ET - TAI) is periodic, and is given by -[4] ET - TAI = DELTA_T_A + K sin E +[4] ET - TAI = DELTA_T_A + K sin E -where DELTA_T_A and K are constant, and E is the eccentric anomaly of the -heliocentric orbit of the Earth-Moon barycenter. Equation [4], which ignores +where DELTA_T_A and K are constant, and E is the eccentric anomaly of the +heliocentric orbit of the Earth-Moon barycenter. Equation [4], which ignores small-period fluctuations, is accurate to about 0.000030 seconds. -The eccentric anomaly E is given by +The eccentric anomaly E is given by [5] E = M + EB sin M -where M is the mean anomaly, which in turn is given by +where M is the mean anomaly, which in turn is given by [6] M = M + M t 0 1 @@ -1463,7 +1463,7 @@ Thus, in order to compute DELTA_ET, the following items are necessary. The numbers, and the formulation, are taken from the following sources. - 1) Moyer, T.D., Transformation from Proper Time on Earth to + 1) Moyer, T.D., Transformation from Proper Time on Earth to Coordinate Time in Solar System Barycentric Space-Time Frame of Reference, Parts 1 and 2, Celestial Mechanics 23 (1981), 33-56 and 57-68. @@ -1472,7 +1472,7 @@ The numbers, and the formulation, are taken from the following sources. Reference System on Algorithms for Computing Time Differences and Clock Rates, JPL IOM 314.5--942, 1 October 1985. -The variable names used above are consistent with those used in the +The variable names used above are consistent with those used in the Astronomical Almanac. \begindata @@ -1483,32 +1483,32 @@ DELTET/EB = 1.671D-2 DELTET/M = ( 6.239996D0 1.99096871D-7 ) DELTET/DELTA_AT = ( 10, @1972-JAN-1 - 11, @1972-JUL-1 - 12, @1973-JAN-1 - 13, @1974-JAN-1 - 14, @1975-JAN-1 - 15, @1976-JAN-1 - 16, @1977-JAN-1 - 17, @1978-JAN-1 - 18, @1979-JAN-1 - 19, @1980-JAN-1 - 20, @1981-JUL-1 - 21, @1982-JUL-1 - 22, @1983-JUL-1 - 23, @1985-JUL-1 - 24, @1988-JAN-1 + 11, @1972-JUL-1 + 12, @1973-JAN-1 + 13, @1974-JAN-1 + 14, @1975-JAN-1 + 15, @1976-JAN-1 + 16, @1977-JAN-1 + 17, @1978-JAN-1 + 18, @1979-JAN-1 + 19, @1980-JAN-1 + 20, @1981-JUL-1 + 21, @1982-JUL-1 + 22, @1983-JUL-1 + 23, @1985-JUL-1 + 24, @1988-JAN-1 25, @1990-JAN-1 - 26, @1991-JAN-1 + 26, @1991-JAN-1 27, @1992-JUL-1 28, @1993-JUL-1 29, @1994-JUL-1 - 30, @1996-JAN-1 + 30, @1996-JAN-1 31, @1997-JUL-1 32, @1999-JAN-1 33, @2006-JAN-1 34, @2009-JAN-1 35, @2012-JUL-1 - 36, @2015-JUL-1 + 36, @2015-JUL-1 37, @2017-JAN-1 ) \begintext diff --git a/src/util/spicemanager_lua.inl b/src/util/spicemanager_lua.inl index f19d9a14ef..b08c9af17e 100644 --- a/src/util/spicemanager_lua.inl +++ b/src/util/spicemanager_lua.inl @@ -69,7 +69,7 @@ namespace { } /** - * Returns a list of all loaded kernels + * Returns a list of all loaded kernels */ [[codegen::luawrap]] std::vector kernels() { return openspace::SpiceManager::ref().loadedKernels();