carpet_diem 0.0.5 → 0.0.6

data/carpet_diem.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'carpet_diem'
-  s.version     = '0.0.5'
+  s.version     = '0.0.6'
   s.licenses    = ['MIT']
   s.summary     = "A Gosu game about a flying carpet"
   s.description = "Be a flying carpet that hovers through the clouds. On your way up you will encounter magic lamps. Rub them to see if a good or an evil genie is hidden inside, the one adding points to your score, the other being your worst enemy!"
@@ -11,8 +11,6 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/RapidRailsGirls/carpet-diem'
   s.executables = %w[carpet_diem]
   s.add_runtime_dependency 'gosu', '0.7.50'
-  s.add_runtime_dependency 'texplay', '~> 0.4'
-  s.add_runtime_dependency 'chingu', '~> 0.8'
 
   s.add_development_dependency 'rspec'
 

data/lib/carpet.rb

@@ -1,5 +1,3 @@
-require 'texplay'
-require 'chingu'
 require_relative 'positionable'
 
 class Carpet
@@ -38,54 +36,9 @@ class Carpet
   end
 
   def collides_with?(object)
-    images_overlap?(object) && !opaque_overlapping_pixels(object).empty?
+    object.bottom  * object.scale > top    &&
+      object.top                  < bottom &&
+      object.right * object.scale > left   &&
+      object.left                 < right
   end
-
-  def images_overlap?(object)
-    object.bottom  > top    &&
-      object.top   < bottom &&
-      object.right > left   &&
-      object.left  < right
-  end
-
-  def opaque_overlapping_pixels(object)
-    overlapping_pixels(object).select do |x,y|
-      !@carpet_image.transparent_pixel?(x,y) && !object.image.transparent_pixel?(x,y)
-    end
-  end
-
-  def overlapping_pixels(object)
-    if left < object.left
-      box_left = object.left
-      if right < object.right * object.scale
-        box_width = right - object.left
-      else
-        box_width = object.width * object.scale
-      end
-    else
-      box_width = object.right * object.scale - left
-      box_left = left
-    end
-    if top < object.top
-      box_top = object.top
-      if bottom < object.bottom * object.scale
-        box_height = bottom - object.top
-      else
-        box_height = object.height * object.scale
-      end
-    else
-      box_top = top
-      box_height = object.bottom * object.scale - top
-    end
-    pixels(box_left, box_top, box_width, box_height)
-  end
-
-  def pixels(offset_x, offset_y, width, height)
-    height.round.times.flat_map do |y|
-      width.round.times.map do |x|
-        [(x + offset_x).to_i, (y + offset_y).to_i]
-      end
-    end
-  end
-
 end

data/lib/endboss.rb

@@ -6,7 +6,7 @@ attr_reader :endboss
     @x = window.width/2 - @image.width/2
     @y = window.height
     @scale = 0.0
-    @sound = Gosu::Sample.new(window, path_to_media('evil_laughter.m4a'))
+    @sound = Gosu::Sample.new(window, path_to_media('evil_laughter.wav'))
     @laughs = false
   end
 

data/lib/lamp_with_genie.rb

@@ -13,7 +13,7 @@ class LampWithGenie
       else
         @image = Gosu::Image.new(window, path_to_media('lamp.png'))
       end
-      @sound = Gosu::Sample.new(window, path_to_media('lamp.m4a'))
+      @sound = Gosu::Sample.new(window, path_to_media('lamp.wav'))
       @rubbed = false
       @y = -@image.height
       @scale = 1
@@ -43,7 +43,7 @@ class LampWithGenie
       prefix = good? ? 'good' : 'evil'
       suffix = '_flipped' if flipped
       @image = Gosu::Image.new(window, path_to_media("#{prefix}_genie#{suffix}.png"))
-      @sound = Gosu::Sample.new(window, path_to_media("#{prefix}_genie.m4a"))
+      @sound = Gosu::Sample.new(window, path_to_media("#{prefix}_genie.wav"))
       @lamp = lamp
       @y = -@image.height
       @flipped = flipped

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carpet_diem
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -28,38 +28,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.50
-- !ruby/object:Gem::Dependency
-  name: texplay
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: chingu
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -95,17 +63,16 @@ files:
 - lib/media/carpet.png
 - lib/media/carpet_flipped.png
 - lib/media/endboss.png
-- lib/media/evil_genie.m4a
 - lib/media/evil_genie.png
+- lib/media/evil_genie.wav
 - lib/media/evil_genie_flipped.png
-- lib/media/evil_laughter.m4a
-- lib/media/good_genie.m4a
+- lib/media/evil_laughter.wav
 - lib/media/good_genie.png
+- lib/media/good_genie.wav
 - lib/media/good_genie_flipped.png
-- lib/media/lamp.m4a
 - lib/media/lamp.png
+- lib/media/lamp.wav
 - lib/media/lamp_flipped.png
-- lib/media/lamp_louder.m4a
 - lib/positionable.rb
 - lib/window.rb
 - bin/carpet_diem