Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Archive
Alchemy Viewer
Commits
c2320fa0
Commit
c2320fa0
authored
8 years ago
by
andreykproductengine
Browse files
Options
Downloads
Patches
Plain Diff
MAINT-2141 Sky Cloud Coverage reverts to 0.27 when toggling view back to region sky
parent
9ce39644
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
doc/contributions.txt
+1
-0
1 addition, 0 deletions
doc/contributions.txt
indra/newview/llwlparamset.cpp
+0
-17
0 additions, 17 deletions
indra/newview/llwlparamset.cpp
with
1 addition
and
17 deletions
doc/contributions.txt
+
1
−
0
View file @
c2320fa0
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llwlparamset.cpp
+
0
−
17
View file @
c2320fa0
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment