diff options
author | makamys <makamys@outlook.com> | 2022-06-19 21:18:45 +0200 |
---|---|---|
committer | makamys <makamys@outlook.com> | 2022-06-19 21:18:45 +0200 |
commit | 5c706c39846ccb47307f2c410e53f24d58980673 (patch) | |
tree | c8af5e4b3e1482b36557bc306b69945a80a50183 /src/main/java | |
parent | a621264ea3bbeab895b561c32ec0974e0fd58a9e (diff) | |
download | Neodymium-5c706c39846ccb47307f2c410e53f24d58980673.tar.gz Neodymium-5c706c39846ccb47307f2c410e53f24d58980673.tar.bz2 Neodymium-5c706c39846ccb47307f2c410e53f24d58980673.zip |
Merge foggy and fogless fragment shader
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/makamys/neodymium/renderer/NeoRenderer.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/makamys/neodymium/renderer/NeoRenderer.java b/src/main/java/makamys/neodymium/renderer/NeoRenderer.java index ef5c9bd..5a20eae 100644 --- a/src/main/java/makamys/neodymium/renderer/NeoRenderer.java +++ b/src/main/java/makamys/neodymium/renderer/NeoRenderer.java @@ -320,8 +320,13 @@ public class NeoRenderer { glGetFloat(GL_FOG_COLOR, fogColorBuf); fogColorBuf.limit(4); - fogStartEnd.put(glGetFloat(GL_FOG_START)); - fogStartEnd.put(glGetFloat(GL_FOG_END)); + if(Config.renderFog) { + fogStartEnd.put(glGetFloat(GL_FOG_START)); + fogStartEnd.put(glGetFloat(GL_FOG_END)); + } else { + fogStartEnd.put(-1); + fogStartEnd.put(-1); + } fogStartEnd.flip(); glUniformMatrix4(u_modelView, false, modelView); @@ -440,7 +445,7 @@ public class NeoRenderer { int fragmentShader; fragmentShader = glCreateShader(GL_FRAGMENT_SHADER); - glShaderSource(fragmentShader, Util.readFile(Config.renderFog ? "shaders/chunk_fog.frag" : "shaders/chunk.frag")); + glShaderSource(fragmentShader, Util.readFile("shaders/chunk.frag")); glCompileShader(fragmentShader); if(glGetShaderi(fragmentShader, GL_COMPILE_STATUS) == 0) { |