Merge pull request #1 from malazar/master

Update for love 0.10.1
This commit is contained in:
Raman Varabets 2016-04-07 21:55:57 +08:00
commit d22546bcb2
8 changed files with 16 additions and 16 deletions

View File

@ -155,13 +155,13 @@ function newobject:draw()
end
love.graphics.stencil(stencilfunc)
love.graphics.setStencilTest(true)
love.graphics.setStencilTest("greater", 0)
for k, v in ipairs(children) do
v:draw()
end
love.graphics.setStencilTest(false)
love.graphics.setStencilTest()
end

View File

@ -133,7 +133,7 @@ function newobject:draw()
end
love.graphics.stencil(stencilfunc)
love.graphics.setStencilTest(true)
love.graphics.setStencilTest("greater", 0)
for k, v in ipairs(self.children) do
local col = loveframes.util.BoundingBox(self.x, v.x, self.y, v.y, width, v.width, height, v.height)
@ -142,7 +142,7 @@ function newobject:draw()
end
end
love.graphics.setStencilTest(false)
love.graphics.setStencilTest()
for k, v in ipairs(self.internals) do
v:draw()

View File

@ -109,7 +109,7 @@ function newobject:draw()
self:SetDrawOrder()
love.graphics.stencil(stencilfunc)
love.graphics.setStencilTest(true)
love.graphics.setStencilTest("greater", 0)
if draw then
draw(self)
@ -117,7 +117,7 @@ function newobject:draw()
drawfunc(self)
end
love.graphics.setStencilTest(false)
love.graphics.setStencilTest()
end

View File

@ -174,7 +174,7 @@ function newobject:draw()
end
love.graphics.stencil(stencilfunc)
love.graphics.setStencilTest(true)
love.graphics.setStencilTest("greater", 0)
for k, v in ipairs(children) do
local col = loveframes.util.BoundingBox(self.x, v.x, self.y, v.y, self.width, v.width, self.height, v.height)
@ -183,7 +183,7 @@ function newobject:draw()
end
end
love.graphics.setStencilTest(false)
love.graphics.setStencilTest()
if not draw then
drawoverfunc(self)

View File

@ -164,7 +164,7 @@ function newobject:draw()
end
love.graphics.stencil(stencilfunc)
love.graphics.setStencilTest(true)
love.graphics.setStencilTest("greater", 0)
for k, v in ipairs(children) do
local col = loveframes.util.BoundingBox(x, v.x, y, v.y, width, v.width, height, v.height)
@ -173,7 +173,7 @@ function newobject:draw()
end
end
love.graphics.setStencilTest(false)
love.graphics.setStencilTest()
for k, v in ipairs(internals) do
v:draw()

View File

@ -165,7 +165,7 @@ function newobject:draw()
end
love.graphics.stencil(stencilfunc)
love.graphics.setStencilTest(true)
love.graphics.setStencilTest("greater", 0)
for k, v in ipairs(internals) do
local col = loveframes.util.BoundingBox(x + self.buttonareax, v.x, self.y, v.y, self.buttonareawidth, v.width, tabheight, v.height)
@ -174,7 +174,7 @@ function newobject:draw()
end
end
love.graphics.setStencilTest(false)
love.graphics.setStencilTest()
if #self.children > 0 then
self.children[self.tab]:draw()

View File

@ -303,7 +303,7 @@ function newobject:draw()
end
love.graphics.stencil(stencilfunc)
love.graphics.setStencilTest(true)
love.graphics.setStencilTest("greater", 0)
if draw then
draw(self)
@ -311,7 +311,7 @@ function newobject:draw()
drawfunc(self)
end
love.graphics.setStencilTest(false)
love.graphics.setStencilTest()
for k, v in ipairs(internals) do
v:draw()

View File

@ -194,7 +194,7 @@ function newobject:draw()
self:SetDrawOrder()
love.graphics.stencil(stencilfunc)
love.graphics.setStencilTest(true)
love.graphics.setStencilTest("greater", 0)
if draw then
draw(self)
@ -206,7 +206,7 @@ function newobject:draw()
v:draw()
end
love.graphics.setStencilTest(false)
love.graphics.setStencilTest()
for k, v in ipairs(self.internals) do
v:draw()