glimmer-dsl-libui 0.2.21 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.21
+0.3.0

data/examples/area_gallery.rb

@@ -49,7 +49,7 @@ window('Area Gallery', 400, 400) {
     }
     text(161, 40, 100) { # x, y, width
       string('Area Gallery') {
-        font family: 'Arial', size: 14
+        font family: 'Arial', size: (OS.mac? ? 14 : 11)
         color :black
       }
     }

data/examples/area_gallery2.rb

@@ -149,7 +149,7 @@ window('Area Gallery', 400, 400) {
       width 100
       
       string {
-        font family: 'Arial', size: 14
+        font family: 'Arial', size: (OS.mac? ? 14 : 11)
         color :black
         
         'Area Gallery'

data/examples/area_gallery3.rb

@@ -50,7 +50,7 @@ window('Area Gallery', 400, 400) {
       }
       text(161, 40, 100) { # x, y, width
         string('Area Gallery') {
-          font family: 'Arial', size: 14
+          font family: 'Arial', size: (OS.mac? ? 14 : 11)
           color :black
         }
       }

data/examples/area_gallery4.rb

@@ -150,7 +150,7 @@ window('Area Gallery', 400, 400) {
         width 100
         
         string {
-          font family: 'Arial', size: 14
+          font family: 'Arial', size: (OS.mac? ? 14 : 11)
           color :black
           
           'Area Gallery'

data/examples/basic_image.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Basic Image', 96, 96) {
+  area {
+    # image is not a real LibUI control. It is built in Glimmer as a custom control that renders
+    # tiny pixels/lines as rectangle paths. As such, it does not have good performance, but can
+    # be used in exceptional circumstances where an image control is really needed.
+    #
+    # Furthermore, adding image directly under area is even slower due to taking up more memory for every
+    # image pixel rendered. Check basic_image2.rb for a faster alternative using on_draw manually.
+    #
+    # It is recommended to pass width/height args to shrink image and achieve faster performance.
+    image(File.expand_path('../icons/glimmer.png', __dir__), 96, 96)
+  }
+}.show

data/examples/basic_image2.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Basic Image', 96, 96) {
+  area {
+    on_draw do |area_draw_params|
+      image(File.expand_path('../icons/glimmer.png', __dir__), 96, 96)
+    end
+  }
+}.show

data/examples/basic_image3.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Basic Image', 96, 96) {
+  area {
+    # image is not a real LibUI control. It is built in Glimmer as a custom control that renders
+    # tiny pixels/lines as rectangle paths. As such, it does not have good performance, but can
+    # be used in exceptional circumstances where an image control is really needed.
+    #
+    # Furthermore, adding image directly under area is even slower due to taking up more memory for every
+    # image pixel rendered. Check basic_image4.rb for a faster alternative using on_draw manually.
+    #
+    # It is recommended to pass width/height args to shrink image and achieve faster performance.
+    image {
+      file File.expand_path('../icons/glimmer.png', __dir__)
+      width 96
+      height 96
+    }
+  }
+}.show

data/examples/basic_image4.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Basic Image', 96, 96) {
+  area {
+    on_draw do |area_draw_params|
+      image {
+        file File.expand_path('../icons/glimmer.png', __dir__)
+        width 96
+        height 96
+      }
+    end
+  }
+}.show

