shoes 3.0.1 → 4.0.0.pre1

data/samples/expert-othello.rb

@@ -9,14 +9,14 @@ module Othello
 
   PIECE_WIDTH  = 62
   PIECE_HEIGHT = 62
-  TOP_OFFSET = 47
-  LEFT_OFFSET = 12
+  TOP_OFFSET   = 47
+  LEFT_OFFSET  = 12
 
   class Game
     BOARD_SIZE = [8,8]
 
     attr_accessor :p1, :p2, :board, :board_history
-        
+
     def initialize
       @board_history = []
       @p1            = Player.new(:black, pieces_per_player)
@@ -50,7 +50,7 @@ module Othello
         end
       end
     end
-    
+
     # Lay the initial 4 pieces in the middle
     def lay_initial_pieces
       lay_piece([4, 3], false)
@@ -62,7 +62,7 @@ module Othello
       lay_piece([4, 4], false)
       next_turn(false)
     end
-    
+
     def lay_piece(c=[0,0], check_adjacent_pieces=true)
       memorize_board
       piece = current_player.piece
@@ -86,17 +86,17 @@ module Othello
       current_winner = calculate_current_winner
       raise "Game over. Player #{current_winner.piece} wins with #{current_winner.pieces_on_board} pieces!" if @p1.pieces + @p2.pieces == 0
     end
-    
+
     def skip_turn?
       possibles = []
