diff --git a/data/assets/atmPaper.scene b/data/assets/atmPaper.scene index 79a9a3955e..f42609e4d9 100644 --- a/data/assets/atmPaper.scene +++ b/data/assets/atmPaper.scene @@ -13,6 +13,8 @@ asset.request('scene/solarsystem/planets/earth/markers') asset.request('scene/solarsystem/planets/earth/moon/moon') asset.request('scene/solarsystem/planets/mars/mars') asset.request('scene/solarsystem/planets/mars/atmosphere') +asset.request('scene/solarsystem/planets/venus/venus') +asset.request('scene/solarsystem/planets/venus/atmosphere') asset.require('scene/digitaluniverse/milkyway') asset.require('scene/digitaluniverse/stars') --assetHelper.requestAll(asset, 'scene/digitaluniverse') diff --git a/data/assets/customization/globebrowsing.asset b/data/assets/customization/globebrowsing.asset index bc72ae17b3..6ec41ece62 100644 --- a/data/assets/customization/globebrowsing.asset +++ b/data/assets/customization/globebrowsing.asset @@ -24,7 +24,7 @@ local vrt_folders = { -- We recommend using this folder for CTX openspace.absPath('${BASE}/../OpenSpaceData/Mars/CTX'), -- if not and you have a custom path for CTX layers, enter it below - '', + 'D:/Pessoal/Work/OpenSpaceData/Mars-Gale-Crater', -- Our provided HiRISE layer openspace.absPath('${ASSETS}/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE'), diff --git a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset index 57578dce05..6255cca682 100644 --- a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset @@ -20,6 +20,7 @@ local Atmosphere = { MieScatteringExtinctionPropCoefficient = 0.23862, -- Advanced Atmosphere Mode Enabled AdvancedMode = true, + UseOnlyAdvancedMie = true, Rayleigh = { Coefficients = { -- Wavelengths are given in 10^-9m @@ -58,8 +59,8 @@ local Atmosphere = { Extinction = { 53.61771e-3/0.98979, 53.61771e-3/0.98979, 53.61771e-3/0.98979 } }, -- Mie Height scale (atmosphere thickness for constant density) in Km - --H_M = 11.1, - H_M = 42.01, + H_M = 11.1, + --H_M = 42.01, -- Mie Phase Function Value (G e [-1.0, 1.0]. -- If G = 1.0, Mie phase function = Rayleigh Phase Function) G = 0.85, @@ -76,7 +77,8 @@ local Atmosphere = { Turbidity = 1.6, -- 2 to 6 JungeExponent = 4.0, - G1 = {0.889, 0.53, 0.71}, + --G1 = {0.889, 0.53, 0.71}, + G1 = {0.03, 0.4, 0.67}, G2 = {0.094, 0.094, 0.094}, Alpha = {0.743, 0.743, 0.743} }, diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp index f82bc9d6c9..661bb7822d 100644 --- a/modules/atmosphere/rendering/renderableatmosphere.cpp +++ b/modules/atmosphere/rendering/renderableatmosphere.cpp @@ -654,6 +654,10 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary) _enableAdvancedModeP = true; } + if (atmosphereDictionary.hasKey(UseOnlyAdvancedMieInfo.identifier)) { + _useOnlyAdvancedMieP = true; + } + // ---- Rayleigh Scattering ----- ghoul::Dictionary rayleighDictionary; success = atmosphereDictionary.getValue(keyRayleigh, rayleighDictionary); diff --git a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl index 73b84cf96a..c250bb36eb 100644 --- a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl +++ b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl @@ -538,7 +538,7 @@ vec3 sunColor(const vec3 x, const float t, const vec3 v, const vec3 s, const flo vec3(0.0f) : transmittanceLUT(r, mu)) : vec3(1.0f); // JCC: Change this function to a impostor texture with gaussian decay color weighted // by the sunRadiance, transmittance and irradianceColor (11/03/2017) - float sunFinalColor = smoothstep(cos(M_PI / 500.0f), cos(M_PI / 900.0f), dot(v, s)) * + float sunFinalColor = smoothstep(cos(M_PI / 900.0f), cos(M_PI / 900.0f), dot(v, s)) * sunRadiance * (1.0f - irradianceFactor); return transmittance * sunFinalColor; diff --git a/modules/base/dashboard/dashboarditemframerate.h b/modules/base/dashboard/dashboarditemframerate.h index 890eb888a8..90dd1b3412 100644 --- a/modules/base/dashboard/dashboarditemframerate.h +++ b/modules/base/dashboard/dashboarditemframerate.h @@ -33,7 +33,7 @@ #include #include -//#define __PERFORMANCE_MEASUREMENTS__ +#define __PERFORMANCE_MEASUREMENTS__ #ifdef __PERFORMANCE_MEASUREMENTS__ //JCC: Temp property to save the fps to a file diff --git a/modules/base/scale/staticscale.cpp b/modules/base/scale/staticscale.cpp index bb282dfb9e..d390d2462f 100644 --- a/modules/base/scale/staticscale.cpp +++ b/modules/base/scale/staticscale.cpp @@ -58,7 +58,7 @@ double StaticScale::scaleValue(const UpdateData&) const { return _scaleValue; } -StaticScale::StaticScale() : _scaleValue(ScaleInfo, 1.f, 0.1f, 100.f) { +StaticScale::StaticScale() : _scaleValue(ScaleInfo, 1.f, 0.1f, 10000.f) { addProperty(_scaleValue); _scaleValue.onChange([this]() {