scorched_earth 5.0.0.pre-java → 5.0.1.pre-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e60a9daf9b54210e93dc7b3f976b483b327e9227
-  data.tar.gz: 3c33b9d2d7e31751af4a2b70b919684f70da8e62
+  metadata.gz: dfa1221f5544042db555d173cf834a693e8f45b2
+  data.tar.gz: d1a2e0323a1e430ff7c3d6d31091c7147e34e8f1
 SHA512:
-  metadata.gz: b71e277cf4f593bdab66c9d42c47890074f54f81cf9a1987a38e813ec69fe6cd53d173b797f12f04d7e95e8632365b2ef443542f30da32ae3e24ede439acd9a0
-  data.tar.gz: 2e0a0f18b34c94a69aaed1d8f3ec60f09650c59eac02c19188f6577abcfe69dcf566740a87fe9cad20dfe158f7537f8ddac27cc8ab2e6872ef2ff60001598e09
+  metadata.gz: ef23bc10966526eb981726d24ef69312758bf2bf87e2dc105b69477e158b385557206d42c2fd6333e8ac425f175425ea1323e6f6f1f78b7fc17a85fc97bc6a9d
+  data.tar.gz: 4e9fb4f997f614af6c8dfd71ce123acca2a2dc4963d8e652606f5a239fac0eb0dccaa9e8feb7faababf3cb4d4394e557b51e49917b84b1cc1274978bd5cca213

data/.rubocop.yml

@@ -0,0 +1,4 @@
+Documentation:
+  Enabled: false
+Metrics/LineLength:
+  Max: 120

data/README.md

