1 files changed, 96 insertions, 133 deletions

diff --git a/apps/plugins/lua/include_lua/draw.lua b/apps/plugins/lua/include_lua/draw.lua
index 4409ab7838..7b239339ff 100644
--- a/apps/plugins/lua/include_lua/draw.lua
+++ b/apps/plugins/lua/include_lua/draw.lua
@@ -52,35 +52,39 @@ if not rb.lcd_framebuffer then rb.splash(rb.HZ, "No Support!") return nil end
 
 local _draw = {} do
 
+    local rocklib_image = getmetatable(rb.lcd_framebuffer())
+    setmetatable(_draw, rocklib_image)
+
     -- Internal Constants
     local _LCD = rb.lcd_framebuffer()
     local LCD_W, LCD_H = rb.LCD_WIDTH, rb.LCD_HEIGHT
     local BSAND = 8 -- blits color to dst if src <> 0
     local _NIL = nil -- nil placeholder
 
-    local function set_viewport(vp)
-        if not vp then rb.set_viewport() return end
-        if rb.LCD_DEPTH  == 2 then -- invert 2-bit screens
-            --vp.drawmode = bit.bxor(vp.drawmode, 4)
-            vp.fg_pattern = 3 - vp.fg_pattern
-            vp.bg_pattern = 3 - vp.bg_pattern
-        end
-        rb.set_viewport(vp)
-    end
+    local _abs     = math.abs
+    local _clear   = rocklib_image.clear
+    local _copy    = rocklib_image.copy
+    local _ellipse = rocklib_image.ellipse
+    local _get     = rocklib_image.get
+    local _line    = rocklib_image.line
+    local _marshal = rocklib_image.marshal
+    local _min     = math.min
+    local _newimg  = rb.new_image
+    local _points  = rocklib_image.points
 
     -- line
-    local function line(img, x1, y1, x2, y2, color, bClip)
-        img:line(x1, y1, x2, y2, color, bClip)
+    _draw.line = function(img, x1, y1, x2, y2, color, bClip)
+        _line(img, x1, y1, x2, y2, color, bClip)
     end
 
     -- horizontal line; x, y define start point; length in horizontal direction
     local function hline(img, x, y , length, color, bClip)
-        img:line(x, y, x + length, _NIL, color, bClip)
+        _line(img, x, y, x + length, _NIL, color, bClip)
     end
 
     -- vertical line; x, y define start point; length in vertical direction
     local function vline(img, x, y , length, color, bClip)
-        img:line(x, y, _NIL, y + length, color, bClip)
+        _line(img, x, y, _NIL, y + length, color, bClip)
     end
 
     -- draws a non-filled figure based on points in t-points
@@ -100,7 +104,7 @@ local _draw = {} do
 
             local pt2 = t_points[i + 1] or pt_first_last-- first and last point
 
-            img:line(pt1[1] + x, pt1[2] + y, pt2[1]+x, pt2[2]+y, color, bClip)
+            _line(img, pt1[1] + x, pt1[2] + y, pt2[1] + x, pt2[2] + y, color, bClip)
         end
 
     end
@@ -109,90 +113,80 @@ local _draw = {} do
     local function rect(img, x, y, width, height, color, bClip)
         if width == 0 or height == 0 then return end
 
-        local ppt = {{0, 0}, {width, 0}, {width, height}, {0, height}}
-        polyline(img, x, y, ppt, color, true, bClip)
-        --[[
-        vline(img, x, y, height, color, bClip);
-        vline(img, x + width, y, height, color, bClip);
-        hline(img, x, y, width, color, bClip);
-        hline(img, x, y + height, width, color, bClip);]]
+        polyline(img, x, y, {{0, 0}, {width, 0}, {width, height}, {0, height}}, color, true, bClip)
+
     end
 
     -- filled rect, fillcolor is color if left empty
-    local function rect_filled(img, x, y, width, height, color, fillcolor, bClip)
+    _draw.rect_filled = function(img, x, y, width, height, color, fillcolor, bClip)
         if width == 0 or height == 0 then return end
 
         if not fillcolor then
-            img:clear(color, x, y, x + width, y + height, bClip)
+            _clear(img, color, x, y, x + width, y + height, bClip)
         else
-            img:clear(fillcolor, x, y, x + width, y + height, bClip)
+            _clear(img, fillcolor, x, y, x + width, y + height, bClip)
             rect(img, x, y, width, height, color, bClip)
         end
     end
 
     -- circle cx,cy define center point
