From c3b462d6b36dcf9a6721293dc9488ac1d6cfca21 Mon Sep 17 00:00:00 2001 From: Kyle McLamb Date: Sat, 30 Apr 2016 10:26:16 -0400 Subject: [PATCH] Manually require postshaders --- lib/postshader.lua | 18 +-------- lib/shaders/postshaders/init.lua | 63 ++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 17 deletions(-) create mode 100644 lib/shaders/postshaders/init.lua diff --git a/lib/postshader.lua b/lib/postshader.lua index 46368bf..599634e 100644 --- a/lib/postshader.lua +++ b/lib/postshader.lua @@ -27,24 +27,8 @@ local util = require(_PACKAGE..'/util') local post_shader = {} post_shader.__index = post_shader -local files = love.filesystem.getDirectoryItems(_PACKAGE.."/shaders/postshaders") -local shaders = {} +local shaders = require(_PACKAGE..'.shaders.postshaders') -for i,v in ipairs(files) do - local name = _PACKAGE.."/shaders/postshaders/"..v - local module = _PACKAGE..".shaders.postshaders."..v:gsub("%.lua","") - if love.filesystem.isFile(name) then - local str = love.filesystem.read(name) - local effect = love.graphics.newShader(require(module)) - local defs = {} - for vtype, extern in str:gmatch("extern (%w+) (%w+)") do - defs[extern] = true - end - local shaderName = name:match(".-([^\\|/]-[^%.]+)$"):gsub("%.lua", "") - shaders[shaderName] = {effect, defs} - end -end - local function new() local obj = {effects = {}} local class = setmetatable(obj, post_shader) diff --git a/lib/shaders/postshaders/init.lua b/lib/shaders/postshaders/init.lua new file mode 100644 index 0000000..697e354 --- /dev/null +++ b/lib/shaders/postshaders/init.lua @@ -0,0 +1,63 @@ +--[[ +The MIT License (MIT) + +Copyright (c) 2016 Marcus Ihde + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +]] +local _PACKAGE = (...) + +-- Since require() doesn't support enumeration we automatically populate the +-- shader list using +-- for f in lib/shaders/postshaders/*.lua; echo \"`basename $f .lua`\", +-- and manually remove init.lua +local names = { +"black_and_white", +"blurh", +"blurv", +"chromatic_aberration", +"contrast", +"curvature", +"edges", +"four_colors", +"hdr_tv", +"monochrome", +"phosphorish", +"phosphor", +"pip", +"pixellate", +"radialblur", +"scanlines", +"tilt_shift", +"waterpaint", +} + +local shaders = {} +for _, name in ipairs(names) do + local module = _PACKAGE.."."..v + local str = require(module) + local effect = love.graphics.newShader(str) + local defs = {} + for vtype, extern in str:gmatch("extern (%w+) (%w+)") do + defs[extern] = true + end + shaders[name] = {effect, defs} +end + +return shaders