@@ -2,9 +2,7 @@
 
 [![Code Climate](https://codeclimate.com/github/jamesmoriarty/scorched-earth-rb/badges/gpa.svg)](https://codeclimate.com/github/jamesmoriarty/scorched-earth-rb) [![Test Coverage](https://codeclimate.com/github/jamesmoriarty/scorched-earth-rb/badges/coverage.svg)](https://codeclimate.com/github/jamesmoriarty/scorched-earth-rb/coverage)
 
-A little [Scorched Earth](https://en.wikipedia.org/wiki/ScorchedEarth_Earth_(video_game)) clone in the Ruby Programming Language.
-
-With a segue into procedurally generated color palettes:
+A little [Scorched Earth](https://en.wikipedia.org/wiki/ScorchedEarth_Earth_(video_game)) clone in the Ruby Programming Language (JRuby). Now including a segue into procedurally generated color palettes:
 - [TriadMixing](http://devmag.org.za/2012/07/29/how-to-choose-colours-procedurally-algorithms/)
 - [CIE94](https://en.wikipedia.org/wiki/Color_difference#CIE94)
 
@@ -12,33 +10,20 @@ With a segue into procedurally generated color palettes:
 
 ## Installation
 
-```
-brew install glew libsndfile
-```
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'scorched_earth'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install scorched_earth
+    $ brew install jruby
+    $ jruby -S gem install scorched_earth --pre
 
 ## Usage
 
-    $ scorched
+    $ jruby -S scorched
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+    $ uname
+    Darwin
+    $ jruby --version              
+    jruby 9.1.5.0 (2.3.1) 2016-09-07 036ce39 Java HotSpot(TM) 64-Bit Server VM 25.74-b02 on 1.8.0_74-b02 +jit [darwin-x86_64]
+    $ jruby -S bundle exec rake
 
 ## Contributing
 

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
+  t.libs << 'test'
+  t.libs << 'lib'
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "scorched_earth"
+require 'bundler/setup'
+require 'scorched_earth'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "scorched_earth"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/exe/scorched

@@ -1,5 +1,5 @@
 #!/usr/bin/env jruby
 
-require_relative "../lib/scorched_earth"
+require_relative '../lib/scorched_earth'
 
 ScorchedEarth::GameWindow.new(800, 600).run

data/lib/scorched_earth.rb

@@ -1,6 +1,6 @@
-$:.unshift File.dirname(__FILE__)
+$LOAD_PATH.unshift File.dirname(__FILE__)
 
-require "scorched_earth/version"
-require "scorched_earth/game_window"
+require 'scorched_earth/version'
+require 'scorched_earth/game_window'
 
 module ScorchedEarth; end

data/lib/scorched_earth/color_palette.rb

@@ -44,7 +44,7 @@ module ScorchedEarth
             Color.new(
               (mix.red   + color.red   * scale).to_i,
               (mix.green + color.green * scale).to_i,
-              (mix.blue  + color.blue  * scale).to_i,
+              (mix.blue  + color.blue  * scale).to_i
             )
           end
         end

data/lib/scorched_earth/event_runner.rb

@@ -0,0 +1,28 @@
+module ScorchedEarth
+  class EventRunner
+    attr_reader :events, :subscribers
+
+    def initialize
+      @events      = Queue.new
+      @subscribers = []
+    end
+
+    def publish(event)
+      events << event
+    end
+
+    def subscribe(klass, &block)
+      subscribers << [klass, block]
+    end
+
+    def process_events!
+      until events.empty?
+        event = events.pop
+
+        subscribers.each do |klass, block|
+          block.call event if event.is_a? klass
+        end
+      end
+    end
+  end
+end

data/lib/scorched_earth/events/entity_created.rb

@@ -1,5 +1,5 @@
 module ScorchedEarth
   module Events
-    EntityCreated  = Struct.new(:entity)
+    EntityCreated = Struct.new(:entity)
   end
 end

data/lib/scorched_earth/events/game_ending.rb

@@ -1,5 +1,5 @@
 module ScorchedEarth
   module Events
-    GameEnding  = Struct.new(:time)
+    GameEnding = Struct.new(:time)
   end
 end

data/lib/scorched_earth/events/mouse_moved.rb

@@ -1,5 +1,5 @@
 module ScorchedEarth
   module Events
-    MouseMoved  = Struct.new(:x, :y)
+    MouseMoved = Struct.new(:x, :y)
   end
 end

data/lib/scorched_earth/events/mouse_pressed.rb

@@ -1,5 +1,5 @@
 module ScorchedEarth
   module Events
-    MousePressed  = Struct.new(:x, :y)
+    MousePressed = Struct.new(:x, :y)
   end
 end

data/lib/scorched_earth/explosion.rb

@@ -3,10 +3,12 @@ module ScorchedEarth
     attr_reader :x, :y, :color, :radius
 
     def initialize(x, y)
-      @x, @y, @radius = x, y, 25
+      @x      = x
+      @y      = y
+      @radius = 25
     end
 
-    def update(delta)
+    def update(_delta)
       @radius += 25
       @x      -= 1_000_000 if radius > 100
     end

data/lib/scorched_earth/game.rb

@@ -1,12 +1,13 @@
-require "scorched_earth/helpers"
-require "scorched_earth/terrain"
-require "scorched_earth/player"
-require "scorched_earth/shot"
-require "scorched_earth/explosion"
-require "scorched_earth/mouse"
-require "scorched_earth/color_palette"
-require "scorched_earth/events/entity_created"
-require "scorched_earth/events/game_ending"
+require 'scorched_earth/helpers'
+require 'scorched_earth/terrain'
+require 'scorched_earth/player'
+require 'scorched_earth/shot'
+require 'scorched_earth/explosion'
+require 'scorched_earth/mouse'
+require 'scorched_earth/color_palette'
+require 'scorched_earth/event_runner'
+require 'scorched_earth/events/entity_created'
+require 'scorched_earth/events/game_ending'
 
 include Java
 
@@ -17,52 +18,43 @@ module ScorchedEarth
     include Helpers
 
     attr_reader :width, :height,
-      :color_palette, :entities, :mouse, :players, :terrain,
-      :events, :event_listeners
+                :color_palette, :entities, :mouse, :players, :terrain,
+                :event_runner
 
-    def initialize width, height
-      @width, @height = width, height
+    def initialize(width, height)
+      @width  = width
+      @height = height
     end
 
     def setup
-      @color_palette   = ColorPalette.new Color::RED, Color::YELLOW, Color::WHITE
-      @entities        = []
-      @events          = Queue.new
-      @event_listeners = []
-      @players         = 2.times.map { |index| Player.new rand(width), color_palette.get("player_#{index}") }
-      @terrain         = Terrain.new width, height, rand(10), color_palette.get("terrain")
-      @mouse           = Mouse.new self
-
-      on Events::EntityCreated do |event|
-        entities << event.entity
-      end
-
-      on Events::GameEnding do |event|
-        if event.time < Time.now
-          setup
-        else
-          emit event
-        end
-      end
+      @color_palette = ColorPalette.new Color::RED, Color::YELLOW, Color::WHITE
+      @entities      = []
+      @event_runner  = EventRunner.new
+      @players       = Array.new(2) { |index| Player.new rand(width), color_palette.get("player_#{index}") }
+      @terrain       = Terrain.new width, height, rand(10), color_palette.get('terrain')
+      @mouse         = Mouse.new event_runner, players, terrain
+
+      event_runner.subscribe(Events::EntityCreated) { |event| entities << event.entity }
+      event_runner.subscribe(Events::GameEnding)    { |event| event.time < Time.now ? setup : event_runner.publish(event) }
     end
 
-    def update delta
-      process_events!
+    def update(delta)
+      event_runner.process_events!
 
-      radius           = 50
+      radius = 50
       @entities.each { |entity| entity.update delta }
       @entities, @dead = *@entities.partition { |entity| terrain.fetch(entity.x, 0) < entity.y }
       @dead
         .select { |entity| entity.is_a? Shot }
         .select { |entity| entity.x < terrain.width && entity.x > 0 }
-        .each   { |entity| terrain.bite entity.x, radius  }
-        .each   { |entity| emit Events::EntityCreated.new(Explosion.new entity.x, entity.y) }
+        .each   { |entity| terrain.bite entity.x, radius }
+        .each   { |entity| event_runner.publish Events::EntityCreated.new(Explosion.new(entity.x, entity.y)) }
         .select { |entity| players.any? { |player| inside_radius? entity.x - player.x, 0, radius } }
-        .each   { emit Events::GameEnding.new(Time.now + 1) }
+        .each   { event_runner.publish Events::GameEnding.new(Time.now + 1) }
     end
 
-    def render graphics
-      graphics.set_color color_palette.get("sky")
+    def render(graphics)
+      graphics.set_color color_palette.get('sky')
       graphics.fill_rect 0, 0, width, height
 
       entities.each do |entity|
@@ -78,26 +70,8 @@ module ScorchedEarth
       terrain.draw graphics
     end
 
-    def emit event
-      events << event
-    end
-
-    def on klass, &block
-      event_listeners << [klass, block]
-    end
-
-    private
-
-    def process_events!
-      until events.empty? do
-        event = events.pop
-
-        event_listeners.each do |klass, block|
-          if event.is_a? klass
-            block.call event
-          end
-        end
-      end
+    def publish(event)
+      event_runner.publish event
     end
   end
 end

data/lib/scorched_earth/game_window.rb

@@ -8,16 +8,16 @@ import java.awt.Dimension
 import javax.swing.JPanel
 import java.awt.Color
 
-require "scorched_earth/game"
-require "scorched_earth/events/mouse_pressed"
-require "scorched_earth/events/mouse_released"
-require "scorched_earth/events/mouse_moved"
+require 'scorched_earth/game'
+require 'scorched_earth/events/mouse_pressed'
+require 'scorched_earth/events/mouse_released'
+require 'scorched_earth/events/mouse_moved'
 
 module ScorchedEarth
   class GameWindow
     attr_reader :buffer_strategy, :canvas, :game
 
-    def initialize width, height
+    def initialize(width, height)
       @container = JFrame.new
       @canvas    = Canvas.new
       @panel     = @container.get_content_pane
@@ -62,39 +62,39 @@ module ScorchedEarth
         graphics.dispose
         buffer_strategy.show
 
-        sleep 1.0/60
+        sleep 1.0 / 60
       end
     end
 
     private
 
-    def mouse_moved event
+    def mouse_moved(event)
       x = event.point.x
       y = event.point.y
 
-      Events::MouseMoved.new x, y
+      game.publish Events::MouseMoved.new x, y
     end
 
-    def mouse_dragged *args; end
+    def mouse_dragged(*args); end
 
-    def mouse_pressed event
+    def mouse_pressed(event)
       x = event.point.x
       y = event.point.y
 
-      game.emit Events::MousePressed.new x, y
+      game.publish Events::MousePressed.new x, y
     end
 
-    def mouse_released event
+    def mouse_released(event)
       x = event.point.x
       y = event.point.y
 
-      game.emit Events::MouseReleased.new x, y
+      game.publish Events::MouseReleased.new x, y
     end
 
-    def mouse_clicked *args; end
+    def mouse_clicked(*args); end
 
-    def mouse_entered *args; end
+    def mouse_entered(*args); end
 
-    def mouse_exited *args; end
+    def mouse_exited(*args); end
   end
 end

data/lib/scorched_earth/helpers.rb

@@ -38,7 +38,7 @@ module ScorchedEarth
     end
 
     def inside_radius?(x, y, radius)
-      x ** 2 + y ** 2 < radius ** 2
+      x**2 + y**2 < radius**2
     end
 
     module_function :angle, :circle, :inside_radius?, :radians_to_degrees, :degrees_to_radians, :normalize_degrees, :offset_x, :offset_y

data/lib/scorched_earth/mouse.rb

@@ -1,28 +1,22 @@
-require "scorched_earth/helpers"
-require "scorched_earth/events/mouse_pressed"
-require "scorched_earth/events/mouse_released"
-require "scorched_earth/events/mouse_moved"
+require 'scorched_earth/helpers'
+require 'scorched_earth/events/mouse_pressed'
+require 'scorched_earth/events/mouse_released'
+require 'scorched_earth/events/mouse_moved'
 
 module ScorchedEarth
   class Mouse
     include Helpers
 
-    attr_reader :game, :mouse_pressed_at, :x, :y
+    attr_reader :event_runner, :players, :terrain, :mouse_pressed_at, :x, :y
 
-    def initialize game
-      @game = game
+    def initialize(event_runner, players, terrain)
+      @event_runner = event_runner
+      @players      = players
+      @terrain      = terrain
 
-      game.on Events::MousePressed, &method(:mouse_pressed)
-      game.on Events::MouseReleased, &method(:mouse_released)
-      game.on Events::MouseMoved, &method(:mouse_moved)
-    end
-
-    def terrain
-      game.terrain
-    end
-
-    def players
-      game.players
+      event_runner.subscribe Events::MousePressed,  &method(:mouse_pressed)
+      event_runner.subscribe Events::MouseReleased, &method(:mouse_released)
+      event_runner.subscribe Events::MouseMoved,    &method(:mouse_moved)
     end
 
     def current_player
@@ -33,40 +27,45 @@ module ScorchedEarth
       players.rotate!
     end
 
-    def mouse_released event
+    def mouse_released(event)
       return unless mouse_pressed_at
 
-      delta         = (Time.now - mouse_pressed_at) * 1000 + 1000
-      x1, y1        = event.x, event.y
-      x2, y2        = current_player.x, height - terrain[current_player.x]
-      degrees       = angle(y2 - y1, x2 - x1) + 180
-      velocity_x    = offset_x(degrees, delta)
-      velocity_y    = offset_y(degrees, delta)
-      shot          = Shot.new current_player.x, terrain[current_player.x], velocity_x, velocity_y, Color.white
+      delta      = (Time.now - mouse_pressed_at) * 1000 + 1000
+      x1         = event.x
+      y1         = event.y
+      x2         = current_player.x
+      y2         = height - terrain[current_player.x]
+      degrees    = angle(y2 - y1, x2 - x1) + 180
+      velocity_x = offset_x(degrees, delta)
+      velocity_y = offset_y(degrees, delta)
+      shot       = Shot.new current_player.x, terrain[current_player.x], velocity_x, velocity_y, Color.white
 
-      game.emit Events::EntityCreated.new shot
+      event_runner.publish Events::EntityCreated.new shot
 
       next_player
     end
 
-    def mouse_pressed event
+    def mouse_pressed(_event)
       @mouse_pressed_at = Time.now
     end
 
-    def mouse_moved event
-      @x, @y = event.x, event.y
+    def mouse_moved(event)
+      @x = event.x
+      @y = event.y
     end
 
     def height
-      game.height
+      terrain.height
     end
 
     def draw(graphics)
       return unless x && y
 
       height = graphics.destination.height
-      x1, y1 = x, y
-      x2, y2 = current_player.x, height - terrain[current_player.x]
+      x1     = x
+      y1     = y
+      x2     = current_player.x
+      y2     = height - terrain[current_player.x]
 
       graphics.set_color player.color
       graphics.draw_line x1, y1, x2, y2

data/lib/scorched_earth/player.rb

@@ -3,7 +3,8 @@ module ScorchedEarth
     attr_reader :x, :color
 
     def initialize(x, color)
-      @x, @color = x, color
+      @x     = x
+      @color = color
     end
 
     def draw(graphics, y)

data/lib/scorched_earth/shot.rb

@@ -1,4 +1,4 @@
-require "scorched_earth/helpers"
+require 'scorched_earth/helpers'
 
 module ScorchedEarth
   class Shot
@@ -6,21 +6,27 @@ module ScorchedEarth
 
     attr_reader :x, :y, :velocity_x, :velocity_y, :color
 
-    def initialize x, y, velocity_x, velocity_y, color
-      @x, @y, @velocity_x, @velocity_y, @color = x, y, velocity_x, velocity_y, color
+    def initialize(x, y, velocity_x, velocity_y, color)
+      @x          = x
+      @y          = y
+      @velocity_x = velocity_x
+      @velocity_y = velocity_y
+      @color      = color
     end
 
-    def update delta
+    def update(delta)
       @velocity_y -= gravity * delta
       @x          += velocity_x * delta
       @y          += velocity_y * delta
     end
 
-    def draw graphics
+    def draw(graphics)
       height  = graphics.destination.height
       degrees = angle(velocity_y, velocity_x)
-      x1, y1  = x, height - y
-      x2, y2  = x1 + offset_x(degrees, length), y1 + offset_y(degrees, length)
+      x1      = x
+      y1      = height - y
+      x2      = x1 + offset_x(degrees, length)
+      y2      = y1 + offset_y(degrees, length)
 
       graphics.set_color color
       graphics.draw_line x1, y1, x2, y2

data/lib/scorched_earth/terrain.rb

@@ -1,4 +1,4 @@
-require "scorched_earth/helpers"
+require 'scorched_earth/helpers'
 
 include Java
 
@@ -11,7 +11,8 @@ module ScorchedEarth
     attr_reader :color, :height
 
     def initialize(width, height, cycles, color)
-      @color, @height = color, height
+      @color = color
+      @height = height
 
       super(width) do |index|
         Math.sin(index.to_f / width * cycles) * height / 4 + (height / 4)
@@ -23,25 +24,25 @@ module ScorchedEarth
     end
 
     def draw(graphics)
-      cached_image = cache do
-        image = graphics.get_device_configuration.create_compatible_image width, height, Transparency.TRANSLUCENT
-
-        each_with_index do |y, x|
-          image.graphics.tap do |graphics|
-            graphics.set_color color
-            graphics.draw_line x, height - y, x, height
-          end
-        end
+      graphics.draw_image cache { _draw(graphics) }, 0, 0, nil
+    end
+
+    def _draw(graphics)
+      image = graphics
+              .get_device_configuration
+              .create_compatible_image width, height, Transparency::TRANSLUCENT
 
-        image
+      each_with_index do |y, x|
+        image.graphics.tap do |image_graphics|
+          image_graphics.set_color color
+          image_graphics.draw_line x, height - y, x, height
+        end
       end
 
-      graphics.draw_image cached_image, 0, 0, nil
+      image
     end
 
-    def bite(center_x, radius)
-      center_y = self[center_x]
-
+    def bite(center_x, radius, center_y = self[center_x])
       circle(radius) do |offset_x, offset_y|
         x = center_x + offset_x
         y = self[x]

data/lib/scorched_earth/version.rb

@@ -1,3 +1,3 @@
 module ScorchedEarth
-  VERSION = "5.0.0.pre"
+  VERSION = '5.0.1.pre'.freeze
 end

data/scorched_earth.gemspec

@@ -4,24 +4,24 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'scorched_earth/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "scorched_earth"
+  spec.name          = 'scorched_earth'
   spec.version       = ScorchedEarth::VERSION
-  spec.authors       = ["James Moriarty"]
-  spec.email         = ["jamespaulmoriarty@gmail.com"]
+  spec.authors       = ['James Moriarty']
+  spec.email         = ['jamespaulmoriarty@gmail.com']
 
-  spec.summary       = %q{A simple clone of the classic game ScorchedEarth Earth.}
-  spec.homepage      = "https://github.com/jamesmoriarty/scorched-earth"
-  spec.license       = "MIT"
-  spec.platform      = "java"
+  spec.summary       = 'A simple clone of the classic game ScorchedEarth Earth.'
+  spec.homepage      = 'https://github.com/jamesmoriarty/scorched-earth'
+  spec.license       = 'MIT'
+  spec.platform      = 'java'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'simplecov'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scorched_earth
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre
+  version: 5.0.1.pre
 platform: java
 authors:
 - James Moriarty
@@ -89,6 +89,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rubocop.yml
 - .travis.yml
 - Gemfile
 - LICENSE.txt
@@ -99,6 +100,7 @@ files:
 - exe/scorched
 - lib/scorched_earth.rb
 - lib/scorched_earth/color_palette.rb
+- lib/scorched_earth/event_runner.rb
 - lib/scorched_earth/events/entity_created.rb
 - lib/scorched_earth/events/game_ending.rb
 - lib/scorched_earth/events/mouse_moved.rb