summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2018-03-18 13:38:36 +0100
committerLaG1924 <12997935+LaG1924@users.noreply.github.com>2018-03-18 13:38:36 +0100
commit90397c50e72567fa9df7d316f1bb263823d42da8 (patch)
treeb91abc68d29cdfe89475566b93f43ad9eb998514
parentOptimized update of RendererSection (diff)
downloadAltCraft-90397c50e72567fa9df7d316f1bb263823d42da8.tar
AltCraft-90397c50e72567fa9df7d316f1bb263823d42da8.tar.gz
AltCraft-90397c50e72567fa9df7d316f1bb263823d42da8.tar.bz2
AltCraft-90397c50e72567fa9df7d316f1bb263823d42da8.tar.lz
AltCraft-90397c50e72567fa9df7d316f1bb263823d42da8.tar.xz
AltCraft-90397c50e72567fa9df7d316f1bb263823d42da8.tar.zst
AltCraft-90397c50e72567fa9df7d316f1bb263823d42da8.zip
-rw-r--r--cwd/shaders/sky.fs3
-rw-r--r--src/RendererWorld.cpp4
2 files changed, 2 insertions, 5 deletions
diff --git a/cwd/shaders/sky.fs b/cwd/shaders/sky.fs
index 549d463..23f6ada 100644
--- a/cwd/shaders/sky.fs
+++ b/cwd/shaders/sky.fs
@@ -4,7 +4,6 @@ in vec2 uvPos;
in vec3 pos;
uniform sampler2D textureAtlas;
-uniform vec4 skyTexture;
uniform float DayTime;
uniform vec4 sunTexture;
uniform vec4 moonTexture;
@@ -42,7 +41,7 @@ vec4 Moon() {
}
void main() {
- vec4 starColor = texture(textureAtlas,TransformTextureCoord(skyTexture,uvPos));
+ vec4 starColor = vec4(0.0f, 0.04f, 0.06f, 1.0f);
gl_FragColor = mix(starColor, DaySkyColor, DayTime);
gl_FragColor += Sun();
gl_FragColor += Moon();
diff --git a/src/RendererWorld.cpp b/src/RendererWorld.cpp
index 628680c..04d8392 100644
--- a/src/RendererWorld.cpp
+++ b/src/RendererWorld.cpp
@@ -446,9 +446,7 @@ void RendererWorld::PrepareRender() {
skyShader = new Shader("./shaders/sky.vs", "./shaders/sky.fs");
skyShader->Use();
- glUniform1i(glGetUniformLocation(skyShader->Program, "textureAtlas"), 0);
- TextureCoordinates skyTexture = AssetManager::Instance().GetTextureByAssetName("minecraft/textures/entity/end_portal");
- glUniform4f(glGetUniformLocation(skyShader->Program, "skyTexture"),skyTexture.x,skyTexture.y,skyTexture.w,skyTexture.h);
+ glUniform1i(glGetUniformLocation(skyShader->Program, "textureAtlas"), 0);
TextureCoordinates sunTexture = AssetManager::Instance().GetTextureByAssetName("minecraft/textures/environment/sun");
glUniform4f(glGetUniformLocation(skyShader->Program, "sunTexture"), sunTexture.x, sunTexture.y, sunTexture.w, sunTexture.h);
TextureCoordinates moonTexture = AssetManager::Instance().GetTextureByAssetName("minecraft/textures/environment/moon_phases");