glimmer-dsl-libui 0.2.20 → 0.2.24

data/examples/tic_tac_toe.rb

@@ -0,0 +1,85 @@
+require 'glimmer-dsl-libui'
+
+require_relative "tic_tac_toe/board"
+
+class TicTacToe
+  include Glimmer
+
+  def initialize
+    @tic_tac_toe_board = Board.new
+  end
+  
+  def launch
+    create_gui
+    register_observers
+    @main_window.show
+  end
+  
+  def register_observers
+    Glimmer::DataBinding::Observer.proc do |game_status|
+      display_win_message if game_status == Board::WIN
+      display_draw_message if game_status == Board::DRAW
+    end.observe(@tic_tac_toe_board, :game_status)
+    
+    3.times.map do |row|
+      3.times.map do |column|
+        Glimmer::DataBinding::Observer.proc do |sign|
+          @cells[row][column].string = sign
+        end.observe(@tic_tac_toe_board[row + 1, column + 1], :sign) # board model is 1-based
+      end
+    end
+  end
+
+  def create_gui
+    @main_window = window('Tic-Tac-Toe', 180, 180) {
+      resizable false
+      
+      @cells = []
+      vertical_box {
+        padded false
+        
+        3.times.map do |row|
+          @cells << []
+          horizontal_box {
+            padded false
+            
+            3.times.map do |column|
+              area {
+                path {
+                  square(0, 0, 60)
+                  
+                  stroke :black, thickness: 2
+                }
+                text(23, 19) {
+                  @cells[row] << string('') {
+                    font family: 'Arial', size: OS.mac? ? 20 : 16
+                  }
+                }
+                on_mouse_up do
+                  @tic_tac_toe_board.mark(row + 1, column + 1) # board model is 1-based
+                end
+              }
+            end
+          }
+        end
+      }
+    }
+  end
+
+  def display_win_message
+    display_game_over_message("Player #{@tic_tac_toe_board.winning_sign} has won!")
+  end
+
+  def display_draw_message
+    display_game_over_message("Draw!")
+  end
+
+  def display_game_over_message(message_text)
+    Glimmer::LibUI.queue_main do
+      msg_box('Game Over', message_text)
+      @tic_tac_toe_board.reset!
+    end
+  end
+end
+
+TicTacToe.new.launch

data/lib/glimmer/libui.rb

@@ -26,12 +26,12 @@ module Glimmer
     class << self
       include Glimmer::FiddleConsumer
       
-      def integer_to_boolean(int, allow_nil: true)
-        int.nil? ? (allow_nil ? nil : false) : ((int.is_a?(TrueClass) || int.is_a?(FalseClass)) ? int : (int.is_a?(Integer) ? int == 1 : (allow_nil ? nil : false)))
+      def integer_to_boolean(int, allow_nil: true, allow_boolean: true)
+        int.nil? ? (allow_nil ? nil : false) : (allow_boolean && (int.is_a?(TrueClass) || int.is_a?(FalseClass)) ? int : (int.is_a?(Integer) ? int == 1 : (allow_nil ? nil : false)))
       end
       
-      def boolean_to_integer(bool, allow_nil: true)
-        bool.nil? ? (allow_nil ? nil : 0) : (bool.is_a?(Integer) ? bool : (bool.is_a?(TrueClass) || bool.is_a?(FalseClass) ? (bool == true ? 1 : 0) : (allow_nil ? nil : 0)))
+      def boolean_to_integer(bool, allow_nil: true, allow_integer: true)
+        bool.nil? ? (allow_nil ? nil : 0) : (allow_integer && bool.is_a?(Integer) ? bool : (bool.is_a?(TrueClass) || bool.is_a?(FalseClass) ? (bool == true ? 1 : 0) : (allow_nil ? nil : 0)))
       end
       
       def degrees_to_radians(degrees)
@@ -83,6 +83,7 @@ module Glimmer
             value = value.chars.map {|char| [char, char]}.flatten.join if value.length == 3
             value = "0x#{value}"
           end
+          value = "0x#{value[1..-1]}" if value.start_with?('#')
           value = value.to_i(16)
         end
         if value.is_a?(Integer)
@@ -100,11 +101,39 @@ module Glimmer
         enum_symbol_values(enum_name).keys
       end
       
+      def enum_names
+       [
+         :align,
+         :at,
+         :attribute_type,
+         :draw_brush_type,
+         :draw_fill_mode,
+         :draw_line_cap,
+         :draw_line_join,
+         :draw_text_align,
+         :ext_key,
+         :modifier,
+         :table_model_column,
+         :table_value_type,
+         :text_italic,
+         :text_stretch,
+         :text_weight,
+         :underline,
+         :underline_color
+       ]
+      end
+      
       # Returns ruby underscored symbols for enum values starting with enum name (camelcase, e.g. 'ext_key')
       def enum_symbol_values(enum_name)
         enum_name = enum_name.to_s.underscore.to_sym
         @enum_symbols ||= {}
-        @enum_symbols[enum_name] ||= ::LibUI.constants.select { |c| c.to_s.start_with?(enum_name.to_s.camelcase(:upper)) }.map { |c| [c.to_s.underscore.sub("#{enum_name}_", '').to_sym, ::LibUI.const_get(c)] }.to_h
+        @enum_symbols[enum_name] ||= ::LibUI.constants.select do |c|
+          c.to_s.match(/#{enum_name.to_s.camelcase(:upper)}[A-Z]/)
+        end.map do |c|
+          [c.to_s.underscore.sub("#{enum_name}_", '').to_sym, ::LibUI.const_get(c)]
+        end.reject do |key, value|
+          enum_name == :underline && key.to_s.start_with?('color')
+        end.to_h
       end
       
       def enum_value_to_symbol(enum_name, enum_value)
@@ -145,7 +174,7 @@ module Glimmer
       # If block returns true at any point, the timer continues for another repetition regardless of `repeat:` keyword arg value
       def timer(time_in_seconds = 0.1, repeat: true, &block)
         closure = fiddle_closure_block_caller(4, [0]) do
-          result = boolean_to_integer(block.call)
+          result = boolean_to_integer(block.call, allow_integer: false)
           repeat -= 1 if repeat.is_a?(Integer)
           if result.nil?
             if (repeat == true || (repeat.is_a?(Integer) && repeat > 0))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.2.20
+  version: 0.2.24
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2021-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -252,11 +252,21 @@ files:
 - examples/method_based_custom_keyword.rb
 - examples/midi_player.rb
 - examples/simple_notepad.rb
+- examples/snake.rb
+- examples/snake/model/apple.rb
+- examples/snake/model/game.rb
+- examples/snake/model/snake.rb
+- examples/snake/model/vertebra.rb
+- examples/snake/presenter/cell.rb
+- examples/snake/presenter/grid.rb
 - examples/tetris.rb
 - examples/tetris/model/block.rb
 - examples/tetris/model/game.rb
 - examples/tetris/model/past_game.rb
 - examples/tetris/model/tetromino.rb
+- examples/tic_tac_toe.rb
+- examples/tic_tac_toe/board.rb
+- examples/tic_tac_toe/cell.rb
 - examples/timer.rb
 - glimmer-dsl-libui.gemspec
 - icons/glimmer.png