data/examples/basic_image5.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+# This is the manual way of rendering an image unto an area control.
+# It could come in handy in special situations.
+# Otherwise, it is recommended to simply utilize the `image` control that
+# can be nested under area or area on_draw listener to automate all this work.
+
+require 'glimmer-dsl-libui'
+require 'chunky_png'
+
+include Glimmer
+
+puts 'Parsing image...'; $stdout.flush
+
+f = File.open(File.expand_path('../icons/glimmer.png', __dir__))
+canvas = ChunkyPNG::Canvas.from_io(f)
+f.close
+canvas.resample_nearest_neighbor!(96, 96)
+data = canvas.to_rgba_stream
+width = canvas.width
+height = canvas.height
+puts "Image width: #{width}"
+puts "Image height: #{height}"
+
+puts 'Parsing colors...'; $stdout.flush
+
+color_maps = height.times.map do |y|
+  width.times.map do |x|
+    r = data[(y*width + x)*4].ord
+    g = data[(y*width + x)*4 + 1].ord
+    b = data[(y*width + x)*4 + 2].ord
+    a = data[(y*width + x)*4 + 3].ord
+    {x: x, y: y, color: {r: r, g: g, b: b, a: a}}
+  end
+end.flatten
+puts "#{color_maps.size} pixels to render..."; $stdout.flush
+
+puts 'Parsing shapes...'; $stdout.flush
+
+shape_maps = []
+original_color_maps = color_maps.dup
+indexed_original_color_maps = Hash[original_color_maps.each_with_index.to_a]
+color_maps.each do |color_map|
+  index = indexed_original_color_maps[color_map]
+  @rectangle_start_x ||= color_map[:x]
+  @rectangle_width ||= 1
+  if color_map[:x] < width - 1 && color_map[:color] == original_color_maps[index + 1][:color]
+    @rectangle_width += 1
+  else
+    if color_map[:x] > 0 && color_map[:color] == original_color_maps[index - 1][:color]
+      shape_maps << {x: @rectangle_start_x, y: color_map[:y], width: @rectangle_width, height: 1, color: color_map[:color]}
+    else
+      shape_maps << {x: color_map[:x], y: color_map[:y], width: 1, height: 1, color: color_map[:color]}
+    end
+    @rectangle_width = 1
+    @rectangle_start_x = color_map[:x] == width - 1 ? 0 : color_map[:x] + 1
+  end
+end
+puts "#{shape_maps.size} shapes to render..."; $stdout.flush
+
+puts 'Rendering image...'; $stdout.flush
+
+window('Basic Image', 96, 96) {
+  area {
+    on_draw do |area_draw_params|
+      shape_maps.each do |shape_map|
+        path {
+          rectangle(shape_map[:x], shape_map[:y], shape_map[:width], shape_map[:height])
+
+          fill shape_map[:color]
+        }
+      end
+    end
+  }
+}.show

data/examples/meta_example.rb

@@ -43,7 +43,7 @@ class MetaExample
   
   def run_example(example)
     Thread.new do
-      command = "ruby -r #{glimmer_dsl_libui_file} #{example} 2>&1"
+      command = "#{RbConfig.ruby} -r #{glimmer_dsl_libui_file} #{example} 2>&1"
       result = ''
       IO.popen(command) do |f|
         sleep(0.0001) # yield to main thread

data/examples/snake/model/apple.rb

@@ -0,0 +1,33 @@
+class Snake
+  module Model
+    class Apple
+      attr_reader :game
+      attr_accessor :row, :column
+      
+      def initialize(game)
+        @game = game
+      end
+      
+      # generates a new location from scratch or via dependency injection of what cell is (for testing purposes)
+      def generate(initial_row: nil, initial_column: nil)
+        if initial_row && initial_column
+          self.row, self.column = initial_row, initial_column
+        else
+          self.row, self.column = @game.height.times.zip(@game.width.times).reject do |row, column|
+            @game.snake.vertebrae.map {|v| [v.row, v.column]}.include?([row, column])
+          end.sample
+        end
+      end
+      
+      def remove
+        self.row = nil
+        self.column = nil
+      end
+    
+      # inspect is overridden to prevent printing very long stack traces
+      def inspect
+        "#{super[0, 120]}... >"
+      end
+    end
+  end
+end

data/examples/snake/model/game.rb

