pixelflow_canvas 0.4.2 → 0.5.0

data/lib/pixelflow_canvas/version.rb

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

data/lib/pixelflow_canvas/vga_palette.rb

@@ -0,0 +1,50 @@
+VGA_PALETTE = [
+    0x00,0x00,0x00,0x00,0x00,0xaa,0x00,0xaa,0x00,0x00,0xaa,0xaa,0xaa,0x00,0x00,0xaa,
+    0x00,0xaa,0xaa,0x55,0x00,0xaa,0xaa,0xaa,0x55,0x55,0x55,0x55,0x55,0xff,0x55,0xff,
+    0x55,0x55,0xff,0xff,0xff,0x55,0x55,0xff,0x55,0xff,0xff,0xff,0x55,0xff,0xff,0xff,
+    0x00,0x00,0x00,0x14,0x14,0x14,0x20,0x20,0x20,0x2c,0x2c,0x2c,0x38,0x38,0x38,0x45,
+    0x45,0x45,0x51,0x51,0x51,0x61,0x61,0x61,0x71,0x71,0x71,0x82,0x82,0x82,0x92,0x92,
+    0x92,0xa2,0xa2,0xa2,0xb6,0xb6,0xb6,0xcb,0xcb,0xcb,0xe3,0xe3,0xe3,0xff,0xff,0xff,
+    0x00,0x00,0xff,0x41,0x00,0xff,0x7d,0x00,0xff,0xbe,0x00,0xff,0xff,0x00,0xff,0xff,
+    0x00,0xbe,0xff,0x00,0x7d,0xff,0x00,0x41,0xff,0x00,0x00,0xff,0x41,0x00,0xff,0x7d,
+    0x00,0xff,0xbe,0x00,0xff,0xff,0x00,0xbe,0xff,0x00,0x7d,0xff,0x00,0x41,0xff,0x00,
+    0x00,0xff,0x00,0x00,0xff,0x41,0x00,0xff,0x7d,0x00,0xff,0xbe,0x00,0xff,0xff,0x00,
+    0xbe,0xff,0x00,0x7d,0xff,0x00,0x41,0xff,0x7d,0x7d,0xff,0x9e,0x7d,0xff,0xbe,0x7d,
+    0xff,0xdf,0x7d,0xff,0xff,0x7d,0xff,0xff,0x7d,0xdf,0xff,0x7d,0xbe,0xff,0x7d,0x9e,
+    0xff,0x7d,0x7d,0xff,0x9e,0x7d,0xff,0xbe,0x7d,0xff,0xdf,0x7d,0xff,0xff,0x7d,0xdf,
+    0xff,0x7d,0xbe,0xff,0x7d,0x9e,0xff,0x7d,0x7d,0xff,0x7d,0x7d,0xff,0x9e,0x7d,0xff,
+    0xbe,0x7d,0xff,0xdf,0x7d,0xff,0xff,0x7d,0xdf,0xff,0x7d,0xbe,0xff,0x7d,0x9e,0xff,
+    0xb6,0xb6,0xff,0xc7,0xb6,0xff,0xdb,0xb6,0xff,0xeb,0xb6,0xff,0xff,0xb6,0xff,0xff,
+    0xb6,0xeb,0xff,0xb6,0xdb,0xff,0xb6,0xc7,0xff,0xb6,0xb6,0xff,0xc7,0xb6,0xff,0xdb,
+    0xb6,0xff,0xeb,0xb6,0xff,0xff,0xb6,0xeb,0xff,0xb6,0xdb,0xff,0xb6,0xc7,0xff,0xb6,
+    0xb6,0xff,0xb6,0xb6,0xff,0xc7,0xb6,0xff,0xdb,0xb6,0xff,0xeb,0xb6,0xff,0xff,0xb6,
+    0xeb,0xff,0xb6,0xdb,0xff,0xb6,0xc7,0xff,0x00,0x00,0x71,0x1c,0x00,0x71,0x38,0x00,
+    0x71,0x55,0x00,0x71,0x71,0x00,0x71,0x71,0x00,0x55,0x71,0x00,0x38,0x71,0x00,0x1c,
+    0x71,0x00,0x00,0x71,0x1c,0x00,0x71,0x38,0x00,0x71,0x55,0x00,0x71,0x71,0x00,0x55,
+    0x71,0x00,0x38,0x71,0x00,0x1c,0x71,0x00,0x00,0x71,0x00,0x00,0x71,0x1c,0x00,0x71,
+    0x38,0x00,0x71,0x55,0x00,0x71,0x71,0x00,0x55,0x71,0x00,0x38,0x71,0x00,0x1c,0x71,
+    0x38,0x38,0x71,0x45,0x38,0x71,0x55,0x38,0x71,0x61,0x38,0x71,0x71,0x38,0x71,0x71,
+    0x38,0x61,0x71,0x38,0x55,0x71,0x38,0x45,0x71,0x38,0x38,0x71,0x45,0x38,0x71,0x55,
+    0x38,0x71,0x61,0x38,0x71,0x71,0x38,0x61,0x71,0x38,0x55,0x71,0x38,0x45,0x71,0x38,
+    0x38,0x71,0x38,0x38,0x71,0x45,0x38,0x71,0x55,0x38,0x71,0x61,0x38,0x71,0x71,0x38,
+    0x61,0x71,0x38,0x55,0x71,0x38,0x45,0x71,0x51,0x51,0x71,0x59,0x51,0x71,0x61,0x51,
+    0x71,0x69,0x51,0x71,0x71,0x51,0x71,0x71,0x51,0x69,0x71,0x51,0x61,0x71,0x51,0x59,
+    0x71,0x51,0x51,0x71,0x59,0x51,0x71,0x61,0x51,0x71,0x69,0x51,0x71,0x71,0x51,0x69,
+    0x71,0x51,0x61,0x71,0x51,0x59,0x71,0x51,0x51,0x71,0x51,0x51,0x71,0x59,0x51,0x71,
+    0x61,0x51,0x71,0x69,0x51,0x71,0x71,0x51,0x69,0x71,0x51,0x61,0x71,0x51,0x59,0x71,
+    0x00,0x00,0x41,0x10,0x00,0x41,0x20,0x00,0x41,0x30,0x00,0x41,0x41,0x00,0x41,0x41,
+    0x00,0x30,0x41,0x00,0x20,0x41,0x00,0x10,0x41,0x00,0x00,0x41,0x10,0x00,0x41,0x20,
+    0x00,0x41,0x30,0x00,0x41,0x41,0x00,0x30,0x41,0x00,0x20,0x41,0x00,0x10,0x41,0x00,
+    0x00,0x41,0x00,0x00,0x41,0x10,0x00,0x41,0x20,0x00,0x41,0x30,0x00,0x41,0x41,0x00,
+    0x30,0x41,0x00,0x20,0x41,0x00,0x10,0x41,0x20,0x20,0x41,0x28,0x20,0x41,0x30,0x20,
+    0x41,0x38,0x20,0x41,0x41,0x20,0x41,0x41,0x20,0x38,0x41,0x20,0x30,0x41,0x20,0x28,
+    0x41,0x20,0x20,0x41,0x28,0x20,0x41,0x30,0x20,0x41,0x38,0x20,0x41,0x41,0x20,0x38,
+    0x41,0x20,0x30,0x41,0x20,0x28,0x41,0x20,0x20,0x41,0x20,0x20,0x41,0x28,0x20,0x41,
+    0x30,0x20,0x41,0x38,0x20,0x41,0x41,0x20,0x38,0x41,0x20,0x30,0x41,0x20,0x28,0x41,
+    0x2c,0x2c,0x41,0x30,0x2c,0x41,0x34,0x2c,0x41,0x3c,0x2c,0x41,0x41,0x2c,0x41,0x41,
+    0x2c,0x3c,0x41,0x2c,0x34,0x41,0x2c,0x30,0x41,0x2c,0x2c,0x41,0x30,0x2c,0x41,0x34,
+    0x2c,0x41,0x3c,0x2c,0x41,0x41,0x2c,0x3c,0x41,0x2c,0x34,0x41,0x2c,0x30,0x41,0x2c,
+    0x2c,0x41,0x2c,0x2c,0x41,0x30,0x2c,0x41,0x34,0x2c,0x41,0x3c,0x2c,0x41,0x41,0x2c,
+    0x3c,0x41,0x2c,0x34,0x41,0x2c,0x30,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+]

