rong-elements 0.2.1 → 0.2.2

data/lib/rong/elements/ball.rb

@@ -1,3 +1,5 @@
+require 'rong/elements/entity'
+
 module Rong
   module Elements
     class Ball
@@ -14,7 +16,8 @@ module Rong
         super(start_x, start_y)
       end
 
-      def reflect_x
+      def reflect_x(x_position=nil)
+        move_to(x_position, y) if x_position
         self.x_direction *= -1
       end
 
@@ -27,8 +30,12 @@ module Rong
         self.y += SPEED * Math.sin(angle_radians) * y_direction
       end
 
-      def stop
+      def stop(resest_x=nil, reset_y=nil)
         self.x_direction = self.y_direction = 0
+
+        reset_x ||= x
+        reset_y ||= y
+        move_to(reset_x, reset_y)
       end
 
       def serve_left_from(x, y)

data/lib/rong/elements/entity.rb

@@ -33,25 +33,19 @@ module Rong
       end
 
       def intersects?(other)
-        if other.left < right && other.left > left
-          if other.bottom < bottom && other.bottom > top
-            true
-          elsif other.top > top && other.top < bottom
-            true
-          else
-            false
-          end
-        elsif other.right > left && other.right < right
-          if other.bottom < bottom && other.bottom > top
-            true
-          elsif other.top > top && other.top < bottom
-            true
-          else
-            false
-          end
-        else
-          false
+        if left > other.right
+          return false
         end
+        if right < other.left
+          return false
+        end
+        if top > other.bottom
+          return false
+        end
+        if bottom < other.top
+          return false
+        end
+        true
       end
     end
   end

data/lib/rong/elements/game.rb

@@ -13,7 +13,7 @@ module Rong
         :score_callbacks,  :hit_callbacks,
         :bounce_callbacks, :win_callbacks
 
-      def initialize
+      def initialize(&block)
         self.left_score = self.right_score = 0
 
         self.score_callbacks  = []
@@ -22,8 +22,18 @@ module Rong
         self.win_callbacks    = []
 
         self.ball    = Ball.new(WINDOW_CENTER_X, WINDOW_CENTER_Y, 0)
-        self.paddles = [Paddle.new("Player 1", LEFT_PADDLE_X,  PADDLE_Y),
-          Paddle.new("Player 2", RIGHT_PADDLE_X, PADDLE_Y)]
+        self.paddles = [Paddle.new("Player 1", :left, LEFT_PADDLE_X,  PADDLE_Y),
+                        Paddle.new("Player 2", :right, RIGHT_PADDLE_X, PADDLE_Y)]
+        yield self if block_given?
+      end
+
+      [:left, :right].each do |side|
+        class_eval <<-MET, __FILE__, __LINE__
+          def #{side}_paddle
+            @#{side}_paddel ||= paddles.find {|p| p.side == :#{side} }
+            @#{side}_paddel
+          end
+        MET
       end
 
       def update
@@ -76,13 +86,12 @@ module Rong
       end
 
       def reset_paddles
-        paddles.first.move_to(LEFT_PADDLE_X,  PADDLE_Y)
-        paddles.last.move_to(RIGHT_PADDLE_X,  PADDLE_Y)
+        left_paddle.move_to(LEFT_PADDLE_X,  PADDLE_Y)
+        right_paddle.move_to(RIGHT_PADDLE_X,  PADDLE_Y)
       end
 
       def declare_winner(who)
-        ball.move_to(WINDOW_CENTER_X, WINDOW_CENTER_Y)
-        ball.stop
+        ball.stop(WINDOW_CENTER_X, WINDOW_CENTER_Y)
         self.winner = who
         win_callbacks.each {|cb| cb.call(who) }
       end
@@ -104,11 +113,11 @@ module Rong
 
         if ball.left < 0 || ball.right > WINDOW_WIDTH
           if ball.left < 0
-            self.left_score += 1
-            ball.serve_right_from(SERVE_FROM_X, SERVE_FROM_Y)
-          else
             self.right_score += 1
             ball.serve_left_from(SERVE_FROM_X, SERVE_FROM_Y)
+          else
+            self.left_score += 1
+            ball.serve_right_from(SERVE_FROM_X, SERVE_FROM_Y)
           end
           score
           reset_paddles
@@ -117,9 +126,9 @@ module Rong
 
       def check_win_condition
         if left_score >= WINNING_SCORE
-          declare_winner(paddles.first)
+          declare_winner(left_paddle)
         elsif right_score >= WINNING_SCORE
-          declare_winner(paddles.last)
+          declare_winner(right_paddle)
         end
       end
     end

data/lib/rong/elements/paddle.rb

@@ -1,3 +1,5 @@
+require 'rong/elements/entity'
+
 module Rong
   module Elements
     class Paddle
@@ -6,10 +8,11 @@ module Rong
       SPEED  = 10
       include Entity
 
-      attr_accessor :name
+      attr_accessor :name, :side
 
-      def initialize(name, start_x, start_y)
+      def initialize(name, side, start_x, start_y)
         self.name = name
+        self.side = side
         super(start_x, start_y)
       end
 
@@ -21,11 +24,14 @@ module Rong
         self.y += SPEED
       end
 
+      def left?
+        side == :left
+      end
+
       def hit(ball)
-        ball.reflect_x
-        if ball.y < y
-          ball.reflect_y
-        end
+        ball_x = left? ? right : left
+        ball.reflect_x(ball_x)
+        ball.reflect_y if ball.y < y
 
         strength = (y - ball.y).abs / (height / 2)
         ball.angle = 45 * strength

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Matt Yoho
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-07 00:00:00 +01:00
+date: 2011-08-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,11 +27,99 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 5
+        - 6
         - 0
-        version: 2.5.0
+        version: 2.6.0
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: guard
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 1
+        version: 0.6.1
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: guard-rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 2
+        version: 0.4.2
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rb-fsevent
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 3
+        version: 0.4.3
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: growl
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 3
+        version: 1.0.3
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: growl_notify
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 1
+        version: 0.0.1
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug19
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: Rong-elements contains shared game models and utilities for Rong, a Ruby implementation of Pong that consists of a server module for managing games, a client module for for interfacing with the server, and hopefully a few client implementations for playing some rad Pong, brah.
 email: mby@mattyoho.com
 executables: []