Fix up atmospheric helpers and transport shader for adv atmo path.

Basic hook-up of sky settings to llatmosphere model.

Moved mie aniso to be a top-level setting instead of a per-mie-layer setting.

3 files changed, 74 insertions, 27 deletions

diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp
index abe1a1a04a..b763a06ab4 100644
--- a/indra/llinventory/llsettingsbase.cpp
+++ b/indra/llinventory/llsettingsbase.cpp
@@ -207,6 +207,11 @@ LLSD LLSettingsBase::interpolateSDMap(const LLSD &settings, const LLSD &other, F
                     LLQuaternion q = slerp(mix, LLQuaternion(value), LLQuaternion(other_value));
                     newvalue = q.getValue();
                 }
+                else if (value[0].type() == LLSD::TypeMap)
+                {
+                    // TODO
+                    // determine if lerping between maps is both feasible and reasonable
+                }
                 else
                 {   // TODO: We could expand this to inspect the type and do a deep lerp based on type. 
                     // for now assume a heterogeneous array of reals. 
@@ -214,7 +219,6 @@ LLSD LLSettingsBase::interpolateSDMap(const LLSD &settings, const LLSD &other, F
 
                     for (size_t i = 0; i < len; ++i)
                     {
-
                         newvalue[i] = lerp(value[i].asReal(), other_value[i].asReal(), mix);
                     }
                 }
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 37da95b95e..491381213f 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -200,10 +200,7 @@ LLSettingsSky::validation_list_t mieValidationList()
             boost::bind(&LLSettingsBase::Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0f)(2.0f)))));
 
         mieValidation.push_back(LLSettingsBase::Validator(LLSettingsSky::SETTING_DENSITY_PROFILE_CONSTANT_TERM, true,  LLSD::TypeReal,  
-            boost::bind(&LLSettingsBase::Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0f)(1.0f)))));
-
-        mieValidation.push_back(LLSettingsBase::Validator(LLSettingsSky::SETTING_MIE_ANISOTROPY_FACTOR, true,  LLSD::TypeReal,  
-            boost::bind(&LLSettingsBase::Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0f)(1.0f)))));
+            boost::bind(&LLSettingsBase::Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0f)(1.0f)))));        
     }
     return mieValidation;
 }
@@ -511,6 +508,9 @@ LLSettingsSky::validation_list_t LLSettingsSky::validationList()
         validation.push_back(Validator(SETTING_SUN_ARC_RADIANS,      true,  LLSD::TypeReal,  
             boost::bind(&Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0f)(0.1f)))));
 
+        validation.push_back(LLSettingsBase::Validator(LLSettingsSky::SETTING_MIE_ANISOTROPY_FACTOR, true,  LLSD::TypeReal,  
+            boost::bind(&LLSettingsBase::Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0f)(1.0f)))));
+
         validation.push_back(Validator(SETTING_RAYLEIGH_CONFIG, true, LLSD::TypeArray, &validateRayleighLayers));
         validation.push_back(Validator(SETTING_ABSORPTION_CONFIG, true, LLSD::TypeArray, &validateAbsorptionLayers));
         validation.push_back(Validator(SETTING_MIE_CONFIG, true, LLSD::TypeArray, &validateMieLayers));
@@ -522,11 +522,13 @@ LLSettingsSky::validation_list_t LLSettingsSky::validationList()
 LLSD LLSettingsSky::rayleighConfigDefault()
 {
     LLSD dflt_rayleigh;
-    dflt_rayleigh[SETTING_DENSITY_PROFILE_WIDTH]            = 0.0f; // 0 -> the entire atmosphere
-    dflt_rayleigh[SETTING_DENSITY_PROFILE_EXP_TERM]         = 1.0f;
-    dflt_rayleigh[SETTING_DENSITY_PROFILE_EXP_SCALE_FACTOR] = -1.0f / 8000.0f;
-    dflt_rayleigh[SETTING_DENSITY_PROFILE_LINEAR_TERM]      = 0.0f;
-    dflt_rayleigh[SETTING_DENSITY_PROFILE_CONSTANT_TERM]    = 0.0f;
+    LLSD dflt_rayleigh_layer;
+    dflt_rayleigh_layer[SETTING_DENSITY_PROFILE_WIDTH]            = 0.0f; // 0 -> the entire atmosphere
+    dflt_rayleigh_layer[SETTING_DENSITY_PROFILE_EXP_TERM]         = 1.0f;
+    dflt_rayleigh_layer[SETTING_DENSITY_PROFILE_EXP_SCALE_FACTOR] = -1.0f / 8000.0f;
+    dflt_rayleigh_layer[SETTING_DENSITY_PROFILE_LINEAR_TERM]      = 0.0f;
+    dflt_rayleigh_layer[SETTING_DENSITY_PROFILE_CONSTANT_TERM]    = 0.0f;
+    dflt_rayleigh.append(dflt_rayleigh_layer);
     return dflt_rayleigh;
 }
 
