mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-28 14:59:31 -05:00
Coding style fixes
This commit is contained in:
+1
-1
Submodule ext/ghoul updated: fffdcec63a...638b32ed52
@@ -590,7 +590,8 @@ public:
|
||||
*
|
||||
* \return pathname of the converted version of the file
|
||||
*/
|
||||
std::string determineConversionOutFilename(const std::string& filename, DataMode mode);
|
||||
std::string determineConversionOutFilename(const std::string& filename,
|
||||
DataMode mode);
|
||||
|
||||
protected:
|
||||
properties::BoolProperty _renderPlaybackInformation;
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __OPENSPACE_CORE___COLORMAPCOMPONENT___H__
|
||||
#define __OPENSPACE_CORE___COLORMAPCOMPONENT___H__
|
||||
#ifndef __OPENSPACE_CORE___COLORMAPPINGCOMPONENT___H__
|
||||
#define __OPENSPACE_CORE___COLORMAPPINGCOMPONENT___H__
|
||||
|
||||
#include <openspace/properties/propertyowner.h>
|
||||
|
||||
@@ -120,4 +120,4 @@ private:
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif // __OPENSPACE_CORE___COLORMAPCOMPONENT___H__
|
||||
#endif // __OPENSPACE_CORE___COLORMAPPINGCOMPONENT___H__
|
||||
|
||||
@@ -310,11 +310,12 @@ void RenderableInterpolatedPoints::initializeShadersAndGlExtras() {
|
||||
_program = BaseModule::ProgramObjectManager.request(
|
||||
"RenderablePointCloud_Interpolated",
|
||||
[]() {
|
||||
std::filesystem::path path = absPath("${MODULE_BASE}/shaders/pointcloud/");
|
||||
return global::renderEngine->buildRenderProgram(
|
||||
"RenderablePointCloud_Interpolated",
|
||||
absPath("${MODULE_BASE}/shaders/pointcloud/billboardpoint_interpolated_vs.glsl"),
|
||||
absPath("${MODULE_BASE}/shaders/pointcloud/billboardpoint_fs.glsl"),
|
||||
absPath("${MODULE_BASE}/shaders/pointcloud/billboardpoint_gs.glsl")
|
||||
path / "billboardpoint_interpolated_vs.glsl",
|
||||
path / "billboardpoint_fs.glsl",
|
||||
path / "billboardpoint_gs.glsl"
|
||||
);
|
||||
}
|
||||
);
|
||||
|
||||
@@ -707,7 +707,8 @@ listOfExoplanetsDeprecated()
|
||||
*
|
||||
* We recommend downloading the file from the Exoplanet Archive's Composite data table,
|
||||
* where multiple sources are combined into one row per planet.
|
||||
* https://exoplanetarchive.ipac.caltech.edu/cgi-bin/TblView/nph-tblView?app=ExoTbls&config=PSCompPars
|
||||
* https://exoplanetarchive.ipac.caltech.edu
|
||||
* /cgi-bin/TblView/nph-tblView?app=ExoTbls&config=PSCompPars
|
||||
*
|
||||
* Please remember to include all columns in the file download, as missing data columns
|
||||
* may lead to an incomplete visualization.
|
||||
|
||||
@@ -1073,7 +1073,9 @@ void RenderableStars::render(const RenderData& data, RendererTasks&) {
|
||||
|
||||
float fadeInVariable = 1.f;
|
||||
if (!_disableFadeInDistance) {
|
||||
const float distCamera = static_cast<float>(glm::length(data.camera.positionVec3()));
|
||||
const float distCamera = static_cast<float>(
|
||||
glm::length(data.camera.positionVec3())
|
||||
);
|
||||
const glm::vec2 fadeRange = _fadeInDistances;
|
||||
const double a = 1.f / ((fadeRange.y - fadeRange.x) * PARSEC);
|
||||
const double b = -(fadeRange.x / (fadeRange.y - fadeRange.x));
|
||||
|
||||
@@ -387,7 +387,10 @@ ghoul::Dictionary Configuration::createDictionary() {
|
||||
{
|
||||
ghoul::Dictionary loadingScreenDict;
|
||||
loadingScreenDict.setValue("IsShowingMessages", loadingScreen.isShowingMessages);
|
||||
loadingScreenDict.setValue("IsShowingNodeNames", loadingScreen.isShowingNodeNames);
|
||||
loadingScreenDict.setValue(
|
||||
"IsShowingNodeNames",
|
||||
loadingScreen.isShowingNodeNames
|
||||
);
|
||||
loadingScreenDict.setValue(
|
||||
"IsShowingLogMessages",
|
||||
loadingScreen.isShowingLogMessages
|
||||
|
||||
@@ -1549,7 +1549,7 @@ KPL/PCK
|
||||
this kernel to produce Type 10 SPK segments based upon the Two-Line
|
||||
element sets available from NORAD/SPACETRACK. The data applies ONLY
|
||||
to the Two-Line Element sets and only to the SGP4 implementations
|
||||
included in the SPICE library [1][2]. The SPK application copies
|
||||
included in the SPICE library [1][2]. The SPK application copies
|
||||
this data to the constants partition of the Type 10 segment, so the
|
||||
user has no need for the kernel after creation of the corresponding
|
||||
SPK.
|
||||
|
||||
Reference in New Issue
Block a user