@@ -0,0 +1,51 @@
+require 'fileutils'
+
+require_relative 'snake'
+require_relative 'apple'
+
+class Snake
+  module Model
+    class Game
+      WIDTH_DEFAULT = 40
+      HEIGHT_DEFAULT = 40
+      FILE_HIGH_SCORE = File.expand_path(File.join(Dir.home, '.glimmer-snake'))
+      
+      attr_reader :width, :height
+      attr_accessor :snake, :apple, :over, :score, :high_score
+      alias over? over
+      
+      def initialize(width = WIDTH_DEFAULT, height = HEIGHT_DEFAULT)
+        @width = width
+        @height = height
+        @snake = Snake.new(self)
+        @apple = Apple.new(self)
+        FileUtils.touch(FILE_HIGH_SCORE)
+        @high_score = File.read(FILE_HIGH_SCORE).to_i rescue 0
+      end
+      
+      def score=(new_score)
+        @score = new_score
+        self.high_score = @score if @score > @high_score
+      end
+      
+      def high_score=(new_high_score)
+        @high_score = new_high_score
+        File.write(FILE_HIGH_SCORE, @high_score.to_s)
+      rescue => e
+        puts e.full_message
+      end
+      
+      def start
+        self.over = false
+        self.score = 0
+        self.snake.generate
+        self.apple.generate
+      end
+      
+      # inspect is overridden to prevent printing very long stack traces
+      def inspect
+        "#{super[0, 75]}... >"
+      end
+    end
+  end
+end

data/examples/snake/model/snake.rb

@@ -0,0 +1,95 @@
+require_relative 'vertebra'
+  
+class Snake
+  module Model
+    class Snake
+      SCORE_EAT_APPLE = 50
+      RIGHT_TURN_MAP = {
+        north: :east,
+        east: :south,
+        south: :west,
+        west: :north
+      }
+      LEFT_TURN_MAP = RIGHT_TURN_MAP.invert
+      
+      attr_accessor :collided
+      alias collided? collided
+      
+      attr_reader :game
+      # vertebrae and joins are ordered from tail to head
+      attr_accessor :vertebrae
+      
+      def initialize(game)
+        @game = game
+      end
+      
+      # generates a new snake location and orientation from scratch or via dependency injection of what head_cell and orientation are (for testing purposes)
+      def generate(initial_row: nil, initial_column: nil, initial_orientation: nil)
+        self.collided = false
+        initial_vertebra = Vertebra.new(snake: self, row: initial_row, column: initial_column, orientation: initial_orientation)
+        self.vertebrae = [initial_vertebra]
+      end
+      
+      def length
+        @vertebrae.length
+      end
+      
+      def head
+        @vertebrae.last
+      end
+      
+      def tail
+        @vertebrae.first
+      end
+      
+      def remove
+        self.vertebrae.clear
+        self.joins.clear
+      end
+      
+      def move
+        @old_tail = tail.dup
+        @new_head = head.dup
+        case @new_head.orientation
+        when :east
+          @new_head.column = (@new_head.column + 1) % @game.width
+        when :west
+          @new_head.column = (@new_head.column - 1) % @game.width
+        when :south
+          @new_head.row = (@new_head.row + 1) % @game.height
+        when :north
+          @new_head.row = (@new_head.row - 1) % @game.height
+        end
+        if @vertebrae.map {|v| [v.row, v.column]}.include?([@new_head.row, @new_head.column])
+          self.collided = true
+          @game.over = true
+        else
+          @vertebrae.append(@new_head)
+          @vertebrae.delete(tail)
+          if head.row == @game.apple.row && head.column == @game.apple.column
+            grow
+            @game.apple.generate
+          end
+        end
+      end
+      
+      def turn_right
+        head.orientation = RIGHT_TURN_MAP[head.orientation]
+      end
+      
+      def turn_left
+        head.orientation = LEFT_TURN_MAP[head.orientation]
+      end
+      
+      def grow
+        @game.score += SCORE_EAT_APPLE
+        @vertebrae.prepend(@old_tail)
+      end
+      
+      # inspect is overridden to prevent printing very long stack traces
+      def inspect
+        "#{super[0, 150]}... >"
+      end
+    end
+  end
+end

data/examples/snake/model/vertebra.rb

@@ -0,0 +1,22 @@
+class Snake
+  module Model
+    class Vertebra
+      ORIENTATIONS = %i[north east south west]
+      # orientation is needed for snake occuppied cells (but not apple cells)
+      attr_reader :snake
+      attr_accessor :row, :column, :orientation
+      
+      def initialize(snake: , row: , column: , orientation: )
+        @row = row || rand(snake.game.height)
+        @column = column || rand(snake.game.width)
+        @orientation = orientation || ORIENTATIONS.sample
+        @snake = snake
+      end
+      
+      # inspect is overridden to prevent printing very long stack traces
+      def inspect
+        "#{super[0, 150]}... >"
+      end
+    end
+  end
+end

