glimmer-dsl-swt 4.18.2.4 → 4.18.3.3

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

@@ -0,0 +1,26 @@
+# 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 Model
+    PastGame = Struct.new(:name, :score, :lines, :level)
+  end
+end

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

@@ -38,31 +38,32 @@ class Tetris
         Z: :red,
       }
       
-      attr_reader :letter, :preview
+      attr_reader :game, :letter, :preview
       alias preview? preview
       attr_accessor :orientation, :blocks, :row, :column
       
-      def initialize
+      def initialize(game)
+        @game = game
         @letter = LETTER_COLORS.keys.sample
         @orientation = :north
         @blocks = default_blocks
         @preview = true
         new_row = 0
-        new_column = (PREVIEW_PLAYFIELD_WIDTH - width)/2
+        new_column = (Model::Game::PREVIEW_PLAYFIELD_WIDTH - width)/2
         update_playfield(new_row, new_column)
       end
       
       def playfield
-        @preview ? Game.preview_playfield : Game.playfield
+        @preview ? game.preview_playfield : game.playfield
       end
       
       def launch!
         remove_from_playfield
         @preview = false
         new_row = 1 - height
-        new_column = (PLAYFIELD_WIDTH - width)/2
+        new_column = (game.playfield_width - width)/2
         update_playfield(new_row, new_column)
-        Game.tetrominoes << self
+        game.tetrominoes << self
       end
       
       def update_playfield(new_row = nil, new_column = nil)
@@ -76,7 +77,7 @@ class Tetris
       
       def add_to_playfield
         update_playfield_block do |playfield_row, playfield_column, row_index, column_index|
-          playfield[playfield_row][playfield_column].color = blocks[row_index][column_index].color if playfield_row >= 0 && playfield[playfield_row][playfield_column]&.clear? && !blocks[row_index][column_index].clear?
+          playfield[playfield_row][playfield_column].color = blocks[row_index][column_index].color if playfield_row >= 0 && playfield[playfield_row][playfield_column]&.clear? && !blocks[row_index][column_index].clear? && playfield[playfield_row][playfield_column].color != blocks[row_index][column_index].color
         end
       end
       
@@ -89,16 +90,16 @@ class Tetris
       
       def stopped?
         return true if @stopped || @preview
-        playfield_remaining_heights = Game.playfield_remaining_heights(self)
+        playfield_remaining_heights = game.playfield_remaining_heights(self)
         result = bottom_most_blocks.any? do |bottom_most_block|
           playfield_column = @column + bottom_most_block[:column_index]
-            playfield_remaining_heights[playfield_column] &&
-            @row + bottom_most_block[:row] >= playfield_remaining_heights[playfield_column] - 1
+          playfield_remaining_heights[playfield_column] &&
+            @row + bottom_most_block[:row_index] >= playfield_remaining_heights[playfield_column] - 1
         end
-        if result && !Game.hypothetical?
+        if result && !game.hypothetical?
           @stopped = result
-          Game.consider_eliminating_lines
-          Model::Game.consider_adding_tetromino
+          game.consider_eliminating_lines
+          @game.consider_adding_tetromino
         end
         result
       end
@@ -113,7 +114,7 @@ class Tetris
           bottom_most_block_row = row_blocks_with_row_index[1]
           {
             block: bottom_most_block,
-            row: bottom_most_block_row,
+            row_index: bottom_most_block_row,
             column_index: column_index
           }
         end
@@ -124,9 +125,10 @@ class Tetris
       end
       
       def right_blocked?
-        (@column == PLAYFIELD_WIDTH - width) ||
+        (@column == game.playfield_width - width) ||
           right_most_blocks.any? { |right_most_block|
-            playfield[@row + right_most_block[:row_index]][@column + right_most_block[:column_index] + 1].occupied?
+            (@row + right_most_block[:row_index]) >= 0 &&
+              playfield[@row + right_most_block[:row_index]][@column + right_most_block[:column_index] + 1].occupied?
           }
       end
       
@@ -150,7 +152,8 @@ class Tetris
       def left_blocked?
         (@column == 0) ||
           left_most_blocks.any? { |left_most_block|
-            playfield[@row + left_most_block[:row_index]][@column + left_most_block[:column_index] - 1].occupied?
+            (@row + left_most_block[:row_index]) >= 0 &&
+              playfield[@row + left_most_block[:row_index]][@column + left_most_block[:column_index] - 1].occupied?
           }
       end
 
@@ -179,22 +182,27 @@ class Tetris
         @blocks.size
       end
       
-      def down
+      def down!(immediate: false)
         launch! if preview?
         unless stopped?
-          new_row = @row + 1
+          block_count = 1
+          if immediate
+            remaining_height, bottom_touching_block = remaining_height_and_bottom_touching_block
+            block_count = remaining_height - @row
+          end
+          new_row = @row + block_count
           update_playfield(new_row, @column)
         end
       end
       
