glimmer-dsl-gtk 0.0.2 → 0.0.6

data/samples/elaborate/tetris.rb

@@ -0,0 +1,338 @@
+require 'glimmer-dsl-gtk'
+
+require_relative 'tetris/model/game'
+
+class Tetris
+  include Glimmer
+  
+  BLOCK_SIZE = 25
+  BEVEL_CONSTANT = 20
+  COLOR_GRAY = [192, 192, 192]
+    
+  def initialize
+    @game = Model::Game.new
+  end
+  
+  def launch
+    create_gui
+    register_observers
+    @game.start!
+    @main_window.show
+  end
+  
+  def create_gui
+    @main_window = window {
+      title 'Glimmer Tetris'
+      default_size Model::Game::PLAYFIELD_WIDTH * BLOCK_SIZE, Model::Game::PLAYFIELD_HEIGHT * BLOCK_SIZE # + 98
+      
+      box(:vertical) {
+        tetris_menu_bar
+
+        box(:horizontal) {
+          @playfield_blocks = playfield(playfield_width: @game.playfield_width, playfield_height: @game.playfield_height, block_size: BLOCK_SIZE)
+          
+          score_board
+        }
+        
+      }
+      
+      on(:key_press_event) do |widget, key_event|
+        case key_event.keyval
+        when 65364 # down arrow
+          @game.down!
+        when 32 # space
+          @game.down!(instant: true)
+        when 65362 # up arrow
+          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
+        when 65361 # left arrow
+          @game.left!
+        when 65363 # right arrow
+          @game.right!
+        when 65506 # right shift
+          @game.rotate!(:right)
+        when 65505 # left shift
+          @game.rotate!(:left)
+        else
+          # Do Nothing
+        end
+      end
+    }
+  end
+  
+  def register_observers
+    observe(@game, :game_over) do |game_over|
+      if game_over
+        show_game_over_dialog
+      else
+        start_moving_tetrominos_down
+      end
+    end
+    
+    @game.playfield_height.times do |row|
+      @game.playfield_width.times do |column|
+        observe(@game.playfield[row][column], :color) do |new_color|
+          color = new_color
+          block = @playfield_blocks[row][column]
+          block[:background_square].fill = color
+          block[:top_bevel_edge].fill = [color[0] + 4*BEVEL_CONSTANT, color[1] + 4*BEVEL_CONSTANT, color[2] + 4*BEVEL_CONSTANT]
+          block[:right_bevel_edge].fill = [color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT]
+          block[:bottom_bevel_edge].fill = [color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT]
+          block[:left_bevel_edge].fill = [color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT]
+          block[:border_square].stroke = new_color == Model::Block::COLOR_CLEAR ? COLOR_GRAY : color
+          block[:drawing_area].queue_draw
+          false
+        end
+      end
+    end
+    
+    Model::Game::PREVIEW_PLAYFIELD_HEIGHT.times do |row|
+      Model::Game::PREVIEW_PLAYFIELD_WIDTH.times do |column|
+        observe(@game.preview_playfield[row][column], :color) do |new_color|
+          color = new_color
+          block = @preview_playfield_blocks[row][column]
+          block[:background_square].fill = color
+          block[:top_bevel_edge].fill = [color[0] + 4*BEVEL_CONSTANT, color[1] + 4*BEVEL_CONSTANT, color[2] + 4*BEVEL_CONSTANT]
+          block[:right_bevel_edge].fill = [color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT]
+          block[:bottom_bevel_edge].fill = [color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT]
+          block[:left_bevel_edge].fill = [color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT]
+          block[:border_square].stroke = new_color == Model::Block::COLOR_CLEAR ? COLOR_GRAY : color
+          block[:drawing_area].queue_draw
+        end
+      end
+    end
+    
+    observe(@game, :score) do |new_score|
+      @score_label.text = new_score.to_s
+    end
+
+    observe(@game, :lines) do |new_lines|
+      @lines_label.text = new_lines.to_s
+    end
+
+    observe(@game, :level) do |new_level|
+      @level_label.text = new_level.to_s
+    end
+  end
+  
+  def tetris_menu_bar
+    menu_bar {
+      menu_item(label: 'Game') { |mi|
+        m = menu {
+          check_menu_item(label: 'Pause') {
+            on(:activate) do
+              @game.paused = !@game.paused?
+            end
+          }
+          
+          menu_item(label: 'Restart') {
+            on(:activate) do
+              @game.restart!
+            end
+          }
+          
+          separator_menu_item
+          
+          menu_item(label: 'Exit') {
+            on(:activate) do
+              @main_window.close
+            end
+          }
+        }
+        mi.submenu = m.gtk
+      }
+      
+      menu_item(label: 'View') { |mi|
+        m = menu {
+          menu_item(label: 'Show High Scores') {
+            on(:activate) do
+              show_high_score_dialog
+            end
+          }
+          
+          menu_item(label: 'Clear High Scores') {
+            on(:activate) do
+              @game.clear_high_scores!
+            end
+          }
+        }
+        mi.submenu = m.gtk
+      }
+      
+      menu_item(label: 'Options') { |mi|
+        m = menu {
+          rmi = radio_menu_item(nil, 'Instant Down on Up') {
+            on(:activate) do
+              @game.instant_down_on_up!
+            end
+          }
+          
+          default_rmi = radio_menu_item(rmi.group, 'Rotate Right on Up') {
+            on(:activate) do
+              @game.rotate_right_on_up!
+            end
+          }
+          default_rmi.activate
+          
+          radio_menu_item(rmi.group, 'Rotate Left on Up') {
+            on(:activate) do
+              @game.rotate_left_on_up!
+            end
+          }
+        }
+        mi.submenu = m.gtk
+      }
+      
+      menu_item(label: 'Options') { |mi|
+        m = menu {
+          menu_item(label: 'About') {
+            on(:activate) do
+              show_about_dialog
+            end
+          }
+        }
+        mi.submenu = m.gtk
+      }
+    }
+  end
+  
+  def score_board
+    box(:vertical) {
+      label
+      @preview_playfield_blocks = playfield(playfield_width: Model::Game::PREVIEW_PLAYFIELD_WIDTH, playfield_height: Model::Game::PREVIEW_PLAYFIELD_HEIGHT, block_size: BLOCK_SIZE)
+      
+      label
+      label('Score')
+      @score_label = label
+
+      label
+      label('Lines')
+      @lines_label = label
+
+      label
+      label('Level')
+      @level_label = label
+      label
+    }
+  end
+  
+  def playfield(playfield_width: , playfield_height: , block_size: , &extra_content)
+    blocks = []
+    box(:vertical) {
+      playfield_height.times.map do |row|
+        blocks << []
+        box(:horizontal) {
+          playfield_width.times.map do |column|
+            blocks.last << block(row: row, column: column, block_size: block_size)
+          end
+        }
+      end
+      
+      extra_content&.call
+    }
+    blocks
+  end
+  
+  def block(row: , column: , block_size: , &extra_content)
+    block = {}
+    bevel_pixel_size = 0.16 * block_size.to_f
+    color = Model::Block::COLOR_CLEAR
+    block[:drawing_area] = drawing_area {
+      size_request block_size, block_size
+      
+      block[:background_square] = square(0, 0, block_size) {
+        fill *color
+      }
+      
+      block[:top_bevel_edge] = polygon(0, 0, block_size, 0, block_size - bevel_pixel_size, bevel_pixel_size, bevel_pixel_size, bevel_pixel_size) {
+        fill color[0] + 4*BEVEL_CONSTANT, color[1] + 4*BEVEL_CONSTANT, color[2] + 4*BEVEL_CONSTANT
+      }
+       
+      block[:right_bevel_edge] = 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 color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT
+      }
+       
+      block[:bottom_bevel_edge] = 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 color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT
+      }
+      
+      block[:left_bevel_edge] = polygon(0, 0, 0, block_size, bevel_pixel_size, block_size - bevel_pixel_size, bevel_pixel_size, bevel_pixel_size) {
+        fill color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT
+      }
+      
+      block[:border_square] = square(0, 0, block_size) {
+        stroke *COLOR_GRAY
+      }
+      
+      extra_content&.call
+    }
+    block
+  end
+  
+  def start_moving_tetrominos_down
+    unless @tetrominos_start_moving_down
+      @tetrominos_start_moving_down = true
+      GLib::Timeout.add(@game.delay*1000) do
+        @game.down! if !@game.game_over? && !@game.paused?
+        true
+      end
+    end
+  end
+  
+  def show_game_over_dialog
+    message_dialog(@main_window) { |md|
+      title 'Game Over!'
+      text "Score: #{@game.high_scores.first.score}\nLines: #{@game.high_scores.first.lines}\nLevel: #{@game.high_scores.first.level}"
+      
+      on(:response) do
+        md.destroy
+      end
+    }.show
+    
+    @game.restart!
+    false
+  end
+  
+  def show_high_score_dialog
+    game_paused = !!@game.paused
+    @game.paused = true
+    
+    if @game.high_scores.empty?
+      high_scores_string = "No games have been scored yet."
+    else
+      high_scores_string = @game.high_scores.map do |high_score|
+        "#{high_score.name} | Score: #{high_score.score} | Lines: #{high_score.lines} | Level: #{high_score.level}"
+      end.join("\n")
+    end
+    
+    message_dialog(@main_window) { |md|
+      title 'High Scores'
+      text high_scores_string
+      
+      on(:response) do
+        md.destroy
+      end
+    }.show
+    
+    @game.paused = game_paused
+  end
+  
+  def show_about_dialog
+    message_dialog(@main_window) { |md|
+      title 'About'
+      text "Glimmer Tetris\n\nGlimmer DSL for GTK\n\nElaborate Sample\n\nCopyright (c) 2021-2022 Andy Maleh"
+      
+      on(:response) do
+        md.destroy
+      end
+    }.show
+  end
+end
+
+Tetris.new.launch