-    local function circle(img, cx, cy, radius, color, bClip)
+    _draw.circle = function(img, cx, cy, radius, color, bClip)
         local r = radius
-        img:ellipse(cx - r, cy - r, cx + r, cy + r, color, _NIL,  bClip)
+        _ellipse(img, cx - r, cy - r, cx + r, cy + r, color, _NIL,  bClip)
     end
 
     -- filled circle cx,cy define center, fillcolor is color if left empty
-    local function circle_filled(img, cx, cy, radius, color, fillcolor, bClip)
+    _draw.circle_filled = function(img, cx, cy, radius, color, fillcolor, bClip)
         fillcolor = fillcolor or color
         local r = radius
-        img:ellipse(cx - r, cy - r, cx + r, cy + r, color, fillcolor, bClip)
+        _ellipse(img, cx - r, cy - r, cx + r, cy + r, color, fillcolor, bClip)
     end
 
     -- ellipse that fits into defined rect
-    local function ellipse_rect(img, x1, y1, x2, y2, color, bClip)
-        img:ellipse(x1, y1, x2, y2, color, _NIL, bClip)
+    _draw.ellipse_rect = function(img, x1, y1, x2, y2, color, bClip)
+        _ellipse(img, x1, y1, x2, y2, color, _NIL, bClip)
     end
 
     --ellipse that fits into defined rect, fillcolor is color if left empty
-    local function ellipse_rect_filled(img, x1, y1, x2, y2, color, fillcolor, bClip)
+    _draw.ellipse_rect_filled = function(img, x1, y1, x2, y2, color, fillcolor, bClip)
         if not fillcolor then fillcolor = color end
 
-        img:ellipse(x1, y1, x2, y2, color, fillcolor, bClip)
+        _ellipse(img, x1, y1, x2, y2, color, fillcolor, bClip)
     end
 
     -- ellipse cx, cy define center point; a, b the major/minor axis
-    local function ellipse(img, cx, cy, a, b, color, bClip)
-        img:ellipse(cx - a, cy - b, cx + a, cy + b, color, _NIL, bClip)
+    _draw.ellipse = function(img, cx, cy, a, b, color, bClip)
+        _ellipse(img, cx - a, cy - b, cx + a, cy + b, color, _NIL, bClip)
     end
 
     -- filled ellipse cx, cy define center point; a, b the major/minor axis
     -- fillcolor is color if left empty
-    local function ellipse_filled(img, cx, cy, a, b, color, fillcolor, bClip)
+    _draw.ellipse_filled = function(img, cx, cy, a, b, color, fillcolor, bClip)
         if not fillcolor then fillcolor = color end
 
-        img:ellipse(cx - a, cy - b, cx + a, cy + b, color, fillcolor, bClip)
+        _ellipse(img, cx - a, cy - b, cx + a, cy + b, color, fillcolor, bClip)
     end
 
     -- rounded rectangle
     local function rounded_rect(img, x, y, w, h, radius, color, bClip)
         local c_img
-
-        local function blit(dx, dy, sx, sy, ox, oy)
-            img:copy(c_img, dx, dy, sx, sy, ox, oy, bClip, BSAND, color)
-        end
-
         if w == 0 or h == 0 then return end
 
         -- limit the radius of the circle otherwise it will overtake the rect
-        radius = math.min(w / 2, radius)
-        radius = math.min(h / 2, radius)
+        radius = _min(w / 2, radius)
+        radius = _min(h / 2, radius)
 
         local r = radius
 
-        c_img = rb.new_image(r * 2 + 1, r * 2 + 1)
-        c_img:clear(0)
-        circle(c_img, r + 1, r + 1, r, 0xFFFFFF)
+        c_img = _newimg(r * 2 + 1, r * 2 + 1)
+        _clear(c_img, 0)
+        _ellipse(c_img, 1, 1, 1 + r + r, 1 + r + r, 0x1, _NIL, bClip)
 
         -- copy 4 pieces of circle to their respective corners
