Skip to content
Snippets Groups Projects
Commit c2320fa0 authored by andreykproductengine's avatar andreykproductengine
Browse files

MAINT-2141 Sky Cloud Coverage reverts to 0.27 when toggling view back to region sky

parent 9ce39644
No related branches found
No related tags found
No related merge requests found
...@@ -1267,6 +1267,7 @@ Sovereign Engineer ...@@ -1267,6 +1267,7 @@ Sovereign Engineer
MAINT-6107 MAINT-6107
STORM-2107 STORM-2107
MAINT-6218 MAINT-6218
MAINT-2141
SpacedOut Frye SpacedOut Frye
VWR-34 VWR-34
VWR-45 VWR-45
......
...@@ -288,14 +288,6 @@ void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight) ...@@ -288,14 +288,6 @@ void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight)
{ {
// set up the iterators // set up the iterators
// keep cloud positions and coverage the same
/// TODO masking will do this later
F32 cloudPos1X = (F32) mParamValues["cloud_pos_density1"][0].asReal();
F32 cloudPos1Y = (F32) mParamValues["cloud_pos_density1"][1].asReal();
F32 cloudPos2X = (F32) mParamValues["cloud_pos_density2"][0].asReal();
F32 cloudPos2Y = (F32) mParamValues["cloud_pos_density2"][1].asReal();
F32 cloudCover = (F32) mParamValues["cloud_shadow"][0].asReal();
LLSD srcVal; LLSD srcVal;
LLSD destVal; LLSD destVal;
...@@ -379,15 +371,6 @@ void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight) ...@@ -379,15 +371,6 @@ void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight)
setSunAngle((1 - weight) * srcSunAngle + weight * destSunAngle); setSunAngle((1 - weight) * srcSunAngle + weight * destSunAngle);
setEastAngle((1 - weight) * srcEastAngle + weight * destEastAngle); setEastAngle((1 - weight) * srcEastAngle + weight * destEastAngle);
// now setup the sun properly
// reset those cloud positions
mParamValues["cloud_pos_density1"][0] = cloudPos1X;
mParamValues["cloud_pos_density1"][1] = cloudPos1Y;
mParamValues["cloud_pos_density2"][0] = cloudPos2X;
mParamValues["cloud_pos_density2"][1] = cloudPos2Y;
mParamValues["cloud_shadow"][0] = cloudCover;
} }
void LLWLParamSet::updateCloudScrolling(void) void LLWLParamSet::updateCloudScrolling(void)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment