diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2020-08-20 17:01:46 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2020-08-20 17:01:46 +0300 |
| commit | 28f4d8513db7efce17bfd8b80fa7c8b237fd1c18 (patch) | |
| tree | f483b9438afaa4c8560ad502764c0c73bce87efd /resources/shaders | |
| parent | 2fe9ee2cf21a158ec1222474b5880d0f7ba23e63 (diff) | |
Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7"
This reverts commit 7f47f12bf0a9cf305542b6c21600ce9b804c1dfd, reversing
changes made to dd42c87da762d2030ee2220bc6f0a3e44cf85c28.
Diffstat (limited to 'resources/shaders')
| -rw-r--r-- | resources/shaders/striped.shader | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/resources/shaders/striped.shader b/resources/shaders/striped.shader index 07ce2bebe6..71b1f7b0fa 100644 --- a/resources/shaders/striped.shader +++ b/resources/shaders/striped.shader @@ -29,7 +29,6 @@ fragment = uniform mediump vec4 u_diffuseColor1; uniform mediump vec4 u_diffuseColor2; uniform mediump vec4 u_specularColor; - uniform mediump float u_opacity; uniform highp vec3 u_lightPosition; uniform mediump float u_shininess; uniform highp vec3 u_viewPosition; @@ -66,7 +65,7 @@ fragment = finalColor += pow(NdotR, u_shininess) * u_specularColor; gl_FragColor = finalColor; - gl_FragColor.a = u_opacity; + gl_FragColor.a = 1.0; } vertex41core = @@ -101,7 +100,6 @@ fragment41core = uniform mediump vec4 u_diffuseColor1; uniform mediump vec4 u_diffuseColor2; uniform mediump vec4 u_specularColor; - uniform mediump float u_opacity; uniform highp vec3 u_lightPosition; uniform mediump float u_shininess; uniform highp vec3 u_viewPosition; @@ -140,7 +138,7 @@ fragment41core = finalColor += pow(NdotR, u_shininess) * u_specularColor; frag_color = finalColor; - frag_color.a = u_opacity; + frag_color.a = 1.0; } [defaults] @@ -148,7 +146,6 @@ u_ambientColor = [0.3, 0.3, 0.3, 1.0] u_diffuseColor1 = [1.0, 0.5, 0.5, 1.0] u_diffuseColor2 = [0.5, 0.5, 0.5, 1.0] u_specularColor = [0.4, 0.4, 0.4, 1.0] -u_opacity = 1.0 u_shininess = 20.0 u_width = 5.0 u_vertical_stripes = 0 |