gosu_more_drawables 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ec007dfd8eca24b8cbb5afa197f310ed1457e41bb5b83a94368f38d63d10116
-  data.tar.gz: 441048e8c1eda429610704b42e5d4e052784ea86794500195d47c8976c31b32f
+  metadata.gz: e8a363874fb18dd5b045675f86bfa6f5f5912420e81aa284ca963415d177e3c1
+  data.tar.gz: 8df53570385f951ab1750843c18d921e9cca6c018118ee8dbcf99187938fdd8c
 SHA512:
-  metadata.gz: d3871f25e8f8e9474db6211cd5a819c5e022edc8d2c2dd7bf34838fb30f395a1880be0087950be7090410e8629179b6b3fed687dcb4e011b65be90d97450fd18
-  data.tar.gz: 8effdd030f874ba90458c7b7a075a9cfe2f59d71c4d631b55e042fccd2dfb9dd621ea4fdf59441de22670501c000638d3a619b6d2692d1c81fe44e68dcac921a
+  metadata.gz: 264661a4ca1155914f874abb0b277a2ddbe80313fe0f0f016c037668d5bf4343098e1be1a1eec629c391e1288da941e2f37a671988c495ad434d84f400654b0f
+  data.tar.gz: e704ea0d5ff1dabfdaf7835f7d118b48654363faa59d3997c6c9bc9bf57321cb45838afd12578783ceda44f5fafb2f43035ef5817ffe3cec87ece5c5ec05b59a

data/.gitignore

@@ -1,8 +1,8 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in gosu_more_drawables.gemspec
-gemspec
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in gosu_more_drawables.gemspec
+gemspec

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2020 Cyberarm
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2020 Cyberarm
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,39 +1,39 @@
-# GosuMoreDrawables
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/gosu_more_drawables`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'gosu_more_drawables'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install gosu_more_drawables
-
-## Usage
-
-TODO: Write usage instructions here
-
-## 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).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/gosu_more_drawables.
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+# GosuMoreDrawables
+
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/gosu_more_drawables`. To experiment with that code, run `bin/console` for an interactive prompt.
+
+TODO: Delete this and the text above, and describe your gem
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'gosu_more_drawables'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install gosu_more_drawables
+
+## Usage
+
+TODO: Write usage instructions here
+
+## 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).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/gosu_more_drawables.
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/Rakefile

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

data/bin/console

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "gosu_more_drawables"
-
-# 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.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "gosu_more_drawables"
+
+# 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.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/gosu_more_drawables.gemspec

