From 69318a6b0c0a4d103c11917e3bbc48f74b9767a9 Mon Sep 17 00:00:00 2001 From: Sabine Lim Date: Tue, 16 May 2023 02:40:25 +1000 Subject: [PATCH] Update Image --- Basalt/objects/BaseFrame.lua | 4 ++-- Basalt/objects/Frame.lua | 4 ++-- Basalt/objects/Image.lua | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/Basalt/objects/BaseFrame.lua b/Basalt/objects/BaseFrame.lua index d3d9968..9e46b10 100644 --- a/Basalt/objects/BaseFrame.lua +++ b/Basalt/objects/BaseFrame.lua @@ -46,7 +46,7 @@ return function(name, basalt) end, setXOffset = function(self, newXOffset) - return self:setOffset(newXOffset, yOffset) + return self:setOffset(newXOffset, nil) end, getYOffset = function(self) @@ -54,7 +54,7 @@ return function(name, basalt) end, setYOffset = function(self, newYOffset) - return self:setOffset(xOffset, newYOffset) + return self:setOffset(nil, newYOffset) end, setPalette = function(self, col, ...) diff --git a/Basalt/objects/Frame.lua b/Basalt/objects/Frame.lua index 646d8a7..838e15a 100644 --- a/Basalt/objects/Frame.lua +++ b/Basalt/objects/Frame.lua @@ -43,7 +43,7 @@ return function(name, basalt) end, setXOffset = function(self, newXOffset) - return self:setOffset(newXOffset, yOffset) + return self:setOffset(newXOffset, nil) end, getYOffset = function(self) @@ -51,7 +51,7 @@ return function(name, basalt) end, setYOffset = function(self, newYOffset) - return self:setOffset(xOffset, newYOffset) + return self:setOffset(nil, newYOffset) end, setParent = function(self, p, ...) diff --git a/Basalt/objects/Image.lua b/Basalt/objects/Image.lua index 5e6d7fb..9580aa7 100644 --- a/Basalt/objects/Image.lua +++ b/Basalt/objects/Image.lua @@ -73,6 +73,14 @@ return function(name, basalt) return self end, + setXOffset = function(self, _x) + return self:setOffset(self, _x, nil) + end, + + setYOffset = function(self, _y) + return self:setOffset(self, nil, _y) + end, + setSize = function(self, _x, _y) base:setSize(_x, _y) autoSize = false @@ -83,6 +91,14 @@ return function(name, basalt) return xOffset, yOffset end, + getXOffset = function(self) + return xOffset + end, + + getYOffset = function(self) + return yOffset + end, + selectFrame = function(self, id) if(bimgLibrary.getFrameObject(id)==nil)then bimgLibrary.addFrame(id) @@ -142,6 +158,10 @@ return function(name, basalt) return self end, + setPath = function(self, path) + return self:loadImage(path) + end, + setImage = function(self, t) if(type(t)=="table")then bimgLibrary = bimg(t) @@ -176,6 +196,14 @@ return function(name, basalt) return self end, + getUsePalette = function(self) + return usePalette + end, + + setUsePalette = function(self, use) + return self:usePalette(use) + end, + play = function(self, inf) if(bimgLibrary.getMetadata("animated"))then local t = bimgLibrary.getMetadata("duration") or bimgLibrary.getMetadata("secondsPerFrame") or 0.2 @@ -186,6 +214,10 @@ return function(name, basalt) return self end, + setPlay = function(self, inf) + return self:play(inf) + end, + stop = function(self) os.cancelTimer(animTimer) animTimer = nil