LOVE/love-android
1
0
Fork 0
mirror of https://github.com/love2d/love-android.git synced 2026-08-18 11:44:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

updated to latest mobile-common branch of Löve

Browse Source
This commit is contained in:
fysx
2014-01-30 08:51:28 +01:00
parent 4c481f9933
commit 33d979caf6
49 changed files with 824 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jni/love/src/scripts/graphics.lua
+4 -4
View File
@@ -1310,7 +1310,7 @@ do
#define TransformProjectionMatrix gl_ModelViewProjectionMatrix
#define NormalMatrix gl_NormalMatrix
uniform sampler2D _tex0_;
uniform vec2 love_ScreenParams;]]
uniform vec4 love_ScreenSize;]]
GLSLES.UNIFORMS = [[
uniform mat4 TransformMatrix;
@@ -1319,7 +1319,7 @@ uniform mat4 TransformProjectionMatrix;
// uniform mat4 NormalMatrix;
uniform float love_PointSize;
uniform sampler2D _tex0_;
uniform vec2 love_ScreenParams;]]
uniform vec4 love_ScreenSize;]]
GLSL.VERTEX = {
HEADER = [[
@@ -1390,7 +1390,7 @@ void main() {
float dummy = texture2D(_tex0_, vec2(.5)).r;
// See Shader::checkSetScreenParams in Shader.cpp.
vec2 pixelcoord = vec2(gl_FragCoord.x, (gl_FragCoord.y * love_ScreenParams[0]) + love_ScreenParams[1]);
vec2 pixelcoord = vec2(gl_FragCoord.x, (gl_FragCoord.y * love_ScreenSize.z) + love_ScreenSize.w);
gl_FragColor = effect(VaryingColor, _tex0_, VaryingTexCoord.st, pixelcoord);
}]],
@@ -1401,7 +1401,7 @@ void main() {
float dummy = texture2D(_tex0_, vec2(.5)).r;
// See Shader::checkSetScreenParams in Shader.cpp.
vec2 pixelcoord = vec2(gl_FragCoord.x, (gl_FragCoord.y * love_ScreenParams[0]) + love_ScreenParams[1]);
vec2 pixelcoord = vec2(gl_FragCoord.x, (gl_FragCoord.y * love_ScreenSize.z) + love_ScreenSize.w);
effects(VaryingColor, _tex0_, VaryingTexCoord.st, pixelcoord);
}]],