LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-14 01:20:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Better boolean shader extern support

Browse Source
This commit is contained in:
Alexander Szpakowski
2013-01-11 00:47:15 -04:00
parent ca1a9caf91
commit 69dc6c76e8
3 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scripts/graphics.lua
+6 -6
View File
@@ -1441,22 +1441,21 @@ void main() {
-- automagic uniform setter
local function shadereffect_dispatch_send(self, name, value, ...)
local valuetype = type(value)
if valuetype == "number" then -- scalar
if valuetype == "number" or valuetype == "boolean" then -- scalar
self:sendFloat(name, value, ...)
elseif valuetype == "userdata" and value:typeOf("Image") then
self:sendImage(name, value)
elseif valuetype == "userdata" and value:typeOf("Canvas") then
self:sendCanvas(name, value)
elseif valuetype == "table" then -- vector or matrix
if type(value[1]) == "number" then
valuetype = type(value[1])
if valuetype == "number" or valuetype == "boolean" then
self:sendFloat(name, value, ...)
elseif type(value[1]) == "table" then
elseif valuetype == "table" then
self:sendMatrix(name, flattenMatrices(value, ...))
else
error("Cannot send value (unsupported type: {"..type(value[1]).."}).")
error("Cannot send value (unsupported type: {"..valuetype.."}).")
end
elseif valuetype == "boolean" then
self:sendFloat(name, value and 1 or 0)
else
if valuetype == "userdata" and value.type then valuetype = value.type end
error("Cannot send value (unsupported type: "..valuetype..").")
@@ -1480,6 +1479,7 @@ void main() {
local effect = love.graphics.newShaderEffect(vertcode, fragcode)
local meta = getmetatable(effect)
meta.send = shadereffect_dispatch_send
meta.sendBoolean = meta.sendFloat
return effect
end