diff options
| author | Moulberry <jjenour@student.unimelb.edu.au> | 2020-08-09 07:08:32 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-09 07:08:32 +1000 |
| commit | d313a5c81a553881123c1e478c96a34e07517db4 (patch) | |
| tree | 36b1abb309ae0f96c378c3c1b917bb9f54bb0234 /src/main/resources/assets/notenoughupdates/shaders/fade_cape.frag | |
| parent | f7d3491def0f7498d7bf0d547445f75f0c515912 (diff) | |
| parent | 0d3a0d7355dac828a97977730bc3acc4dee7e1b4 (diff) | |
| download | NotEnoughUpdates-1.2-REL.tar.gz NotEnoughUpdates-1.2-REL.tar.bz2 NotEnoughUpdates-1.2-REL.zip | |
Merge pull request #17 from Moulberry/beta1.2.3-BETA1.2.2-BETA1.2.1-BETA1.2-REL
Beta
Diffstat (limited to 'src/main/resources/assets/notenoughupdates/shaders/fade_cape.frag')
| -rw-r--r-- | src/main/resources/assets/notenoughupdates/shaders/fade_cape.frag | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/resources/assets/notenoughupdates/shaders/fade_cape.frag b/src/main/resources/assets/notenoughupdates/shaders/fade_cape.frag index 76738c31..33d6b341 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/fade_cape.frag +++ b/src/main/resources/assets/notenoughupdates/shaders/fade_cape.frag @@ -16,16 +16,16 @@ vec3 hsv2rgb(vec3 c) { void main() { vec4 texture = texture2D(textureIn, gl_TexCoord[0].st); - float hue = mod(millis/10000f+gl_TexCoord[0].t, 1f); + float hue = mod(millis/10000.0f+gl_TexCoord[0].t, 1.0f); float sat = 0.5f; float val = 0.5f; vec3 fade = hsv2rgb(vec3(hue, sat, val)); - gl_FragColor = vec4(texture.rgb*texture.a + fade*(1-texture.a), 1f) * passColour; + gl_FragColor = vec4(texture.rgb*texture.a + fade*(1.0f-texture.a), 1.0f) * passColour; - vec3 fakeSunNormal = normalize(vec3(0.2f,1f,-0.2f)); + vec3 fakeSunNormal = normalize(vec3(0.2f,1.0f,-0.2f)); vec3 normNormal = normalize(passNormal); float shading = max(0.6f, dot(fakeSunNormal, normNormal)); gl_FragColor = vec4(gl_FragColor.rgb*shading, gl_FragColor.a); -}
\ No newline at end of file +} |
