Some merge fixes and some sprite fixes.

2016-03-10 15:36:33 +01:00
parent 4322a5d8da
commit 7e6288c597
3 changed files with 19 additions and 28 deletions
@@ -18,13 +18,4 @@ void main()
 		result += textureLod(Texture, Input.TextureCoordinate, i);
 	}
 	fragmentColor = result;
-/*
-	vec4 texel0 = textureLod(Texture, Input.TextureCoordinate, 0);
-	vec4 texel1 = textureLod(Texture, Input.TextureCoordinate, 1);
-	vec4 texel2 = textureLod(Texture, Input.TextureCoordinate, 2);
-	vec4 texel3 = textureLod(Texture, Input.TextureCoordinate, 3);
-	vec4 texel4 = textureLod(Texture, Input.TextureCoordinate, 4);
-
-	fragmentColor = texel0 + texel1 + texel2 + texel3 + texel4;*/
-	
 }