mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-02 00:44:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup of mostly asset files

Browse Source 
- Fixes for all files
 - constexpr cleanup
 - Cosmetic changes
 - Remove punctuation from the end of messages
This commit is contained in:
Alexander Bock
2022-07-28 17:21:59 +02:00
parent 0494343a58
commit 163ac4dcef
928 changed files with 2834 additions and 2858 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/globebrowsingmodule.cpp
+7 -9
View File
@@ -95,7 +95,7 @@ namespace {
"WMSCacheEnabled",
"WMS Cache Enabled",
"Determines whether automatic caching of WMS servers is enabled. Changing the "
"value of this property will not affect already created WMS datasets."
"value of this property will not affect already created WMS datasets"
};
constexpr openspace::properties::Property::PropertyInfo OfflineModeInfo = {
@@ -105,27 +105,27 @@ namespace {
"not even try to retrieve images through an internet connection. Please note "
"that this setting is only reasonable, if the caching is enabled and there is "
"available cached data. Changing the value of this property will not affect "
"already created WMS datasets."
"already created WMS datasets"
};
constexpr openspace::properties::Property::PropertyInfo WMSCacheLocationInfo = {
"WMSCacheLocation",
"WMS Cache Location",
"The location of the cache folder for WMS servers. Changing the value of this "
"property will not affect already created WMS datasets."
"property will not affect already created WMS datasets"
};
constexpr openspace::properties::Property::PropertyInfo WMSCacheSizeInfo = {
"WMSCacheSize",
"WMS Cache Size",
"The maximum size of the cache for each WMS server. Changing the value of this "
"property will not affect already created WMS datasets."
"property will not affect already created WMS datasets"
};
constexpr openspace::properties::Property::PropertyInfo TileCacheSizeInfo = {
"TileCacheSize",
"Tile Cache Size",
"The maximum size of the MemoryAwareTileCache, on the CPU and GPU."
"The maximum size of the MemoryAwareTileCache, on the CPU and GPU"
};
@@ -243,7 +243,7 @@ void GlobeBrowsingModule::internalInitialize(const ghoul::Dictionary& dict) {
"WMS caching is disabled, but offline mode is enabled. Unless you know "
"what you are doing, this will probably cause many servers to stop working. "
"If you want to silence this warning, set the 'NoWarning' parameter to "
"'true'."
"'true'"
);
}
@@ -460,9 +460,7 @@ void GlobeBrowsingModule::goToChunk(const globebrowsing::RenderableGlobe& globe,
const glm::dvec3 cameraPosition = global::navigationHandler->camera()->positionVec3();
SceneGraphNode* globeSceneGraphNode = dynamic_cast<SceneGraphNode*>(globe.owner());
if (!globeSceneGraphNode) {
LERROR(
"Cannot go to chunk. The renderable is not attached to a scene graph node."
);
LERROR("Cannot go to chunk. The renderable is not attached to scene graph node");
return;
}
const glm::dmat4 inverseModelTransform = glm::inverse(
modules/globebrowsing/globebrowsingmodule_lua.inl
+2 -2
View File
@@ -230,7 +230,7 @@ namespace {
else {
n = global::navigationHandler->orbitalNavigator().anchorNode();
if (!n) {
throw ghoul::lua::LuaError("No anchor node is set.");
throw ghoul::lua::LuaError("No anchor node is set");
}
}
@@ -286,7 +286,7 @@ namespace {
else {
n = global::navigationHandler->orbitalNavigator().anchorNode();
if (!n) {
throw ghoul::lua::LuaError("No anchor node is set.");
throw ghoul::lua::LuaError("No anchor node is set");
}
}
modules/globebrowsing/src/asynctiledataprovider.cpp
+4 -9
View File
@@ -135,7 +135,7 @@ void AsyncTileDataProvider::update() {
// May reset
switch (_resetMode) {
case ResetMode::ShouldResetAll: {
case ResetMode::ShouldResetAll:
// Clean all finished jobs
clearTiles();
// Only allow resetting if there are no jobs currently running
@@ -144,8 +144,7 @@ void AsyncTileDataProvider::update() {
LINFO(fmt::format("Tile data reader '{}' reset successfully", _name));
}
break;
}
case ResetMode::ShouldResetAllButRawTileDataReader: {
case ResetMode::ShouldResetAllButRawTileDataReader:
// Clean all finished jobs
clearTiles();
// Only allow resetting if there are no jobs currently running
@@ -154,8 +153,7 @@ void AsyncTileDataProvider::update() {
LINFO(fmt::format("Tile data reader '{}' reset successfully", _name));
}
break;
}
case ResetMode::ShouldBeDeleted: {
case ResetMode::ShouldBeDeleted:
// Clean all finished jobs
clearTiles();
// Only allow resetting if there are no jobs currently running
@@ -163,10 +161,7 @@ void AsyncTileDataProvider::update() {
_shouldBeDeleted = true;
}
break;
}
case ResetMode::ShouldNotReset: {
break;
}
case ResetMode::ShouldNotReset:
default:
break;
}
modules/globebrowsing/src/dashboarditemglobelocation.cpp
+3 -3
View File
@@ -46,13 +46,13 @@ namespace {
"FontName",
"Font Name",
"This value is the name of the font that is used. It can either refer to an "
"internal name registered previously, or it can refer to a path that is used."
"internal name registered previously, or it can refer to a path that is used"
};
constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = {
"FontSize",
"Font Size",
"This value determines the size of the font that is used to render the date."
"This value determines the size of the font that is used to render the date"
};
constexpr openspace::properties::Property::PropertyInfo DisplayFormatInfo = {
@@ -64,7 +64,7 @@ namespace {
constexpr openspace::properties::Property::PropertyInfo SignificantDigitsInfo = {
"SignificantDigits",
"Significant Digits",
"Determines the number of significant digits that are shown in the location text."
"Determines the number of significant digits that are shown in the location text"
};
struct [[codegen::Dictionary(DashboardItemGlobeLocation)]] Parameters {
modules/globebrowsing/src/gdalwrapper.cpp
+2 -2
View File
@@ -41,14 +41,14 @@ namespace {
"LogGdalErrors",
"Log GDAL errors",
"If this value is enabled, any error that is raised by GDAL will be logged using "
"the logmanager. If this value is disabled, any error will be ignored."
"the logmanager. If this value is disabled, any error will be ignored"
};
constexpr openspace::properties::Property::PropertyInfo GdalMaximumCacheInfo = {
"GdalMaximumCacheSize",
"GDAL maximum cache size",
"This function sets the maximum amount of RAM memory in MB that GDAL is "
"permitted to use for caching."
"permitted to use for caching"
};
void gdalErrorHandler(CPLErr eErrClass, int, const char* msg) {
modules/globebrowsing/src/globelabelscomponent.cpp
+13 -13
View File
@@ -63,44 +63,44 @@ namespace {
constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
"Enabled",
"Enabled",
"Enables and disables labels' rendering."
"Enables and disables labels' rendering"
};
constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = {
"FontSize",
"Font Size",
"Font size for the rendering labels. This is different fromt text size."
"Font size for the rendering labels. This is different fromt text size"
};
constexpr openspace::properties::Property::PropertyInfo MinMaxSizeInfo = {
"MinMaxSize",
"Min/Max Text Size",
"Minimum and maximum label size, in pixels."
"Minimum and maximum label size, in pixels"
};
constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
"LabelsSize",
"Labels Size",
"This value affects the size scale of the labels."
"This value affects the size scale of the labels"
};
constexpr openspace::properties::Property::PropertyInfo HeightOffsetInfo = {
"HeightOffset",
"Height Offset",
"This value moves the label away from the globe surface by the specified "
"distance (in meters)."
"distance (in meters)"
};
constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
"Color",
"Color",
"The text color of the labels."
"The text color of the labels"
};
constexpr openspace::properties::Property::PropertyInfo OpacityInfo = {
"Opacity",
"Opacity",
"The opacity of the labels."
"The opacity of the labels"
};
constexpr openspace::properties::Property::PropertyInfo FadeDistancesInfo = {
@@ -108,39 +108,39 @@ namespace {
"Fade-In Distances",
"The distances above the globe's surface at which the labels start fading in or "
"out, given in meters. The final distances are also adjusted by the specified "
"height offset."
"height offset"
};
constexpr openspace::properties::Property::PropertyInfo FadeInEnabledInfo = {
"FadeInEnabled",
"Fade In Enabled",
"Sets whether the labels fade in when approaching the globe from a distance. If "
"false, no fading happens and the labels immediately has full opacity."
"false, no fading happens and the labels immediately has full opacity"
};
constexpr openspace::properties::Property::PropertyInfo FadeOutEnabledInfo = {
"FadeOutEnabled",
"Fade Out Enabled",
"Sets whether the labels fade out when approaching the surface of the globe. If "
"false, no fading happens and the labels stays in full opacity."
"false, no fading happens and the labels stays in full opacity"
};
constexpr openspace::properties::Property::PropertyInfo DisableCullingInfo = {
"DisableCulling",
"Culling Disabled",
"Labels culling disabled."
"Labels culling disabled"
};
constexpr openspace::properties::Property::PropertyInfo DistanceEPSInfo = {
"DistanceEPS",
"Culling Distance",
"Labels culling distance from globe's center."
"Labels culling distance from globe's center"
};
constexpr openspace::properties::Property::PropertyInfo AlignmentOptionInfo = {
"AlignmentOption",
"Alignment Option",
"Labels are aligned horizontally or circularly related to the planet."
"Labels are aligned horizontally or circularly related to the planet"
};
struct [[codegen::Dictionary(GlobeLabelsComponent)]] Parameters {
modules/globebrowsing/src/globerotation.cpp
+4 -4
View File
@@ -48,7 +48,7 @@ namespace {
"Latitude",
"The latitude of the location on the globe's surface. The value can range from "
"-90 to 90, with negative values representing the southern hemisphere of the "
"globe. The default value is 0.0."
"globe. The default value is 0.0"
};
constexpr openspace::properties::Property::PropertyInfo LongitudeInfo = {
@@ -56,14 +56,14 @@ namespace {
"Longitude",
"The longitude of the location on the globe's surface. The value can range from "
"-180 to 180, with negative values representing the western hemisphere of the "
"globe. The default value is 0.0."
"globe. The default value is 0.0"
};
constexpr openspace::properties::Property::PropertyInfo AngleInfo = {
"Angle",
"Angle",
"A rotation angle that can be used to rotate the object around its own y-axis, "
"which will be pointing out of the globe's surface."
"which will be pointing out of the globe's surface"
};
constexpr openspace::properties::Property::PropertyInfo UseHeightmapInfo = {
@@ -71,7 +71,7 @@ namespace {
"Use Heightmap",
"If set to true, the heightmap will be used when computing the surface normal. "
"This means that the object will be rotated to lay flat on the surface at the "
"given coordinate and follow the shape of the landscape."
"given coordinate and follow the shape of the landscape"
};
struct [[codegen::Dictionary(GlobeRotation)]] Parameters {
modules/globebrowsing/src/globetranslation.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ namespace {
"Use Heightmap",
"If this value is 'true', the altitude specified in 'Altitude' will be treated "
"as an offset from the heightmap. Otherwise, it will be an offset from the "
"globe's reference ellipsoid. The default value is 'false'."
"globe's reference ellipsoid. The default value is 'false'"
};
struct [[codegen::Dictionary(GlobeTranslation)]] Parameters {
modules/globebrowsing/src/gpulayergroup.cpp
+1 -1
View File
@@ -39,7 +39,7 @@ void GPULayerGroup::setValue(ghoul::opengl::ProgramObject& program,
ghoul_assert(
layerGroup.activeLayers().size() == _gpuActiveLayers.size(),
"GPU and CPU active layers must have same size!"
"GPU and CPU active layers must have same size"
);
const std::vector<Layer*>& activeLayers = layerGroup.activeLayers();
modules/globebrowsing/src/layer.cpp
+8 -9
View File
@@ -48,14 +48,14 @@ namespace {
"Type",
"Type",
"The type of this Layer. This value is a read-only property and thus cannot be "
"changed."
"changed"
};
constexpr openspace::properties::Property::PropertyInfo BlendModeInfo = {
"BlendMode",
"Blend Mode",
"This value specifies the blend mode that is applied to this layer. The blend "
"mode determines how this layer is added to the underlying layers beneath."
"mode determines how this layer is added to the underlying layers beneath"
};
constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
@@ -63,28 +63,28 @@ namespace {
"Enabled",
"If this value is enabled, the layer will be used for the final composition of "
"the planet. If this value is disabled, the layer will be ignored in the "
"composition."
"composition"
};
constexpr openspace::properties::Property::PropertyInfo ResetInfo = {
"Reset",
"Reset",
"If this value is triggered, this layer will be reset. This will delete the "
"local cache for this layer and will trigger a fresh load of all tiles."
"local cache for this layer and will trigger a fresh load of all tiles"
};
constexpr openspace::properties::Property::PropertyInfo RemoveInfo = {
"Remove",
"Remove",
"If this value is triggered, a script will be executed that will remove this "
"layer before the next frame."
"layer before the next frame"
};
constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
"Color",
"Color",
"If the 'Type' of this layer is a solid color, this value determines what this "
"solid color is."
"solid color is"
};
constexpr openspace::properties::Property::PropertyInfo GuiDescriptionInfo = {
@@ -206,7 +206,7 @@ Layer::Layer(layers::Group::ID id, const ghoul::Dictionary& layerDict, LayerGrou
if (p.type.has_value()) {
typeID = ghoul::from_string<layers::Layer::ID>(*p.type);
if (typeID == layers::Layer::ID::Unknown) {
throw ghoul::RuntimeError("Unknown layer type!");
throw ghoul::RuntimeError("Unknown layer type");
}
}
else {
@@ -515,10 +515,9 @@ void Layer::addVisibleProperties() {
addPropertySubOwner(*_tileProvider);
}
break;
case layers::Layer::ID::SolidColor: {
case layers::Layer::ID::SolidColor:
addProperty(_solidColor);
break;
}
default:
throw ghoul::MissingCaseException();
}
modules/globebrowsing/src/layeradjustment.cpp
+3 -3
View File
@@ -32,20 +32,20 @@ namespace {
constexpr openspace::properties::Property::PropertyInfo ChromaKeyColorInfo = {
"ChromaKeyColor",
"Chroma Key Color",
"This color is used as the chroma key for the layer that is adjusted."
"This color is used as the chroma key for the layer that is adjusted"
};
constexpr openspace::properties::Property::PropertyInfo ChromaKeyToleranceInfo = {
"ChromaKeyTolerance",
"Chroma Key Tolerance",
"This value determines the tolerance that is used to determine whether a color "
"is matching the selected Chroma key."
"is matching the selected Chroma key"
};
constexpr openspace::properties::Property::PropertyInfo TypeInfo = {
"Type",
"Type",
"The type of layer adjustment that is applied to the underlying layer."
"The type of layer adjustment that is applied to the underlying layer"
};
struct [[codegen::Dictionary(LayerAdjustment)]] Parameters {
modules/globebrowsing/src/layergroup.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ namespace {
"Blend between levels",
"If this value is enabled, images between different levels are interpolated, "
"rather than switching between levels abruptly. This makes transitions smoother "
"and more visually pleasing.",
"and more visually pleasing",
openspace::properties::Property::Visibility::Hidden
};
} // namespace
modules/globebrowsing/src/layerrendersettings.cpp
+5 -5
View File
@@ -29,7 +29,7 @@ namespace {
"SetDefault",
"Set Default",
"If this value is triggered it will reset all of these values to their default "
"values."
"values"
};
constexpr openspace::properties::Property::PropertyInfo OpacityInfo = {
@@ -37,27 +37,27 @@ namespace {
"Opacity",
"This value sets the transparency of this layer. If this value is equal to '1', "
"the layer is completely opaque. If this value is equal to '0', the layer is "
"completely transparent."
"completely transparent"
};
constexpr openspace::properties::Property::PropertyInfo GammaInfo = {
"Gamma",
"Gamma",
"This value is used as an exponent to adjust the color for each tile."
"This value is used as an exponent to adjust the color for each tile"
};
constexpr openspace::properties::Property::PropertyInfo MultiplierInfo = {
"Multiplier",
"Multiplier",
"This value is used as a multiplier to adjust the color applied after taking the "
"gamma value as an exponent."
"gamma value as an exponent"
};
constexpr openspace::properties::Property::PropertyInfo OffsetInfo = {
"Offset",
"Offset",
"This value is used as an additive modifier to adjust the color applied after "
"the gamma exponent and the multiplier has been performed."
"the gamma exponent and the multiplier has been performed"
};
} // namespace
modules/globebrowsing/src/lrucache.inl
+2 -2
View File
@@ -100,7 +100,7 @@ ValueType LRUCache<KeyType, ValueType, HasherType>::get(const KeyType& key) {
template<typename KeyType, typename ValueType, typename HasherType>
std::pair<KeyType, ValueType> LRUCache<KeyType, ValueType, HasherType>::popMRU() {
ghoul_assert(!_itemList.empty(), "Cannot pop LRU cache. Ensure cache is not empty.");
ghoul_assert(!_itemList.empty(), "Cannot pop LRU cache. Ensure cache is not empty");
auto first_it = _itemList.begin();
_itemMap.erase(first_it->first);
@@ -111,7 +111,7 @@ std::pair<KeyType, ValueType> LRUCache<KeyType, ValueType, HasherType>::popMRU()
template<typename KeyType, typename ValueType, typename HasherType>
std::pair<KeyType, ValueType> LRUCache<KeyType, ValueType, HasherType>::popLRU() {
ghoul_assert(!_itemList.empty(), "Cannot pop LRU cache. Ensure cache is not empty.");
ghoul_assert(!_itemList.empty(), "Cannot pop LRU cache. Ensure cache is not empty");
auto lastIt = _itemList.end();
lastIt--;
modules/globebrowsing/src/memoryawaretilecache.cpp
+3 -3
View File
@@ -38,14 +38,14 @@ namespace {
"CpuAllocatedTileData",
"CPU allocated tile data (MB)",
"This value denotes the amount of RAM memory (in MB) that this tile cache is "
"utilizing."
"utilizing"
};
constexpr openspace::properties::Property::PropertyInfo GpuAllocatedDataInfo = {
"GpuAllocatedTileData",
"GPU allocated tile data (MB)",
"This value denotes the amount of GPU memory (in MB) that this tile cache is "
"utilizing."
"utilizing"
};
constexpr openspace::properties::Property::PropertyInfo TileCacheSizeInfo = {
@@ -340,7 +340,7 @@ void MemoryAwareTileCache::assureTextureContainerExists(
void MemoryAwareTileCache::setSizeEstimated(size_t estimatedSize) {
ZoneScoped
ghoul_assert(!_textureContainerMap.empty(), "Texture containers must exist.");
ghoul_assert(!_textureContainerMap.empty(), "Texture containers must exist");
LDEBUG("Resetting tile cache size");
modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl
+1 -1
View File
@@ -67,7 +67,7 @@ void PrioritizingConcurrentJobManager<P, KeyType>::clearEnqueuedJobs() {
template <typename P, typename KeyType>
std::shared_ptr<Job<P>> PrioritizingConcurrentJobManager<P, KeyType>::popFinishedJob() {
ghoul_assert(!_finishedJobs.empty(), "There is no finished job to pop!");
ghoul_assert(!_finishedJobs.empty(), "There is no finished job to pop");
std::lock_guard lock(_finishedJobsMutex);
std::shared_ptr<Job<P>> result = _finishedJobs.pop();
modules/globebrowsing/src/rawtiledatareader.cpp
+3 -3
View File
@@ -361,7 +361,7 @@ glm::ivec2 geodeticToPixel(const Geodetic2& geo,
const double X = glm::degrees(geo.lon);
const double divisor = t[2] * t[4] - t[1] * t[5];
ghoul_assert(divisor != 0.0, "Division by zero!");
ghoul_assert(divisor != 0.0, "Division by zero");
const double P = (t[0] * t[5] - t[2] * t[3] + t[2] * Y - t[5] * X) / divisor;
const double L = (-t[0] * t[4] + t[1] * t[3] - t[1] * Y + t[4] * X) / divisor;
@@ -589,7 +589,7 @@ RawTile::ReadError RawTileDataReader::rasterRead(int rasterBand,
const IODescription& io,
char* dataDestination) const
{
ghoul_assert(isInside(io.read.region, io.read.fullRegion), "write region of bounds!");
ghoul_assert(isInside(io.read.region, io.read.fullRegion), "write region of bounds");
ghoul_assert(
io.write.region.start.x >= 0 && io.write.region.start.y >= 0,
"Invalid write region"
@@ -807,7 +807,7 @@ IODescription RawTileDataReader::ioDescription(const TileIndex& tileIndex) const
);
ghoul_assert(
io.write.region.numPixels.x == _initData.dimensions.x,
"Write region must match tile it writes to."
"Write region must match tile it writes to"
);
return io;
modules/globebrowsing/src/renderableglobe.cpp
+13 -13
View File
@@ -117,14 +117,14 @@ namespace {
"Level by projected area (else distance)",
"If this value is set to 'true', the tile level is determined by the area "
"projected on screen. If it is 'false', the distance to the center of the tile "
"is used instead."
"is used instead"
};
constexpr openspace::properties::Property::PropertyInfo ResetTileProviderInfo = {
"ResetTileProviders",
"Reset tile providers",
"If this property is triggered, all tile provides for the globe are reset and "
"data is reloaded from scratch."
"data is reloaded from scratch"
};
constexpr openspace::properties::Property::PropertyInfo ModelSpaceRenderingInfo = {
@@ -133,7 +133,7 @@ namespace {
"This value determines the tile level that is used as the cut off between "
"rendering tiles using the globe model rendering vs the flat in-game rendering "
"method. This value is a tradeoff between not having precision errors in the "
"rendering and represting a tile as flat or curved."
"rendering and represting a tile as flat or curved"
};
constexpr openspace::properties::Property::PropertyInfo DynamicLodIterationCountInfo =
@@ -150,7 +150,7 @@ namespace {
"Perform shading",
"This value determines whether there should be lighting applied to the surface "
"of the globe. Note that if there is an atmosphere attached to the planet, there "
"is a separate setting to control the shadowing induced by the atmosphere part."
"is a separate setting to control the shadowing induced by the atmosphere part"
};
constexpr openspace::properties::Property::PropertyInfo AccurateNormalsInfo = {
@@ -176,7 +176,7 @@ namespace {
constexpr openspace::properties::Property::PropertyInfo ShadowMappingInfo = {
"ShadowMapping",
"Shadow Mapping",
"Enables shadow mapping algorithm. Used by renderable rings too."
"Enables shadow mapping algorithm. Used by renderable rings too"
};
constexpr openspace::properties::Property::PropertyInfo RenderAtDistanceInfo = {
@@ -184,7 +184,7 @@ namespace {
"Render at Distance",
"Tells the rendering engine not to perform distance based performance culling "
"for this globe. Turning this property on will let the globe to be seen at far "
"away distances when normally it would be hidden."
"away distances when normally it would be hidden"
};
constexpr openspace::properties::Property::PropertyInfo ZFightingPercentageInfo = {
@@ -198,7 +198,7 @@ namespace {
"NumberShadowSamples",
"Number of Shadow Samples",
"The number of samples used during shadow mapping calculation "
"(Percentage Closer Filtering)."
"(Percentage Closer Filtering)"
};
constexpr openspace::properties::Property::PropertyInfo TargetLodScaleFactorInfo = {
@@ -206,14 +206,14 @@ namespace {
"Target Level of Detail Scale Factor",
"Determines the targeted level-of-detail of the tiles for this globe. A higher "
"value means that the tiles rendered are a higher resolution for the same "
"distance of the camera to the planet."
"distance of the camera to the planet"
};
constexpr openspace::properties::Property::PropertyInfo CurrentLodScaleFactorInfo = {
"CurrentLodScaleFactor",
"Current Level of Detail Scale Factor (Read Only)",
"The currently used scale factor whose target value is deteremined by "
"'TargetLodScaleFactor'."
"'TargetLodScaleFactor'"
};
constexpr openspace::properties::Property::PropertyInfo OrenNayarRoughnessInfo = {
@@ -226,7 +226,7 @@ namespace {
"NActiveLayers",
"Number of active layers",
"This is the number of currently active layers, if this value reaches the "
"maximum, bad things will happen."
"maximum, bad things will happen"
};
struct [[codegen::Dictionary(RenderableGlobe)]] Parameters {
@@ -1730,7 +1730,7 @@ void RenderableGlobe::recompileShaders() {
absPath("${MODULE_GLOBEBROWSING}/shaders/renderer_fs.glsl"),
shaderDictionary
);
ghoul_assert(_localRenderer.program, "Failed to initialize programObject!");
ghoul_assert(_localRenderer.program, "Failed to initialize programObject");
_localRenderer.updatedSinceLastCall = true;
_localRenderer.program->setUniform("xSegments", _grid.xSegments);
@@ -1752,7 +1752,7 @@ void RenderableGlobe::recompileShaders() {
absPath("${MODULE_GLOBEBROWSING}/shaders/renderer_fs.glsl"),
shaderDictionary
);
ghoul_assert(_globalRenderer.program, "Failed to initialize programObject!");
ghoul_assert(_globalRenderer.program, "Failed to initialize programObject");
_globalRenderer.program->setUniform("xSegments", _grid.xSegments);
@@ -2034,7 +2034,7 @@ void RenderableGlobe::calculateEclipseShadows(ghoul::opengl::ProgramObject& prog
if ((sourceNode == nullptr) || (casterNode == nullptr)) {
LERRORC(
"Renderableglobe",
"Invalid scenegraph node for the shadow's caster or shadow's receiver."
"Invalid scenegraph node for the shadow's caster or shadow's receiver"
);
return;
}
modules/globebrowsing/src/renderableglobe.h
+2 -2
View File
@@ -118,8 +118,8 @@ public:
static documentation::Documentation Documentation();
private:
constexpr static const int MinSplitDepth = 2;
constexpr static const int MaxSplitDepth = 22;
static constexpr int MinSplitDepth = 2;
static constexpr int MaxSplitDepth = 22;
struct {
properties::BoolProperty showChunkEdges;
modules/globebrowsing/src/ringscomponent.cpp
+11 -11
View File
@@ -75,48 +75,48 @@ namespace {
"Texture",
"Texture",
"This value is the path to a texture on disk that contains a one-dimensional "
"texture which is used for these rings."
"texture which is used for these rings"
};
constexpr openspace::properties::Property::PropertyInfo TextureFwrdInfo = {
"TextureFwrd",
"TextureFwrd",
"This value is the path to a texture on disk that contains a one-dimensional "
"texture which is used for forward scattering light in these rings."
"texture which is used for forward scattering light in these rings"
};
constexpr openspace::properties::Property::PropertyInfo TextureBckwrdInfo = {
"TextureBckwrd",
"TextureBckwrd",
"This value is the path to a texture on disk that contains a one-dimensional "
"texture which is used for backward scattering light in these rings."
"texture which is used for backward scattering light in these rings"
};
constexpr openspace::properties::Property::PropertyInfo TextureUnlitInfo = {
"TextureUnlit",
"TextureUnlit",
"This value is the path to a texture on disk that contains a one-dimensional "
"texture which is used for unlit part in these rings."
"texture which is used for unlit part in these rings"
};
constexpr openspace::properties::Property::PropertyInfo TextureColorInfo = {
"TextureColor",
"TextureColor",
"This value is the path to a texture on disk that contains a one-dimensional "
"texture color which is used for unlit part in these rings."
"texture color which is used for unlit part in these rings"
};
constexpr openspace::properties::Property::PropertyInfo TextureTransparencyInfo = {
"TextureTransparency",
"TextureTransparency",
"This value is the path to a texture on disk that contains a one-dimensional "
"texture transparency which is used for unlit part in these rings."
"texture transparency which is used for unlit part in these rings"
};
constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
"Size",
"Size",
"This value specifies the radius of the rings in meter."
"This value specifies the radius of the rings in meter"
};
constexpr openspace::properties::Property::PropertyInfo OffsetInfo = {
@@ -125,7 +125,7 @@ namespace {
"This value is used to limit the width of the rings. Each of the two values is "
"a value between 0 and 1, where 0 is the center of the ring and 1 is the "
"maximum extent at the radius. For example, if the value is {0.5, 1.0}, the "
"ring is only shown between radius/2 and radius. It defaults to {0.0, 1.0}."
"ring is only shown between radius/2 and radius. It defaults to {0.0, 1.0}"
};
constexpr openspace::properties::Property::PropertyInfo NightFactorInfo = {
@@ -133,14 +133,14 @@ namespace {
"Night Factor",
"This value is a multiplicative factor that is applied to the side of the rings "
"that is facing away from the Sun. If this value is equal to '1', no darkening "
"of the night side occurs."
"of the night side occurs"
};
constexpr openspace::properties::Property::PropertyInfo ColorFilterInfo = {
"ColorFilter",
"Color Filter",
"This value affects the filtering out of part of the rings depending on the "
"color values of the texture. The higher value, the more rings are filtered out."
"color values of the texture. The higher value, the more rings are filtered out"
};
constexpr openspace::properties::Property::PropertyInfo ZFightingPercentageInfo = {
@@ -154,7 +154,7 @@ namespace {
"NumberShadowSamples",
"Number of Shadow Samples",
"The number of samples used during shadow mapping calculation "
"(Percentage Closer Filtering)."
"(Percentage Closer Filtering)"
};
struct [[codegen::Dictionary(RingsComponent)]] Parameters {
modules/globebrowsing/src/shadowcomponent.cpp
+11 -11
View File
@@ -64,13 +64,13 @@ namespace {
"DistanceFraction",
"Distance Fraction",
"Distance fraction of original distance from light source to the globe to be "
"considered as the new light source distance."
"considered as the new light source distance"
};
constexpr openspace::properties::Property::PropertyInfo DepthMapSizeInfo = {
"DepthMapSize",
"Depth Map Size",
"The depth map size in pixels. You must entry the width and height values."
"The depth map size in pixels. You must entry the width and height values"
};
constexpr GLfloat ShadowBorder[] = { 1.f, 1.f, 1.f, 1.f };
@@ -81,30 +81,30 @@ namespace {
GLenum fbErr = glCheckFramebufferStatus(GL_FRAMEBUFFER);
switch (fbErr) {
case GL_FRAMEBUFFER_UNDEFINED:
LERROR("Indefined framebuffer.");
LERROR("Indefined framebuffer");
break;
case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
LERROR("Incomplete, missing attachement.");
LERROR("Incomplete, missing attachement");
break;
case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
LERROR("Framebuffer doesn't have at least one image attached to it.");
LERROR("Framebuffer doesn't have at least one image attached to it");
break;
case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
LERROR(
"Returned if the value of GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is "
"GL_NONE for any color attachment point(s) named by GL_DRAW_BUFFERi."
"GL_NONE for any color attachment point(s) named by GL_DRAW_BUFFERi"
);
break;
case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
LERROR(
"Returned if GL_READ_BUFFER is not GL_NONE and the value of "
"GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is GL_NONE for the color "
"attachment point named by GL_READ_BUFFER.");
"attachment point named by GL_READ_BUFFER");
break;
case GL_FRAMEBUFFER_UNSUPPORTED:
LERROR(
"Returned if the combination of internal formats of the attached "
"images violates an implementation - dependent set of restrictions."
"images violates an implementation - dependent set of restrictions"
);
break;
case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE:
@@ -114,21 +114,21 @@ namespace {
"is the not same for all attached textures; or , if the attached "
"images are a mix of renderbuffers and textures, the value of "
"GL_RENDERBUFFE_r_samples does not match the value of "
"GL_TEXTURE_SAMPLES."
"GL_TEXTURE_SAMPLES"
);
LERROR(
"Returned if the value of GL_TEXTURE_FIXED_SAMPLE_LOCATIONS is not "
"the same for all attached textures; or , if the attached images are "
"a mix of renderbuffers and textures, the value of "
"GL_TEXTURE_FIXED_SAMPLE_LOCATIONS is not GL_TRUE for all attached "
"textures."
"textures"
);
break;
case GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS:
LERROR(
"Returned if any framebuffer attachment is layered, and any "
"populated attachment is not layered, or if all populated color "
"attachments are not from textures of the same target."
"attachments are not from textures of the same target"
);
break;
default:
modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
+2 -2
View File
@@ -36,7 +36,7 @@ namespace {
"FilePath",
"File Path",
"The path of the GDAL file or the image file that is to be used in this tile "
"provider."
"provider"
};
constexpr openspace::properties::Property::PropertyInfo TilePixelSizeInfo = {
@@ -45,7 +45,7 @@ namespace {
"This value is the preferred size (in pixels) for each tile. Choosing the right "
"value is a tradeoff between more efficiency (larger images) and better quality "
"(smaller images). The tile pixel size has to be smaller than the size of the "
"complete image if a single image is used."
"complete image if a single image is used"
};
struct [[codegen::Dictionary(DefaultTileProvider)]] Parameters {
modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
+1 -1
View File
@@ -32,7 +32,7 @@ namespace {
"FilePath",
"File Path",
"The file path that is used for this image provider. The file must point to an "
"image that is then loaded and used for all tiles."
"image that is then loaded and used for all tiles"
};
struct [[codegen::Dictionary(SingleImageProvider)]] Parameters {
modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
+2 -3
View File
@@ -58,7 +58,7 @@ namespace {
"FixedTime",
"Fixed Time",
"If the 'UseFixedTime' is enabled, this time will be used instead of the actual "
"time taken from OpenSpace for the displayed tiles."
"time taken from OpenSpace for the displayed tiles"
};
struct [[codegen::Dictionary(TemporalTileProvider)]] Parameters {
@@ -414,10 +414,9 @@ DefaultTileProvider TemporalTileProvider::createTileProvider(
value = FileSys.expandPathTokens(std::move(value), IgnoredTokens).string();
break;
}
case Mode::Folder: {
case Mode::Folder:
value = std::string(timekey);
break;
}
}
ghoul::Dictionary dict = _initDict;
modules/globebrowsing/src/tileprovider/tileprovider.cpp
+3 -3
View File
@@ -123,7 +123,7 @@ TileProvider::TileProvider() : properties::PropertyOwner({ "TileProvider" }) {}
void TileProvider::initialize() {
ZoneScoped
ghoul_assert(!isInitialized, "TileProvider can only be initialized once.");
ghoul_assert(!isInitialized, "TileProvider can only be initialized once");
if (TileProvider::NumTileProviders >
static_cast<unsigned int>(std::numeric_limits<uint16_t>::max()) - 1)
@@ -156,7 +156,7 @@ void TileProvider::internalDeinitialize() {}
ChunkTile TileProvider::chunkTile(TileIndex tileIndex, int parents, int maxParents) {
ZoneScoped
ghoul_assert(isInitialized, "TileProvider was not initialized.");
ghoul_assert(isInitialized, "TileProvider was not initialized");
auto ascendToParent = [](TileIndex& ti, TileUvTransform& uv) {
uv.uvOffset *= 0.5;
@@ -210,7 +210,7 @@ ChunkTile TileProvider::chunkTile(TileIndex tileIndex, int parents, int maxParen
ChunkTilePile TileProvider::chunkTilePile(TileIndex tileIndex, int pileSize) {
ZoneScoped
ghoul_assert(isInitialized, "TileProvider was not initialized.");
ghoul_assert(isInitialized, "TileProvider was not initialized");
ghoul_assert(pileSize >= 0, "pileSize must be positive");
ChunkTilePile chunkTilePile;
modules/globebrowsing/src/tiletextureinitdata.cpp
+1 -2
View File
@@ -41,10 +41,9 @@ size_t numberOfRasters(ghoul::opengl::Texture::Format format) {
case ghoul::opengl::Texture::Format::RGBA:
case ghoul::opengl::Texture::Format::BGRA:
return 4;
default: {
default:
ghoul_assert(false, "Unknown format");
throw ghoul::MissingCaseException();
}
}
}
modules/globebrowsing/src/timequantizer.cpp
+1 -1
View File
@@ -277,7 +277,7 @@ void DateTime::decrementOnce(int value, char unit) {
default:
throw ghoul::RuntimeError(
"Invalid unit format in TQ decrementOnce '" + std::to_string(unit) +
"'. Expected 'y', 'M', 'd', 'h', or 'm'."
"'. Expected 'y', 'M', 'd', 'h', or 'm'"
);
}
}