pixelflow_canvas 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 419e160a5f8978c34f3fa8fbb79c399747cb628267e32dacdcba7ac9276681c5
-  data.tar.gz: 4017536c4d4c091b861248367964a04df890904517135194d971df0d14703283
+  metadata.gz: 41a7011e19eb27f8dfa28ad15746219181b319916b7e96282cd4d2e4e6763f78
+  data.tar.gz: 243ea9344e2497cbd997dc22e7fa9bec85bd8b4b20bc304ecd12b96788431352
 SHA512:
-  metadata.gz: 682317f125eef34904ce479f8b95ce4bf9cfc18db7f674d20dbee9504dbb3602d103adad43b0c35ec5f1630b4c0e580c6e99c6f6359ec3db200314c0819b4c2b
-  data.tar.gz: 2fcd08dedd0dfeb7ba71eb8608b72403c6794761541578cb1bcfb49188db055aa16898587d5853331b4847552ebe3c52df73489746260c311d4c033b73221a3b
+  metadata.gz: e1a230c46f83f1a526bcf3c52bd30ce54a95576234a1c24f9c6bd6556cb1855186769f788f2a23f7a64146c464473fe7590a09d23bc270714ac484ea27d6ff5e
+  data.tar.gz: 122f9cc6306a6a510ddcdfb6922e33a98d0efe71fcf0ae37fff06ef85aa64b416a28dc46f9c85e37e23af6916590739484fccd4622ae19f9ab3623e638e496be

data/lib/pixelflow_canvas/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PixelflowCanvas
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/lib/pixelflow_canvas.rb

@@ -39,6 +39,7 @@ module Pixelflow
             @r = color_mode == :palette ? 15 : 255
             @g = color_mode == :palette ? 0 : 255
             @b = color_mode == :palette ? 0 : 255
+            @mask = nil
             @color_mode = :rgb
             @advance_mode = :right
             @draw_mode = :direct
@@ -53,7 +54,7 @@ module Pixelflow
             end
         end
 
-        attr_reader :width, :height
+        attr_reader :width, :height, :color_mode
 
         def run(&block)
             instance_eval(&block)
@@ -159,6 +160,42 @@ module Pixelflow
             end
         end
 
+        class MaskGenerator
+            def initialize(canvas)
+                @canvas = canvas
+                @mask = [false] * canvas.width * canvas.height
+            end
+
+            attr_reader :mask
+
+            def add_color(r = nil, g = nil, b = nil)
+                offset = 0
+                (0...@canvas.height).each do |y|
+                    (0...@canvas.width).each do |x|
+                        if @canvas.color_mode == :rgb
+                            if @canvas.get_pixel(x, y) == [r, g, b]
+                                @mask[offset] = true
+                            end
+                        else
+                            if @canvas.get_pixel(x, y) == r
+                                @mask[offset] = true
+                            end
+                        end
+                        offset += 1
+                    end
+                end
+            end
+        end
+
+        def set_mask(&block)
+            @mask = MaskGenerator.new(self)
+            @mask.instance_eval(&block)
+        end
+
+        def remove_mask()
+            @mask = nil
+        end
+
         def set_color(r, g = 0, b = 0)
             @r = r
             @g = g
@@ -218,14 +255,15 @@ module Pixelflow
             r ||= @r
             g ||= @g
             b ||= @b
-            x0 = x0.to_i
-            y0 = y0.to_i
-            x1 = x1.to_i
-            y1 = y1.to_i
+            x = x.to_i
+            y = y.to_i
             return if x < 0 || x >= @width || y < 0 || y >= @height
             unless x == @x && y == @y
                 move_to(x, y)
             end
+            if @mask
+                return unless @mask.mask[y * @width + x]
+            end
             if @color_mode == :rgb
                 offset = (@y * @width + @x) * 3
                 if @compose_mode == :add
@@ -267,10 +305,8 @@ module Pixelflow
         end
 
         def get_pixel(x, y)
