testing
This commit is contained in:
parent
e364f6d449
commit
66a7f8e033
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
[submodule "multi"]
|
||||||
|
path = multi
|
||||||
|
url = https://github.com/rayaman/multi
|
||||||
10
gui/init.lua
10
gui/init.lua
@ -10,7 +10,7 @@ local cursor_hand = love.mouse.getSystemCursor("hand")
|
|||||||
local clips = {}
|
local clips = {}
|
||||||
local max, min, abs, rad, floor, ceil = math.max, math.min, math.abs, math.rad, math.floor,math.ceil
|
local max, min, abs, rad, floor, ceil = math.max, math.min, math.abs, math.rad, math.floor,math.ceil
|
||||||
local frame, image, text, box, video = 0, 1, 2, 4, 8
|
local frame, image, text, box, video = 0, 1, 2, 4, 8
|
||||||
|
local has_moonshine, moonshine = pcall(require,"moonshine")
|
||||||
local global_drag
|
local global_drag
|
||||||
|
|
||||||
gui.__index = gui
|
gui.__index = gui
|
||||||
@ -729,7 +729,9 @@ local draw_handler = function(child)
|
|||||||
drawtypes[band(type,image)](child,x,y,w,h)
|
drawtypes[band(type,image)](child,x,y,w,h)
|
||||||
drawtypes[band(type,text)](child,x,y,w,h)
|
drawtypes[band(type,text)](child,x,y,w,h)
|
||||||
|
|
||||||
love.graphics.setScissor() -- Remove the scissor
|
if child.__variables.clip[1] then
|
||||||
|
love.graphics.setScissor() -- Remove the scissor
|
||||||
|
end
|
||||||
end
|
end
|
||||||
drawer:newLoop(function()
|
drawer:newLoop(function()
|
||||||
local children = gui:getAllChildren()
|
local children = gui:getAllChildren()
|
||||||
@ -739,10 +741,6 @@ drawer:newLoop(function()
|
|||||||
child.effect(function()
|
child.effect(function()
|
||||||
draw_handler(child)
|
draw_handler(child)
|
||||||
end)
|
end)
|
||||||
elseif child.chain then
|
|
||||||
child.chain.draw(function()
|
|
||||||
draw_handler(child)
|
|
||||||
end)
|
|
||||||
else
|
else
|
||||||
draw_handler(child)
|
draw_handler(child)
|
||||||
end
|
end
|
||||||
|
|||||||
1
multi
Submodule
1
multi
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit a5b59ee601cdf73200f17ae32e64c37ff8b75509
|
||||||
Loading…
x
Reference in New Issue
Block a user