diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogChunkStreamer.java b/src/client/java/su/divan2000/veila/client/render/fog/FogChunkStreamer.java index 4a57dde..fbcbf7a 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogChunkStreamer.java +++ b/src/client/java/su/divan2000/veila/client/render/fog/FogChunkStreamer.java @@ -163,15 +163,6 @@ public final class FogChunkStreamer { FogWorldVolume.CHUNKS_Z ); - - System.out.println( - worldChunkX + " " + - worldChunkZ + " -> " + - physicalChunkX + " " + - physicalChunkZ - ); - - FogWorldVolume.uploadChunk( physicalChunkX, physicalChunkZ, diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogSystem.java b/src/client/java/su/divan2000/veila/client/render/fog/FogSystem.java index 315b663..d70a367 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogSystem.java +++ b/src/client/java/su/divan2000/veila/client/render/fog/FogSystem.java @@ -114,13 +114,6 @@ public final class FogSystem { originChunkX = newOriginChunkX; originChunkZ = newOriginChunkZ; - FogChunkStreamer.update( - oldOriginChunkX, - oldOriginChunkZ, - originChunkX, - originChunkZ - ); - ringChunkOffsetX = Math.floorMod(originChunkX, FogWorldVolume.CHUNKS_X); @@ -128,6 +121,13 @@ public final class FogSystem { ringChunkOffsetZ = Math.floorMod(originChunkZ, FogWorldVolume.CHUNKS_Z); + + FogChunkStreamer.update( + oldOriginChunkX, + oldOriginChunkZ, + originChunkX, + originChunkZ + ); } public static int originChunkX() { diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogWorldVolume.java b/src/client/java/su/divan2000/veila/client/render/fog/FogWorldVolume.java index 43a652c..996f251 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogWorldVolume.java +++ b/src/client/java/su/divan2000/veila/client/render/fog/FogWorldVolume.java @@ -160,22 +160,13 @@ public final class FogWorldVolume { int textureChunkZ, FloatBuffer data ) { - - - GL13.glActiveTexture(GL13.GL_TEXTURE0); GL11.glBindTexture(GL12.GL_TEXTURE_3D, texture); + + // Сбрасываем ВСЕ pixel store параметры, которые мог оставить Minecraft GL11.glPixelStorei(GL11.GL_UNPACK_ALIGNMENT, 1); - - System.out.println( - data.remaining() - ); - - - int error = GL11.glGetError(); - - if (error != GL11.GL_NO_ERROR) { - System.out.println("GL BEFORE = " + error); - } + GL11.glPixelStorei(GL11.GL_UNPACK_ROW_LENGTH, 0); + GL11.glPixelStorei(GL11.GL_UNPACK_SKIP_PIXELS, 0); + GL11.glPixelStorei(GL11.GL_UNPACK_SKIP_ROWS, 0); GL30.glTexSubImage3D( GL12.GL_TEXTURE_3D, @@ -194,12 +185,6 @@ public final class FogWorldVolume { data ); - error = GL11.glGetError(); - - if (error != GL11.GL_NO_ERROR) { - System.out.println("GL AFTER = " + error); - } - GL11.glBindTexture(GL12.GL_TEXTURE_3D, 0); }