julian/EndlessRoll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed Ramp glitch (same trick as with clamping borders with obstacles)

Browse Source 
Tools (bomb) can be set on top of obstacles and even terrain!
This commit is contained in:
=
2017-08-04 17:46:55 +02:00
parent 472c36aec7
commit 0c0748b13d
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build/intermediates/assets/debug/shader/entityFragmentShader.glsl
View File

@ -5,6 +5,8 @@ uniform float alpha;
uniform vec2 texAtlasSize; uniform vec2 texAtlasSize;
uniform float texAtlasIndex; uniform float texAtlasIndex;
const float clampBorder = 0.005;
varying vec2 pass_TexCoords; varying vec2 pass_TexCoords;
vec2 getTexCoordsInAtlas(in float atlasIndex); vec2 getTexCoordsInAtlas(in float atlasIndex);
@ -12,6 +14,8 @@ vec2 getTexCoordsInAtlas(in float atlasIndex);
void main() { void main() {
vec2 texAtlasCoords = getTexCoordsInAtlas(texAtlasIndex); vec2 texAtlasCoords = getTexCoordsInAtlas(texAtlasIndex);
if(texAtlasSize.x > 1.0 || texAtlasSize.y > 1.0)
texAtlasCoords = clamp(texAtlasCoords, clampBorder, 1.0 - clampBorder);
gl_FragColor = texture2D(texture, texAtlasCoords); gl_FragColor = texture2D(texture, texAtlasCoords);
gl_FragColor.a = min(gl_FragColor.a, alpha); gl_FragColor.a = min(gl_FragColor.a, alpha);

BIN
app/build/intermediates/res/resources-debug.ap_
View File

Binary file not shown.

4
app/src/main/assets/shader/entityFragmentShader.glsl
View File

@ -5,6 +5,8 @@ uniform float alpha;
uniform vec2 texAtlasSize; uniform vec2 texAtlasSize;
uniform float texAtlasIndex; uniform float texAtlasIndex;
const float clampBorder = 0.005;
varying vec2 pass_TexCoords; varying vec2 pass_TexCoords;
vec2 getTexCoordsInAtlas(in float atlasIndex); vec2 getTexCoordsInAtlas(in float atlasIndex);
@ -12,6 +14,8 @@ vec2 getTexCoordsInAtlas(in float atlasIndex);
void main() { void main() {
vec2 texAtlasCoords = getTexCoordsInAtlas(texAtlasIndex); vec2 texAtlasCoords = getTexCoordsInAtlas(texAtlasIndex);
if(texAtlasSize.x > 1.0 || texAtlasSize.y > 1.0)
texAtlasCoords = clamp(texAtlasCoords, clampBorder, 1.0 - clampBorder);
gl_FragColor = texture2D(texture, texAtlasCoords); gl_FragColor = texture2D(texture, texAtlasCoords);
gl_FragColor.a = min(gl_FragColor.a, alpha); gl_FragColor.a = min(gl_FragColor.a, alpha);