Paper version.

This commit is contained in:
Jonathas Costa
2020-09-11 00:44:51 -04:00
parent 76f6dac16c
commit d03f2a522c
7 changed files with 15 additions and 7 deletions

View File

@@ -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')

View File

@@ -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'),

View File

@@ -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}
},

View File

@@ -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);

View File

@@ -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;

View File

@@ -33,7 +33,7 @@
#include <openspace/properties/scalar/boolproperty.h>
#include <openspace/properties/scalar/floatproperty.h>
//#define __PERFORMANCE_MEASUREMENTS__
#define __PERFORMANCE_MEASUREMENTS__
#ifdef __PERFORMANCE_MEASUREMENTS__
//JCC: Temp property to save the fps to a file

View File

@@ -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]() {