-        blit(x, y, _NIL, _NIL, r + 1, r + 1) --TL
-        blit(x + w - r - 2, y, r, _NIL, r + 1, r + 1) --TR
-        blit(x , y + h - r - 2, _NIL, r, r + 1, _NIL) --BL
-        blit(x + w - r - 2, y + h - r - 2, r, r, r + 1, r + 1)--BR
+        _copy(img, c_img, x, y, _NIL, _NIL, r + 1, r + 1, bClip, BSAND, color) --TL
+        _copy(img, c_img, x + w - r - 2, y, r, _NIL, r + 1, r + 1, bClip, BSAND, color) --TR
+        _copy(img, c_img, x , y + h - r - 2, _NIL, r, r + 1, _NIL, bClip, BSAND, color) --BL
+        _copy(img, c_img, x + w - r - 2, y + h - r - 2, r, r, r + 1, r + 1, bClip, BSAND, color)--BR
         c_img = _NIL
 
         vline(img, x, y + r, h - r * 2, color, bClip);
@@ -202,38 +196,34 @@ local _draw = {} do
     end
 
     -- rounded rectangle fillcolor is color if left empty
-    local function rounded_rect_filled(img, x, y, w, h, radius, color, fillcolor, bClip)
+    _draw.rounded_rect_filled = function(img, x, y, w, h, radius, color, fillcolor, bClip)
         local c_img
 
-        local function blit(dx, dy, sx, sy, ox, oy)
-            img:copy(c_img, dx, dy, sx, sy, ox, oy, bClip, BSAND, fillcolor)
-        end
-
         if w == 0 or h == 0 then return end
 
         if not fillcolor then fillcolor = color end
 
         -- limit the radius of the circle otherwise it will overtake the rect
-        radius = math.min(w / 2, radius)
-        radius = math.min(h / 2, radius)
+        radius = _min(w / 2, radius)
+        radius = _min(h / 2, radius)
 
         local r = radius
 
-        c_img = rb.new_image(r * 2 + 1, r * 2 + 1)
-        c_img:clear(0)
-        circle_filled(c_img, r + 1, r + 1, r, fillcolor)
+        c_img = _newimg(r * 2 + 1, r * 2 + 1)
+        _clear(c_img, 0)
+        _ellipse(c_img, 1, 1, 1 + r + r, 1 + r + r, 0x1, 0x1, bClip)
 
         -- copy 4 pieces of circle to their respective corners
-        blit(x, y, _NIL, _NIL, r + 1, r + 1) --TL
-        blit(x + w - r - 2, y, r, _NIL, r + 1, r + 1) --TR
-        blit(x, y + h - r - 2, _NIL, r, r + 1, _NIL) --BL
-        blit(x + w - r - 2, y + h - r - 2, r, r, r + 1, r + 1) --BR
+        _copy(img, c_img, x, y, _NIL, _NIL, r + 1, r + 1, bClip, BSAND, fillcolor) --TL
+        _copy(img, c_img, x + w - r - 2, y, r, _NIL, r + 1, r + 1, bClip, BSAND, fillcolor) --TR
+        _copy(img, c_img, x, y + h - r - 2, _NIL, r, r + 1, _NIL, bClip, BSAND, fillcolor) --BL
+        _copy(img, c_img, x + w - r - 2, y + h - r - 2, r, r, r + 1, r + 1, bClip, BSAND, fillcolor) --BR
         c_img = _NIL
 
         -- finish filling areas circles didn't cover
-        img:clear(fillcolor, x + r, y, x + w - r, y + h - 1, bClip)
-        img:clear(fillcolor, x, y + r, x + r, y + h - r, bClip)
-        img:clear(fillcolor, x + w - r, y + r, x + w - 1, y + h - r - 1, bClip)
+        _clear(img, fillcolor, x + r, y, x + w - r, y + h - 1, bClip)
+        _clear(img, fillcolor, x, y + r, x + r, y + h - r, bClip)
+        _clear(img, fillcolor, x + w - r, y + r, x + w - 1, y + h - r - 1, bClip)
 
         if fillcolor ~= color then
             rounded_rect(img, x, y, w, h, r, color, bClip)
@@ -241,23 +231,23 @@ local _draw = {} do
     end
 
     -- draws an image at xy coord in dest image
-    local function image(dst, src, x, y, bClip)
+    _draw.image = function(dst, src, x, y, bClip)
         if not src then --make sure an image was passed, otherwise bail
             rb.splash(rb.HZ, "No Image!")
             return _NIL
         end
 
-        dst:copy(src, x, y, 1, 1, _NIL, _NIL, bClip)
+        _copy(dst, src, x, y, 1, 1, _NIL, _NIL, bClip)
     end
 
     -- floods an area of targetclr with fillclr x, y specifies the start seed
