diff --git a/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml b/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml index b87a75b..b055fe3 100644 --- a/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml +++ b/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml @@ -1002,73 +1002,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build/intermediates/assets/debug/shader/entityFragmentShader.glsl b/app/build/intermediates/assets/debug/shader/entityFragmentShader.glsl index b678759..52b67c0 100644 --- a/app/build/intermediates/assets/debug/shader/entityFragmentShader.glsl +++ b/app/build/intermediates/assets/debug/shader/entityFragmentShader.glsl @@ -9,24 +9,26 @@ const float clampBorder = 0.005; varying vec2 pass_TexCoords; -vec2 getTexCoordsInAtlas(in float atlasIndex); +vec2 getTexCoordsInAtlas(in vec2 clampedTexCoords, in float atlasIndex); void main() { - vec2 texAtlasCoords = getTexCoordsInAtlas(texAtlasIndex); + vec2 clampedTexCoords = pass_TexCoords; if(texAtlasSize.x > 1.0 || texAtlasSize.y > 1.0) - texAtlasCoords = clamp(texAtlasCoords, clampBorder, 1.0 - clampBorder); + clampedTexCoords = clamp(pass_TexCoords, clampBorder, 1.0 - clampBorder); + + vec2 texAtlasCoords = getTexCoordsInAtlas(clampedTexCoords, texAtlasIndex); gl_FragColor = texture2D(texture, texAtlasCoords); gl_FragColor.a = min(gl_FragColor.a, alpha); } -vec2 getTexCoordsInAtlas(in float atlasIndex){ +vec2 getTexCoordsInAtlas(in vec2 clampedTexCoords, in float atlasIndex){ vec2 texAtlasCoords = vec2(0.0, 0.0); - texAtlasCoords.x = mod(pass_TexCoords.x, 1.0) / texAtlasSize.x; + texAtlasCoords.x = mod(clampedTexCoords.x, 1.0) / texAtlasSize.x; texAtlasCoords.x += mod(atlasIndex, texAtlasSize.x) / texAtlasSize.x; - texAtlasCoords.y = mod(pass_TexCoords.y, 1.0) / texAtlasSize.y; + texAtlasCoords.y = mod(clampedTexCoords.y, 1.0) / texAtlasSize.y; texAtlasCoords.y += floor(atlasIndex / texAtlasSize.y) / texAtlasSize.y; return texAtlasCoords; diff --git a/app/build/intermediates/res/resources-debug.ap_ b/app/build/intermediates/res/resources-debug.ap_ index 5db4c71..3dd865f 100644 Binary files a/app/build/intermediates/res/resources-debug.ap_ and b/app/build/intermediates/res/resources-debug.ap_ differ diff --git a/app/src/main/assets/levelpacks/Grasslands.xml b/app/src/main/assets/levelpacks/Grasslands.xml index b87a75b..b055fe3 100644 --- a/app/src/main/assets/levelpacks/Grasslands.xml +++ b/app/src/main/assets/levelpacks/Grasslands.xml @@ -1002,73 +1002,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/assets/shader/entityFragmentShader.glsl b/app/src/main/assets/shader/entityFragmentShader.glsl index b678759..52b67c0 100644 --- a/app/src/main/assets/shader/entityFragmentShader.glsl +++ b/app/src/main/assets/shader/entityFragmentShader.glsl @@ -9,24 +9,26 @@ const float clampBorder = 0.005; varying vec2 pass_TexCoords; -vec2 getTexCoordsInAtlas(in float atlasIndex); +vec2 getTexCoordsInAtlas(in vec2 clampedTexCoords, in float atlasIndex); void main() { - vec2 texAtlasCoords = getTexCoordsInAtlas(texAtlasIndex); + vec2 clampedTexCoords = pass_TexCoords; if(texAtlasSize.x > 1.0 || texAtlasSize.y > 1.0) - texAtlasCoords = clamp(texAtlasCoords, clampBorder, 1.0 - clampBorder); + clampedTexCoords = clamp(pass_TexCoords, clampBorder, 1.0 - clampBorder); + + vec2 texAtlasCoords = getTexCoordsInAtlas(clampedTexCoords, texAtlasIndex); gl_FragColor = texture2D(texture, texAtlasCoords); gl_FragColor.a = min(gl_FragColor.a, alpha); } -vec2 getTexCoordsInAtlas(in float atlasIndex){ +vec2 getTexCoordsInAtlas(in vec2 clampedTexCoords, in float atlasIndex){ vec2 texAtlasCoords = vec2(0.0, 0.0); - texAtlasCoords.x = mod(pass_TexCoords.x, 1.0) / texAtlasSize.x; + texAtlasCoords.x = mod(clampedTexCoords.x, 1.0) / texAtlasSize.x; texAtlasCoords.x += mod(atlasIndex, texAtlasSize.x) / texAtlasSize.x; - texAtlasCoords.y = mod(pass_TexCoords.y, 1.0) / texAtlasSize.y; + texAtlasCoords.y = mod(clampedTexCoords.y, 1.0) / texAtlasSize.y; texAtlasCoords.y += floor(atlasIndex / texAtlasSize.y) / texAtlasSize.y; return texAtlasCoords; diff --git a/app/src/main/res/drawable/tools_ramp.png b/app/src/main/res/drawable/tools_ramp.png index 65d44ed..86b23a8 100644 Binary files a/app/src/main/res/drawable/tools_ramp.png and b/app/src/main/res/drawable/tools_ramp.png differ