data/samples/hello/hello_drawing_area.rb

@@ -7,9 +7,7 @@ window {
   default_size 400, 400
   
   drawing_area {
-    rectangle(0, 0, 400, 400) {
-      fill 255, 255, 255
-    }
+    paint 255, 255, 255
     
     arc(85, 85, 45, (Math::PI/180)*90, -(Math::PI/180)*90) {
       fill 255, 0, 0

data/samples/hello/hello_drawing_area_manual.rb

@@ -8,61 +8,60 @@ window {
   
   drawing_area {
     on(:draw) do |drawing_area_widget, cairo_context|
-      cairo_context.rectangle(0, 0, 400, 400)
-      cairo_context.set_source_rgb(255, 255, 255)
-      cairo_context.fill
+      cairo_context.set_source_rgb(255/255.0, 255/255.0, 255/255.0)
+      cairo_context.paint
       
       cairo_context.arc(85, 85, 45, (Math::PI/180)*90, -(Math::PI/180)*90)
       cairo_context.set_source_rgb(255, 0, 0)
       cairo_context.fill
       
       cairo_context.arc(85, 85, 45, (Math::PI/180)*90, -(Math::PI/180)*90)
-      cairo_context.set_source_rgb(0, 128, 255)
+      cairo_context.set_source_rgb(0, 128/255.0, 255/255.0)
       cairo_context.set_line_width(3)
       cairo_context.stroke
 
       cairo_context.arc(85, 185, 45, (Math::PI/180)*100, -(Math::PI/180)*30)
-      cairo_context.set_source_rgb(255, 0, 0)
+      cairo_context.set_source_rgb(255/255.0, 0, 0)
       cairo_context.fill
       
       cairo_context.arc(85, 185, 45, (Math::PI/180)*100, -(Math::PI/180)*30)
-      cairo_context.set_source_rgb(0, 128, 255)
+      cairo_context.set_source_rgb(0, 128/255.0, 255/255.0)
       cairo_context.set_line_width(3)
       cairo_context.stroke
       
       cairo_context.circle(85, 285, 45)
-      cairo_context.set_source_rgb(255, 0, 0)
+      cairo_context.set_source_rgb(255/255.0, 0, 0)
       cairo_context.fill
       
       cairo_context.circle(85, 285, 45)
-      cairo_context.set_source_rgb(0, 128, 255)
+      cairo_context.set_source_rgb(0, 128/255.0, 255/255.0)
       cairo_context.set_line_width(3)
       cairo_context.stroke
       
       cairo_context.rectangle(140, 40, 180, 90)
-      cairo_context.set_source_rgb(255, 255, 0)
+      cairo_context.set_source_rgb(255/255.0, 255/255.0, 0)
       cairo_context.fill
       
       cairo_context.rectangle(140, 40, 180, 90)
-      cairo_context.set_source_rgb(255, 0, 0)
+      cairo_context.set_source_rgb(255/255.0, 0, 0)
       cairo_context.set_line_width(3)
       cairo_context.stroke
       
       cairo_context.rounded_rectangle(140, 140, 180, 90, 30, 20)
-      cairo_context.set_source_rgb(255, 255, 0)
+      cairo_context.set_source_rgb(255/255.0, 255/255.0, 0)
       cairo_context.fill
       
       cairo_context.rounded_rectangle(140, 140, 180, 90, 30, 20)
-      cairo_context.set_source_rgb(255, 0, 0)
+      cairo_context.set_source_rgb(255/255.0, 0, 0)
       cairo_context.set_line_width(3)
       cairo_context.stroke
       
       cairo_context.triangle(140, 240, 320, 240, 230, 330)
-      cairo_context.set_source_rgb(255, 255, 0)
+      cairo_context.set_source_rgb(255/255.0, 255/255.0, 0)
       cairo_context.fill
       
       cairo_context.triangle(140, 240, 320, 240, 230, 330)
-      cairo_context.set_source_rgb(255, 0, 0)
+      cairo_context.set_source_rgb(255/255.0, 0, 0)
       cairo_context.set_line_width(3)
       cairo_context.stroke
       
@@ -71,7 +70,7 @@ window {
       cairo_context.curve_to 190, 60, 200, 80, 210, 70
       cairo_context.curve_to 240, 80, 250, 100, 260, 90
       cairo_context.curve_to 290, 90, 300, 110, 310, 100
-      cairo_context.set_source_rgb(0, 255, 0)
+      cairo_context.set_source_rgb(0, 255/255.0, 0)
       cairo_context.fill
       
       cairo_context.new_path
@@ -79,7 +78,7 @@ window {
       cairo_context.curve_to 190, 60, 200, 80, 210, 70
       cairo_context.curve_to 240, 80, 250, 100, 260, 90
       cairo_context.curve_to 290, 90, 300, 110, 310, 100
-      cairo_context.set_source_rgb(0, 0, 255)
+      cairo_context.set_source_rgb(0, 0, 255/255.0)
       cairo_context.stroke
       
       cairo_context.new_path
@@ -90,7 +89,7 @@ window {
       cairo_context.line_to 200, 200
       cairo_context.line_to 180, 170
       cairo_context.close_path
-      cairo_context.set_source_rgb(0, 255, 0)
+      cairo_context.set_source_rgb(0, 255/255.0, 0)
       cairo_context.fill
       
       cairo_context.new_path
@@ -101,7 +100,7 @@ window {
       cairo_context.line_to 200, 200
       cairo_context.line_to 180, 170
       cairo_context.close_path
-      cairo_context.set_source_rgb(0, 0, 255)
+      cairo_context.set_source_rgb(0, 0, 255/255.0)
       cairo_context.stroke
       
       cairo_context.new_path
@@ -112,7 +111,7 @@ window {
       cairo_context.line_to 200, 280
       cairo_context.line_to 180, 270
       cairo_context.close_path
-      cairo_context.set_source_rgb(0, 255, 0)
+      cairo_context.set_source_rgb(0, 255/255.0, 0)
       cairo_context.fill
       
       cairo_context.new_path
@@ -123,7 +122,7 @@ window {
       cairo_context.line_to 200, 280
       cairo_context.line_to 180, 270
       cairo_context.close_path
-      cairo_context.set_source_rgb(0, 0, 255)
+      cairo_context.set_source_rgb(0, 0, 255/255.0)
       cairo_context.stroke
       
       cairo_context.new_path
@@ -133,7 +132,7 @@ window {
       cairo_context.line_to 220, 340
       cairo_context.line_to 200, 330
       cairo_context.line_to 180, 320
-      cairo_context.set_source_rgb(0, 0, 255)
+      cairo_context.set_source_rgb(0, 0, 255/255.0)
       cairo_context.stroke
     end
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-gtk
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -159,8 +159,10 @@ files:
 - bin/girb
 - bin/girb_runner.rb
 - glimmer-dsl-gtk.gemspec
+- images/breaking-blue-wave.png
 - lib/glimmer-dsl-gtk.rb
 - lib/glimmer/dsl/gtk/dsl.rb
+- lib/glimmer/dsl/gtk/observe_expression.rb
 - lib/glimmer/dsl/gtk/on_expression.rb
 - lib/glimmer/dsl/gtk/operation_expression.rb
 - lib/glimmer/dsl/gtk/property_expression.rb
@@ -169,19 +171,42 @@ files:
 - lib/glimmer/gtk.rb
 - lib/glimmer/gtk/shape.rb
 - lib/glimmer/gtk/shape/arc.rb
+- lib/glimmer/gtk/shape/arc_negative.rb
 - lib/glimmer/gtk/shape/circle.rb
 - lib/glimmer/gtk/shape/path.rb
 - lib/glimmer/gtk/shape/polygon.rb
 - lib/glimmer/gtk/shape/polyline.rb
 - lib/glimmer/gtk/shape/rectangle.rb
 - lib/glimmer/gtk/shape/rounded_rectangle.rb
+- lib/glimmer/gtk/shape/square.rb
 - lib/glimmer/gtk/shape/triangle.rb
+- lib/glimmer/gtk/transformable.rb
 - lib/glimmer/gtk/widget_proxy.rb
 - lib/glimmer/gtk/widget_proxy/application_proxy.rb
 - lib/glimmer/gtk/widget_proxy/box_proxy.rb
 - lib/glimmer/gtk/widget_proxy/drawing_area_proxy.rb
 - lib/glimmer/gtk/widget_proxy/message_dialog_proxy.rb
 - lib/glimmer/gtk/widget_proxy/window_proxy.rb
+- samples/cairo/arc.rb
+- samples/cairo/arc_negative.rb
+- samples/cairo/clip.rb
+- samples/cairo/clip_image.rb
+- samples/cairo/curve_to.rb
+- samples/cairo/dashes.rb
+- samples/cairo/fill_and_stroke2.rb
+- samples/cairo/fill_style.rb
+- samples/cairo/gradient.rb
+- samples/cairo/image.rb
+- samples/cairo/image_gradient.rb
+- samples/cairo/multi_segment_caps.rb
+- samples/cairo/rounded_rectangle.rb
+- samples/cairo/set_line_cap.rb
+- samples/cairo/set_line_join.rb
+- samples/elaborate/tetris.rb
+- samples/elaborate/tetris/model/block.rb
+- samples/elaborate/tetris/model/game.rb
+- samples/elaborate/tetris/model/past_game.rb
+- samples/elaborate/tetris/model/tetromino.rb
 - samples/elaborate/widget_gallery.rb
 - samples/hello/hello_application.rb
 - samples/hello/hello_button.rb