-      def left
+      def left!
         unless left_blocked?
           new_column = @column - 1
           update_playfield(@row, new_column)
         end
       end
       
-      def right
+      def right!
         unless right_blocked?
           new_column = @column + 1
           update_playfield(@row, new_column)
@@ -202,11 +210,11 @@ class Tetris
       end
       
       # Rotate in specified direcation, which can be :right (clockwise) or :left (counterclockwise)
-      def rotate(direction)
+      def rotate!(direction)
         return if stopped?
         can_rotate = nil
         new_blocks = nil
-        Game.hypothetical do
+        game.hypothetical do
           hypothetical_rotated_tetromino = hypothetical_tetromino
           new_blocks = hypothetical_rotated_tetromino.rotate_blocks(direction)
           can_rotate = !hypothetical_rotated_tetromino.stopped? && !hypothetical_rotated_tetromino.right_blocked? && !hypothetical_rotated_tetromino.left_blocked?
@@ -222,13 +230,13 @@ class Tetris
       end
       
       def rotate_blocks(direction)
-          new_blocks = Matrix[*@blocks].transpose.to_a
-          if direction == :right
-            new_blocks = new_blocks.map(&:reverse)
-          else
-            new_blocks = new_blocks.reverse
-          end
-          Matrix[*new_blocks].to_a
+        new_blocks = Matrix[*@blocks].transpose.to_a
+        if direction == :right
+          new_blocks = new_blocks.map(&:reverse)
+        else
+          new_blocks = new_blocks.reverse
+        end
+        Matrix[*new_blocks].to_a
       end
       
       def hypothetical_tetromino
@@ -242,6 +250,14 @@ class Tetris
         end
       end
       
+      def remaining_height_and_bottom_touching_block
+        playfield_remaining_heights = game.playfield_remaining_heights(self)
+        bottom_most_blocks.map do |bottom_most_block|
+          playfield_column = @column + bottom_most_block[:column_index]
+          [playfield_remaining_heights[playfield_column] - (bottom_most_block[:row_index] + 1), bottom_most_block]
+        end.min_by(&:first)
+      end
+      
       def default_blocks
         case @letter
         when :I

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

@@ -26,14 +26,42 @@ class Tetris
   
       options :game_playfield, :block_size, :row, :column
   
