pixelflow_canvas 0.4.3 → 0.6.0

data/lib/pixelflow_canvas/version.rb

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

data/lib/pixelflow_canvas.rb

@@ -3,6 +3,7 @@
 require_relative "pixelflow_canvas/version"
 require_relative "pixelflow_canvas/vga_palette.rb"
 require 'chunky_png'
+require 'json'
 require 'socket'
 require 'time'
 
@@ -484,6 +485,112 @@ module Pixelflow
             draw_line(x1, y1, x2, y2)
             draw_line(x2, y2, x0, y0)
         end
+
+        # FONT RENDERING
+
+        def self.load_font(font)
+            @@cypher_fonts ||= {}
+            return if @@cypher_fonts[font]
+            # STDERR.puts "Loading font from #{path}..."
+            font_data = {}
+            File.open(File.join(File.dirname(__FILE__), 'pixelflow_canvas', 'fonts', "#{font}.bdf")) do |f|
+                char = nil
+                f.each_line do |line|
+                    if line[0, 9] == 'STARTCHAR'
+                        char = {}
+                    elsif line[0, 8] == 'ENCODING'
+                        char[:encoding] = line.sub('ENCODING ', '').strip.to_i
+                    elsif line[0, 7] == 'ENDCHAR'
+                        font_data[char[:encoding]] = char
+                        char = nil
+                    elsif line[0, 3] == 'BBX'
+                        parts = line.split(' ')
+                        char[:width] = parts[1].to_i
+                        char[:height] = parts[2].to_i
+                    elsif line[0, 6] == 'BITMAP'
+                        char[:bitmap] = []
+                    else
+                        if char && char[:bitmap]
+                            char[:bitmap] << line.to_i(16)
+                        end
+                    end
+                end
+            end
+            @@cypher_fonts[font] = font_data
+        end
+
+        def draw_text(x, y, s, font, scale = 1)
+            Canvas.load_font(font)
+            dx = 0
+            s.each_char do |c|
+                glyph = @@cypher_fonts[font][c.ord]
+                if glyph
+                    w = ((((glyph[:width] - 1) >> 3) + 1) << 3) - 1
+                    (0...glyph[:height]).each do |iy|
+                        (0...glyph[:width]).each do |ix|
+                            if (((glyph[:bitmap][iy] >> (w - ix)) & 1) == 1)
+                                (0...scale).each do |oy|
+                                    (0...scale).each do |ox|
+                                        set_pixel(x + (ix + dx) * scale + ox, y + iy * scale + oy)
+                                    end
+                                end
+                            end
+                        end
+                    end
+                    dx += glyph[:width]
+                end
+            end
+        end
+
+        def self.text_width(s, font, options = {})
+            Canvas.load_font(font)
+            width = 0
+            s.each_char do |c|
+                glyph = @@cypher_fonts[font][c.ord]
+                if glyph
+                    width += glyph[:width]
+                end
+            end
+            width
+        end
+
+        # EVENT POLLING
+
+        class Event
+            def initialize(data)
+                @data = data
+            end
+
+            attr_reader :data
+
+            def on(type, &block)
+                if type == :mouse_move && @data[0] == 3
+                    yield(@data[1], @data[2])
+                end
+            end
+        end
+
+        def fetch_events(&block)
+            @socket.write([9].pack('C'))
+            @socket.flush
+            json = ''
+            loop do
+                begin
+                    buffer = @socket.recv_nonblock(1024)
+                    json += buffer
+                rescue IO::WaitReadable
+                    break
+                end
+            end
+            return if json.empty?
+            json.split("\r\n").each do |line|
+                line.strip!
+                next if line.empty?
+                JSON.parse(line).each do |event|
+                    yield Event.new(event)
+                end
+            end
+        end
     end
 
     class Turtle

data/test-sirds.rb

@@ -1,4 +1,5 @@
 require './lib/pixelflow_canvas.rb'
+require 'json'
 
 def depth(x, y)
     r = (x - 128) ** 2 + (y - 128) ** 2
@@ -34,4 +35,12 @@ end
 #     end
 # end
 
-canvas.save_as_png('sirds.png')
+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-draw.rb → test-triangle.rb}

@@ -4,7 +4,6 @@ width = 256
 height = 256
 
 canvas = Pixelflow::Canvas.new(width, height, :palette)
-canvas.set_interpolation_mode(:bilinear)
 turtle = Pixelflow::Turtle.new(canvas)
 turtle.set_color(13)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pixelflow_canvas
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Michael Specht
@@ -36,12 +36,20 @@ files:
 - README.md
 - Rakefile
 - lib/pixelflow_canvas.rb
+- lib/pixelflow_canvas/fonts/4x6.bdf
+- lib/pixelflow_canvas/fonts/6x10.bdf
+- lib/pixelflow_canvas/fonts/7x13.bdf
+- lib/pixelflow_canvas/fonts/7x13B.bdf
+- lib/pixelflow_canvas/fonts/8x13.bdf
+- lib/pixelflow_canvas/fonts/8x13B.bdf
+- lib/pixelflow_canvas/fonts/9x15.bdf
+- lib/pixelflow_canvas/fonts/9x15B.bdf
 - lib/pixelflow_canvas/version.rb
 - lib/pixelflow_canvas/vga_palette.rb
 - sig/pixelflow_canvas.rbs
 - test-anaglyph.rb
-- test-draw.rb
 - test-sirds.rb
+- test-triangle.rb
 - test-turtle.rb
 - test.rb
 homepage: https://github.com/specht/pixelflow_canvas_ruby