diff --git a/GuiManager/Misc/SetImage.int b/GuiManager/Misc/SetImage.int deleted file mode 100644 index db4ff92..0000000 --- a/GuiManager/Misc/SetImage.int +++ /dev/null @@ -1,35 +0,0 @@ -_GuiPro.jobqueue:registerJob("LoadImage",function(path) - local dat = love.image.newImageData(path) - return dat -end) -local cache = {} -_GuiPro.jobqueue.OnJobCompleted(function(JOBID,n) - cache[JOBID].Image=_GuiPro.imagecache[n] - cache[JOBID].ImageHeigth=cache[JOBID].Image:getHeight() - cache[JOBID].ImageWidth=cache[JOBID].Image:getWidth() - cache[JOBID].Quad=love.graphics.newQuad(0,0,cache[JOBID].width,cache[JOBID].height,cache[JOBID].ImageWidth,cache[JOBID].ImageHeigth) -end) -function gui:SetImage(i) - local temp = self.Image - if _GuiPro.imagecache[i] then - self.Image=_GuiPro.imagecache[i] - self.ImageHeigth=self.Image:getHeight() - self.ImageWidth=self.Image:getWidth() - self.Quad=love.graphics.newQuad(0,0,self.width,self.height,self.ImageWidth,self.ImageHeigth) - else - if type(i)=="string" then - local ii = _GuiPro.jobqueue:pushJob("LoadImage",i) - cache[ii] = self - elseif tostring(i):find("ImageData") then - self.Image=love.graphics.newImage(i) - self.ImageHeigth=self.Image:getHeight() - self.ImageWidth=self.Image:getWidth() - self.Quad=love.graphics.newQuad(0,0,self.width,self.height,self.ImageWidth,self.ImageHeigth) - elseif i then - self.Image=i - self.ImageHeigth=self.Image:getHeight() - self.ImageWidth=self.Image:getWidth() - self.Quad=love.graphics.newQuad(0,0,self.width,self.height,self.ImageWidth,self.ImageHeigth) - end - end -end \ No newline at end of file diff --git a/GuiManager/Misc/SquareX.int b/GuiManager/Misc/SquareX.int index a369af3..c846e39 100644 --- a/GuiManager/Misc/SquareX.int +++ b/GuiManager/Misc/SquareX.int @@ -1,8 +1,9 @@ function gui:SquareX(n) - local n = n or 0 + local n = n or 1 local w = self.Parent.width local rw = w*n local s = (w-rw)/2 self:setDualDim(self.x+s,self.y+s,rw,rw,sx,sy) - return self.Parent.width + self:Move(s,s) + return self.Parent.width,rw end \ No newline at end of file diff --git a/GuiManager/Misc/SquareY.int b/GuiManager/Misc/SquareY.int index f55d8ea..c90020b 100644 --- a/GuiManager/Misc/SquareY.int +++ b/GuiManager/Misc/SquareY.int @@ -1,8 +1,9 @@ function gui:SquareY(n) - local n = n or 0 + local n = n or 1 local w = self.Parent.height local rw = w*n local s = (w-rw)/2 - self:setDualDim(self.x+s,self.y+s,rw,rw) - return self.Parent.height + self:setDualDim(nil,nil,rw,rw) + self:Move(s,s) + return self.Parent.height,rw end \ No newline at end of file