glimmer-dsl-swt 4.18.1.0 → 4.18.2.3

data/samples/elaborate/tetris/model/tetromino.rb

@@ -0,0 +1,228 @@
+# Copyright (c) 2007-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_relative 'block'
+
+require 'matrix'
+
+class Tetris
+  module Model
+    class Tetromino
+      ORIENTATIONS = [:north, :east, :south, :west]
+      
+      LETTER_COLORS = {
+        I: :cyan,
+        J: :blue,
+        L: :dark_yellow,
+        O: :yellow,
+        S: :green,
+        T: :magenta,
+        Z: :red,
+      }
+      
+      attr_reader :letter
+      attr_accessor :orientation, :blocks, :row, :column
+      
+      def initialize
+        @letter = LETTER_COLORS.keys.sample
+        @orientation = :north
+        @blocks = default_blocks
+        new_row = 1 - height
+        new_column = (PLAYFIELD_WIDTH - width)/2
+        update_playfield(new_row, new_column)
+      end
+      
+      def update_playfield(new_row = nil, new_column = nil)
+        remove_from_playfield
+        if !new_row.nil? && !new_column.nil?
+          @row = new_row
+          @column = new_column
+          add_to_playfield
+        end
+      end
+      
+      def add_to_playfield
+        update_playfield_block do |playfield_row, playfield_column, row_index, column_index|
+          Game.playfield[playfield_row][playfield_column].color = blocks[row_index][column_index].color if playfield_row >= 0 && Game.playfield[playfield_row][playfield_column].clear? && !blocks[row_index][column_index].clear?
+        end
+      end
+      
+      def remove_from_playfield
+        return if @row.nil? || @column.nil?
+        update_playfield_block do |playfield_row, playfield_column, row_index, column_index|
+          Game.playfield[playfield_row][playfield_column].clear if playfield_row >= 0 && !blocks[row_index][column_index].clear? && Game.playfield[playfield_row][playfield_column].color == color
+        end
+      end
+      
+      def stopped?(blocks: nil)
+        blocks ||= @blocks
+        playfield_remaining_heights = Game.playfield_remaining_heights(self)
+        result = bottom_blocks(blocks).any? do |bottom_block|
+          playfield_column = @column + bottom_block[:column_index]
+          !bottom_block[:block].clear? &&
+            (@row + bottom_block[:row]) >= playfield_remaining_heights[playfield_column] - 1
+        end
+        Game.consider_eliminating_lines if result
+        result
+      end
+      
+      # Returns blocks at the bottom of a tetromino, which could be from multiple rows depending on shape (e.g. T)
+      def bottom_blocks(blocks = nil)
+        blocks ||= @blocks
+        width.times.map do |column_index|
+          row_blocks_with_row_index = @blocks.each_with_index.to_a.reverse.detect do |row_blocks, row_index|
+            !row_blocks[column_index].clear?
+          end
+          bottom_block = row_blocks_with_row_index[0][column_index]
+          bottom_block_row = row_blocks_with_row_index[1]
+          {
+            block: bottom_block,
+            row: bottom_block_row,
+            column_index: column_index
+          }
+        end
+      end
+      
+      def bottom_block_for_column(column)
+        bottom_blocks.detect {|bottom_block| (@column + bottom_block[:column_index]) == column}
+      end
+      
+      def right_blocked?
+        (@column == PLAYFIELD_WIDTH - width) || Game.playfield[row][column + width].occupied?
+      end
+      
+      def left_blocked?
+        (@column == 0) || Game.playfield[row][column - 1].occupied?
+      end
+      
+      def width
+        @blocks[0].size
+      end
+      
+      def height
+        @blocks.size
+      end
+      
+      def down
+        unless stopped?
+          new_row = @row + 1
+          update_playfield(new_row, @column)
+        end
+      end
+      
+      def left
+        unless left_blocked?
+          new_column = @column - 1
+          update_playfield(@row, new_column)
+        end
+      end
+      
+      def right
+        unless right_blocked?
+          new_column = @column + 1
+          update_playfield(@row, new_column)
+        end
+      end
+      
+      # Rotate in specified direcation, which can be :right (clockwise) or :left (counterclockwise)
+      def rotate(direction)
+        return if stopped?
+        array_rotation_value = direction == :right ? -1 : 1
+        self.orientation = ORIENTATIONS[ORIENTATIONS.rotate(array_rotation_value).index(@orientation)]
+        new_blocks = Matrix[*@blocks].transpose.to_a
+        if direction == :right
+          new_blocks = new_blocks.map(&:reverse)
+        else
+          new_blocks = new_blocks.reverse
+        end
+        new_blocks = Matrix[*new_blocks].to_a
+        unless stopped?(blocks: new_blocks) || right_blocked? || left_blocked?
+          remove_from_playfield
+          self.blocks = new_blocks
+          update_playfield(@row, @column)
+        end
+      end
+      
+      def default_blocks
+        case @letter
+        when :I
+          [
+            [block, block, block, block]
+          ]
+        when :J
+          [
+            [block, block, block],
+            [empty, empty, block],
+          ]
+        when :L
+          [
+            [block, block, block],
+            [block, empty, empty],
+          ]
+        when :O
+          [
+            [block, block],
+            [block, block],
+          ]
+        when :S
+          [
+            [empty, block, block],
+            [block, block, empty],
+          ]
+        when :T
+          [
+            [block, block, block],
+            [empty, block, empty],
+          ]
+        when :Z
+          [
+            [block, block, empty],
+            [empty, block, block],
+          ]
+        end
+      end
+      
+      def color
+        LETTER_COLORS[@letter]
+      end
+      
+      private
+      
+      def block
+        Block.new(color)
+      end
+      
+      def empty
+        Block.new
+      end
+      
+      def update_playfield_block(&updater)
+        @row.upto(@row + height - 1) do |playfield_row|
+          @column.upto(@column + width - 1) do |playfield_column|
+            row_index = playfield_row - @row
+            column_index = playfield_column - @column
+            updater.call(playfield_row, playfield_column, row_index, column_index)
+          end
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/tetris/view/block.rb