data/examples/snake/presenter/cell.rb

@@ -0,0 +1,27 @@
+class Snake
+  module Presenter
+    class Cell
+      COLOR_CLEAR = :white
+      COLOR_SNAKE = :green
+      COLOR_APPLE = :red
+    
+      attr_reader :row, :column, :grid
+      attr_accessor :color
+      
+      def initialize(grid: ,row: ,column: )
+        @row = row
+        @column = column
+        @grid = grid
+      end
+      
+      def clear
+        self.color = COLOR_CLEAR unless color == COLOR_CLEAR
+      end
+      
+      # inspect is overridden to prevent printing very long stack traces
+      def inspect
+        "#{super[0, 150]}... >"
+      end
+    end
+  end
+end

data/examples/snake/presenter/grid.rb

@@ -0,0 +1,47 @@
+require 'glimmer/data_binding/observer'
+require_relative '../model/game'
+require_relative 'cell'
+
+class Snake
+  module Presenter
+    class Grid
+      attr_reader :game, :cells
+      
+      def initialize(game = Model::Game.new)
+        @game = game
+        @cells = @game.height.times.map do |row|
+          @game.width.times.map do |column|
+            Cell.new(grid: self, row: row, column: column)
+          end
+        end
+        Glimmer::DataBinding::Observer.proc do |new_vertebrae|
+          occupied_snake_positions = @game.snake.vertebrae.map {|v| [v.row, v.column]}
+          @cells.each_with_index do |row_cells, row|
+            row_cells.each_with_index do |cell, column|
+              if [@game.apple.row, @game.apple.column] == [row, column]
+                cell.color = Cell::COLOR_APPLE
+              elsif occupied_snake_positions.include?([row, column])
+                cell.color = Cell::COLOR_SNAKE
+              else
+                cell.clear
+              end
+            end
+          end
+        end.observe(@game.snake, :vertebrae)
+      end
+      
+      def clear
+        @cells.each do |row_cells|
+          row_cells.each do |cell|
+            cell.clear
+          end
+        end
+      end
+      
+      # inspect is overridden to prevent printing very long stack traces
+      def inspect
+        "#{super[0, 75]}... >"
+      end
+    end
+  end
+end

data/examples/snake.rb

@@ -0,0 +1,90 @@
+require 'glimmer-dsl-libui'
+require 'glimmer/data_binding/observer'
+
+require_relative 'snake/presenter/grid'
+
+class Snake
+  CELL_SIZE = 15
+  SNAKE_MOVE_DELAY = 0.1
+  include Glimmer
+  
+  def initialize
+    @game = Model::Game.new
+    @grid = Presenter::Grid.new(@game)
+    @game.start
+    create_gui
+    register_observers
+  end
+  
+  def launch
+    @main_window.show
+  end
+  
+  def register_observers
+    @game.height.times do |row|
+      @game.width.times do |column|
+        Glimmer::DataBinding::Observer.proc do |new_color|
+          @cell_grid[row][column].fill = new_color
+        end.observe(@grid.cells[row][column], :color)
+      end
+    end
+    
+    Glimmer::DataBinding::Observer.proc do |game_over|
+      Glimmer::LibUI.queue_main do
+        if game_over
+          msg_box('Game Over!', "Score: #{@game.score} | High Score: #{@game.high_score}")
+          @game.start
+        end
+      end
+    end.observe(@game, :over)
+    
+    Glimmer::LibUI.timer(SNAKE_MOVE_DELAY) do
+      unless @game.over?
+        @game.snake.move
+        @main_window.title = "Glimmer Snake (Score: #{@game.score} | High Score: #{@game.high_score})"
+      end
+    end
+  end
+  
+  def create_gui
+    @cell_grid = []
+    @main_window = window('Glimmer Snake', @game.width * CELL_SIZE, @game.height * CELL_SIZE) {
+      resizable false
+      
+      vertical_box {
+        padded false
+        
+        @game.height.times do |row|
+          @cell_grid << []
+          horizontal_box {
+            padded false
+            
+            @game.width.times do |column|
+              area {
+                @cell_grid.last << path {
+                  square(0, 0, CELL_SIZE)
+                  
+                  fill Presenter::Cell::COLOR_CLEAR
+                }
+                
+                on_key_up do |area_key_event|
+                  orientation_and_key = [@game.snake.head.orientation, area_key_event[:ext_key]]
+                  case orientation_and_key
+                  in [:north, :right] | [:east, :down] | [:south, :left] | [:west, :up]
+                    @game.snake.turn_right
+                  in [:north, :left] | [:west, :down] | [:south, :right] | [:east, :up]
+                    @game.snake.turn_left
+                  else
+                    # No Op
+                  end
+                end
+              }
+            end
+          }
+        end
+      }
+    }
+  end
+end
+
+Snake.new.launch