-    function flood_fill(img, x, y, targetclr, fillclr)
+    _draw.flood_fill = function(img, x, y, targetclr, fillclr)
         -- scanline 4-way flood algorithm
         --          ^
         -- <--------x--->
         --          v
         -- check that target color doesn't = fill and the first point is target color
-        if targetclr == fillclr or targetclr ~= img:get(x,y, true) then return end
+        if targetclr == fillclr or targetclr ~= _get(img, x, y, true) then return end
         local max_w = img:width()
         local max_h = img:height()
 
@@ -271,21 +261,20 @@ local _draw = {} do
         -- y coordinates are in even indices
 
         local qtail = 0
-        local iter_n; -- North iteration
-        local iter_s; -- South iteration
 
         local function check_ns(val, x, y)
             if targetclr == val then
-                if targetclr == iter_n() then
+                y = y - 1
+                if targetclr == _get(img, x, y, true) then -- north
                     qtail = qtail + 2
                     qpt[qtail - 1] = x
-                    qpt[qtail] = (y - 1)
+                    qpt[qtail] = y 
                 end
-
-                if targetclr == iter_s() then
+                y = y + 2
+                if targetclr == _get(img, x, y, true) then -- south
                     qtail = qtail + 2
                     qpt[qtail - 1] = x
-                    qpt[qtail] = (y + 1)
+                    qpt[qtail] = y 
                 end
                 return fillclr
             end
@@ -293,17 +282,12 @@ local _draw = {} do
         end
 
         local function seed_pt(x, y)
-            -- will never hit max_w * max_h^2 but make sure not to end early
-            for qhead = 2, max_w * max_h * max_w * max_h, 2 do
-
-                if targetclr == img:get(x, y, true) then
-                    iter_n = img:points(x, y - 1, 1, y - 1)
-                    iter_s = img:points(x, y + 1, 1, y + 1)
-                    img:marshal(x, y, 1, y, _NIL, _NIL, true, check_ns)
+            -- should never hit max but make sure not to end early
+            for qhead = 2, 0x40000000, 2 do
 
-                    iter_n = img:points(x + 1, y - 1, max_w, y - 1)
-                    iter_s = img:points(x + 1, y + 1, max_w, y + 1)
-                    img:marshal(x + 1, y, max_w, y, _NIL, _NIL, true, check_ns)
+                if targetclr == _get(img, x, y, true) then
+                    _marshal(img, x, y, 1, y, _NIL, _NIL, true, check_ns) -- west
+                    _marshal(img, x + 1, y, max_w, y, _NIL, _NIL, true, check_ns) -- east
                 end
 
                 x = qpt[qhead - 1]
@@ -320,7 +304,7 @@ local _draw = {} do
     end -- flood_fill
 
     -- draws a closed figure based on points in t_points
-    local function polygon(img, x, y, t_points, color, fillcolor, bClip)
+    _draw.polygon = function(img, x, y, t_points, color, fillcolor, bClip)
         if #t_points < 2 then error("not enough points", 3) end
 
         if fillcolor then
@@ -335,35 +319,41 @@ local _draw = {} do
                     if pt[2] < y_min then y_min = pt[2] end
                     if pt[2] > y_max then y_max = pt[2] end
                 end
-                w = math.abs(x_max) + math.abs(x_min)
-                h = math.abs(y_max) + math.abs(y_min)
+                w = _abs(x_max) + _abs(x_min)
+                h = _abs(y_max) + _abs(y_min)
                 x_min = x_min - 2  -- leave a border to use flood_fill
                 y_min = y_min - 2
 
-                local fill_img = rb.new_image(w + 3, h + 3)
-                fill_img:clear(0xFFFFFF)
+                local fill_img = _newimg(w + 3, h + 3)
+                _clear(fill_img, 0x1)
 
                 for i = 1, #t_points, 1 do
                     local pt1 = t_points[i]
                     local pt2 = t_points[i + 1] or t_points[1]-- first and last point
