3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 21:44:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Revert "Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7""

Browse source 
This reverts commit 28f4d8513d.
The original revert was to revert an accidental merge from master to 4.7. This now reverts the revert on Master, so that we still have those changes on Master.
This commit is contained in:
Ghostkeeper 2020-08-20 16:35:52 +02:00
parent a757dc7fa0
commit 9ea418c0a1
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
12 changed files with 278 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

7
resources/shaders/striped.shader
View file

@ -29,6 +29,7 @@ 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;
@ -65,7 +66,7 @@ fragment =
finalColor += pow(NdotR, u_shininess) * u_specularColor;
gl_FragColor = finalColor;
gl_FragColor.a = 1.0;
gl_FragColor.a = u_opacity;
}
vertex41core =
@ -100,6 +101,7 @@ 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;
@ -138,7 +140,7 @@ fragment41core =
finalColor += pow(NdotR, u_shininess) * u_specularColor;
frag_color = finalColor;
frag_color.a = 1.0;
frag_color.a = u_opacity;
}
[defaults]
@ -146,6 +148,7 @@ 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