diff --git a/Basalt/libraries/Lerp.lua b/Basalt/libraries/Lerp.lua deleted file mode 100644 index eaaeee5..0000000 --- a/Basalt/libraries/Lerp.lua +++ /dev/null @@ -1,27 +0,0 @@ -local lerp = function(s, e, pct) - return s + (e - s) * pct -end - -local flip = function (x) - return 1 - x -end - -local easeIn = function (t) - return t * t * t -end - -local easeOut = function(t) - return flip(easeIn(flip(t))) -end - -return { - lerp = lerp, - flip = flip, - easeIn = easeIn, - easeOut = easeOut, - - easeInOut = function(t) - return lerp(easeIn(t), easeOut(t), t) - end - -} \ No newline at end of file diff --git a/Basalt/libraries/geometric.lua b/Basalt/libraries/geometric.lua deleted file mode 100644 index 88facc2..0000000 --- a/Basalt/libraries/geometric.lua +++ /dev/null @@ -1,88 +0,0 @@ -local function filledRectangle(x1,y1,x2,y2) - -end - -local function filledCircle(xC, yC, r) - local points = {} - for x=-r, r+1 do - local dy = math.floor(math.sqrt(r*r - x*x)) - for y=-dy, dy+1 do - table.insert(points, {x=xC+x, y=yC+y}) - end - end - return points -end - -local function elipse(xC, yC, r1, r2, filled) - local rx,ry = math.ceil(math.floor(r1-0.5)/2),math.ceil(math.floor(r2-0.5)/2) - local x,y=0,ry - local d1 = ((ry * ry) - (rx * rx * ry) + (0.25 * rx * rx)) - local dx = 2*ry^2*x - local dy = 2*rx^2*y - local points = {} - while dx < dy do - table.insert(points,{x=x+xC,y=y+yC}) - table.insert(points,{x=-x+xC,y=y+yC}) - table.insert(points,{x=x+xC,y=-y+yC}) - table.insert(points,{x=-x+xC,y=-y+yC}) - if filled then - for y=-y+yC+1,y+yC-1 do - table.insert(points,{x=x+xC,y=y}) - table.insert(points,{x=-x+xC,y=y}) - end - end - if d1 < 0 then - x = x + 1 - dx = dx + 2*ry^2 - d1 = d1 + dx + ry^2 - else - x,y = x+1,y-1 - dx = dx + 2*ry^2 - dy = dy - 2*rx^2 - d1 = d1 + dx - dy + ry^2 - end - end - local d2 = (((ry * ry) * ((x + 0.5) * (x + 0.5))) + ((rx * rx) * ((y - 1) * (y - 1))) - (rx * rx * ry * ry)) - while y >= 0 do - table.insert(points,{x=x+xC,y=y+yC}) - table.insert(points,{x=-x+xC,y=y+yC}) - table.insert(points,{x=x+xC,y=-y+yC}) - table.insert(points,{x=-x+xC,y=-y+yC}) - if filled then - for y=-y+yC,y+yC do - table.insert(points,{x=x+xC,y=y}) - table.insert(points,{x=-x+xC,y=y}) - end - end - if d2 > 0 then - y = y - 1 - dy = dy - 2*rx^2 - d2 = d2 + rx^2 - dy - else - y = y - 1 - x = x + 1 - dy = dy - 2*rx^2 - dx = dx + 2*ry^2 - d2 = d2 + dx - dy + rx^2 - end - end - return points -end - -local function circle(xC, yC, r, filled) - return elipse(xC, yC, r, r, filled) -end - -return { -circle = function(x, y, radius, filled) - return circle(x, y, radius, filled) -end, - -rectangle = function(x1,y1,x2, y2, filled) - local positions = {} -end, - -elipse = function(xCenter, yCenter, radius1, radius2, filled) - return elipse(xCenter, yCenter, radius1, radius2, filled) -end -} \ No newline at end of file diff --git a/README.md b/README.md index dd9152a..51b0ba9 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,14 @@ If you have questions, feel free to join the discord server: [https://discord.gg ## Changelogs From now on we will add changes: +#### Version 4: +- You can now mirror a frame to a monitor by using :setMirror(side) +- with dynamic values you are able to use percentage values and even functions which get called everytime we need the size of that object +- XML got added to make design and logic seperate (you don't have to) - you are now able to use xml to create your UI design. +- Animations are now more advanced and provide many features to do cool stuff. They are also very easy to use now! +- Also some smaller bugfixes +- new bugs to explore + #### Version 3: - fixed monitor support - added :setIndex() for scrollbars