data/lib/pixelflow_canvas.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "pixelflow_canvas/version"
+require_relative "pixelflow_canvas/vga_palette.rb"
+require 'chunky_png'
 require 'socket'
 require 'time'
 
@@ -39,7 +41,7 @@ module Pixelflow
             @advance_mode = :right
             @draw_mode = :direct
             @compose_mode = :over
-            @palette = [0] * 768
+            @palette = VGA_PALETTE.dup
             @socket = TCPSocket.new('127.0.0.1', 19223)
             set_size(width, height)
             set_color_mode(color_mode) if color_mode
@@ -67,6 +69,9 @@ module Pixelflow
                 raise "Invalid color mode: #{mode}"
             end
             @color_mode = mode
+            if mode == :palette
+                @palette = VGA_PALETTE.dup
+            end
             recreate_screen()
             @socket.write([2, COLOR_MODES[@color_mode]].pack('CC'))
             @socket.flush
@@ -122,6 +127,29 @@ module Pixelflow
             @last_timestamp = t
         end
 
+        def save_as_png(path)
+            if @color_mode == :rgb
+                image = ChunkyPNG::Image.from_rgb_stream(@width, @height, @screen.pack('C*'))
+                image.save(path)
+            else
+                buffer = [0] * @width * @height * 3
+                offset = 0
+                source = 0
+                (0...@height).each do |y|
+                    (0...@width).each do |x|
+                        i = @screen[source]
+                        buffer[offset + 0] = @palette[i + 0]
+                        buffer[offset + 1] = @palette[i + 1]
+                        buffer[offset + 2] = @palette[i + 2]
+                        source += 1
+                        offset += 3
+                    end
+                end
+                image = ChunkyPNG::Image.from_rgb_stream(@width, @height, buffer.pack('C*'))
+                image.save(path)
+            end
+        end
+
         def set_color(r, g = 0, b = 0)
             @r = r
             @g = g