data/examples/tetris/model/game.rb

@@ -113,7 +113,7 @@ class Tetris
       end
       
       def tetris_dir
-        @tetris_dir ||= File.join(File.expand_path('~'), '.glimmer-tetris')
+        @tetris_dir ||= File.join(Dir.home, '.glimmer-tetris')
       end
       
       def tetris_high_score_file

data/examples/tetris.rb

@@ -153,6 +153,8 @@ class Tetris
         end
       }
       radio_menu_item('Rotate Left on Up Arrow') {
+        checked true
+
         on_clicked do
           @game.rotate_left_on_up = true
         end
@@ -235,7 +237,19 @@ class Tetris
       on_key_down do |key_event|
         case key_event
         in ext_key: :down
-          @game.down!
+          if OS.windows?
+            # rate limit downs in Windows as they go too fast when key is held
+            @queued_downs ||= 0
+            if @queued_downs < 2
+              @queued_downs += 1
+              Glimmer::LibUI.timer(0.01, repeat: false) do
+                @game.down! if @queued_downs < 2
+                @queued_downs -= 1
+              end
+            end
+          else
+            @game.down!
+          end
         in key: ' '
           @game.down!(instant: true)
         in ext_key: :up
@@ -319,8 +333,11 @@ class Tetris
   end
   
   def start_moving_tetrominos_down
-    Glimmer::LibUI.timer(@game.delay) do
-      @game.down! if !@game.game_over? && !@game.paused?
+    unless @tetrominos_start_moving_down
+      @tetrominos_start_moving_down = true
+      Glimmer::LibUI.timer(@game.delay) do
+        @game.down! if !@game.game_over? && !@game.paused?
+      end
     end
   end
   
@@ -333,6 +350,8 @@ class Tetris
   
   def show_high_scores
     Glimmer::LibUI.queue_main do
+      game_paused = !!@game.paused
+      @game.paused = true
       if @game.high_scores.empty?
         high_scores_string = "No games have been scored yet."
       else
@@ -341,6 +360,7 @@ class Tetris
         end.join("\n")
       end
       msg_box('High Scores', high_scores_string)
+      @game.paused = game_paused
     end
   end
   

data/examples/tic_tac_toe.rb

@@ -52,7 +52,7 @@ class TicTacToe
                 }
                 text(23, 19) {
                   @cells[row] << string('') {
-                    font family: 'Arial', size: 20
+                    font family: 'Arial', size: OS.mac? ? 20 : 16
                   }
                 }
                 on_mouse_up do

data/lib/glimmer/dsl/libui/control_expression.rb

@@ -40,7 +40,7 @@ module Glimmer
         
         def add_content(parent, keyword, *args, &block)
           super
-          parent.post_add_content
+          parent&.post_add_content
         end
       end
     end

data/lib/glimmer/libui/control_proxy/image_part_proxy.rb

@@ -34,7 +34,6 @@ module Glimmer
           @args = args
           @block = block
           @enabled = true
-          @children = []
           post_add_content if @block.nil?
         end