bricks_meet_balls 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66706a65047376f0a85a62aed149e15f17608265
-  data.tar.gz: 76c2a71feb7c8f7259df3cbbf8157e1c3cbee0d2
+  metadata.gz: ee70b072f09da8e76ac9e454478f74982d793263
+  data.tar.gz: 566f87cfcb7bfe04cfc8af03b3d44a12bba06367
 SHA512:
-  metadata.gz: 0691572b829556820dc0e44220ce8e5f81e2e73ad7d4446964a9f884907f4c5160b4ed5c4b7e9022594d0abdc82e3dc59f4da1ed538e17299edfcf82bab556a2
-  data.tar.gz: 77a05581f232059bf850be09d13ef1bbbad33f3b188314221c9a1e6f091b1b1f8699dc0b002c5ff6de55b94e2ba536d9ca29801360ba4375465b58134c881dd5
+  metadata.gz: 9efc35b6670c0461466abe68119f1af435594851daa8bbbbc1f3d9d6d6e8aaaf3837bb99a6304cdeb1bf8255c10331c3d7a82d4c84072bd65076db75d3ddf2f7
+  data.tar.gz: 95186a489f53d33c0711e677606f9b62472778a6584dc4773998ba095aec6c46fef255f4641dd6558dc71498319e604e8451a017618eb6108e236a0482d2c940

data/NEWS.md

@@ -1,5 +1,14 @@
 # NEWS
 
+## 0.0.4: 2014-03-27
+
+### Changes
+
+  * Improvements
+    * Added accessor methods
+    * Support for tiling an image on bricks
+    * Support friction for ball with bar
+
 ## 0.0.3: 2014-03-27
 
 ### Changes

data/examples/groonga/main.rb

@@ -34,13 +34,6 @@ BALL_IMAGES = [
   "droonga-icon-full-size.png",
 ]
 
-width = 640
-height = 480
-num_of_rows = 10
-num_of_columns = 8
-num_of_balls = 29
-endless = true
-
 base_dir = File.expand_path(File.dirname(__FILE__))
 ball_images = BALL_IMAGES.collect do |ball_image|
   File.join(base_dir, ball_image)
@@ -49,15 +42,13 @@ brick_images = BRICK_IMAGES.collect do |brick_image|
   File.join(base_dir, brick_image)
 end
 
-window = BricksMeetBalls::Window.new(width,
-                                     height,
-                                     num_of_rows,
-                                     num_of_columns,
-                                     num_of_balls,
-                                     ball_images,
-                                     brick_images,
-                                     endless)
-
+window = BricksMeetBalls::Window.new(640, 480)
+window.num_of_rows = 10
+window.num_of_columns = 8
+window.num_of_balls = 29
+window.ball_images = ball_images
+window.brick_images = brick_images
+window.endless = true
 window.set_background_image(brick_images.first)
 
 window.show

data/lib/bricks_meet_balls/ball.rb

@@ -12,7 +12,7 @@ module BricksMeetBalls
       @window = window
       @x = @y = 0.0
       @ball_radius = @window.height * 0.01
-      @angle = ([*30..85, *95..150].sample) - 90
+      @angle = [*30..85, *95..150].sample - 90
       @speed = @window.height * 0.005
       @moving = true
       if image_path
@@ -58,28 +58,30 @@ module BricksMeetBalls
       @moving = true
     end
 
-    def reflect(target)
+    def reflect(target, friction=0)
       if target.hit_on_top_or_bottom?(@x, @y)
-        reflect_x_axis
+        reflect_x_axis(friction)
       elsif target.hit_on_left_or_right?(@x, @y)
-        reflect_y_axis
+        reflect_y_axis(friction)
       end
     end
 
-    def reflect_x_axis
+    def reflect_x_axis(friction=0)
       if @angle <= 180
         @angle = 180 - @angle
       else
         @angle = 360 - (@angle - 180)
       end
+      @angle += friction
     end
 
-    def reflect_y_axis
+    def reflect_y_axis(friction=0)
       if @angle <= 180
         @angle = 180 + (180 - @angle)
       else
         @angle = 360 - @angle
       end
+      @angle += friction
     end
   end
 end

data/lib/bricks_meet_balls/brick.rb

@@ -34,7 +34,7 @@ module BricksMeetBalls
       @image.draw(@x1 + @border_width,
                   @y1 + @border_width,
                   ZOrder::Brick,
-                  (0.95* @width  / @image.width),
+                  (0.95 * @width  / @image.width),
                   (0.95 * @height / @image.height))
     end
   end

