mirror of
https://github.com/tanema/light_world.lua.git
synced 2024-12-24 20:24:19 +00:00
Added compatibility with android
Added util.loadShader - loads shaders and sets uniform variables Fixed implicit type conversions in shaders
This commit is contained in:
parent
2d39bb48cf
commit
378586c406
@ -31,10 +31,10 @@ local PostShader = require(_PACKAGE..'postshader')
|
||||
local light_world = {}
|
||||
light_world.__index = light_world
|
||||
|
||||
light_world.image_mask = love.graphics.newShader(_PACKAGE.."/shaders/image_mask.glsl")
|
||||
light_world.shadowShader = love.graphics.newShader(_PACKAGE.."/shaders/shadow.glsl")
|
||||
light_world.refractionShader = love.graphics.newShader(_PACKAGE.."shaders/refraction.glsl")
|
||||
light_world.reflectionShader = love.graphics.newShader(_PACKAGE.."shaders/reflection.glsl")
|
||||
light_world.image_mask = util.loadShader(_PACKAGE.."/shaders/image_mask.glsl")
|
||||
light_world.shadowShader = util.loadShader(_PACKAGE.."/shaders/shadow.glsl")
|
||||
light_world.refractionShader = util.loadShader(_PACKAGE.."/shaders/refraction.glsl")
|
||||
light_world.reflectionShader = util.loadShader(_PACKAGE.."/shaders/reflection.glsl")
|
||||
|
||||
local function new(options)
|
||||
local obj = {}
|
||||
|
@ -34,7 +34,7 @@ for i,v in ipairs(files) do
|
||||
local name = _PACKAGE.."/shaders/postshaders".."/"..v
|
||||
if love.filesystem.isFile(name) then
|
||||
local str = love.filesystem.read(name)
|
||||
local effect = love.graphics.newShader(name)
|
||||
local effect = util.loadShader(name)
|
||||
local defs = {}
|
||||
for vtype, extern in str:gmatch("extern (%w+) (%w+)") do
|
||||
defs[extern] = true
|
||||
|
@ -3,9 +3,9 @@ extern float steps = 2.0;
|
||||
vec4 effect(vec4 color, Image texture, vec2 texture_coords, vec2 pixel_coords) {
|
||||
vec2 pSize = vec2(1.0 / love_ScreenSize.x, 1.0 / love_ScreenSize.y);
|
||||
vec4 col = Texel(texture, texture_coords);
|
||||
for(int i = 1; i <= steps; i++) {
|
||||
col = col + Texel(texture, vec2(texture_coords.x, texture_coords.y - pSize.y * i));
|
||||
col = col + Texel(texture, vec2(texture_coords.x, texture_coords.y + pSize.y * i));
|
||||
for(int i = 1; i <= int(steps); i++) {
|
||||
col = col + Texel(texture, vec2(texture_coords.x, texture_coords.y - pSize.y * float(i)));
|
||||
col = col + Texel(texture, vec2(texture_coords.x, texture_coords.y + pSize.y * float(i)));
|
||||
}
|
||||
col = col / (steps * 2.0 + 1.0);
|
||||
return vec4(col.r, col.g, col.b, 1.0);
|
||||
|
@ -3,9 +3,9 @@ extern float steps = 2.0;
|
||||
vec4 effect(vec4 color, Image texture, vec2 texture_coords, vec2 pixel_coords) {
|
||||
vec2 pSize = vec2(1.0 / love_ScreenSize.x, 1.0 / love_ScreenSize.y);
|
||||
vec4 col = Texel(texture, texture_coords);
|
||||
for(int i = 1; i <= steps; i++) {
|
||||
col = col + Texel(texture, vec2(texture_coords.x - pSize.x * i, texture_coords.y));
|
||||
col = col + Texel(texture, vec2(texture_coords.x + pSize.x * i, texture_coords.y));
|
||||
for(int i = 1; i <= int(steps); i++) {
|
||||
col = col + Texel(texture, vec2(texture_coords.x - pSize.x * float(i), texture_coords.y));
|
||||
col = col + Texel(texture, vec2(texture_coords.x + pSize.x * float(i), texture_coords.y));
|
||||
}
|
||||
col = col / (steps * 2.0 + 1.0);
|
||||
return vec4(col.r, col.g, col.b, 1.0);
|
||||
|
@ -2,7 +2,7 @@ extern vec3 palette[4];
|
||||
|
||||
vec4 effect(vec4 color, Image texture, vec2 texture_coords, vec2 pixel_coords){
|
||||
vec4 pixel = Texel(texture, texture_coords);
|
||||
int index = int(min(0.9999, max(0.0001,(pixel.r + pixel.g + pixel.b) / 3.0)) * 4);
|
||||
int index = int(min(0.9999, max(0.0001,(pixel.r + pixel.g + pixel.b) / 3.0)) * 4.0);
|
||||
|
||||
return vec4(palette[index], 1.0);
|
||||
}
|
@ -94,22 +94,22 @@ vec4 grid_color( vec2 coords )
|
||||
vec2 onex = vec2( 1.0/love_ScreenSize.x, 0.0 );
|
||||
vec2 oney = vec2( 0.0, 1.0/love_ScreenSize.y );
|
||||
|
||||
vec4 effect(vec4 vcolor, Image texture, vec2 texCoord, vec2 pixel_coords)
|
||||
vec4 effect(vec4 vcolor, Image texture, highp vec2 texCoord, vec2 pixel_coords)
|
||||
{
|
||||
vec2 coords = (texCoord * love_ScreenSize.xy);
|
||||
vec2 pixel_start = floor(coords);
|
||||
highp vec2 coords = (texCoord * love_ScreenSize.xy);
|
||||
highp vec2 pixel_start = floor(coords);
|
||||
coords -= pixel_start;
|
||||
vec2 pixel_center = pixel_start + vec2(0.5);
|
||||
vec2 texture_coords = pixel_center / love_ScreenSize.xy;
|
||||
highp vec2 pixel_center = pixel_start + vec2(0.5);
|
||||
highp vec2 texture_coords = pixel_center / love_ScreenSize.xy;
|
||||
|
||||
vec4 color = vec4(0.0);
|
||||
vec4 pixel;
|
||||
vec3 centers = vec3(-0.25,-0.5,-0.75);
|
||||
vec3 posx = vec3(coords.x);
|
||||
vec3 hweight;
|
||||
float vweight;
|
||||
float dx,dy;
|
||||
float w;
|
||||
highp vec4 color = vec4(0.0);
|
||||
highp vec4 pixel;
|
||||
highp vec3 centers = vec3(-0.25,-0.5,-0.75);
|
||||
highp vec3 posx = vec3(coords.x);
|
||||
highp vec3 hweight;
|
||||
highp float vweight;
|
||||
highp float dx,dy;
|
||||
highp float w;
|
||||
|
||||
float i,j;
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
*/
|
||||
// modified by slime73 for use with love pixeleffects
|
||||
|
||||
vec3 to_focus(float pixel)
|
||||
vec3 to_focus(highp float pixel)
|
||||
{
|
||||
pixel = mod(pixel + 3.0, 3.0);
|
||||
if (pixel >= 2.0) // Blue
|
||||
@ -16,24 +16,24 @@ vec3 to_focus(float pixel)
|
||||
return vec3(1.0 - pixel, pixel, 0.0);
|
||||
}
|
||||
|
||||
vec4 effect(vec4 vcolor, Image texture, vec2 texture_coords, vec2 pixel_coords)
|
||||
vec4 effect(vec4 vcolor, Image texture, highp vec2 texture_coords, vec2 pixel_coords)
|
||||
{
|
||||
float y = mod(texture_coords.y * love_ScreenSize.y, 1.0);
|
||||
float intensity = exp(-0.2 * y);
|
||||
highp float y = mod(texture_coords.y * love_ScreenSize.y, 1.0);
|
||||
highp float intensity = exp(-0.2 * y);
|
||||
|
||||
vec2 one_x = vec2(1.0 / (3.0 * love_ScreenSize.x), 0.0);
|
||||
highp vec2 one_x = vec2(1.0 / (3.0 * love_ScreenSize.x), 0.0);
|
||||
|
||||
vec3 color = Texel(texture, texture_coords - 0.0 * one_x).rgb;
|
||||
vec3 color_prev = Texel(texture, texture_coords - 1.0 * one_x).rgb;
|
||||
vec3 color_prev_prev = Texel(texture, texture_coords - 2.0 * one_x).rgb;
|
||||
highp vec3 color = Texel(texture, texture_coords - 0.0 * one_x).rgb;
|
||||
highp vec3 color_prev = Texel(texture, texture_coords - 1.0 * one_x).rgb;
|
||||
highp vec3 color_prev_prev = Texel(texture, texture_coords - 2.0 * one_x).rgb;
|
||||
|
||||
float pixel_x = 3.0 * texture_coords.x * love_ScreenSize.x;
|
||||
highp float pixel_x = 3.0 * texture_coords.x * love_ScreenSize.x;
|
||||
|
||||
vec3 focus = to_focus(pixel_x - 0.0);
|
||||
vec3 focus_prev = to_focus(pixel_x - 1.0);
|
||||
vec3 focus_prev_prev = to_focus(pixel_x - 2.0);
|
||||
highp vec3 focus = to_focus(pixel_x - 0.0);
|
||||
highp vec3 focus_prev = to_focus(pixel_x - 1.0);
|
||||
highp vec3 focus_prev_prev = to_focus(pixel_x - 2.0);
|
||||
|
||||
vec3 result =
|
||||
highp vec3 result =
|
||||
0.8 * color * focus +
|
||||
0.6 * color_prev * focus_prev +
|
||||
0.3 * color_prev_prev * focus_prev_prev;
|
||||
@ -42,4 +42,3 @@ vec4 effect(vec4 vcolor, Image texture, vec2 texture_coords, vec2 pixel_coords)
|
||||
|
||||
return vec4(intensity * result, 1.0);
|
||||
}
|
||||
|
||||
|
@ -10,11 +10,11 @@ vec4 effect(vec4 vcolor, Image texture, vec2 texture_coords, vec2 pixel_coords)
|
||||
int i;
|
||||
for (i = 0; i < nsamples; i++)
|
||||
{
|
||||
number scale = blurstart + blurwidth * (i / float(nsamples-1));
|
||||
number scale = blurstart + blurwidth * (float(i) / float(nsamples-1));
|
||||
c.rgb += Texel(texture, texture_coords * scale).rgb;
|
||||
}
|
||||
|
||||
c.rgb /= nsamples;
|
||||
c.rgb /= float(nsamples);
|
||||
|
||||
return c;
|
||||
}
|
||||
|
@ -9,11 +9,11 @@ vec4 effect(vec4 color, Image texture, vec2 texture_coords, vec2 pixel_coords) {
|
||||
if(normal.a > 0.0 && normal.r > 0.0) {
|
||||
vec3 pColor = Texel(backBuffer, texture_coords).rgb;
|
||||
vec4 pColor2;
|
||||
for(int i = 0; i < reflectionStrength; i++) {
|
||||
pColor2 = Texel(texture, vec2(texture_coords.x, texture_coords.y + pSize.y * i));
|
||||
for(int i = 0; i < int(reflectionStrength); i++) {
|
||||
pColor2 = Texel(texture, vec2(texture_coords.x, texture_coords.y + pSize.y * float(i)));
|
||||
if(pColor2.a > 0.0 && pColor2.g > 0.0) {
|
||||
vec3 rColor = Texel(backBuffer, vec2(texture_coords.x, texture_coords.y + pSize.y * i * 2.0)).rgb;
|
||||
return vec4(rColor, (1.0 - i / reflectionStrength) * reflectionVisibility);
|
||||
vec3 rColor = Texel(backBuffer, vec2(texture_coords.x, texture_coords.y + pSize.y * float(i) * 2.0)).rgb;
|
||||
return vec4(rColor, (1.0 - float(i) / reflectionStrength) * reflectionVisibility);
|
||||
}
|
||||
}
|
||||
return vec4(0.0);
|
||||
|
@ -32,7 +32,7 @@ vec4 effect(vec4 color, Image texture, vec2 texture_coords, vec2 pixel_coords) {
|
||||
pixel.rgb = lightColor * pow(att, lightSmooth);
|
||||
}
|
||||
} else {
|
||||
vec3 normal = normalize(vec3(normalColor.r,invert_normal ? 1 - normalColor.g : normalColor.g, normalColor.b) * 2.0 - 1.0);
|
||||
vec3 normal = normalize(vec3(normalColor.r,invert_normal ? 1.0 - normalColor.g : normalColor.g, normalColor.b) * 2.0 - 1.0);
|
||||
//on the normal map, draw normal shadows
|
||||
vec3 dir = vec3((lightPosition.xy - pixel_coords.xy) / love_ScreenSize.xy, lightPosition.z);
|
||||
dir.x *= love_ScreenSize.x / love_ScreenSize.y;
|
||||
@ -47,4 +47,3 @@ vec4 effect(vec4 color, Image texture, vec2 texture_coords, vec2 pixel_coords) {
|
||||
return pixel;
|
||||
}
|
||||
}
|
||||
|
||||
|
37
lib/util.lua
37
lib/util.lua
@ -59,4 +59,41 @@ function util.drawto(canvas, x, y, scale, cb)
|
||||
love.graphics.pop()
|
||||
end
|
||||
|
||||
function util.loadShader(name)
|
||||
local shader = ""
|
||||
local externInit = {}
|
||||
for line in love.filesystem.lines(name) do
|
||||
|
||||
if line:sub(1,6) == "extern" then
|
||||
local type, name = line:match("extern (%w+) (%w+)")
|
||||
local value = line:match("=(.*);")
|
||||
if value then
|
||||
externInit[name] = {type=type, val=value}
|
||||
line = line:match("extern %w+ %w+")..";"
|
||||
end
|
||||
end
|
||||
shader = shader.."\n"..line
|
||||
end
|
||||
|
||||
local effect = love.graphics.newShader(shader)
|
||||
for k, v in pairs(externInit) do
|
||||
if v.type == "bool" then
|
||||
effect:send(k, v.val)
|
||||
elseif v.type == "int" or v.type == "uint" then
|
||||
effect:sendInt(k, tonumber(v.val))
|
||||
elseif v.type == "float" or v.type == "double" or v.type == "number" then
|
||||
effect:send(k, tonumber(v.val))
|
||||
elseif v.type:sub(1,3) == "vec" then
|
||||
v.val = v.val:gsub(" ", ""):sub(6):sub(1, -2)
|
||||
local next = v.val:gmatch("([^,]+)")
|
||||
local values = {}
|
||||
for n in next do
|
||||
table.insert(values, tonumber(n))
|
||||
end
|
||||
effect:send(k, values)
|
||||
end
|
||||
end
|
||||
return effect
|
||||
end
|
||||
|
||||
return util
|
||||
|
Loading…
Reference in New Issue
Block a user