@@ -0,0 +1,45 @@
+# Copyright (c) 2007-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.
+
+class Tetris
+  module View
+    class Block
+      include Glimmer::UI::CustomWidget
+  
+      options :block_size, :row, :column
+  
+      body {
+        composite {
+          layout nil
+          layout_data {
+            width_hint block_size
+            height_hint block_size
+          }
+          background bind(Model::Game.playfield[row][column], :color)
+          rectangle(0, 0, block_size, block_size)
+          rectangle(3, 3, block_size - 6, block_size - 6) {
+            foreground :gray
+          }
+        }
+      }
+    end
+  end
+end

data/samples/elaborate/tetris/view/playfield.rb

@@ -0,0 +1,49 @@
+# Copyright (c) 2007-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_relative 'block'
+
+class Tetris
+  module View
+    class Playfield
+      include Glimmer::UI::CustomWidget
+  
+      options :playfield_width, :playfield_height, :block_size
+  
+      body {
+        composite {
+          grid_layout(playfield_width, true) {
+            margin_width block_size
+            margin_height block_size
+            horizontal_spacing 0
+            vertical_spacing 0
+          }
+          
+          playfield_height.times { |row|
+            playfield_width.times { |column|
+              block(block_size: block_size, row: row, column: column)
+            }
+          }
+        }
+      }
+    end
+  end
+end

data/samples/hello/hello_canvas.rb