-            x0 = x0.to_i
-            y0 = y0.to_i
-            x1 = x1.to_i
-            y1 = y1.to_i
+            x = x.to_i
+            y = y.to_i
             return 0 if x < 0 || x >= @width || y < 0 || y >= @height
             if @color_mode == :rgb
                 return @screen[(y * @width + x) * 3, 3]
@@ -480,6 +516,54 @@ module Pixelflow
             end
         end
 
+        def draw_arc(x, y, r, a0, a1, close_path = false)
+            # x = x.to_i
+            # y = y.to_i
+            # r = r.to_i
+            a0 = a0.to_f
+            a1 = a1.to_f
+            a0 = a0 * Math::PI / 180.0
+            a1 = a1 * Math::PI / 180.0
+            da = 1.0 / r
+            a = a0
+            while a < a1
+                x0 = x + r * Math.cos(a)
+                y0 = y + r * Math.sin(a)
+                a += da
+                x1 = x + r * Math.cos(a)
+                y1 = y + r * Math.sin(a)
+                draw_line(x0, y0, x1, y1)
+            end
+            if close_path
+                x0 = x + r * Math.cos(a0)
+                y0 = y + r * Math.sin(a0)
+                draw_line(x, y, x0, y0)
+                x0 = x + r * Math.cos(a1)
+                y0 = y + r * Math.sin(a1)
+                draw_line(x, y, x0, y0)
+            end
+        end
+
+        def fill_arc(x, y, r, a0, a1)
+            # x = x.to_i
+            # y = y.to_i
+            # r = r.to_i
+            a0 = a0.to_f
+            a1 = a1.to_f
+            a0 = a0 * Math::PI / 180.0
+            a1 = a1 * Math::PI / 180.0
+            da = 1.0 / r
+            a = a0
+            while a < a1
+                x0 = x + r * Math.cos(a)
+                y0 = y + r * Math.sin(a)
+                a += da
+                x1 = x + r * Math.cos(a)
+                y1 = y + r * Math.sin(a)
+                fill_triangle(x, y, x0, y0, x1, y1)
+            end
+        end
+
         def draw_quadratic_bezier(x0, y0, x1, y1, x2, y2, steps = 100)
             steps = steps.to_i
             xp = nil
@@ -518,6 +602,45 @@ module Pixelflow
             draw_line(x2, y2, x0, y0)
         end
 
+        def fill_triangle(x0, y0, x1, y1, x2, y2)
+            x0 = x0.to_i
+            y0 = y0.to_i
+            x1 = x1.to_i
+            y1 = y1.to_i
+            x2 = x2.to_i
+            y2 = y2.to_i
+            if y0 > y1
+                x0, x1 = x1, x0
+                y0, y1 = y1, y0
+            end
+            if y1 > y2
+                x1, x2 = x2, x1
+                y1, y2 = y2, y1
+            end
+            if y0 > y1
+                x0, x1 = x1, x0
+                y0, y1 = y1, y0
+            end
+            total_height = y2 - y0
+            (0...total_height).each do |i|
+                second_half = i > y1 - y0 || y1 == y0
+                segment_height = second_half ? y2 - y1 : y1 - y0
+                alpha = i.to_f / total_height
+                beta = (i - (second_half ? y1 - y0 : 0)).to_f / segment_height
+                ax = x0 + (x2 - x0) * alpha
+                ay = y0 + (y2 - y0) * alpha
+                bx = second_half ? x1 + (x2 - x1) * beta : x0 + (x1 - x0) * beta
+                by = second_half ? y1 + (y2 - y1) * beta : y0 + (y1 - y0) * beta
+                if ax > bx
+                    ax, bx = bx, ax
+                    ay, by = by, ay
+                end
+                (ax.to_i..bx.to_i).each do |j|
+                    set_pixel(j, y0 + i)
+                end
+            end
+        end
+
         def flood_fill(x, y, r = nil, g = nil, b = nil)
             x = x.to_i
             y = y.to_i

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pixelflow_canvas
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Michael Specht