-      @board.each_with_index { |col,col_index| 
-        col.each_with_index { |cell,row_index| 
+      @board.each_with_index { |col,col_index|
+        col.each_with_index { |cell,row_index|
           return false if possible_move?([col_index,row_index])
-        } 
+        }
       }
       true
     end
-    
+
     def possible_move?(c=[0,0])
       return nil if board_at(c) != 0
       possible_moves = []
@@ -114,14 +114,14 @@ module Othello
       return nil if pieces_to_change.compact.all? { |a| a.empty? }
       true
     end
-    
+
     def memorize_board
       dup_board = new_board
       dup_board = []
       @board.each do |col|
         dup_board << col.dup
       end
-      @board_history << { :player => current_player, :board => dup_board }
+      @board_history << { player: current_player, board: dup_board }
     end
 
     def undo!
@@ -133,11 +133,11 @@ module Othello
 
     def calculate_current_winner
       @p1.pieces_on_board, @p2.pieces_on_board = 0, 0
-      @board.each { |row| 
+      @board.each { |row|
         row.each { |cell|
           if cell == 1
             @p1.pieces_on_board += 1
-          else 
+          else
             @p2.pieces_on_board += 1
           end
         }
@@ -164,7 +164,7 @@ module Othello
 
       pieces_in_between.empty? || c_last.nil? ? nil : pieces_in_between
     end
-    
+
     # Find the value of the board at the given coordinate.
     def board_at(c)
       @board[c[0]][c[1]]
@@ -186,7 +186,7 @@ module Othello
     def pieces_per_player
       total_squares / 2
     end
-    
+
     # The total number of squares
     def total_squares
       BOARD_SIZE[0] * BOARD_SIZE[1]
@@ -200,41 +200,41 @@ module Othello
         @pieces_on_board = 0 # used only in calculating winner
         @color = color
       end
-      
+
       def piece
         color == :black ? 1 : 2
       end
-      
+
       def opp_piece
         color == :black ? 2 : 1
       end
-    end 
+    end
   end
 
   def draw_player_1(first_turn=false)
-    stack :margin => 10 do
+    stack margin: 10 do
       if GAME.current_player==GAME.p1
         background yellow
-        para span("Player 1 (#{GAME.current_player.color}) turn", :stroke => black, :font => "Trebuchet 20px bold"), :margin => 4
+        para span("Player 1 (#{GAME.current_player.color}) turn", stroke: black, font: "Trebuchet 20px bold"), margin: 4
       else
         background white
-        para span("Player 1", :stroke => black, :font => "Trebuchet 10px bold"), :margin => 4
+        para span("Player 1", stroke: black, font: "Trebuchet 10px bold"), margin: 4
 
-        button("Undo last move", :top => 0, :left => -150) { GAME.undo!; draw_board } unless GAME.board_history.empty?
+        button("Undo last move", top: 0, left: -150) { GAME.undo!; draw_board } unless GAME.board_history.empty?
       end
     end
   end
 
   def draw_player_2(first_turn=false)
-    stack :top => 550, :left => 0, :margin => 10 do
-      if GAME.current_player==GAME.p2 
+    stack top: 550, left: 0, margin: 10 do
+      if GAME.current_player==GAME.p2
         background yellow
-        para span("Player 2's (#{GAME.current_player.color}) turn", :stroke => black, :font => "Trebuchet 20px bold"), :margin => 4
+        para span("Player 2's (#{GAME.current_player.color}) turn", stroke: black, font: "Trebuchet 20px bold"), margin: 4
       else
         background white
-        para span("Player 2", :stroke => black, :font => "Trebuchet 10px bold"), :margin => 4
+        para span("Player 2", stroke: black, font: "Trebuchet 10px bold"), margin: 4
 
-        button("Undo last move", :top => 0, :left => -150) { GAME.undo!; draw_board } unless GAME.board_history.empty?
+        button("Undo last move", top: 0, left: -150) { GAME.undo!; draw_board } unless GAME.board_history.empty?
       end
     end
   end
@@ -244,9 +244,9 @@ module Othello
     clear do
       background black
       draw_player_1
-      stack :margin => 10 do
+      stack margin: 10 do
         fill rgb(0, 190, 0)
-        rect :left => 0, :top => 0, :width => 495, :height => 495
+        rect left: 0, top: 0, width: 495, height: 495
 
         GAME.board.each_with_index do |col, col_index|
           col.each_with_index do |cell, row_index|
@@ -256,7 +256,7 @@ module Othello
             fill rgb(0, 440, 0, 90)
             strokewidth 1
             stroke rgb(0, 100, 0)
-            rect :left => left, :top => top, :width => PIECE_WIDTH, :height => PIECE_HEIGHT
+            rect left: left, top: top, width: PIECE_WIDTH, height: PIECE_HEIGHT
 
             if cell != 0
               strokewidth 0
@@ -282,26 +282,25 @@ module Othello
   end
 
   def find_piece(x,y)
-    GAME.board.each_with_index { |row_array, row| 
-      row_array.each_with_index { |col_array, col| 
+    GAME.board.each_with_index { |row_array, row|
+      row_array.each_with_index { |col_array, col|
         left, top = left_top_corner_of_piece(col, row).map { |i| i - 5}
         right, bottom = right_bottom_corner_of_piece(col, row).map { |i| i -5 }
         return [col, row] if x >= left && x <= right && y >= top && y <= bottom
-      } 
+      }
     }
     return false
   end
-
-  GAME = Othello::Game.new
 end
 
+GAME = Othello::Game.new
 
-Shoes.app :width => 520, :height => 600 do
+Shoes.app width: 520, height: 600 do
   extend Othello
 
   draw_board
-  
-  click { |button, x, y| 
+
+  click { |button, x, y|
     if coords = find_piece(x,y)
       begin
         GAME.lay_piece(coords)

data/samples/expert-pong.rb

@@ -9,25 +9,25 @@
 # redrawing the shapes, you can move the shapes around as objects.
 # Yeah, see, notice how @you, @comp and @ball are used.
 #
-Shoes.app :width => 400, :height => 400, :resizable => false do
-  paddle_size = 75
+Shoes.app width: 400, height: 400, resizable: false do
+  paddle_size   = 75
   ball_diameter = 20
-  vx, vy = [3, 4]
-  compuspeed = 10
-  bounce = 1.2
+  vx, vy        = [3, 4]
+  compuspeed    = 10
+  bounce        = 1.2
 
   # set up the playing board
   nostroke and background white
-  @ball = oval 0, 0, ball_diameter, :fill => "#9B7"
-  @you, @comp = [app.height-4, 0].map {|y| rect 0, y, paddle_size, 4, :curve => 2}
+  @ball = oval 0, 0, ball_diameter, fill: "#9B7"
+  @you, @comp = [app.height-4, 0].map {|y| rect 0, y, paddle_size, 4, curve: 2}
 
   # animates at 40 frames per second
   @anim = animate 40 do
 
     # check for game over
     if @ball.top + ball_diameter < 0 or @ball.top > app.height
-      para strong("GAME OVER", :size => 32), "\n",
-        @ball.top < 0 ? "You win!" : "Computer wins", :top => 140, :align => 'center'
+      para strong("GAME OVER", size: 32), "\n",
+        @ball.top < 0 ? "You win!" : "Computer wins", top: 140, align: 'center'
       @ball.hide and @anim.stop
     end
 
@@ -36,7 +36,7 @@ Shoes.app :width => 400, :height => 400, :resizable => false do
     nx, ny = (@ball.left + vx).to_i, (@ball.top + vy).to_i
 
     # move the @comp paddle, speed based on `compuspeed` variable
-    @comp.left += 
+    @comp.left +=
       if nx + (ball_diameter / 2) > @comp.left + paddle_size;  compuspeed
       elsif nx < @comp.left;                                  -compuspeed
       else 0 end

data/samples/expert-snake.rb

@@ -0,0 +1,78 @@
+Shoes.app title: 'Snake Game v0.1' do
+  def game_start
+    @score = para 'Score:', stroke: white
+    @pos = {up: [0, -10], down: [0, 10], left: [-10, 0], right: [10, 0]}
+    @rx, @ry = proc{20 + 10*rand(56)}, proc{40 + 10*rand(44)}
+
+    create_food
+
+    create_bricks
+
+    create_initial_snake
+
+    dir = :left
+    @run  = animate 5 do
+      check_food
+      go dir
+      @score.text = "Score: #{@snake.length * 10}"
+      brick? @snake[0]
+    end
+    keypress{|k| dir = k if @pos.keys.include? k}
+  end
+
+  def go k
+    x, y = @pos[k]
+    @snake.unshift @snake.pop
+    n = @snake.length > 1 ? 1 : 0
+    @snake[0].move @snake[n].left + x, @snake[n].top + y
+    @snake[0].style stroke: red
+    @snake[1].style stroke: white if n > 0
+  end
+
+  def check_food
+    (@snake << rect(0, 0, 10, 10)) if eat? @snake[0]
+  end
+
+  def eat? s
+    @foods.each_with_index do |f, i|
+      (f.move @rx[], @ry[]; return true) if f.left == s.left and f.top == s.top
+    end
+    return false
+  end
+
+  def brick? s
+    @bricks.each do |b|
+      (@run.remove; alert 'Game Over. ') if b.left == s.left and b.top == s.top
+    end
+  end
+
+  def create_food
+    @foods = []
+    stroke lime
+    50.times{@foods << rect(@rx[], @ry[], 10, 10)}
+  end
+
+  def create_bricks
+    @bricks = []
+    stroke deepskyblue; fill blue
+
+    50.times{@bricks << rect(@rx[], @ry[], 10, 10)}
+
+    20.step(570, 10){|n| @bricks << rect(n, 40, 10, 10) << rect(n, 470, 10, 10)}
+
+    40.step(470, 10){|n| @bricks << rect(10, n, 10, 10) << rect(570, n, 10, 10)}
+  end
+
+  def create_initial_snake
+    @snake = []
+    stroke white; nofill
+
+    @snake << rect(300, 100, 10, 10)
+
+    @snake[0].style stroke: red
+  end
+
+  background black
+
+  game_start
+end

data/samples/expert-tankspank.rb

@@ -8,378 +8,378 @@ $width, $height = 700, 500
 $camera_tightness = 0.1
 
 module Collisions
-	def contains? x, y
-		not (x < west or x > east or y < north or y > south)
-	end
-	
-	def intersects? other
-		not (other.east < west or other.west > east or
-			other.south < north or other.north > south)
-	end
+  def contains? x, y
+    not (x < west or x > east or y < north or y > south)
+  end
+
+  def intersects? other
+    not (other.east < west or other.west > east or
+      other.south < north or other.north > south)
+  end
 end
 
 class Building
-	include Collisions
-	
-	attr_reader :west, :east, :north, :south
-	
-	def initialize(west, east, north, south)
-		@west, @east, @north, @south = west, east, north, south
-		@top, @bottom = 1.1 + rand(3) * 0.15, 1.0
-		
-		color = (1..3).collect { 0.2 + 0.4 * rand }
-		color << 0.9
-		@stroke = $app.rgb *color
-		color[-1] = 0.3
-		@fill = $app.rgb *color
-	end
-	
-	def draw
-		$app.stroke @stroke
-		$app.fill @fill
-		Opp.draw_opp_box(@west, @east, @north, @south, @top, @bottom)
-	end
+  include Collisions
+
+  attr_reader :west, :east, :north, :south
+
+  def initialize(west, east, north, south)
+    @west, @east, @north, @south = west, east, north, south
+    @top, @bottom = 1.1 + rand(3) * 0.15, 1.0
+
+    color = (1..3).collect { 0.2 + 0.4 * rand }
+    color << 0.9
+    @stroke = $app.rgb *color
+    color[-1] = 0.3
+    @fill = $app.rgb *color
+  end
+
+  def draw
+    $app.stroke @stroke
+    $app.fill @fill
+    Opp.draw_opp_box(@west, @east, @north, @south, @top, @bottom)
+  end
 end
 
 module Guidance
-	def guidance_system x, y, dest_x, dest_y, angle
-		vx, vy = dest_x - x, dest_y - y
-		if vx.abs < 0.1 and vy.abs <= 0.1
-			yield 0, 0
-		else
-			length = Math.sqrt(vx * vx + vy * vy)
-			vx /= length
-			vy /= length
-			ax, ay = Math.cos(angle), Math.sin(angle)
-			cos_between = vx * ax + vy * ay
-			sin_between = vx * -ay + vy * ax
-			yield sin_between, cos_between
-		end
-	end
+  def guidance_system x, y, dest_x, dest_y, angle
+    vx, vy = dest_x - x, dest_y - y
+    if vx.abs < 0.1 and vy.abs <= 0.1
+      yield 0, 0
+    else
+      length = Math.sqrt(vx * vx + vy * vy)
+      vx /= length
+      vy /= length
+      ax, ay = Math.cos(angle), Math.sin(angle)
+      cos_between = vx * ax + vy * ay
+      sin_between = vx * -ay + vy * ax
+      yield sin_between, cos_between
+    end
+  end
 end
 
 module Life
-	attr_reader :health
-	def dead?
-		@health == 0
-	end
-	def hurt damage
-		@health = [@health - damage, 0].max
-	end
+  attr_reader :health
+  def dead?
+    @health == 0
+  end
+  def hurt damage
+    @health = [@health - damage, 0].max
+  end
 end
 
 class Tank
-	include Collisions
-	include Guidance
-	include Life
-	# ^ sounds like insurance
-	
-	@@collide_size = 15
-	def west; @x - @@collide_size; end
-	def east; @x + @@collide_size; end
-	def north; @y - @@collide_size; end
-	def south; @y + @@collide_size; end
-	
-	attr_reader :x, :y
-	
-	def initialize
-		@x, @y = 0, -125
-		@last_x, @last_y = @x, @y
-		@tank_angle = 0.0
-		@dest_x, @dest_y = 0, 0
-		@acceleration = 0.0
-		@speed = 0.0
-		@moving = false
-		
-		@aim_angle = 0.0
-		@target_x, @target_y = 0, 0
-		@aimed = false
-		
-		@health = 100
-	end
-	
-	def set_destination
-		@dest_x, @dest_y = @target_x, @target_y
-		@moving = true
-	end
-	
-	def fire
-		Opp.add_shell Shell.new(@x + 30 * Math.cos(@aim_angle),
-			@y + 30 * Math.sin(@aim_angle), @aim_angle)
-	end
-	
-	def update button, mouse_x, mouse_y
-		@target_x, @target_y = mouse_x, mouse_y
-		
-		if @moving
-			guidance_system @x, @y, @dest_x, @dest_y, @tank_angle do |direction, on_target|
-				turn direction
-				@acceleration = on_target * 0.25
-			end
-			
-			distance = Math.sqrt((@dest_x - @x) ** 2 + (@dest_y - @y) ** 2)
-			@moving = false if distance < 50
-		else
-			@acceleration = 0.0
-		end
-		
-		guidance_system @x, @y, @target_x, @target_y, @aim_angle do |direction, on_target|
-			aim direction
-			@aimed = on_target > 0.98
-		end
-		
-		integrity = @health / 100.0 # the more hurt you are, the slower you go
-		@speed = [[@speed + @acceleration, 5.0 * integrity].min, -3.0 * integrity].max
-		@speed *= 0.9 if !@moving
-		
-		@last_x, @last_y = @x, @y
-		@x += @speed * Math.cos(@tank_angle)
-		@y += @speed * Math.sin(@tank_angle)
-	end
-	
-	def collide_and_stop
-		@x, @y = @last_x, @last_y
-		hurt @speed.abs * 3 + 5
-		@speed = 0
-		@moving = false
-	end
-	
-	def turn direction
-		@tank_angle += [[-0.03, direction].max, 0.03].min
-	end
-	
-	def aim direction
-		@aim_angle += [[-0.1, direction].max, 0.1].min
-	end
-	
-	def draw
-		$app.stroke $app.blue
-		$app.fill $app.blue(0.4)
-		Opp.draw_opp_rect @x - 20, @x + 20, @y - 15, @y + 15, 1.05, @tank_angle
-		#Opp.draw_opp_box @x - 20, @x + 20, @y - 20, @y + 20, 1.03, 1.0
-		Opp.draw_opp_rect @x - 10, @x + 10, @y - 7, @y + 7, 1.05, @aim_angle
-		x, unused1, y, unused2 = Opp.project(@x, 0, @y, 0, 1.05)
-		$app.line x, y, x + 25 * Math.cos(@aim_angle), y + 25 * Math.sin(@aim_angle)
-		
-		$app.stroke $app.red
-		$app.fill $app.red(@aimed ? 0.4 : 0.1)
-		Opp.draw_opp_oval @target_x - 10, @target_x + 10, @target_y - 10, @target_y + 10, 1.00
-		
-		if @moving
-			$app.stroke $app.green
-			$app.fill $app.green(0.2)
-			Opp.draw_opp_oval @dest_x - 20, @dest_x + 20, @dest_y - 20, @dest_y + 20, 1.00
-		end
-	end
+  include Collisions
+  include Guidance
+  include Life
+  # ^ sounds like insurance
+
+  @@collide_size = 15
+  def west; @x - @@collide_size; end
+  def east; @x + @@collide_size; end
+  def north; @y - @@collide_size; end
+  def south; @y + @@collide_size; end
+
+  attr_reader :x, :y
+
+  def initialize
+    @x, @y = 0, -125
+    @last_x, @last_y = @x, @y
+    @tank_angle = 0.0
+    @dest_x, @dest_y = 0, 0
+    @acceleration = 0.0
+    @speed = 0.0
+    @moving = false
+
+    @aim_angle = 0.0
+    @target_x, @target_y = 0, 0
+    @aimed = false
+
+    @health = 100
+  end
+
+  def set_destination
+    @dest_x, @dest_y = @target_x, @target_y
+    @moving = true
+  end
+
+  def fire
+    Opp.add_shell Shell.new(@x + 30 * Math.cos(@aim_angle),
+      @y + 30 * Math.sin(@aim_angle), @aim_angle)
+  end
+
+  def update button, mouse_x, mouse_y
+    @target_x, @target_y = mouse_x, mouse_y
+
+    if @moving
+      guidance_system @x, @y, @dest_x, @dest_y, @tank_angle do |direction, on_target|
+        turn direction
+        @acceleration = on_target * 0.25
+      end
+
+      distance = Math.sqrt((@dest_x - @x) ** 2 + (@dest_y - @y) ** 2)
+      @moving = false if distance < 50
+    else
+      @acceleration = 0.0
+    end
+
+    guidance_system @x, @y, @target_x, @target_y, @aim_angle do |direction, on_target|
+      aim direction
+      @aimed = on_target > 0.98
+    end
+
+    integrity = @health / 100.0 # the more hurt you are, the slower you go
+    @speed = [[@speed + @acceleration, 5.0 * integrity].min, -3.0 * integrity].max
+    @speed *= 0.9 if !@moving
+
+    @last_x, @last_y = @x, @y
+    @x += @speed * Math.cos(@tank_angle)
+    @y += @speed * Math.sin(@tank_angle)
+  end
+
+  def collide_and_stop
+    @x, @y = @last_x, @last_y
+    hurt @speed.abs * 3 + 5
+    @speed = 0
+    @moving = false
+  end
+
+  def turn direction
+    @tank_angle += [[-0.03, direction].max, 0.03].min
+  end
+
+  def aim direction
+    @aim_angle += [[-0.1, direction].max, 0.1].min
+  end
+
+  def draw
+    $app.stroke $app.blue
+    $app.fill $app.blue(0.4)
+    Opp.draw_opp_rect @x - 20, @x + 20, @y - 15, @y + 15, 1.05, @tank_angle
+    #Opp.draw_opp_box @x - 20, @x + 20, @y - 20, @y + 20, 1.03, 1.0
+    Opp.draw_opp_rect @x - 10, @x + 10, @y - 7, @y + 7, 1.05, @aim_angle
+    x, unused1, y, unused2 = Opp.project(@x, 0, @y, 0, 1.05)
+    $app.line x, y, x + 25 * Math.cos(@aim_angle), y + 25 * Math.sin(@aim_angle)
+
+    $app.stroke $app.red
+    $app.fill $app.red(@aimed ? 0.4 : 0.1)
+    Opp.draw_opp_oval @target_x - 10, @target_x + 10, @target_y - 10, @target_y + 10, 1.00
+
+    if @moving
+      $app.stroke $app.green
+      $app.fill $app.green(0.2)
+      Opp.draw_opp_oval @dest_x - 20, @dest_x + 20, @dest_y - 20, @dest_y + 20, 1.00
+    end
+  end
 end
 
 class Shell
-	attr_reader :x, :y
-	
-	def initialize x, y, angle
-		@x, @y, @angle = x, y, angle
-		@speed = 10.0
-	end
-	
-	def update
-		@x += @speed * Math.cos(@angle)
-		@y += @speed * Math.sin(@angle)
-	end
-	
-	def draw
-		$app.stroke $app.red
-		$app.fill $app.red(0.1)
-		Opp.draw_opp_box @x - 2, @x + 2, @y - 2, @y + 2, 1.05, 1.04
-	end
+  attr_reader :x, :y
+
+  def initialize x, y, angle
+    @x, @y, @angle = x, y, angle
+    @speed = 10.0
+  end
+
+  def update
+    @x += @speed * Math.cos(@angle)
+    @y += @speed * Math.sin(@angle)
+  end
+
+  def draw
+    $app.stroke $app.red
+    $app.fill $app.red(0.1)
+    Opp.draw_opp_box @x - 2, @x + 2, @y - 2, @y + 2, 1.05, 1.04
+  end
 end
 
 class Opp
-	def self.new_game
-		@offset_x, @offset_y = 0, 0
-		@buildings = [
-			[-1000, -750, -750, -250],
-			[-500, 250, -750, -250],
-			[500, 1000, -750, -500],
-			[750, 1250, -250, 0],
-			[750, 1250, 250, 750],
-			[250, 500, 0, 750],
-			[-250, 0, 0, 500],
-			[-500, 0, 750, 1000],
-			[-1000, -500, 0, 500],
-			[400, 600, -350, -150]
-		].collect { |p| Building.new *p }
-		@shells = []
-		@boundary = [-1250, 1500, -1250, 1250]
-		@tank = Tank.new
-		@center_x, @center_y = $app.width / 2, $app.height / 2
-	end
-	
-	def self.tank
-		@tank
-	end
-	
-	def self.read_input
-		@input = $app.mouse
-	end
-	
-	def self.update_scene
-		button, x, y = @input
-		x += @offset_x - @center_x
-		y += @offset_y - @center_y
-		
-		@tank.update(button, x, y) if !@tank.dead?
-		@buildings.each do |b|
-			@tank.collide_and_stop if b.intersects? @tank
-		end
-		
-		@shells.each { |s| s.update }
-		@buildings.each do |b|
-			@shells.reject! do |s|
-				b.contains?(s.x, s.y)
-			end
-		end
-		#collide shells with tanks -- don't need this until there are enemy tanks
-		#@shells.reject! do |s|
-		#	@tank.contains?(s.x, s.y)
-		#end
-		
-		$app.clear do
-			@offset_x += $camera_tightness * (@tank.x - @offset_x)
-			@offset_y += $camera_tightness * (@tank.y - @offset_y)
-			
-			$app.background $app.black
-			@center_x, @center_y = $app.width / 2, $app.height / 2
-			
-			$app.stroke $app.red(0.9)
-			$app.nofill
-			draw_opp_box *(@boundary + [1.1, 1.0, false])
-			
-			@tank.draw
-			@shells.each { |s| s.draw }
-			@buildings.each { |b| b.draw }
-		end
-	end
-	
-	def self.add_shell shell
-		@shells << shell
-		@shells.shift if @shells.size > 10
-	end
-	
-	def self.project left, right, top, bottom, depth
-		[left, right].collect { |x| @center_x + depth * (x - @offset_x) } +
-			[top, bottom].collect { |y| @center_y + depth * (y - @offset_y) }
-	end
-	
-	# here "front" and "back" push the rect into and out of the window.
-	# 1.0 means your x and y units are pixels on the surface.
-	# greater than that brings the box closer.  less pushes it back.  0.0 => infinity.
-	# the front will be filled but the rest is wireframe only.
-	def self.draw_opp_box left, right, top, bottom, front, back, occlude = true
-		near_left, near_right, near_top, near_bottom = project(left, right, top, bottom, front)
-		far_left, far_right, far_top, far_bottom = project(left, right, top, bottom, back)
-		
-		# determine which sides of the box are visible
-		if occlude
-			draw_left = @center_x < near_left
-			draw_right = near_right < @center_x
-			draw_top = @center_y < near_top
-			draw_bottom = near_bottom < @center_y
-		else
-			draw_left, draw_right, draw_top, draw_bottom = [true] * 4
-		end
-		
-		# draw lines for the back edges
-		$app.line far_left, far_top, far_right, far_top if draw_top
-		$app.line far_left, far_bottom, far_right, far_bottom if draw_bottom
-		$app.line far_left, far_top, far_left, far_bottom if draw_left
-		$app.line far_right, far_top, far_right, far_bottom if draw_right
-		
-		# draw lines to connect the front and back
-		$app.line near_left, near_top, far_left, far_top if draw_left or draw_top
-		$app.line near_right, near_top, far_right, far_top if draw_right or draw_top
-		$app.line near_left, near_bottom, far_left, far_bottom if draw_left or draw_bottom
-		$app.line near_right, near_bottom, far_right, far_bottom if draw_right or draw_bottom
-		
-		# draw the front, filled
-		$app.rect near_left, near_top, near_right - near_left, near_bottom - near_top
-	end
-	
-	def self.draw_opp_rect left, right, top, bottom, depth, angle, with_x = false
-		pl, pr, pt, pb = project(left, right, top, bottom, depth)
-		cos = Math.cos(angle)
-		sin = Math.sin(angle)
-		cx, cy = (pr + pl) / 2.0, (pb + pt) / 2.0
-		points = [[pl, pt], [pr, pt], [pr, pb], [pl, pb]].collect do |x, y|
-			[cx + (x - cx) * cos - (y - cy) * sin,
-				cy + (x - cx) * sin + (y - cy) * cos]
-		end
-		
-		$app.line *(points[0] + points[1])
-		$app.line *(points[1] + points[2])
-		$app.line *(points[2] + points[3])
-		$app.line *(points[3] + points[0])
-	end
-	
-	def self.draw_opp_oval left, right, top, bottom, depth
-		pl, pr, pt, pb = project(left, right, top, bottom, depth)
-		$app.oval(pl, pt, pr - pl, pb - pt)
-	end
-	
-	def self.draw_opp_plane x1, y1, x2, y2, front, back, stroke_color
-		near_x1, near_x2, near_y1, near_y2 = project(x1, x2, y1, y2, front)
-		far_x1, far_x2, far_y1, far_y2 = project(x1, x2, y1, y2, back)
-		
-		$app.stroke stroke_color
-		
-		$app.line far_x1, far_y1, far_x2, far_y2
-		$app.line far_x1, far_y1, near_x1, near_y1
-		$app.line far_x2, far_y2, near_x2, near_y2
-		$app.line near_x1, near_y1, near_x2, near_y2
-	end
+  def self.new_game
+    @offset_x, @offset_y = 0, 0
+    @buildings = [
+      [-1000, -750, -750, -250],
+      [-500, 250, -750, -250],
+      [500, 1000, -750, -500],
+      [750, 1250, -250, 0],
+      [750, 1250, 250, 750],
+      [250, 500, 0, 750],
+      [-250, 0, 0, 500],
+      [-500, 0, 750, 1000],
+      [-1000, -500, 0, 500],
+      [400, 600, -350, -150]
+    ].collect { |p| Building.new *p }
+    @shells = []
+    @boundary = [-1250, 1500, -1250, 1250]
+    @tank = Tank.new
+    @center_x, @center_y = $app.width / 2, $app.height / 2
+  end
+
+  def self.tank
+    @tank
+  end
+
+  def self.read_input
+    @input = $app.mouse
+  end
+
+  def self.update_scene
+    button, x, y = @input
+    x += @offset_x - @center_x
+    y += @offset_y - @center_y
+
+    @tank.update(button, x, y) if !@tank.dead?
+    @buildings.each do |b|
+      @tank.collide_and_stop if b.intersects? @tank
+    end
+
+    @shells.each { |s| s.update }
+    @buildings.each do |b|
+      @shells.reject! do |s|
+        b.contains?(s.x, s.y)
+      end
+    end
+    #collide shells with tanks -- don't need this until there are enemy tanks
+    #@shells.reject! do |s|
+    # @tank.contains?(s.x, s.y)
+    #end
+
+    $app.clear do
+      @offset_x += $camera_tightness * (@tank.x - @offset_x)
+      @offset_y += $camera_tightness * (@tank.y - @offset_y)
+
+      $app.background $app.black
+      @center_x, @center_y = $app.width / 2, $app.height / 2
+
+      $app.stroke $app.red(0.9)
+      $app.nofill
+      draw_opp_box *(@boundary + [1.1, 1.0, false])
+
+      @tank.draw
+      @shells.each { |s| s.draw }
+      @buildings.each { |b| b.draw }
+    end
+  end
+
+  def self.add_shell shell
+    @shells << shell
+    @shells.shift if @shells.size > 10
+  end
+
+  def self.project left, right, top, bottom, depth
+    [left, right].collect { |x| @center_x + depth * (x - @offset_x) } +
+      [top, bottom].collect { |y| @center_y + depth * (y - @offset_y) }
+  end
+
+  # here "front" and "back" push the rect into and out of the window.
+  # 1.0 means your x and y units are pixels on the surface.
+  # greater than that brings the box closer.  less pushes it back.  0.0 => infinity.
+  # the front will be filled but the rest is wireframe only.
+  def self.draw_opp_box left, right, top, bottom, front, back, occlude = true
+    near_left, near_right, near_top, near_bottom = project(left, right, top, bottom, front)
+    far_left, far_right, far_top, far_bottom = project(left, right, top, bottom, back)
+
+    # determine which sides of the box are visible
+    if occlude
+      draw_left = @center_x < near_left
+      draw_right = near_right < @center_x
+      draw_top = @center_y < near_top
+      draw_bottom = near_bottom < @center_y
+    else
+      draw_left, draw_right, draw_top, draw_bottom = [true] * 4
+    end
+
+    # draw lines for the back edges
+    $app.line far_left, far_top, far_right, far_top if draw_top
+    $app.line far_left, far_bottom, far_right, far_bottom if draw_bottom
+    $app.line far_left, far_top, far_left, far_bottom if draw_left
+    $app.line far_right, far_top, far_right, far_bottom if draw_right
+
+    # draw lines to connect the front and back
+    $app.line near_left, near_top, far_left, far_top if draw_left or draw_top
+    $app.line near_right, near_top, far_right, far_top if draw_right or draw_top
+    $app.line near_left, near_bottom, far_left, far_bottom if draw_left or draw_bottom
+    $app.line near_right, near_bottom, far_right, far_bottom if draw_right or draw_bottom
+
+    # draw the front, filled
+    $app.rect near_left, near_top, near_right - near_left, near_bottom - near_top
+  end
+
+  def self.draw_opp_rect left, right, top, bottom, depth, angle, with_x = false
+    pl, pr, pt, pb = project(left, right, top, bottom, depth)
+    cos = Math.cos(angle)
+    sin = Math.sin(angle)
+    cx, cy = (pr + pl) / 2.0, (pb + pt) / 2.0
+    points = [[pl, pt], [pr, pt], [pr, pb], [pl, pb]].collect do |x, y|
+      [cx + (x - cx) * cos - (y - cy) * sin,
+        cy + (x - cx) * sin + (y - cy) * cos]
+    end
+
+    $app.line *(points[0] + points[1])
+    $app.line *(points[1] + points[2])
+    $app.line *(points[2] + points[3])
+    $app.line *(points[3] + points[0])
+  end
+
+  def self.draw_opp_oval left, right, top, bottom, depth
+    pl, pr, pt, pb = project(left, right, top, bottom, depth)
+    $app.oval(pl, pt, pr - pl, pb - pt)
+  end
+
+  def self.draw_opp_plane x1, y1, x2, y2, front, back, stroke_color
+    near_x1, near_x2, near_y1, near_y2 = project(x1, x2, y1, y2, front)
+    far_x1, far_x2, far_y1, far_y2 = project(x1, x2, y1, y2, back)
+
+    $app.stroke stroke_color
+
+    $app.line far_x1, far_y1, far_x2, far_y2
+    $app.line far_x1, far_y1, near_x1, near_y1
+    $app.line far_x2, far_y2, near_x2, near_y2
+    $app.line near_x1, near_y1, near_x2, near_y2
+  end
 end
 
-Shoes.app :width => $width, :height => $height do
-	$app = self
-	
-	Opp.new_game
-	@playing = true
-	
-	keypress do |key|
-		if @playing
-			if key == "1" or key == "z"
-				Opp.tank.set_destination
-			elsif key == "2" or key == "x" or key == " "
-				Opp.tank.fire
-			end
-		else
-			if key == "n"
-				Opp.new_game
-				@playing = true
-			end
-		end
-	end
-	
-	click do |button, x, y|
-		if @playing
-			if button == 1
-				Opp.tank.set_destination
-			else
-				Opp.tank.fire
-			end
-		end
-	end
-	
-	game_over_count = -1
-	animate(60) do
-		Opp.read_input if @playing
-		Opp.update_scene
-		
-		@playing = false if Opp.tank.dead?
-		if !@playing
-			stack do
-				banner "Game Over", :stroke => white, :margin => 10
-				caption "learn to drive!", :stroke => white, :margin => 20
-			end
-		end
-	end
+Shoes.app width: $width, height: $height do
+  $app = self
+
+  Opp.new_game
+  @playing = true
+
+  keypress do |key|
+    if @playing
+      if key == "1" or key == "z"
+        Opp.tank.set_destination
+      elsif key == "2" or key == "x" or key == " "
+        Opp.tank.fire
+      end
+    else
+      if key == "n"
+        Opp.new_game
+        @playing = true
+      end
+    end
+  end
+
+  click do |button, x, y|
+    if @playing
+      if button == 1
+        Opp.tank.set_destination
+      else
+        Opp.tank.fire
+      end
+    end
+  end
+
+  game_over_count = -1
+  animate(60) do
+    Opp.read_input if @playing
+    Opp.update_scene
+
+    @playing = false if Opp.tank.dead?
+    if !@playing
+      stack do
+        banner "Game Over", stroke: white, margin: 10
+        caption "learn to drive!", stroke: white, margin: 20
+      end
+    end
+  end
 end