@@ -1,33 +1,33 @@
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "gosu_more_drawables/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "gosu_more_drawables"
-  spec.version       = GosuMoreDrawables::VERSION
-  spec.authors       = ["Cyberarm"]
-  spec.email         = ["matthewlikesrobots@gmail.com"]
-
-  spec.summary       = %q{Adds circles and arcs to Gosu}
-  spec.description   = %q{Adds Gosu.draw_circle and Gosu.draw_arc for Gosu}
-  spec.homepage      = "https://github.com/cyberarm/gosu_more_drawables"
-  spec.license       = "MIT"
-
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/cyberarm/gosu_more_drawables"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-end
+lib = File.expand_path("lib", __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "gosu_more_drawables/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "gosu_more_drawables"
+  spec.version       = GosuMoreDrawables::VERSION
+  spec.authors       = ["Cyberarm"]
+  spec.email         = ["matthewlikesrobots@gmail.com"]
+
+  spec.summary       = %q{Adds circles and arcs to Gosu}
+  spec.description   = %q{Adds Gosu.draw_circle and Gosu.draw_arc for Gosu}
+  spec.homepage      = "https://github.com/cyberarm/gosu_more_drawables"
+  spec.license       = "MIT"
+
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/cyberarm/gosu_more_drawables"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "minitest", "~> 5.0"
+end

data/lib/gosu_more_drawables/draw_arc.rb

@@ -1,64 +1,95 @@
-module Gosu
-def self.draw_arc(x, y, z, radius, percentage = 1.0, segments = nil, thickness = 4, color = Gosu::Color::WHITE)
-    segments ||= 128
-
-    segments = 360.0 / segments
-
-    return if percentage == 0.0
-
-    0.step((359 * percentage), segments) do |angle|
-      angle2 = angle + segments
-
-      point_a_left_x = x + Gosu.offset_x(angle, radius - thickness)
-      point_a_left_y = y + Gosu.offset_y(angle, radius - thickness)
-
-      point_a_right_x = x + Gosu.offset_x(angle2, radius - thickness)
-      point_a_right_y = y + Gosu.offset_y(angle2, radius - thickness)
-
-      point_b_left_x = x + Gosu.offset_x(angle, radius)
-      point_b_left_y = y + Gosu.offset_y(angle, radius)
-
-      point_b_right_x = x + Gosu.offset_x(angle2, radius)
-      point_b_right_y = y + Gosu.offset_y(angle2, radius)
-
-      if color.is_a?(Array)
-        Gosu.draw_quad(
-          point_a_left_x, point_a_left_y, color.first,
-          point_b_left_x, point_b_left_y, color.last,
-          point_a_right_x, point_a_right_y, color.first,
-          point_b_right_x, point_b_right_y, color.last
-        )
-      elsif color.is_a?(Hash)
-        start_color = color[:from]
-        end_color = color[:to]
-
-        color_a = Gosu::Color.rgba(
-          (end_color.red - start_color.red) * (angle / 360.0) + start_color.red,
-          (end_color.green - start_color.green) * (angle / 360.0) + start_color.green,
-          (end_color.blue - start_color.blue) * (angle / 360.0) + start_color.blue,
-          (end_color.alpha - start_color.alpha) * (angle / 360.0) + start_color.alpha,
-        )
-        color_b = Gosu::Color.rgba(
-          (end_color.red - start_color.red) * (angle2 / 360.0) + start_color.red,
-          (end_color.green - start_color.green) * (angle2 / 360.0) + start_color.green,
-          (end_color.blue - start_color.blue) * (angle2 / 360.0) + start_color.blue,
-          (end_color.alpha - start_color.alpha) * (angle2 / 360.0) + start_color.alpha,
-        )
-
-        Gosu.draw_quad(
-          point_a_left_x, point_a_left_y, color_a,
-          point_b_left_x, point_b_left_y, color_a,
-          point_a_right_x, point_a_right_y, color_b,
-          point_b_right_x, point_b_right_y, color_b
-        )
-      else
-        Gosu.draw_quad(
-          point_a_left_x, point_a_left_y, color,
-          point_b_left_x, point_b_left_y, color,
-          point_a_right_x, point_a_right_y, color,
-          point_b_right_x, point_b_right_y, color
-        )
-      end
-    end
-  end
+module Gosu
+  # Draw an arc around the point x and y.
+  #
+  # Color accepts the following: *Gosu::Color*, *Array* (with 2 colors), or a *Hash* with keys: _from:_ and _to:_ both colors.
+  #
+  # With a *Gosu::Color* the arc will be painted with color
+  #
+  # With an *Array* the first *Gosu::Color* with be the innermost color and the last *Gosu::Color* with be the outermost color
+  #
+  # With a *Hash* the arc will smoothly transition from the start of the arc to the end
+  # @example
+  #   # Using a Hash
+  #   Gosu.draw_arc(100, 100, 50, 0.5, 128, 4, {from: Gosu::Color::BLUE, to: Gosu::Color::GREEN}, 0, :default)
+  #
+  #   # Using an Array
+  #   Gosu.draw_arc(100, 100, 50, 0.5, 128, 4, [Gosu::Color::BLUE, Gosu::Color::GREEN], 0, :default)
+  #
+  #   # Using a Gosu::Color
+  #   Gosu.draw_arc(100, 100, 50, 0.5, 128, 4, Gosu::Color::BLUE, 0, :default)
+  #
+  #
+  # @param x X position.
+  # @param y Y position.
+  # @param radius radius of arc, in pixels.
+  # @param percentage how complete the segment is, __0.0 is 0% and _1.0_ is 100%.
+  # @param segments how many segments for arc, more will appear smoother, less will appear jagged.
+  # @param thickness how thick arc will be.
+  # @param color [Gosu::Color, Array<Gosu::Color, Gosu::Color>, Hash{from: start_color, to: end_color}] color or colors to draw the arc with.
+  # @param z Z position.
+  # @param mode blend mode.
+  #
+  # @note _thickness_ is subtracted from radius, meaning that the arc will grow towards the origin, not away from it.
+  #
+  # @return [void]
+  def self.draw_arc(x, y, radius, percentage = 1.0, segments = 128, thickness = 4, color = Gosu::Color::WHITE, z = 0, mode = :default)
+    segments = 360.0 / segments
+
+    return if percentage == 0.0
+
+    0.step((359 * percentage), segments) do |angle|
+      angle2 = angle + segments
+
+      point_a_left_x = x + Gosu.offset_x(angle, radius - thickness)
+      point_a_left_y = y + Gosu.offset_y(angle, radius - thickness)
+
+      point_a_right_x = x + Gosu.offset_x(angle2, radius - thickness)
+      point_a_right_y = y + Gosu.offset_y(angle2, radius - thickness)
+
+      point_b_left_x = x + Gosu.offset_x(angle, radius)
+      point_b_left_y = y + Gosu.offset_y(angle, radius)
+
+      point_b_right_x = x + Gosu.offset_x(angle2, radius)
+      point_b_right_y = y + Gosu.offset_y(angle2, radius)
+
+      if color.is_a?(Array)
+        Gosu.draw_quad(
+          point_a_left_x, point_a_left_y, color.first,
+          point_b_left_x, point_b_left_y, color.last,
+          point_a_right_x, point_a_right_y, color.first,
+          point_b_right_x, point_b_right_y, color.last
+        )
+      elsif color.is_a?(Hash)
+        start_color = color[:from]
+        end_color = color[:to]
+
+        color_a = Gosu::Color.rgba(
+          (end_color.red - start_color.red) * (angle / 360.0) + start_color.red,
+          (end_color.green - start_color.green) * (angle / 360.0) + start_color.green,
+          (end_color.blue - start_color.blue) * (angle / 360.0) + start_color.blue,
+          (end_color.alpha - start_color.alpha) * (angle / 360.0) + start_color.alpha,
+        )
+        color_b = Gosu::Color.rgba(
+          (end_color.red - start_color.red) * (angle2 / 360.0) + start_color.red,
+          (end_color.green - start_color.green) * (angle2 / 360.0) + start_color.green,
+          (end_color.blue - start_color.blue) * (angle2 / 360.0) + start_color.blue,
+          (end_color.alpha - start_color.alpha) * (angle2 / 360.0) + start_color.alpha,
+        )
+
+        Gosu.draw_quad(
+          point_a_left_x, point_a_left_y, color_a,
+          point_b_left_x, point_b_left_y, color_a,
+          point_a_right_x, point_a_right_y, color_b,
+          point_b_right_x, point_b_right_y, color_b
+        )
+      else
+        Gosu.draw_quad(
+          point_a_left_x, point_a_left_y, color,
+          point_b_left_x, point_b_left_y, color,
+          point_a_right_x, point_a_right_y, color,
+          point_b_right_x, point_b_right_y, color
+        )
+      end
+    end
+  end
 end

data/lib/gosu_more_drawables/draw_circle.rb

@@ -1,20 +1,31 @@
-module Gosu
-  def self.draw_circle(x, y, z, radius, color = Gosu::Color::WHITE, step_size = 36)
-    step_size = (360.0/step_size).floor
-
-    0.step(359, step_size) do |angle|
-      angle2 = angle + step_size
-
-      point_lx = x + Gosu.offset_x(angle, radius)
-      point_ly = y + Gosu.offset_y(angle, radius)
-      point_rx = x + Gosu.offset_x(angle2, radius)
-      point_ry = y + Gosu.offset_y(angle2, radius)
-
-      Gosu.draw_triangle(
-        point_lx, point_ly, color,
-	      point_rx, point_ry, color,
-	      x, y, color, z
-      )
-    end
-  end
+module Gosu
+  ##
+  # Draw a filled circled around point X and Y.
+  #
+  # @param x X position.
+  # @param y Y position.
+  # @param radius radius of circle, in pixels.
+  # @param step_size resolution of circle, more steps will apear smoother, less will appear jagged.
+  # @param color color to draw circle with.
+  # @param mode blend mode.
+  #
+  # @return [void]
+  def self.draw_circle(x, y, radius, step_size = 36, color = Gosu::Color::WHITE, z = 0, mode = :default)
+    step_size = (360.0 / step_size).floor
+
+    0.step(359, step_size) do |angle|
+      angle2 = angle + step_size
+
+      point_lx = x + Gosu.offset_x(angle, radius)
+      point_ly = y + Gosu.offset_y(angle, radius)
+      point_rx = x + Gosu.offset_x(angle2, radius)
+      point_ry = y + Gosu.offset_y(angle2, radius)
+
+      Gosu.draw_triangle(
+        point_lx, point_ly, color,
+	      point_rx, point_ry, color,
+	      x, y, color, z, mode
+      )
+    end
+  end
 end

data/lib/gosu_more_drawables/version.rb

@@ -1,3 +1,3 @@
-module GosuMoreDrawables
-  VERSION = "0.1.0"
-end
+module GosuMoreDrawables
+  VERSION = "0.2.0"
+end

data/lib/gosu_more_drawables.rb

@@ -1,3 +1,3 @@
-require_relative "gosu_more_drawables/draw_arc"
-require_relative "gosu_more_drawables/draw_circle"
-require_relative "gosu_more_drawables/version"
+require_relative "gosu_more_drawables/draw_arc"
+require_relative "gosu_more_drawables/draw_circle"
+require_relative "gosu_more_drawables/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu_more_drawables
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Cyberarm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Adds circles and arcs to Gosu