@@ -129,11 +157,15 @@ module Pixelflow
         end
 
         def set_palette(i, r, g, b)
-            i = i % 256
-            r = (r % 256) << 2
-            g = (g % 256) << 2
-            b = (b % 256) << 2
+            i = i.to_i.clamp(0, 255)
+            r = r.to_i.clamp(0, 255)
+            g = g.to_i.clamp(0, 255)
+            b = b.to_i.clamp(0, 255)
+            @palette[i * 3 + 0] = r
+            @palette[i * 3 + 1] = g
+            @palette[i * 3 + 2] = b
             @socket.write([3, i, r, g, b].pack('CCCCC'))
+            @socket.flush
         end
 
         def move_to(x, y)
@@ -452,6 +484,73 @@ 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
     end
 
     class Turtle

data/test-anaglyph.rb

@@ -10,4 +10,6 @@ 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.draw_line(20, 10, 90, 200)
+
+canvas.save_as_png('anaglyph.png')

data/test-sirds.rb

@@ -10,7 +10,7 @@ width = 256
 height = 256
 
 canvas = Pixelflow::Canvas.new(width, height, :palette)
-(0...64).each { |i| canvas.set_palette(i, i, i, i) }
+(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))
@@ -34,3 +34,4 @@ end
 #     end
 # end
 
+canvas.save_as_png('sirds.png')

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,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pixelflow_canvas
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Michael Specht
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-27 00:00:00.000000000 Z
-dependencies: []
+date: 2024-10-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: chunky_png
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 description: Use a virtual CRT for old school graphics programming, in VS Code, from
   Ruby.
 email:
@@ -22,11 +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