-                    fill_img:line(pt1[1] - x_min, pt1[2] - y_min,
+                    _line(fill_img, pt1[1] - x_min, pt1[2] - y_min,
                                       pt2[1]- x_min, pt2[2] - y_min, 0)
 
                 end
-            flood_fill(fill_img, fill_img:width(), fill_img:height() , 1, 0)
-            img:copy(fill_img, x - 1, y - 1, _NIL, _NIL, _NIL, _NIL, bClip, BSAND, fillcolor)
+            _draw.flood_fill(fill_img, fill_img:width(), fill_img:height() , 0x1, 0x0)
+            _copy(img, fill_img, x - 1, y - 1, _NIL, _NIL, _NIL, _NIL, bClip, BSAND, fillcolor)
         end
 
         polyline(img, x, y, t_points, color, true, bClip)
     end
 
     -- draw text onto image if width/height are supplied text is centered
-    local function text(img, x, y, width, height, font, color, text)
+    _draw.text = function(img, x, y, width, height, font, color, text)
         font = font or rb.FONT_UI
 
         local opts = {x = 0, y = 0, width = LCD_W - 1, height = LCD_H - 1,
-               font = font, drawmode = 3, fg_pattern = 0xFFFFFF, bg_pattern = 0}
-        set_viewport(opts)
+               font = font, drawmode = 3, fg_pattern = 0x1, bg_pattern = 0}
+
+        if rb.LCD_DEPTH  == 2 then -- invert 2-bit screens
+            --vp.drawmode = bit.bxor(vp.drawmode, 4)
+            vp.fg_pattern = 3 - vp.fg_pattern
+            vp.bg_pattern = 3 - vp.bg_pattern
+        end
+        rb.set_viewport(opts)
 
         local res, w, h = rb.font_getstringsize(text, font)
 
@@ -380,8 +370,8 @@ local _draw = {} do
         end
 
         -- make a copy of the current screen for later
-        local screen_img = rb.new_image(LCD_W, LCD_H)
-        screen_img:copy(_LCD)
+        local screen_img = _newimg(LCD_W, LCD_H)
+        _copy(screen_img, _LCD)
 
         -- check if the screen buffer is supplied image if so set img to the copy
         if img == _LCD then
@@ -391,10 +381,6 @@ local _draw = {} do
         -- we will be printing the text to the screen then blitting into img
         rb.lcd_clear_display()
 
-        local function blit(dx, dy)
-            img:copy(_LCD, dx, dy, _NIL, _NIL, _NIL, _NIL, false, BSAND, color)
-        end
-
         if w > LCD_W then -- text is too long for the screen do it in chunks
             local l = 1
             local resp, wp, hp
@@ -417,7 +403,7 @@ local _draw = {} do
                 end
 
                 -- using the mask we made blit color into img
-                blit(x + width, y + height)
+                _copy(img, _LCD, x + width, y + height, _NIL, _NIL, _NIL, _NIL, false, BSAND, color)
                 x = x + wp
                 rb.lcd_clear_display()
                 lenr = text:len()
@@ -426,43 +412,20 @@ local _draw = {} do
             rb.lcd_putsxy(0, 0, text)
 
             -- using the mask we made blit color into img
-            blit(x + width, y + height)
+            _copy(img, _LCD, x + width, y + height, _NIL, _NIL, _NIL, _NIL, false, BSAND, color)
         end
 
-        _LCD:copy(screen_img) -- restore screen
-        set_viewport() -- set viewport default
+        _copy(_LCD, screen_img) -- restore screen
+        rb.set_viewport() -- set viewport default
         return res, w, h
     end
 
-    -- expose functions to the outside through _draw table
-    _draw.image    = image
-    _draw.text     = text
-    _draw.line     = line
+    -- expose internal functions to the outside through _draw table
     _draw.hline    = hline
     _draw.vline    = vline
-    _draw.polygon  = polygon
     _draw.polyline = polyline
     _draw.rect     = rect
-    _draw.circle   = circle
-    _draw.ellipse  = ellipse
-    _draw.flood_fill    = flood_fill
-    _draw.ellipse_rect  = ellipse_rect
     _draw.rounded_rect  = rounded_rect
-    -- filled functions use color as fillcolor if fillcolor is left empty...
-    _draw.rect_filled          = rect_filled
-    _draw.circle_filled        = circle_filled
-    _draw.ellipse_filled       = ellipse_filled
-    _draw.ellipse_rect_filled  = ellipse_rect_filled
-    _draw.rounded_rect_filled  = rounded_rect_filled
-
-    -- adds the above _draw functions into the metatable for RLI_IMAGE
-    local ex = getmetatable(rb.lcd_framebuffer())
-    for k, v in pairs(_draw) do
-        if ex[k] == _NIL then
-            ex[k] = v
-        end
-    end
-
 end -- _draw functions
 
 return _draw