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
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Operate
Terraform modules
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 Viewer
Alchemy Viewer
Commits
f156730f
Commit
f156730f
authored
4 years ago
by
Ptolemy
Browse files
Options
Downloads
Patches
Plain Diff
SL-13465 Fix local scalar mix masking global mix() function.
parent
31924129
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/app_settings/shaders/class1/deferred/moonF.glsl
+2
-2
2 additions, 2 deletions
...a/newview/app_settings/shaders/class1/deferred/moonF.glsl
indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
+2
-2
2 additions, 2 deletions
.../newview/app_settings/shaders/class1/windlight/moonF.glsl
with
4 additions
and
4 deletions
indra/newview/app_settings/shaders/class1/deferred/moonF.glsl
+
2
−
2
View file @
f156730f
...
...
@@ -64,9 +64,9 @@ void main()
vec3
luma_weights
=
vec3
(
0
.
3
,
0
.
5
,
0
.
3
);
vec4
light_color
=
max
(
sunlight_color
,
moonlight_color
);
float
mix
=
1
.
0
-
dot
(
normalize
(
light_color
.
rgb
),
luma_weights
);
float
blend
=
1
.
0
-
dot
(
normalize
(
light_color
.
rgb
),
luma_weights
);
vec3
exp
=
vec3
(
1
.
0
-
mix
*
moon_brightness
)
*
2
.
0
-
1
.
0
;
vec3
exp
=
vec3
(
1
.
0
-
blend
*
moon_brightness
)
*
2
.
0
-
1
.
0
;
c
.
rgb
=
pow
(
c
.
rgb
,
exp
);
//c.rgb *= moonlight_color.rgb;
...
...
This diff is collapsed.
Click to expand it.
indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
+
2
−
2
View file @
f156730f
...
...
@@ -56,9 +56,9 @@ void main()
// mix factor which blends when sunlight is brighter
// and shows true moon color at night
vec3
luma_weights
=
vec3
(
0
.
3
,
0
.
5
,
0
.
3
);
float
mix
=
1
.
0
f
-
dot
(
normalize
(
sunlight_color
.
rgb
),
luma_weights
);
float
blend
=
1
.
0
f
-
dot
(
normalize
(
sunlight_color
.
rgb
),
luma_weights
);
vec3
exp
=
vec3
(
1
.
0
-
mix
*
moon_brightness
)
*
2
.
0
-
1
.
0
;
vec3
exp
=
vec3
(
1
.
0
-
blend
*
moon_brightness
)
*
2
.
0
-
1
.
0
;
c
.
rgb
=
pow
(
c
.
rgb
,
exp
);
//c.rgb *= moonlight_color.rgb;
...
...
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