dl-tetris 0.0.1 → 0.0.2

data/README.markdown

@@ -9,6 +9,15 @@ Arrow keys move, up arrow rotates and space drops your piece.
 
 ![Tetris Screenshot 1](http://kzar.co.uk/images/tetris.png)
 
+Installation
+------------
+
+`gem install dl-tetris`
+
+`dl-tetris`
+
+(Checkout [Rubygems.org](https://rubygems.org/gems/dl-tetris) for more info.)
+
 Notes
 -----
 

data/bin/dl-tetris

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+# A hack but it was deemed impossible: http://bit.ly/eBKJIu 
+`rsdl #{File.dirname(__FILE__)}/boot.rb`

data/bin/tetris~

@@ -1,2 +1 @@
-#!/usr/bin/env rsdl
-load boot.rb
+%x[rsdl $PWD/boot.rb]

data/lib/tetris/game.rb

@@ -1,7 +1,7 @@
 class Game
   def initialize(w, h, speed, font_file)
     # Setup rubygame stuff
-    @screen = Rubygame::Screen.new([w * $TileSize, h * $TileSize], 0,
+    @screen = Rubygame::Screen.new([w * $TileSize, h * $TileSize], 0, 
                                    [Rubygame::HWSURFACE, Rubygame::DOUBLEBUF])
     @queue = Rubygame::EventQueue.new
     @clock = Rubygame::Clock.new
@@ -18,14 +18,14 @@ class Game
     @step = 0
     @score = 0
   end
-
+  
   def run
     loop do
       update(@clock.tick)
       draw
     end
   end
-
+  
   def update(time_delta)
     # Process the event queue
     @queue.each do |ev|
@@ -45,7 +45,7 @@ class Game
         end
       when Rubygame::QuitEvent
         Rubygame.quit
-        exit
+        exit        
       end
     end
     # Update the game state
@@ -57,7 +57,7 @@ class Game
     @piece.update(@map) {|x, y, colour| @map.set(x, y, colour)}
     @score += @map.update
   end
-
+  
   def draw_square(x, y, colour, border=true)
     # Setup the points for SDL
     x_pos = x * $TileSize
@@ -68,12 +68,15 @@ class Game
     @screen.draw_box_s(pt1, pt2, colour)
     @screen.draw_box(pt1, pt2, :black) if border
   end
-
+  
   def draw
     @screen.fill(@background)
-    @piece.squares {|x, y, colour| draw_square(x, y, colour)}
-    @map.draw {|coords, colour| draw_square(coords[0], coords[1], colour)}
+    
+    draw_squares = lambda {|x, y, colour| draw_square(x, y, colour)}
+    @piece.squares.each &draw_squares
+    @map.squares.each &draw_squares
+
     @ttf.render("Score: " + @score.to_s, true, :black).blit(@screen, [0,0])
     @screen.flip
   end
-end
+end

data/lib/tetris/game.rb~

@@ -0,0 +1,79 @@
+class Game
+  def initialize(w, h, speed, font_file)
+    # Setup rubygame stuff
+    @screen = Rubygame::Screen.new([w * $TileSize, h * $TileSize], 0,
+                                   [Rubygame::HWSURFACE, Rubygame::DOUBLEBUF])
+    @queue = Rubygame::EventQueue.new
+    @clock = Rubygame::Clock.new
+    @clock.target_framerate = 30
+    Rubygame::TTF.setup
+    @ttf = Rubygame::TTF.new(font_file, 20)
+
+    # Setup the game of tetris
+    @screen.title = "Tetris"
+    @map = Map.new(w, h)
+    @piece = Piece.new
+    @background = :white
+    @speed = speed
+    @step = 0
+    @score = 0
+  end
+
+  def run
+    loop do
+      update(@clock.tick)
+      draw
+    end
+  end
+
+  def update(time_delta)
+    # Process the event queue
+    @queue.each do |ev|
+      case ev
+      when Rubygame::KeyDownEvent
+        case(ev.key)
+        when Rubygame::K_LEFT
+          @piece.move(-1, 0, @map)
+        when Rubygame::K_RIGHT
+          @piece.move(1, 0, @map)
+        when Rubygame::K_DOWN
+          @piece.move(0, 1, @map)
+        when Rubygame::K_UP
+          @piece.rotate(@map)
+        when Rubygame::K_SPACE
+          @piece.drop(@map)
+        end
+      when Rubygame::QuitEvent
+        Rubygame.quit
+        exit
+      end
+    end
+    # Update the game state
+    @step += time_delta
+    if @step > @speed
+      @step -= @speed
+      @piece.move(0, 1, @map)
+    end
+    @piece.update(@map) {|x, y, colour| @map.set(x, y, colour)}
+    @score += @map.update
+  end
+
+  def draw_square(x, y, colour, border=true)
+    # Setup the points for SDL
+    x_pos = x * $TileSize
+    y_pos = y * $TileSize
+    pt1 = [x_pos, y_pos]
+    pt2 = [x_pos + $TileSize, y_pos + $TileSize]
+    # Draw the square and then the border
+    @screen.draw_box_s(pt1, pt2, colour)
+    @screen.draw_box(pt1, pt2, :black) if border
+  end
+
+  def draw
+    @screen.fill(@background)
+    @piece.squares {|x, y, colour| draw_square(x, y, colour)}
+    @map.draw {|coords, colour| draw_square(coords[0], coords[1], colour)}
+    @ttf.render("Score: " + @score.to_s, true, :black).blit(@screen, [0,0])
+    @screen.flip
+  end
+end

data/lib/tetris/map.rb

@@ -2,67 +2,46 @@ class Map
   def initialize(w, h)
     @w = w
     @h = h
-    @tiles = Array.new(w, nil)
-  end
-
-  def clear(x, y, w, h)
-    (x..(x + w)).each do |x|
-      (y..(y + h)).each do |y|
-        set(x, y, nil)
-      end
-    end
+    @tiles = Array.new(h) {Array.new(w, nil)}
   end
 
   def set(x, y, colour)
-    @tiles[pos(x,y)] = colour
-  end
-
-  def draw
-    @tiles.each_with_index do |colour, p|
-      yield(coords(p), colour) if colour
+    @tiles[y][x] = colour
+  end
+  
+  def squares
+    Enumerator.new do |yielder|
+      @tiles.each_with_index do |line, y|
+        line.each_with_index do |colour, x|
+          yielder.yield(x, y, colour) if colour
+        end
+      end
     end
   end
 
   def free?(x, y)
-    x >= 0 and x < @w and y >= 0 and y < @h and not @tiles[pos(x,y)]
+    x >= 0 and x < @w and y >= 0 and y < @h and not @tiles[y][x]
   end
 
   def update
     points = 0
-    shift_lines! do |line|
-      # Enumerable should have an every? method
-      if not line.each.any? {|tile| not tile} then
-        points += 1
-        true
-      end
-    end
+    shift_lines! {|line| points += 1 if line.all?}
     points
   end
 
   private
 
-  def coords(p)
-    [p % @w, p / @w]
-  end
-
-  def pos(x, y)
-    x + y * @w
-  end
-
   def shift_lines!
-    (0..@h).each do |y|
-      row = (0..@w-1).collect {|x| @tiles[pos(x,y-1)] }
-      shift_line(y-1, 1) if yield row
-    end
-  end
-
-  def shift_line(y, distance)
-    if y < 1 then
-      @tiles[pos(0,y + distance)..pos(@w-1,y + distance)] = [nil] * @w
-    else
-      @tiles[pos(0,y)..pos(@w-1,y)] =
-        @tiles[pos(0,y-distance)..pos(@w-1,y-distance)]
-      shift_line(y-1, distance)
+    @tiles.each_with_index {|line, y| shift_line(y) if yield line}
+  end
+  
+  def shift_line(y)
+    case y
+      when 0
+      @tiles[y].fill(nil)
+      when 1..@h
+      @tiles[y] = @tiles[y - 1]
+      shift_line(y - 1)
     end
   end
-end
+end

data/lib/tetris/map.rb~

@@ -0,0 +1,68 @@
+class Map
+  def initialize(w, h)
+    @w = w
+    @h = h
+    @tiles = Array.new(w, nil)
+  end
+
+  def clear(x, y, w, h)
+    (x..(x + w)).each do |x|
+      (y..(y + h)).each do |y|
+        set(x, y, nil)
+      end
+    end
+  end
+
+  def set(x, y, colour)
+    @tiles[pos(x,y)] = colour
+  end
+
+  def draw
+    @tiles.each_with_index do |colour, p|
+      yield(coords(p), colour) if colour
+    end
+  end
+
+  def free?(x, y)
+    x >= 0 and x < @w and y >= 0 and y < @h and not @tiles[pos(x,y)]
+  end
+
+  def update
+    points = 0
+    shift_lines! do |line|
+      # Enumerable should have an every? method
+      if not line.each.any? {|tile| not tile} then
+        points += 1
+        true
+      end
+    end
+    points
+  end
+
+  private
+
+  def coords(p)
+    [p % @w, p / @w]
+  end
+
+  def pos(x, y)
+    x + y * @w
+  end
+
+  def shift_lines!
+    (0..@h).each do |y|
+      row = (0..@w-1).collect {|x| @tiles[pos(x,y-1)] }
+      shift_line(y-1, 1) if yield row
+    end
+  end
+
+  def shift_line(y, distance)
+    if y < 1 then
+      @tiles[pos(0,y + distance)..pos(@w-1,y + distance)] = [nil] * @w
+    else
+      @tiles[pos(0,y)..pos(@w-1,y)] =
+        @tiles[pos(0,y-distance)..pos(@w-1,y-distance)]
+      shift_line(y-1, distance)
+    end
+  end
+end

data/lib/tetris/piece.rb

@@ -11,29 +11,13 @@ class Piece
     @colour = $Colours.rand_item
   end
 
-  def parse_piece_string(s)
-    s.chars.each_with_object([]) do |c, result|
-      case c
-        when " " then result << false
-        when "," then next
-        else result << true
-      end
-    end
-  end
-
-  def load_pieces(pieces)
-    pieces.collect do |piece|
-      piece.collect {|rotation| parse_piece_string rotation}
-    end
-  end
-
   def squares(piece=current)
-    result = []
-    piece.each_with_index do |tile, i|
-      x, y = coords(i)
-      result << yield(@x+x, @y+y, @colour) if tile
+    Enumerator.new do |yielder|
+      piece.each_with_index do |tile, i|
+        x, y = coords(i)
+        yielder.yield(@x+x, @y+y, @colour) if tile
+      end
     end
-    return result
   end
 
   def move(x, y, map)
@@ -53,13 +37,29 @@ class Piece
 
   def update(map)
     if collision?(map, 0, 1)
-      squares {|x, y, colour| map.set(x, y, colour)}
+      squares.each {|x, y, colour| map.set(x, y, colour)}
       initialize
     end
   end
 
   private
 
+  def parse_piece_string(s)
+    s.chars.each_with_object([]) do |c, result|
+      case c
+        when " " then result << false
+        when "," then next
+        else result << true
+      end
+    end
+  end
+
+  def load_pieces(pieces)
+    pieces.collect do |piece|
+      piece.collect {|rotation| parse_piece_string rotation}
+    end
+  end
+
   def current
     @type[@rotation]
   end
@@ -77,6 +77,6 @@ class Piece
   end
 
   def collision?(map, x_offset, y_offset, piece=current)
-    squares(piece) {|x, y, c| not map.free?(x + x_offset, y + y_offset)}.any?
+    squares(piece).any? {|x, y, c| not map.free?(x + x_offset, y + y_offset)}
   end
-end
+end

data/lib/tetris/piece.rb~

@@ -0,0 +1,82 @@
+class Piece
+  @@type_width = 4
+
+  def initialize
+    @@types ||= load_pieces($Pieces)
+
+    @type = @@types.rand_item
+    @rotation = 0
+    @x = 0
+    @y = 0
+    @colour = $Colours.rand_item
+  end
+
+  def parse_piece_string(s)
+    s.chars.each_with_object([]) do |c, result|
+      case c
+        when " " then result << false
+        when "," then next
+        else result << true
+      end
+    end
+  end
+
+  def load_pieces(pieces)
+    pieces.collect do |piece|
+      piece.collect {|rotation| parse_piece_string rotation}
+    end
+  end
+
+  def squares(piece=current)
+    result = []
+    piece.each_with_index do |tile, i|
+      x, y = coords(i)
+      result << yield(@x+x, @y+y, @colour) if tile
+    end
+    return result
+  end
+
+  def move(x, y, map)
+    unless collision?(map, x, y)
+      @x += x
+      @y += y
+    end
+  end
+
+  def drop(map)
+    @y += 1 while not collision?(map, 0, 1)
+  end
+
+  def rotate(map)
+    @rotation = next_rotation unless collision?(map, 0, 0, @type[next_rotation])
+  end
+
+  def update(map)
+    if collision?(map, 0, 1)
+      squares {|x, y, colour| map.set(x, y, colour)}
+      initialize
+    end
+  end
+
+  private
+
+  def current
+    @type[@rotation]
+  end
+
+  def next_rotation
+    if @rotation > @type.count - 2
+      return 0
+    else
+      return @rotation + 1
+    end
+  end
+
+  def coords(p)
+    [p % @@type_width, p / @@type_width]
+  end
+
+  def collision?(map, x_offset, y_offset, piece=current)
+    squares(piece) {|x, y, c| not map.free?(x + x_offset, y + y_offset)}.any?
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Dave Barker
@@ -52,7 +52,7 @@ description: Simple tetris clone written using the rubygame library. Arrow keys
 email: 
 - kzar@kzar.co.uk
 executables: 
-- tetris
+- dl-tetris
 extensions: []
 
 extra_rdoc_files: []
@@ -60,12 +60,15 @@ extra_rdoc_files: []
 files: 
 - bin/boot.rb
 - bin/boot.rb~
-- bin/tetris
+- bin/dl-tetris
 - bin/tetris~
 - lib/tetris/core_ruby_ext.rb
 - lib/tetris/game.rb
+- lib/tetris/game.rb~
 - lib/tetris/map.rb
+- lib/tetris/map.rb~
 - lib/tetris/piece.rb
+- lib/tetris/piece.rb~
 - lib/tetris.rb
 - test/game_test.rb
 - test/test_helper.rb

data/bin/tetris

@@ -1,2 +0,0 @@
-#!/usr/bin/env rsdl
-load "boot.rb"