@@ -556,12 +558,13 @@ LLSD LLSettingsSky::absorptionConfigDefault()
 LLSD LLSettingsSky::mieConfigDefault()
 {
     LLSD dflt_mie;
-    dflt_mie[SETTING_DENSITY_PROFILE_WIDTH]            = 0.0f; // 0 -> the entire atmosphere
-    dflt_mie[SETTING_DENSITY_PROFILE_EXP_TERM]         = 1.0f;
-    dflt_mie[SETTING_DENSITY_PROFILE_EXP_SCALE_FACTOR] = -1.0f / 1200.0f;
-    dflt_mie[SETTING_DENSITY_PROFILE_LINEAR_TERM]      = 0.0f;
-    dflt_mie[SETTING_DENSITY_PROFILE_CONSTANT_TERM]    = 0.0f;
-    dflt_mie[SETTING_MIE_ANISOTROPY_FACTOR]            = 0.9f;
+    LLSD dflt_mie_layer;
+    dflt_mie_layer[SETTING_DENSITY_PROFILE_WIDTH]            = 0.0f; // 0 -> the entire atmosphere
+    dflt_mie_layer[SETTING_DENSITY_PROFILE_EXP_TERM]         = 1.0f;
+    dflt_mie_layer[SETTING_DENSITY_PROFILE_EXP_SCALE_FACTOR] = -1.0f / 1200.0f;
+    dflt_mie_layer[SETTING_DENSITY_PROFILE_LINEAR_TERM]      = 0.0f;
+    dflt_mie_layer[SETTING_DENSITY_PROFILE_CONSTANT_TERM]    = 0.0f;
+    dflt_mie.append(dflt_mie_layer);
     return dflt_mie;
 }
 
@@ -600,16 +603,15 @@ LLSD LLSettingsSky::defaults()
     dfltsetting[SETTING_TYPE] = "sky";
 
     // defaults are for earth...
-    dfltsetting[SETTING_PLANET_RADIUS]      = 6360.0f;
-    dfltsetting[SETTING_SKY_BOTTOM_RADIUS]  = 6360.0f;
-    dfltsetting[SETTING_SKY_TOP_RADIUS]     = 6420.0f;
-    dfltsetting[SETTING_SUN_ARC_RADIANS]    = 0.00935f / 2.0f;
-
-    // These are technically capable of handling multiple layers of density config
-    // and so are expected to be an array, but we make an array of size 1 w/ each default density config
-    dfltsetting[SETTING_RAYLEIGH_CONFIG].append(rayleighConfigDefault());
-    dfltsetting[SETTING_MIE_CONFIG].append(mieConfigDefault());
-    dfltsetting[SETTING_ABSORPTION_CONFIG].append(absorptionConfigDefault());
+    dfltsetting[SETTING_PLANET_RADIUS]          = 6360.0f;
+    dfltsetting[SETTING_SKY_BOTTOM_RADIUS]      = 6360.0f;
+    dfltsetting[SETTING_SKY_TOP_RADIUS]         = 6420.0f;
+    dfltsetting[SETTING_SUN_ARC_RADIANS]        = 0.00935f / 2.0f;
+    dfltsetting[SETTING_MIE_ANISOTROPY_FACTOR]  = 0.8f;
+
+    dfltsetting[SETTING_RAYLEIGH_CONFIG]    = rayleighConfigDefault();
+    dfltsetting[SETTING_MIE_CONFIG]         = mieConfigDefault();
+    dfltsetting[SETTING_ABSORPTION_CONFIG]  = absorptionConfigDefault();
 
     return dfltsetting;
 }
diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h
index 70d7a1c54f..4fb8c101ee 100644
--- a/indra/llinventory/llsettingssky.h
+++ b/indra/llinventory/llsettingssky.h
@@ -66,6 +66,7 @@ public:
     static const std::string SETTING_SKY_BOTTOM_RADIUS;
     static const std::string SETTING_SKY_TOP_RADIUS;
     static const std::string SETTING_SUN_ARC_RADIANS;
+    static const std::string SETTING_MIE_ANISOTROPY_FACTOR;
 
     static const std::string SETTING_RAYLEIGH_CONFIG;
     static const std::string SETTING_MIE_CONFIG;
@@ -77,7 +78,7 @@ public:
         static const std::string SETTING_DENSITY_PROFILE_EXP_SCALE_FACTOR;
         static const std::string SETTING_DENSITY_PROFILE_LINEAR_TERM;
         static const std::string SETTING_DENSITY_PROFILE_CONSTANT_TERM;
-        static const std::string SETTING_MIE_ANISOTROPY_FACTOR;
+        
 
     static const std::string SETTING_LEGACY_HAZE;
 
@@ -100,6 +101,46 @@ public:
     
     static LLSD defaults();
 
+    F32 getPlanetRadius() const
+    {
+        return mSettings[SETTING_PLANET_RADIUS].asReal();
+    }
+
+    F32 getSkyBottomRadius() const
+    {
+        return mSettings[SETTING_SKY_BOTTOM_RADIUS].asReal();
+    }
+
+    F32 getSkyTopRadius() const
+    {
+        return mSettings[SETTING_SKY_TOP_RADIUS].asReal();
+    }
+
+    F32 getSunArcRadians() const
+    {
+        return mSettings[SETTING_SUN_ARC_RADIANS].asReal();
+    }
+
+    F32 getMieAnisotropy() const
+    {
+        return mSettings[SETTING_MIE_ANISOTROPY_FACTOR].asReal();
+    }
+    
+    LLSD getRayleighConfigs() const
+    {
+        return mSettings[SETTING_RAYLEIGH_CONFIG];
+    }
+
+    LLSD getMieConfigs() const
+    {
+        return mSettings[SETTING_MIE_CONFIG];
+    }
+
+    LLSD getAbsorptionConfigs() const
+    {
+        return mSettings[SETTING_ABSORPTION_CONFIG];
+    }
+
     LLUUID getBloomTextureId() const
     {
         return mSettings[SETTING_BLOOM_TEXTUREID].asUUID();