@@ -30,19 +30,19 @@ shell {
     rectangle(0, 0, 220, 400, fill: true) {
       background :red
     }
-    round_rectangle(50, 20, 300, 150, 30, 50, fill: true) {
+    rectangle(50, 20, 300, 150, 30, 50, round: true, fill: true) {
       background :magenta
     }
-    gradient_rectangle(150, 200, 100, 70, true, fill: true) {
+    rectangle(150, 200, 100, 70, true, gradient: true) {
       background :dark_magenta
       foreground :yellow
     }
-    gradient_rectangle(50, 200, 30, 70, false, fill: true) {
+    rectangle(50, 200, 30, 70, false, gradient: true) {
       background :magenta
       foreground :dark_blue
     }
-    rectangle(200, 80, 108, 36) {
-      foreground color(:dark_blue)
+    rectangle(205, 50, 88, 96) {
+      foreground :yellow
     }
     text('Picasso', 60, 80) {
       background :yellow
@@ -55,8 +55,9 @@ shell {
     arc(210, 210, 100, 100, 30, -77, fill: true) {
       background :red
     }
-    polygon([250, 210, 260, 170, 270, 210, 290, 230, 250, 210]) {
+    polygon(250, 210, 260, 170, 270, 210, 290, 230, fill: true) {
       background :dark_yellow
     }
+    polyline(250, 110, 260, 70, 270, 110, 290, 130, 250, 110)
   }
 }.open

data/samples/hello/hello_canvas_animation.rb

@@ -35,7 +35,7 @@ shell {
         oval(0, 0, 400, 400) { # x, y, width, height
           foreground :black # sets oval background color
         }
-        arc(0, 0, 400, 400, -1*index%360, 10, fill: true) {  # x, y, width, height, start angle, arc angle
+        arc(0, 0, 400, 400, -1.4*index%360, 10, fill: true) {  # x, y, width, height, start angle, arc angle
           background rgb(200, 200, 50) # sets arc background color
         }
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.1.0
+  version: 4.18.2.3
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -330,18 +330,20 @@ dependencies:
         version: 0.7.0
 description: Glimmer DSL for SWT (JRuby Desktop Development GUI Framework) is a native-GUI
   cross-platform desktop development library written in JRuby, an OS-threaded faster
-  version of Ruby. Glimmer's main innovation is a declarative Ruby DSL that enables
-  productive and efficient authoring of desktop application user-interfaces while
-  relying on the robust Eclipse SWT library. Glimmer additionally innovates by having
-  built-in data-binding support, which greatly facilitates synchronizing the GUI with
-  domain models, thus achieving true decoupling of object oriented components and
-  enabling developers to solve business problems (test-first) without worrying about
-  GUI concerns, or alternatively drive development GUI-first, and then write clean
-  business models (test-first) afterwards. To get started quickly, Glimmer offers
-  scaffolding options for Apps, Gems, and Custom Widgets. Glimmer also includes native-executable
-  packaging support, sorely lacking in other libraries, thus enabling the delivery
-  of desktop apps written in Ruby as truly native DMG/PKG/APP files on the Mac + App
-  Store, MSI/EXE files on Windows, and Gem Packaged Shell Scripts on Linux.
+  JVM version of Ruby. Glimmer's main innovation is a declarative Ruby DSL that enables
+  productive and efficient authoring of desktop application user-interfaces by relying
+  on the robust Eclipse SWT library. Glimmer additionally innovates by having built-in
+  data-binding support, which greatly facilitates synchronizing the GUI with domain
+  models, thus achieving true decoupling of object oriented components and enabling
+  developers to solve business problems (test-first) without worrying about GUI concerns,
+  or alternatively drive development GUI-first, and then write clean business models
+  (test-first) afterwards. Not only does Glimmer provide a large set of GUI widgets,
+  but it also supports drawing Canvas Graphics like Shapes and Animations. To get
+  started quickly, Glimmer offers scaffolding options for Apps, Gems, and Custom Widgets.
+  Glimmer also includes native-executable packaging support, sorely lacking in other
+  libraries, thus enabling the delivery of desktop apps written in Ruby as truly native
+  DMG/PKG/APP files on the Mac + App Store, MSI/EXE files on Windows, and Gem Packaged
+  Shell Scripts on Linux.
 email: andy.am@gmail.com
 executables:
 - glimmer
@@ -463,6 +465,12 @@ files:
 - samples/elaborate/contact_manager/contact_repository.rb
 - samples/elaborate/login.rb
 - samples/elaborate/meta_sample.rb
+- samples/elaborate/tetris.rb
+- samples/elaborate/tetris/model/block.rb
+- samples/elaborate/tetris/model/game.rb
+- samples/elaborate/tetris/model/tetromino.rb
+- samples/elaborate/tetris/view/block.rb
+- samples/elaborate/tetris/view/playfield.rb
 - samples/elaborate/tic_tac_toe.rb
 - samples/elaborate/tic_tac_toe/board.rb
 - samples/elaborate/tic_tac_toe/cell.rb