pixelflow_canvas 0.7.4 → 0.7.6

data/docs/render-docs.rb

@@ -0,0 +1,98 @@
+#!/usr/bin/env ruby
+
+require 'stringio'
+require 'yaml'
+require '../lib/pixelflow_canvas'
+require 'digest'
+require 'fileutils'
+
+palettes = YAML.load(File.read('../lib/pixelflow_canvas/palettes.yaml'))
+
+s = StringIO.open do |io|
+    palettes.each do |name, palette|
+        io.puts
+        io.puts "#### #{name}"
+        io.puts
+        io.puts "<div class='swatches'>"
+        palette.each.with_index do |color, i|
+            io.puts "<span style='background-color: #{color}'><span>#{i}</span></span>"
+        end
+        io.puts "</div>"
+    end
+    io.string
+end
+
+readme = File.read('palettes.md')
+readme.sub!(/<!-- palettes start -->(.*?)<!-- palettes end -->/m, "<!-- palettes start -->\n#{s}\n<!-- palettes end -->")
+File.write('palettes.md', readme)
+
+s = StringIO.open do |io|
+    Dir['../lib/pixelflow_canvas/fonts/*.bdf'].sort.each do |path|
+        font = File.basename(path).split('.').first
+        width = font.split('x').first.to_i
+        height = font.split('x').last.to_i + 1
+        scale = 8
+        png_path = "images/#{font}.png"
+        unless File.exist?(png_path)
+            Pixelflow::Canvas.new(width * 26 * scale + 2 * scale, height * 4 * scale + 2 * scale, :palette) do
+                set_draw_mode(:buffered)
+                set_color(15)
+                fill_rect(0, 0, width * 26 * scale + 2 * scale, height * 4 * scale + 2 * scale)
+                set_color(0)
+                draw_text(scale, scale, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', font, 8)
+                draw_text(scale, height * 8 + scale, 'abcdefghijklmnopqrstuvwxyz', font, 8)
+                draw_text(scale, height * 8 * 2 + scale, '`1234567890-=~!@#$%^&*()_+', font, 8)
+                draw_text(scale, height * 8 * 3 + scale, ',./<>?;\':"[]{}|\\äöüÄÖÜß°éµ', font, 8)
+                flip()
+                save_as_png(png_path)
+            end
+        end
+        io.puts
+        io.puts "#### #{font}"
+        io.puts
+        io.puts "<img src='#{png_path}' alt='#{font}'>"
+    end
+    io.string
+end
+
+readme = File.read('drawing_things.md')
+readme.sub!(/<!-- fonts start -->(.*?)<!-- fonts end -->/m, "<!-- fonts start -->\n#{s}\n<!-- fonts end -->")
+File.write('drawing_things.md', readme)
+
+Dir['*.md'].each do |path|
+    s = File.read(path)
+    i = 0
+    loop do
+        i0 = s.index('<!-- code begin', i)
+        break unless i0
+        i = i0 + 1
+        i1 = s.index('code end -->', i0)
+        snippet = s[i0+15..i1-1]
+        snippet.strip!
+        sha1 = Digest::SHA1.hexdigest(snippet)[0, 16]
+        png_path = "images/code/#{sha1}.png"
+        code = StringIO.open do |io|
+            io.puts "require 'pixelflow_canvas'"
+            io.print "canvas = "
+            io.puts snippet
+            io.puts "canvas.save_as_png('#{png_path}')"
+            io.string
+        end
+        puts '-' * 20
+        puts code
+        puts '-' * 20
+        unless File.exist?(png_path)
+            FileUtils.mkpath(File.dirname(png_path))
+            puts "CREATING #{png_path}"
+            puts code
+            IO.popen('ruby', 'r+') do |io|
+                io.write(code)
+                io.close_write
+                io.read
+            end
+        end
+        newline_index = s.index("\n", i1)
+        s[i1+12..newline_index] = "<img class='full' src='#{png_path}'>\n"
+    end
+    File.open(path, 'w') { |f| f.write(s) }
+end

data/lib/pixelflow_canvas/palettes.yaml

@@ -2419,6 +2419,263 @@
 - "#85c448"
 - "#439d40"
 - "#29694e"
+:vga:
+- "#000000"
+- "#0000aa"
+- "#00aa00"
+- "#00aaaa"
+- "#aa0000"
+- "#aa00aa"
+- "#aa5500"
+- "#aaaaaa"
+- "#555555"
+- "#5555ff"
+- "#55ff55"
+- "#55ffff"
+- "#ff5555"
+- "#ff55ff"
+- "#ffff55"
+- "#ffffff"
+- "#000000"
+- "#141414"
+- "#202020"
+- "#2c2c2c"
+- "#383838"
+- "#454545"
+- "#515151"
+- "#616161"
+- "#717171"
+- "#828282"
+- "#929292"
+- "#a2a2a2"
+- "#b6b6b6"
+- "#cbcbcb"
+- "#e3e3e3"
+- "#ffffff"
+- "#0000ff"
+- "#4100ff"
+- "#7d00ff"
+- "#be00ff"
+- "#ff00ff"
+- "#ff00be"
+- "#ff007d"
+- "#ff0041"
+- "#ff0000"
+- "#ff4100"
+- "#ff7d00"
+- "#ffbe00"
+- "#ffff00"
+- "#beff00"
+- "#7dff00"
+- "#41ff00"
+- "#00ff00"
+- "#00ff41"
+- "#00ff7d"
+- "#00ffbe"
+- "#00ffff"
+- "#00beff"
+- "#007dff"
+- "#0041ff"
+- "#7d7dff"
+- "#9e7dff"
+- "#be7dff"
+- "#df7dff"
+- "#ff7dff"
+- "#ff7ddf"
+- "#ff7dbe"
+- "#ff7d9e"
+- "#ff7d7d"
+- "#ff9e7d"
+- "#ffbe7d"
+- "#ffdf7d"
+- "#ffff7d"
+- "#dfff7d"
+- "#beff7d"
+- "#9eff7d"
+- "#7dff7d"
+- "#7dff9e"
+- "#7dffbe"
+- "#7dffdf"
+- "#7dffff"
+- "#7ddfff"
+- "#7dbeff"
+- "#7d9eff"
+- "#b6b6ff"
+- "#c7b6ff"
+- "#dbb6ff"
+- "#ebb6ff"
+- "#ffb6ff"
+- "#ffb6eb"
+- "#ffb6db"
+- "#ffb6c7"
+- "#ffb6b6"
+- "#ffc7b6"
+- "#ffdbb6"
+- "#ffebb6"
+- "#ffffb6"
+- "#ebffb6"
+- "#dbffb6"
+- "#c7ffb6"
+- "#b6ffb6"
+- "#b6ffc7"
+- "#b6ffdb"
+- "#b6ffeb"
+- "#b6ffff"
+- "#b6ebff"
+- "#b6dbff"
+- "#b6c7ff"
+- "#000071"
+- "#1c0071"
+- "#380071"
+- "#550071"
+- "#710071"
+- "#710055"
+- "#710038"
+- "#71001c"
+- "#710000"
+- "#711c00"
+- "#713800"
+- "#715500"
+- "#717100"
+- "#557100"
+- "#387100"
+- "#1c7100"
+- "#007100"
+- "#00711c"
+- "#007138"
+- "#007155"
+- "#007171"
+- "#005571"
+- "#003871"
+- "#001c71"
+- "#383871"
+- "#453871"
+- "#553871"
+- "#613871"
+- "#713871"
+- "#713861"
+- "#713855"
+- "#713845"
+- "#713838"
+- "#714538"
+- "#715538"
+- "#716138"
+- "#717138"
+- "#617138"
+- "#557138"
+- "#457138"
+- "#387138"
+- "#387145"
+- "#387155"
+- "#387161"
+- "#387171"
+- "#386171"
+- "#385571"
+- "#384571"
+- "#515171"
+- "#595171"
+- "#615171"
+- "#695171"
+- "#715171"
+- "#715169"
+- "#715161"
+- "#715159"
+- "#715151"
+- "#715951"
+- "#716151"
+- "#716951"
+- "#717151"
+- "#697151"
+- "#617151"
+- "#597151"
+- "#517151"
+- "#517159"
+- "#517161"
+- "#517169"
+- "#517171"
+- "#516971"
+- "#516171"
+- "#515971"
+- "#000041"
+- "#100041"
+- "#200041"
+- "#300041"
+- "#410041"
+- "#410030"
+- "#410020"
+- "#410010"
+- "#410000"
+- "#411000"
+- "#412000"
+- "#413000"
+- "#414100"
+- "#304100"
+- "#204100"
+- "#104100"
+- "#004100"
+- "#004110"
+- "#004120"
+- "#004130"
+- "#004141"
+- "#003041"
+- "#002041"
+- "#001041"
+- "#202041"
+- "#282041"
+- "#302041"
+- "#382041"
+- "#412041"
+- "#412038"
+- "#412030"
+- "#412028"
+- "#412020"
+- "#412820"
+- "#413020"
+- "#413820"
+- "#414120"
+- "#384120"
+- "#304120"
+- "#284120"
+- "#204120"
+- "#204128"
+- "#204130"
+- "#204138"
+- "#204141"
+- "#203841"
+- "#203041"
+- "#202841"
+- "#2c2c41"
+- "#302c41"
+- "#342c41"
+- "#3c2c41"
+- "#412c41"
+- "#412c3c"
+- "#412c34"
+- "#412c30"
+- "#412c2c"
+- "#41302c"
+- "#41342c"
+- "#413c2c"
+- "#41412c"
+- "#3c412c"
+- "#34412c"
+- "#30412c"
+- "#2c412c"
+- "#2c4130"
+- "#2c4134"
+- "#2c413c"
+- "#2c4141"
+- "#2c3c41"
+- "#2c3441"
+- "#2c3041"
+- "#000000"
+- "#000000"
+- "#000000"
+- "#000000"
+- "#000000"
+- "#000000"
+- "#000000"
+- "#000000"
 :vines_flexible_linear_ramps:
 - "#150a1f"
 - "#280b26"

data/lib/pixelflow_canvas/version.rb

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

data/lib/pixelflow_canvas.rb

@@ -23,9 +23,10 @@ module Pixelflow
             :buffered => 1
         }
         COMPOSE_MODES = {
-            :over => 0,
+            :copy => 0,
             :add => 1,
-            :subtract => 2
+            :subtract => 2,
+            :multiply => 3,
         }
         INTERPOLATION_MODES = {
             :nearest => 0,
@@ -43,7 +44,7 @@ module Pixelflow
             @color_mode = :rgb
             @advance_mode = :right
             @draw_mode = :direct
-            @compose_mode = :over
+            @compose_mode = :copy
             @palette = VGA_PALETTE.dup
             @socket = TCPSocket.new('127.0.0.1', 19223)
             set_size(width, height)
@@ -107,7 +108,7 @@ module Pixelflow
             unless COMPOSE_MODES.keys.include?(mode)
                 raise "Invalid compose mode: #{mode}"
             end
-            if mode != :over && @color_mode != :rgb
+            if mode != :copy && @color_mode != :rgb
                 raise "Cannot switch compose mode to #{mode} in palette color mode!"
             end
             @compose_mode = mode
@@ -132,8 +133,12 @@ module Pixelflow
         def ensure_max_fps(fps)
             fps1 = 1.0 / fps
             t = Time.now.to_f
-            dt = t - @last_timestamp
-            sleep(fps1 - dt) if dt < fps1
+            if @last_timestamp
+                loop do
+                    sleep 0.01
+                    break if (Time.now.to_f - @last_timestamp) >= fps1
+                end
+            end
             @last_timestamp = t
         end
 
@@ -276,6 +281,17 @@ module Pixelflow
                     r = 255 if r > 255
                     g = 255 if g > 255
                     b = 255 if b > 255
+                elsif @compose_mode == :subtract
+                    r = @screen[offset + 0] - r
+                    g = @screen[offset + 1] - g
+                    b = @screen[offset + 2] - b
+                    r = 0 if r < 0
+                    g = 0 if g < 0
+                    b = 0 if b < 0
+                elsif @compose_mode == :multiply
+                    r = (@screen[offset + 0] * r) / 255
+                    g = (@screen[offset + 1] * g) / 255
+                    b = (@screen[offset + 2] * b) / 255
                 end
                 @screen[offset + 0] = r
                 @screen[offset + 1] = g
@@ -447,7 +463,7 @@ module Pixelflow
             fa2 = 4 * a2
             fb2 = 4 * b2
             x0 = 0
-            y0 = b
+            y0 = rb
             sigma = 2 * b2 + a2 * (1 - 2 * rb)
             while b2 * x0 <= a2 * y0
                 set_pixel(x + x0, y + y0)
@@ -461,7 +477,7 @@ module Pixelflow
                 sigma += b2 * ((4 * x0) + 6)
                 x0 += 1
             end
-            x0 = a
+            x0 = ra
             y0 = 0
             sigma = 2 * a2 + b2 * (1 - 2 * ra)
             while a2 * y0 <= b2 * x0
@@ -488,7 +504,7 @@ module Pixelflow
             fa2 = 4 * a2
             fb2 = 4 * b2
             x0 = 0
-            y0 = b
+            y0 = rb
             sigma = 2 * b2 + a2 * (1 - 2 * rb)
             while b2 * x0 <= a2 * y0
                 (x - x0..x + x0).each do |i|
@@ -502,7 +518,7 @@ module Pixelflow
                 sigma += b2 * ((4 * x0) + 6)
                 x0 += 1
             end
-            x0 = a
+            x0 = ra
             y0 = 0
             sigma = 2 * a2 + b2 * (1 - 2 * ra)
             while a2 * y0 <= b2 * x0
@@ -743,13 +759,13 @@ module Pixelflow
             end
         end
 
-        def self.text_width(s, font, options = {})
+        def text_width(s, font, scale = 1)
             Canvas.load_font(font)
             width = 0
             s.each_char do |c|
                 glyph = @@cypher_fonts[font][c.ord]
                 if glyph
-                    width += glyph[:width]
+                    width += glyph[:width] * scale
                 end
             end
             width

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelflow_canvas
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.6
 platform: ruby
 authors:
 - Michael Specht
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-28 00:00:00.000000000 Z
+date: 2024-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -32,9 +32,39 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
+- docs/.gitignore
+- docs/Gemfile
+- docs/Gemfile.lock
+- docs/LICENSE
+- docs/README.md
+- docs/_config.yml
+- docs/advanced_use.md
+- docs/drawing_things.md
+- docs/images/4x6.png
+- docs/images/6x10.png
+- docs/images/7x13.png
+- docs/images/7x13B.png
+- docs/images/8x13.png
+- docs/images/8x13B.png
+- docs/images/9x15.png
+- docs/images/9x15B.png
+- docs/images/code/0ba813cd6b7e0ae0.png
+- docs/images/code/30c5ac94e5fa22ba.png
+- docs/images/code/3871051301832e44.png
+- docs/images/code/40acf0284459aa0e.png
+- docs/images/code/4eb9d4f97e05c739.png
+- docs/images/code/584e2ee3b7526718.png
+- docs/images/code/7fa15cea8c83a542.png
+- docs/images/code/809d9ce7d7a8ce6c.png
+- docs/images/code/85abc3576f6d78b1.png
+- docs/images/code/ec32331b354119d2.png
+- docs/images/code/ef667cfe7ff65c27.png
+- docs/index.md
+- docs/palettes.md
+- docs/render-docs.rb
 - lib/pixelflow_canvas.rb
 - lib/pixelflow_canvas/fonts/4x6.bdf
 - lib/pixelflow_canvas/fonts/6x10.bdf
@@ -47,12 +77,6 @@ files:
 - lib/pixelflow_canvas/palettes.yaml
 - lib/pixelflow_canvas/version.rb
 - lib/pixelflow_canvas/vga_palette.rb
-- sig/pixelflow_canvas.rbs
-- test-anaglyph.rb
-- test-sirds.rb
-- test-triangle.rb
-- test-turtle.rb
-- test.rb
 homepage: https://github.com/specht/pixelflow_canvas_ruby
 licenses:
 - GPL-3.0-only

data/sig/pixelflow_canvas.rbs

@@ -1,4 +0,0 @@
-module PixelflowCanvas
-  VERSION: String
-  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
-end

data/test-anaglyph.rb

@@ -1,15 +0,0 @@
-require './lib/pixelflow_canvas.rb'
-
-width = 256
-height = 256
-
-canvas = Pixelflow::Canvas.new(width, height, :rgb)
-canvas.set_compose_mode(:add)
-
-canvas.set_color(255, 0, 0)
-canvas.draw_line(10, 10, 100, 200)
-
-canvas.set_color(0, 255, 0)
-canvas.draw_line(20, 10, 90, 200)
-
-canvas.save_as_png('anaglyph.png')

data/test-sirds.rb

@@ -1,46 +0,0 @@
-require './lib/pixelflow_canvas.rb'
-require 'json'
-
-def depth(x, y)
-    r = (x - 128) ** 2 + (y - 128) ** 2
-    return 10 if r < 5000
-    r * 0.001
-end
-
-width = 256
-height = 256
-
-canvas = Pixelflow::Canvas.new(width, height, :palette)
-(0...64).each { |i| canvas.set_palette(i, i * 4, i * 4, i * 4) }
-(0...height).each do |y|
-    (0...48).each do |x|
-        canvas.set_pixel(x, y, rand(64))
-    end
-end
-(0...height).each do |y|
-    sx = 0
-    dx = 48
-    while dx < width
-        c = canvas.get_pixel(sx, y)
-        canvas.set_pixel(dx, y, c)
-        dx += 1
-        sx = dx - 48 + depth(dx - 24, y)
-    end
-end
-
-# (0...height).each do |y|
-#     (0...width).each do |x|
-#         d = depth(x, y)
-#         canvas.set_pixel(x, y, d)
-#     end
-# end
-
-i = 0
-loop do
-    canvas.fetch_events do |event|
-        STDERR.puts event.to_json
-    end
-    canvas.ensure_max_fps(30)
-    i += 1
-    # STDERR.puts "\r #{i}"
-end

data/test-triangle.rb

@@ -1,25 +0,0 @@
-require './lib/pixelflow_canvas.rb'
-
-width = 256
-height = 256
-
-canvas = Pixelflow::Canvas.new(width, height, :palette)
-turtle = Pixelflow::Turtle.new(canvas)
-turtle.set_color(13)
-
-def draw(canvas, x0, y0, x1, y1, x2, y2, level)
-    canvas.draw_triangle(x0, y0, x1, y1, x2, y2)
-    mx0 = (x0 + x1) / 2
-    my0 = (y0 + y1) / 2
-    mx1 = (x1 + x2) / 2
-    my1 = (y1 + y2) / 2
-    mx2 = (x2 + x0) / 2
-    my2 = (y2 + y0) / 2
-    if level > 0
-        draw(canvas, x0, y0, mx0, my0, mx2, my2, level - 1)
-        draw(canvas, x1, y1, mx1, my1, mx0, my0, level - 1)
-        draw(canvas, x2, y2, mx2, my2, mx1, my1, level - 1)
-    end
-end
-
-draw(canvas, 128, 10, 10, 186, 246, 246, 5)

data/test-turtle.rb

@@ -1,14 +0,0 @@
-require './lib/pixelflow_canvas.rb'
-
-width = 256
-height = 256
-
-canvas = Pixelflow::Canvas.new(width, height, :palette)
-turtle = Pixelflow::Turtle.new(canvas)
-turtle.set_color(13)
-
-turtle.forward(10)
-turtle.turn_right(90)
-turtle.forward(10)
-turtle.turn_right(90)
-turtle.forward(10)

data/test.rb

@@ -1,36 +0,0 @@
-require './lib/pixelflow_canvas.rb'
-
-def depth(x, y)
-    r = (x - 128) ** 2 + (y - 128) ** 2
-    return 10 if r < 5000
-    r * 0.001
-end
-
-width = 256
-height = 256
-
-canvas = Pixelflow::Canvas.new(width, height, :palette)
-(0...64).each { |i| canvas.set_palette(i, i, i, i) }
-(0...height).each do |y|
-    (0...48).each do |x|
-        canvas.set_pixel(x, y, rand(64))
-    end
-end
-(0...height).each do |y|
-    sx = 0
-    dx = 48
-    while dx < width
-        c = canvas.get_pixel(sx, y)
-        canvas.set_pixel(dx, y, c)
-        dx += 1
-        sx = dx - 48 + depth(dx - 24, y)
-    end
-end
-
-# (0...height).each do |y|
-#     (0...width).each do |x|
-#         d = depth(x, y)
-#         canvas.set_pixel(x, y, d)
-#     end
-# end
-