+      before_body {
+        @bevel_constant = 20
+      }
+  
       body {
-        composite {
+        canvas {
           layout nil
           background bind(game_playfield[row][column], :color)
-          # TODO improve shapes to have a bevel look
-          rectangle(0, 0, block_size, block_size)
-          rectangle(3, 3, block_size - 6, block_size - 6) {
-            foreground :gray
+          polygon(0, 0, block_size, 0, block_size - 4, 4, 4, 4, fill: true) {
+            background bind(game_playfield[row][column], :color) { |color_value|
+              color = color(color_value)
+              rgb(color.red + 4*@bevel_constant, color.green + 4*@bevel_constant, color.blue + 4*@bevel_constant)
+            }
+          }
+          polygon(block_size, 0, block_size - 4, 4, block_size - 4, block_size - 4, block_size, block_size, fill: true) {
+            background bind(game_playfield[row][column], :color) { |color_value|
+              color = color(color_value)
+              rgb(color.red - @bevel_constant, color.green - @bevel_constant, color.blue - @bevel_constant)
+            }
+          }
+          polygon(block_size, block_size, 0, block_size, 4, block_size - 4, block_size - 4, block_size - 4, fill: true) {
+            background bind(game_playfield[row][column], :color) { |color_value|
+              color = color(color_value)
+              rgb(color.red - 2*@bevel_constant, color.green - 2*@bevel_constant, color.blue - 2*@bevel_constant)
+            }
+          }
+          polygon(0, 0, 0, block_size, 4, block_size - 4, 4, 4, fill: true) {
+            background bind(game_playfield[row][column], :color) { |color_value|
+              color = color(color_value)
+              rgb(color.red - @bevel_constant, color.green - @bevel_constant, color.blue - @bevel_constant)
+            }
+          }
+          rectangle(0, 0, block_size, block_size) {
+            foreground bind(game_playfield[row][column], :color) { |color_value|
+              color_value == Model::Block::COLOR_CLEAR ? :gray : color_value
+            }
           }
         }
       }

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

@@ -0,0 +1,133 @@
+# 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 'tetris_menu_bar'
+
+class Tetris
+  module View
+    class HighScoreDialog
+      include Glimmer::UI::CustomShell
+  
+      options :parent_shell, :game
+      
+      after_body {
+        @game_over_observer = observe(game, :game_over) do |game_over|
+          close if !game_over
+        end
+      }
+      
+      body {
+        dialog(parent_shell) {
+          row_layout {
+            type :vertical
+            center true
+          }
+          text 'Tetris'
+          
+          tetris_menu_bar(game: game)
+          
+          label(:center) {
+            text bind(game, :game_over) {|game_over| game_over ? 'Game Over!' : 'High Scores'}
+            font name: FONT_NAME, height: FONT_TITLE_HEIGHT, style: FONT_TITLE_STYLE
+          }
+          @high_score_table = table {
+            layout_data {
+              height 100
+            }
+            
+            table_column {
+              text 'Name'
+            }
+            table_column {
+              text 'Score'
+            }
+            table_column {
+              text 'Lines'
+            }
+            table_column {
+              text 'Level'
+            }
+            
+            items bind(game, :high_scores, read_only_sort: true), column_properties(:name, :score, :lines, :level)
+          }
+          composite {
+            row_layout :horizontal
+                        
+            button {
+              text 'Clear'
+              
+              on_widget_selected {
+                game.clear_high_scores!
+              }
+            }
+            @play_close_button = button {
+              text bind(game, :game_over) {|game_over| game_over ? 'Play Again?' : 'Close'}
+              focus true # initial focus
+              
+              on_widget_selected {
+                async_exec { close }
+                game.paused = @game_paused
+                game.restart! if game.game_over?
+              }
+            }
+          }
+          
+          on_swt_show {
+            @game_paused = game.paused?
+            game.paused = true
+            if game.game_over? && game.added_high_score?
+              game.added_high_score = false
+              game.save_high_scores!
+              @high_score_table.edit_table_item(
+                @high_score_table.items.first, # row item
+                0, # column
+                after_write: -> {
+                  game.save_high_scores!
+                  @play_close_button.set_focus
+                },
+                after_cancel: -> {
+                  @play_close_button.set_focus
+                },
+              )
+            end
+          }
+          
+          on_shell_closed {
+            # guard is needed because there is an observer in Tetris closing on
+            # game.show_high_scores change, which gets set below
+            unless @closing
+              @closing = true
+              @high_score_table.cancel_edit!
+              game.paused = @game_paused
+              game.show_high_scores = false
+            else
+              @closing = false
+            end
+          }
+          
+          on_widget_disposed {
+            @game_over_observer.deregister
+          }
+        }
+      }
+    end
+  end
+end

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

@@ -29,7 +29,7 @@ class Tetris
       options :game_playfield, :playfield_width, :playfield_height, :block_size
   
       body {
-        composite {
+        canvas {
           grid_layout {
             num_columns playfield_width
             make_columns_equal_width true

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

@@ -27,11 +27,11 @@ class Tetris
     class ScoreLane
       include Glimmer::UI::CustomWidget
   
-      options :block_size
+      options :block_size, :game
       
       before_body {
-        @font_name = 'Menlo'
-        @font_height = 32
+        @font_name = FONT_NAME
+        @font_height = FONT_TITLE_HEIGHT
       }
   
       body {
@@ -46,16 +46,16 @@ class Tetris
           }
           label(:center) {
             text 'Next'
-            font name: @font_name, height: @font_height, style: :bold
+            font name: @font_name, height: @font_height, style: FONT_TITLE_STYLE
           }
-          playfield(game_playfield: Model::Game.preview_playfield, playfield_width: PREVIEW_PLAYFIELD_WIDTH, playfield_height: PREVIEW_PLAYFIELD_HEIGHT, block_size: BLOCK_SIZE)
+          playfield(game_playfield: game.preview_playfield, playfield_width: Model::Game::PREVIEW_PLAYFIELD_WIDTH, playfield_height: Model::Game::PREVIEW_PLAYFIELD_HEIGHT, block_size: block_size)
 
           label(:center) {
             text 'Score'
-            font name: @font_name, height: @font_height, style: :bold
+            font name: @font_name, height: @font_height, style: FONT_TITLE_STYLE
           }
           label(:center) {
-            text bind(Model::Game, :score)
+            text bind(game, :score)
             font height: @font_height
           }
           
@@ -63,10 +63,10 @@ class Tetris
           
           label(:center) {
             text 'Lines'
-            font name: @font_name, height: @font_height, style: :bold
+            font name: @font_name, height: @font_height, style: FONT_TITLE_STYLE
           }
           label(:center) {
-            text bind(Model::Game, :lines)
+            text bind(game, :lines)
             font height: @font_height
           }
           
@@ -74,10 +74,10 @@ class Tetris
           
           label(:center) {
             text 'Level'
-            font name: @font_name, height: @font_height, style: :bold
+            font name: @font_name, height: @font_height, style: FONT_TITLE_STYLE
           }
           label(:center) {
-            text bind(Model::Game, :level)
+            text bind(game, :level)
             font height: @font_height
           }
         }