glimmer-dsl-libui 0.2.14 → 0.2.18

data/examples/tetris.rb

@@ -0,0 +1,155 @@
+require 'glimmer-dsl-libui'
+
+require_relative 'tetris/model/game'
+
+class Tetris
+  include Glimmer
+  
+  BLOCK_SIZE = 25
+  BEVEL_CONSTANT = 20
+  COLOR_GRAY = {r: 192, g: 192, b: 192}
+    
+  attr_reader :game
+  
+  def initialize
+    @game = Model::Game.new
+    create_gui
+    register_observers
+  end
+  
+  def launch
+    @game.start!
+    @main_window.show
+  end
+  
+  def create_gui
+    @main_window = window('Glimmer Tetris', Model::Game::PLAYFIELD_WIDTH * BLOCK_SIZE, Model::Game::PLAYFIELD_HEIGHT * BLOCK_SIZE) {
+      playfield(playfield_width: Model::Game::PLAYFIELD_WIDTH, playfield_height: Model::Game::PLAYFIELD_HEIGHT, block_size: BLOCK_SIZE)
+    }
+  end
+  
+  def register_observers
+    Glimmer::DataBinding::Observer.proc do |game_over|
+      if game_over
+        show_game_over_dialog
+      else
+        start_moving_tetrominos_down
+      end
+    end.observe(@game, :game_over)
+    
+    Model::Game::PLAYFIELD_HEIGHT.times do |row|
+      Model::Game::PLAYFIELD_HEIGHT.times do |column|
+        Glimmer::DataBinding::Observer.proc do |new_color|
+          Glimmer::LibUI.queue_main do
+            color = Glimmer::LibUI.interpret_color(new_color)
+            block = @blocks[row][column]
+            block[:background_square].fill = color
+            block[:top_bevel_edge].fill = {r: color[:r] + 4*BEVEL_CONSTANT, g: color[:g] + 4*BEVEL_CONSTANT, b: color[:b] + 4*BEVEL_CONSTANT}
+            block[:right_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
+            block[:bottom_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
+            block[:left_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
+            block[:border_square].stroke = new_color == Model::Block::COLOR_CLEAR ? COLOR_GRAY : color
+          end
+        end.observe(@game.playfield[row][column], :color)
+      end
+    end
+  end
+  
+  def playfield(playfield_width: , playfield_height: , block_size: )
+    @blocks = []
+    vertical_box {
+      padded false
+      
+      playfield_height.times.map do |row|
+        @blocks << []
+        horizontal_box {
+          padded false
+          
+          playfield_width.times.map do |column|
+            @blocks.last << block(row: row, column: column, block_size: block_size)
+          end
+        }
+      end
+    }
+  end
+  
+  def block(row: , column: , block_size: )
+    block = {}
+    bevel_pixel_size = 0.16 * block_size.to_f
+    color = Glimmer::LibUI.interpret_color(Model::Block::COLOR_CLEAR)
+    area {
+      block[:background_square] = path {
+        square(0, 0, block_size)
+        
+        fill color
+      }
+      block[:top_bevel_edge] = path {
+        polygon(0, 0, block_size, 0, block_size - bevel_pixel_size, bevel_pixel_size, bevel_pixel_size, bevel_pixel_size)
+  
+        fill r: color[:r] + 4*BEVEL_CONSTANT, g: color[:g] + 4*BEVEL_CONSTANT, b: color[:b] + 4*BEVEL_CONSTANT
+      }
+      block[:right_bevel_edge] = path {
+        polygon(block_size, 0, block_size - bevel_pixel_size, bevel_pixel_size, block_size - bevel_pixel_size, block_size - bevel_pixel_size, block_size, block_size)
+  
+        fill r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT
+      }
+      block[:bottom_bevel_edge] = path {
+        polygon(block_size, block_size, 0, block_size, bevel_pixel_size, block_size - bevel_pixel_size, block_size - bevel_pixel_size, block_size - bevel_pixel_size)
+  
+        fill r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT
+      }
+      block[:left_bevel_edge] = path {
+        polygon(0, 0, 0, block_size, bevel_pixel_size, block_size - bevel_pixel_size, bevel_pixel_size, bevel_pixel_size)
+  
+        fill r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT
+      }
+      block[:border_square] = path {
+        square(0, 0, block_size)
+  
+        stroke COLOR_GRAY
+      }
+      
+      on_key_down do |key_event|
+        case key_event
+        in ext_key: :down
+          game.down!
+        in ext_key: :up
+          case game.up_arrow_action
+          when :instant_down
+            game.down!(instant: true)
+          when :rotate_right
+            game.rotate!(:right)
+          when :rotate_left
+            game.rotate!(:left)
+          end
+        in ext_key: :left
+          game.left!
+        in ext_key: :right
+          game.right!
+        in modifier: :shift
+          game.rotate!(:right)
+        in modifier: :control
+          game.rotate!(:left)
+        else
+          # Do Nothing
+        end
+      end
+    }
+    block
+  end
+  
+  def start_moving_tetrominos_down
+    Glimmer::LibUI.timer(@game.delay) do
+      @game.down! if !@game.game_over? && !@game.paused?
+    end
+  end
+  
+  def show_game_over_dialog
+    Glimmer::LibUI.queue_main do
+      msg_box('Game Over', "Score: #{@game.high_scores.first.score}\nLines: #{@game.high_scores.first.lines}\nLevel: #{@game.high_scores.first.level}")
+      @game.restart!
+    end
+  end
+end
+
+Tetris.new.launch

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

@@ -37,6 +37,7 @@ module Glimmer
         end
   
         def interpret(parent, keyword, *args, &block)
+          args = [args] if args.size > 1 && Glimmer::LibUI::Shape.shape_class(keyword).parameters.size == 1
           Glimmer::LibUI::Shape.create(keyword, parent, args, &block)
         end
         

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

@@ -109,6 +109,31 @@ module Glimmer
           queue_redraw_all
         end
           
+        def request_auto_redraw
+          # TODO implement functionality to delay queuing area redraws until post_add_content has been called (area definition is done). Maybe offer an option to enable redrawing before area is closed too.
+          queue_redraw_all if auto_redraw_enabled?
+        end
+        
+        def auto_redraw_enabled(value = nil)
+          if value.nil?
+            @auto_redraw_enabled = true if @auto_redraw_enabled.nil?
+            @auto_redraw_enabled
+          else
+            @auto_redraw_enabled = !!value
+          end
+        end
+        alias auto_redraw_enabled? auto_redraw_enabled
+        alias auto_redraw_enabled= auto_redraw_enabled
+        alias set_auto_redraw_enabled auto_redraw_enabled
+        
+        def pause_auto_redraw
+          self.auto_redraw_enabled = false
+        end
+          
+        def resume_auto_redraw
+          self.auto_redraw_enabled = true
+        end
+        
         private
         
         def build_control

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

@@ -68,12 +68,16 @@ module Glimmer
           if args.empty?
             @fill ||= {}
           else
-            @fill = Glimmer::LibUI.interpret_color(args)
-            @parent_proxy&.queue_redraw_all
+            new_color = Glimmer::LibUI.interpret_color(args)
+            if new_color != @fill
+              @fill_observer&.unobserve(@fill) if @fill
+              @fill = new_color
+              request_auto_redraw
+            end
           end
           @fill.tap do
             @fill_observer ||= Glimmer::DataBinding::Observer.proc do
-              @parent_proxy&.queue_redraw_all
+              request_auto_redraw
             end
             @fill_observer.observe(@fill)
           end
@@ -92,12 +96,16 @@ module Glimmer
           if args.empty?
             @stroke ||= {}
           else
-            @stroke = Glimmer::LibUI.interpret_color(args)
-            @parent_proxy&.queue_redraw_all
+            new_color = Glimmer::LibUI.interpret_color(args)
+            if new_color != @stroke
+              @stroke_observer&.unobserve(@stroke) if @stroke
+              @stroke = Glimmer::LibUI.interpret_color(args)
+              request_auto_redraw
+            end
           end
           @stroke.tap do
             @stroke_observer ||= Glimmer::DataBinding::Observer.proc do
-              @parent_proxy&.queue_redraw_all
+              request_auto_redraw
             end
             @stroke_observer.observe(@stroke)
           end
@@ -137,7 +145,11 @@ module Glimmer
         end
         
         def redraw
-          @parent_proxy&.queue_redraw_all
+          @parent_proxy&.redraw
+        end
+        
+        def request_auto_redraw
+          @parent_proxy&.request_auto_redraw
         end
         
         private

data/lib/glimmer/libui/shape/figure.rb

@@ -41,8 +41,10 @@ module Glimmer
           if value.nil?
             @closed
           else
-            @closed = value
-            area_proxy&.queue_redraw_all
+            if !!value != !!@closed
+              @closed = value
+              request_auto_redraw
+            end
           end
         end
         alias closed= closed

data/lib/glimmer/libui/shape/polybezier.rb

@@ -0,0 +1,45 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/libui/shape'
+
+module Glimmer
+  module LibUI
+    class Shape
+      class Polybezier < Shape
+        parameters :point_array
+        parameter_defaults []
+      
+        def draw(area_draw_params)
+          alternating_x_y_array = point_array.to_a.compact.flatten
+          unless alternating_x_y_array.empty?
+            ::LibUI.draw_path_new_figure(path_proxy.libui, alternating_x_y_array[0], alternating_x_y_array[1])
+            ((alternating_x_y_array.size - 2) / 6).times do |n|
+              point_alternating_x_y_index = n * 6
+              ::LibUI.draw_path_bezier_to(path_proxy.libui, alternating_x_y_array[point_alternating_x_y_index + 2], alternating_x_y_array[point_alternating_x_y_index + 3], alternating_x_y_array[point_alternating_x_y_index + 4], alternating_x_y_array[point_alternating_x_y_index + 5], alternating_x_y_array[point_alternating_x_y_index + 6], alternating_x_y_array[point_alternating_x_y_index + 7])
+            end
+          end
+          super
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/shape/polygon.rb

@@ -0,0 +1,46 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/libui/shape'
+
+module Glimmer
+  module LibUI
+    class Shape
+      class Polygon < Shape
+        parameters :point_array
+        parameter_defaults []
+      
+        def draw(area_draw_params)
+          alternating_x_y_array = point_array.to_a.compact.flatten
+          unless alternating_x_y_array.empty?
+            ::LibUI.draw_path_new_figure(path_proxy.libui, alternating_x_y_array[0], alternating_x_y_array[1])
+            ((alternating_x_y_array.size - 2) / 2).times do |n|
+              point_alternating_x_y_index = n * 2
+              ::LibUI.draw_path_line_to(path_proxy.libui, alternating_x_y_array[point_alternating_x_y_index + 2], alternating_x_y_array[point_alternating_x_y_index + 3])
+            end
+            ::LibUI.draw_path_close_figure(path_proxy.libui)
+          end
+          super
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/shape/polyline.rb

@@ -0,0 +1,45 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/libui/shape'
+
+module Glimmer
+  module LibUI
+    class Shape
+      class Polyline < Shape
+        parameters :point_array
+        parameter_defaults []
+      
+        def draw(area_draw_params)
+          alternating_x_y_array = point_array.to_a.compact.flatten
+          unless alternating_x_y_array.empty?
+            ::LibUI.draw_path_new_figure(path_proxy.libui, alternating_x_y_array[0], alternating_x_y_array[1])
+            ((alternating_x_y_array.size - 2) / 2).times do |n|
+              point_alternating_x_y_index = n * 2
+              ::LibUI.draw_path_line_to(path_proxy.libui, alternating_x_y_array[point_alternating_x_y_index + 2], alternating_x_y_array[point_alternating_x_y_index + 3])
+            end
+          end
+          super
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/shape.rb

@@ -87,7 +87,11 @@ module Glimmer
       end
       
       def redraw
-        area_proxy&.queue_redraw_all
+        area_proxy&.auto_redraw
+      end
+      
+      def request_auto_redraw
+        area_proxy&.request_auto_redraw
       end
       
       def destroy
@@ -113,8 +117,10 @@ module Glimmer
           method_name = method_name.to_s
           parameter_index = self.class.parameters.index(method_name_parameter)
           if method_name.start_with?('set_') || method_name.end_with?('=') || !args.empty?
-            @args[parameter_index] = args.first
-            area_proxy&.queue_redraw_all
+            if args.first != @args[parameter_index]
+              @args[parameter_index] = args.first
+              request_auto_redraw
+            end
           else
             @args[parameter_index]
           end

data/lib/glimmer/libui.rb

@@ -27,11 +27,11 @@ module Glimmer
       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 == 1)
+        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)))
       end
       
       def boolean_to_integer(bool, allow_nil: true)
-        bool.nil? ? (allow_nil ? nil : 0) : (bool.is_a?(Integer) ? bool : (bool == true ? 1 : 0))
+        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)))
       end
       
       def degrees_to_radians(degrees)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.18
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-24 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -252,6 +252,11 @@ files:
 - examples/method_based_custom_keyword.rb
 - examples/midi_player.rb
 - examples/simple_notepad.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/timer.rb
 - glimmer-dsl-libui.gemspec
 - icons/glimmer.png
@@ -339,6 +344,9 @@ files:
 - lib/glimmer/libui/shape/circle.rb
 - lib/glimmer/libui/shape/figure.rb
 - lib/glimmer/libui/shape/line.rb
+- lib/glimmer/libui/shape/polybezier.rb
+- lib/glimmer/libui/shape/polygon.rb
+- lib/glimmer/libui/shape/polyline.rb
 - lib/glimmer/libui/shape/rectangle.rb
 - lib/glimmer/libui/shape/square.rb
 - sounds/AlanWalker-Faded.mid