mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-29 23:39:26 -05:00
Code cleanup branch (#618)
* Make height map fallback layer work again * Add documentation to joystick button bindings * Removed grouped property headers * Add new version number constant generated by CMake * Make Joystick deadzone work properly * Change the startup date on Earth to today * Fix key modifier handling * Add debugging indices for TreeNodeDebugging * Fix script schedule for OsirisRex * Do not open Mission schedule automatically * Upload default projection texture automatically * General code cleanup * Fix check_style_guide warnings * Remove .clang-format * MacOS compile fixes * Clang analyzer fixes
This commit is contained in:
@@ -35,6 +35,7 @@
|
||||
#include <ghoul/filesystem/filesystem.h>
|
||||
#include <ghoul/misc/assert.h>
|
||||
#include <ghoul/io/texture/texturereader.h>
|
||||
#include <ghoul/logging/logmanager.h>
|
||||
#include <ghoul/opengl/programobject.h>
|
||||
#include <ghoul/opengl/texture.h>
|
||||
#include <ghoul/opengl/textureunit.h>
|
||||
@@ -80,115 +81,107 @@ namespace {
|
||||
const char* keyTextureScale = "PreCalculatedTextureScale";
|
||||
const char* keySaveTextures = "SaveCalculatedTextures";
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo AtmosphereHeightInfo = {
|
||||
const openspace::properties::Property::PropertyInfo AtmosphereHeightInfo = {
|
||||
"atmmosphereHeight",
|
||||
"Atmosphere Height (KM)",
|
||||
"The thickness of the atmosphere in Km"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo
|
||||
AverageGroundReflectanceInfo = {
|
||||
const openspace::properties::Property::PropertyInfo AverageGroundReflectanceInfo = {
|
||||
"AverageGroundReflectance",
|
||||
"Average Ground Reflectance (%)",
|
||||
"Average percentage of light reflected by the ground during the pre-calculation "
|
||||
"phase"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo
|
||||
GroundRadianceEmittioninfo = {
|
||||
const openspace::properties::Property::PropertyInfo GroundRadianceEmittioninfo = {
|
||||
"GroundRadianceEmittion",
|
||||
"Percentage of initial radiance emitted from ground",
|
||||
"Multiplier of the ground radiance color during the rendering phase"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo RayleighHeightScaleInfo = {
|
||||
const openspace::properties::Property::PropertyInfo RayleighHeightScaleInfo = {
|
||||
"RayleighHeightScale",
|
||||
"Rayleigh Scale Height (KM)",
|
||||
"It is the vertical distance over which the density and pressure fall by a "
|
||||
"constant factor"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo
|
||||
RayleighScatteringCoeffXInfo =
|
||||
{
|
||||
const openspace::properties::Property::PropertyInfo RayleighScatteringCoeffXInfo = {
|
||||
"RayleighScatteringCoeffX",
|
||||
"Rayleigh Scattering Coeff X (x10e-3)",
|
||||
"Rayleigh sea-level scattering coefficients in meters"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo
|
||||
RayleighScatteringCoeffYInfo =
|
||||
{
|
||||
const openspace::properties::Property::PropertyInfo RayleighScatteringCoeffYInfo = {
|
||||
"RayleighScatteringCoeffY",
|
||||
"Rayleigh Scattering Coeff Y (x10e-3)",
|
||||
"Rayleigh sea-level scattering coefficients in meters"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo
|
||||
RayleighScatteringCoeffZInfo =
|
||||
{
|
||||
const openspace::properties::Property::PropertyInfo RayleighScatteringCoeffZInfo = {
|
||||
"RayleighScatteringCoeffZ",
|
||||
"Rayleigh Scattering Coeff Z (x10e-3)",
|
||||
"Rayleigh sea-level scattering coefficients in meters"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo OzoneLayerInfo = {
|
||||
const openspace::properties::Property::PropertyInfo OzoneLayerInfo = {
|
||||
"Ozone",
|
||||
"Ozone Layer Enabled",
|
||||
"Enables/Disable Ozone Layer during pre-calculation phase"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo OzoneHeightScaleInfo = {
|
||||
const openspace::properties::Property::PropertyInfo OzoneHeightScaleInfo = {
|
||||
"OzoneLayerHeightScale",
|
||||
"Ozone Scale Height (KM)",
|
||||
"It is the vertical distance over which the density and pressure fall by a "
|
||||
"constant factor"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo OzoneLayerCoeffXInfo = {
|
||||
const openspace::properties::Property::PropertyInfo OzoneLayerCoeffXInfo = {
|
||||
"OzoneLayerCoeffX",
|
||||
"Ozone Layer Extinction Coeff X (x10e-5)",
|
||||
"Ozone scattering coefficients in meters"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo OzoneLayerCoeffYInfo = {
|
||||
const openspace::properties::Property::PropertyInfo OzoneLayerCoeffYInfo = {
|
||||
"OzoneLayerCoeffY",
|
||||
"Ozone Layer Extinction Coeff Y (x10e-5)",
|
||||
"Ozone scattering coefficients in meters"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo OzoneLayerCoeffZInfo = {
|
||||
const openspace::properties::Property::PropertyInfo OzoneLayerCoeffZInfo = {
|
||||
"OzoneLayerCoeffZ",
|
||||
"Ozone Layer Extinction Coeff Z (x10e-5)",
|
||||
"Ozone scattering coefficients in meters"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo MieHeightScaleInfo = {
|
||||
const openspace::properties::Property::PropertyInfo MieHeightScaleInfo = {
|
||||
"MieHeightScale",
|
||||
"Mie Scale Height (KM)",
|
||||
"It is the vertical distance over which the density and pressure fall by a "
|
||||
"constant factor"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo MieScatteringCoeffXInfo = {
|
||||
const openspace::properties::Property::PropertyInfo MieScatteringCoeffXInfo = {
|
||||
"MieScatteringCoeffX",
|
||||
"Mie Scattering Coeff X (x10e-3)",
|
||||
"Mie sea-level scattering coefficients in meters"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo MieScatteringCoeffYInfo = {
|
||||
const openspace::properties::Property::PropertyInfo MieScatteringCoeffYInfo = {
|
||||
"MieScatteringCoeffY",
|
||||
"Mie Scattering Coeff Y (x10e-3)",
|
||||
"Mie sea-level scattering coefficients in meters"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo MieScatteringCoeffZInfo = {
|
||||
const openspace::properties::Property::PropertyInfo MieScatteringCoeffZInfo = {
|
||||
"MieScatteringCoeffZ",
|
||||
"Mie Scattering Coeff Z (x10e-3)",
|
||||
"Mie sea-level scattering coefficients in meters"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo
|
||||
const openspace::properties::Property::PropertyInfo
|
||||
MieScatteringExtinctionPropCoeffInfo =
|
||||
{
|
||||
"MieScatteringExtinctionPropCoefficient",
|
||||
@@ -196,41 +189,37 @@ namespace {
|
||||
"Mie Scattering/Extinction Proportion Coefficient (%)"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo
|
||||
MieAsymmetricFactorGInfo =
|
||||
{
|
||||
const openspace::properties::Property::PropertyInfo MieAsymmetricFactorGInfo = {
|
||||
"MieAsymmetricFactorG",
|
||||
"Mie Asymmetric Factor G",
|
||||
"Averaging of the scattering angle over a high number of scattering events"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo SunIntensityInfo = {
|
||||
const openspace::properties::Property::PropertyInfo SunIntensityInfo = {
|
||||
"SunIntensity",
|
||||
"Sun Intensity",
|
||||
"Unitless for now"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo AtmosphereExposureInfo = {
|
||||
const openspace::properties::Property::PropertyInfo AtmosphereExposureInfo = {
|
||||
"HdrExposure",
|
||||
"Atmosphere Exposure",
|
||||
"Constant to controls the exposure of the radiance range"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo AtmosphereGammaInfo = {
|
||||
const openspace::properties::Property::PropertyInfo AtmosphereGammaInfo = {
|
||||
"Gamma",
|
||||
"Gamma Correction",
|
||||
"Gamma Correction"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo
|
||||
EnableSunOnCameraPositionInfo =
|
||||
{
|
||||
const openspace::properties::Property::PropertyInfo EnableSunOnCameraPositionInfo = {
|
||||
"SunFollowingCamera",
|
||||
"Enable Sun On Camera Position",
|
||||
"When selected the Sun is artificially positioned behind the observer all times"
|
||||
};
|
||||
|
||||
static const openspace::properties::Property::PropertyInfo EclipseHardShadowsInfo = {
|
||||
const openspace::properties::Property::PropertyInfo EclipseHardShadowsInfo = {
|
||||
"EclipseHardShadowsInfo",
|
||||
"Enable Hard Shadows for Eclipses",
|
||||
"Enable/Disables hard shadows through the atmosphere"
|
||||
@@ -444,7 +433,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
|
||||
if (success) {
|
||||
// Not using right now.
|
||||
glm::vec3 rayleighWavelengths;
|
||||
success = rayleighDictionary.getValue(
|
||||
rayleighDictionary.getValue(
|
||||
"Coefficients.Wavelengths",
|
||||
rayleighWavelengths
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user