data/lib/bricks_meet_balls/util.rb

@@ -52,9 +52,5 @@ module BricksMeetBalls
     def drop?(y)
       y > @y2
     end
-
-    def base_dir
-      @base_dir ||= File.expand_path(File.dirname(__FILE__))
-    end
   end
 end

data/lib/bricks_meet_balls/version.rb

@@ -1,3 +1,3 @@
 module BricksMeetBalls
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/bricks_meet_balls/window.rb

@@ -10,6 +10,10 @@ module BricksMeetBalls
   class Window < Gosu::Window
     include Util
 
+    attr_accessor :num_of_rows, :num_of_columns, :num_of_balls
+    attr_accessor :ball_images, :brick_images
+    attr_accessor :endless
+
     def initialize(width=240, height=480,
                    num_of_rows=2, num_of_columns=3, num_of_balls=1,
                    ball_images=nil, brick_images=nil, endless=false)
@@ -29,19 +33,28 @@ module BricksMeetBalls
       @num_of_rows = num_of_rows
       @num_of_balls = num_of_balls
       @endless = endless
+      @background_image = nil
+    end
+
+    def show
+      @brick_width = self.width / @num_of_columns
+      @brick_height = @brick_width / 3
       create_bricks(@num_of_columns, @num_of_rows)
       create_balls(@num_of_balls)
-      @background_image = nil
+      super
     end
 
     def update
+      friction = 0
       if button_down?(Gosu::KbLeft) ||
          button_down?(Gosu::MsLeft)
         @bar.move_left
+        friction -= 15
       end
       if button_down?(Gosu::KbRight) ||
          button_down?(Gosu::MsRight)
         @bar.move_right
+        friction += 15
       end
 
       @balls.each do |ball|
@@ -54,7 +67,7 @@ module BricksMeetBalls
           end
         end
         if @bar.hit?(ball.x, ball.y)
-          ball.reflect(@bar)
+          ball.reflect(@bar, friction)
         end
         if self.out_from_left_or_right?(ball.x)
           ball.reflect_y_axis
@@ -85,6 +98,7 @@ module BricksMeetBalls
 
     def draw
       draw_area
+      draw_background_image if @background_image
       @bricks.each {|brick| brick.draw }
       @balls.each {|ball| ball.draw }
       @bar.draw
@@ -112,38 +126,66 @@ module BricksMeetBalls
       @background_image = Gosu::Image.new(self, image_path, false)
     end
 
+    def enable_tiling_an_image_on_bricks
+      @tiling_an_image_on_bricks = true
+    end
+
     private
     def draw_area
       draw_square(self,
                   0, 0,
                   self.width, self.height,
                   Gosu::Color::WHITE, ZOrder::Background)
-      return unless @background_image
+    end
+
+    def draw_background_image
+      width = 1.0 * self.width / @background_image.width
+      height = 1.0 * @brick_height * @num_of_rows / @background_image.height
       @background_image.draw(0,
                              0,
                              ZOrder::Background,
-                             1.0 * self.width  / @background_image.width,
-                             0.5 * self.height / @background_image.height)
+                             width,
+                             height)
     end
 
     def create_bricks(num_of_columns, num_of_rows)
-      1.upto(num_of_columns) do |column|
-        1.upto(num_of_rows) do |row|
+      if @tiling_an_image_on_bricks
+        if @brick_images.is_a?(Array)
+          brick_image = @brick_images.sample
+        else
+          brick_image = @brick_images
+        end
+        tile_images = tiling(brick_image, num_of_columns, num_of_rows)
+      end
+      1.upto(num_of_rows) do |row|
+        1.upto(num_of_columns) do |column|
           if @brick_images.is_a?(Array)
             brick_image = @brick_images.sample
           else
             brick_image = @brick_images
           end
+          if @tiling_an_image_on_bricks
+            image_index = (column - 1) + (num_of_columns * (row - 1))
+            brick_image = tile_images[image_index]
+          end
           @bricks << Brick.new(self,
                                column,
                                row,
-                               self.width / num_of_columns,
-                               self.width / num_of_columns / 3,
+                               @brick_width,
+                               @brick_height,
                                brick_image)
         end
       end
     end
 
+    def tiling(image_path, num_of_columns, num_of_rows)
+      Gosu::Image.load_tiles(self,
+                             image_path,
+                             -1 * num_of_columns,
+                             -1 * num_of_rows,
+                             false)
+    end
+
     def create_balls(n)
       n.times do
         create_ball

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bricks_meet_balls
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu