Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(grid3): Grid3dLayer coloring by constant color fixed #2227

Merged
merged 40 commits into from
Sep 6, 2024
Merged
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
f45ad58
package-lock updated
Dec 14, 2023
0c057bc
Merge remote-tracking branch 'upstream/master'
Dec 26, 2023
23dbe18
Merge remote-tracking branch 'upstream/master'
Jan 24, 2024
62ab6ea
Merge remote-tracking branch 'upstream/master'
Jan 26, 2024
1e47198
Merge remote-tracking branch 'upstream/master'
Jan 30, 2024
584d17d
Merge remote-tracking branch 'upstream/master'
Feb 1, 2024
beb8949
Merge remote-tracking branch 'upstream/master'
Feb 21, 2024
07ded84
build: package-lock updated
Feb 21, 2024
6ec8fe8
Merge remote-tracking branch 'upstream/master'
Feb 26, 2024
59b3f36
Merge remote-tracking branch 'upstream/master'
Feb 29, 2024
d7da0bd
Merge branch 'equinor:master' into master
LeonidPolukhin Mar 6, 2024
3429072
Merge remote-tracking branch 'upstream/master'
Mar 14, 2024
099b709
Merge remote-tracking branch 'upstream/master'
Apr 2, 2024
e2e71cf
Merge remote-tracking branch 'upstream/master'
Apr 8, 2024
0570e97
Merge remote-tracking branch 'upstream/master'
Apr 24, 2024
5642ae2
Merge remote-tracking branch 'upstream/master'
Jun 3, 2024
9482620
SidePanel.scss deleted
Jun 3, 2024
f9687cf
Merge remote-tracking branch 'upstream/master'
Jun 4, 2024
26e44e6
Merge remote-tracking branch 'upstream/master'
Jun 4, 2024
a44b519
Merge remote-tracking branch 'upstream/master'
Jun 7, 2024
ef84eee
build: well-log-viewer vers bumped
Jun 7, 2024
df75121
Merge remote-tracking branch 'upstream/master'
Jun 13, 2024
bae9683
Merge remote-tracking branch 'upstream/master'
Jun 18, 2024
2677d81
SidePanel.scss reverted
Jun 18, 2024
bd05715
Merge branch 'equinor:master' into master
LeonidPolukhin Jun 18, 2024
a8fdc55
Merge remote-tracking branch 'upstream/master'
Jun 18, 2024
2da8c26
Merge branch 'master' of https://github.com/LeonidPolukhin/webviz-sub…
Jun 18, 2024
b61cb75
Merge remote-tracking branch 'upstream/master'
Jun 19, 2024
71cd94c
Merge remote-tracking branch 'upstream/master'
Jun 24, 2024
578a037
build: wlv version bumped in package-lock
Jun 24, 2024
292e1cf
Merge remote-tracking branch 'upstream/master'
Jul 1, 2024
265fe2e
Merge remote-tracking branch 'upstream/master'
Jul 8, 2024
82c3f10
Merge remote-tracking branch 'upstream/master'
Jul 30, 2024
f1a180b
Merge remote-tracking branch 'upstream/master'
Jul 31, 2024
cf7310d
Merge remote-tracking branch 'upstream/master'
Aug 13, 2024
bede0d0
Merge remote-tracking branch 'upstream/master'
Aug 22, 2024
d30a9e3
Merge remote-tracking branch 'upstream/master'
Sep 5, 2024
dc4021e
Merge remote-tracking branch 'upstream/master'
Sep 6, 2024
d1b4c52
fix(grid3d): const coloring fixed
Sep 6, 2024
2b5b9f4
Merge branch 'master' into FixGrid3DConstColor
w1nklr Sep 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ void main(void) {
}

if (coloringMode == 0 && isnan(property)) {
fragColor = vec4(undefinedPropertyColor.rgb, 1.0);
vec3 lightColor = getPhongLightColor(undefinedPropertyColor.rgb, cameraPosition, position_commonspace.xyz, normal);
fragColor = vec4(lightColor, 1.0);
return;
}

Expand Down
Loading