smalruby 0.1.10-x86-mingw32 → 0.1.11-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4de81755881df577b8df42c9c1a48f4dc2a873e2
-  data.tar.gz: 4bae43f78318894db8b44a763de404aa41f5bf64
+  metadata.gz: 92e5998bc53ec3da2c3feeaf5bfeca7d7b624159
+  data.tar.gz: 4ca3ba06b85379c063c16f9bb79aa0c247fc6409
 SHA512:
-  metadata.gz: 97c03a1720b43af95f0fa00b75de5f258768e262da85c878b8b5639fbd0a4a0f6b36a1372c703a5f574083f766d75529f32520ff9f23986a6676795dd23506d4
-  data.tar.gz: 6a5ef2b469e2a8bd7ec772941648fd6bffdd24ce98ca6a2cb37ec3d23938932d5f723748e9dbe9b64a7e77e57682bcd96e4e0a3f737183dc0743c14b2fa3a643
+  metadata.gz: ee5dfdfa2b482dfecb2e11ba6528e331d9c8c836e95d99de938469fc550610dcf43ccc88663615451b56d1167ef211463c68fe1405c3a475dbf7b6875aca1bb9
+  data.tar.gz: 443025a3c48212026f047c7bf20f54377bdf5c86bc6484081867444b3d0103363ec3a63a48e4aa9c4d299207c0542b45db9a87c093c903657dca9fb7a6341687

data/.rubocop.yml

@@ -27,7 +27,7 @@ Metrics/ClassLength:
   Max: 1000
 
 Metrics/CyclomaticComplexity:
-  Max: 8
+  Max: 10
 
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
@@ -39,12 +39,12 @@ Metrics/MethodLength:
 
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 170
+  Max: 500
 
 Metrics/PerceivedComplexity:
-  Max: 8
+  Max: 15
 
-Performance/ParallelAssignment:
+Style/ParallelAssignment:
   Enabled: false
 
 Style/AccessorMethodName:
@@ -98,8 +98,10 @@ Style/StringLiterals:
 Style/SymbolProc:
   Enabled: false
 
-# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
-Style/TrailingComma:
+Style/TrailingCommaInLiteral:
+  Enabled: false
+
+Style/TrailingCommaInArguments:
   Enabled: false
 
 Style/UnneededPercentQ:
@@ -107,3 +109,50 @@ Style/UnneededPercentQ:
 
 Style/NegatedIf:
   Enabled: false
+
+Performance/RedundantMatch:
+  Enabled: false
+
+Style/ExtraSpacing:
+  Exclude:
+    - 'smalruby.gemspec'
+
+Style/SpaceAroundOperators:
+  Exclude:
+    - 'smalruby.gemspec'
+
+Style/MutableConstant:
+  Enabled: false
+
+Style/ConditionalAssignment:
+  Enabled: false
+
+Style/ZeroLengthPredicate:
+  Enabled: false
+
+Style/SignalException:
+  Enabled: false
+
+Style/MultilineMethodCallIndentation:
+  Enabled: false
+
+Style/Alias:
+  Enabled: false
+
+Lint/UselessAccessModifier:
+  Enabled: false
+
+Style/SpaceInsideStringInterpolation:
+  Enabled: false
+
+Style/NumericPredicate:
+  Enabled: false
+
+Style/EmptyMethod:
+  Enabled: false
+
+Style/MethodMissing:
+  Enabled: false
+
+Metrics/BlockLength:
+  Max: 35

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 rvm:
-  - 2.1.5
+  - 2.3.3
 
 env:
   AUDIODEV=null
@@ -9,3 +9,4 @@ env:
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq libsdl1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev timidity libsdl-ttf2.0-dev libsdl-sge-dev fonts-horai-umefont fonts-ipafont
+ - gem update bundler

data/README.md

@@ -6,6 +6,13 @@
 smalruby is a 2D game development library. This is part of "Smalruby"
 project that is a learning ruby programming environment for kids.
 
+## Requirement
+
+* Windows or UNIX like OS (MAC OS X, Linux, etc...)
+* Ruby 2.0.0-p353 or higher
+* dxruby_sdl (for Mac OS X and Linux): https://github.com/smalruby/dxruby_sdl
+* rsdl (for Mac OS X): http://www.kumaryu.net/proj/ruby-rsdl/
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/smalruby.rb

@@ -99,7 +99,7 @@ module Smalruby
         attach_thread_input =
           Win32API.new('user32', 'AttachThreadInput', %w(i i i), 'v')
         attach_thread_input.call(this_thread_id, active_thread_id, 1)
-        Win32API.new('user32', 'SetForegroundWindow', %w(i), 'i')
+        Win32API.new('user32', 'BringWindowToTop', %w(i), 'i')
           .call(Window.hWnd)
         attach_thread_input.call(this_thread_id, active_thread_id, 0)
 

data/lib/smalruby/character.rb

@@ -27,6 +27,7 @@ module Smalruby
     attr_reader :rotation_style
     attr_reader :enable_pen
     attr_accessor :pen_color
+    attr_accessor :volume
 
     def initialize(option = {})
       defaults = {
@@ -61,6 +62,7 @@ module Smalruby
       @angle = 0 unless Util.windows?
       @enable_pen = false
       @pen_color = 'black'
+      @volume = 100
 
       self.scale_x = 1.0
       self.scale_y = 1.0
@@ -205,17 +207,17 @@ module Smalruby
       @vector[:y] = Math.sin(radian)
 
       if @rotation_style == :free
-        self.scale_x = 1
+        self.scale_x = scale_x.abs
         super(val)
       elsif @rotation_style == :left_right
         if @vector[:x] >= 0
-          self.scale_x = 1
+          self.scale_x = scale_x.abs
         else
-          self.scale_x = -1
+          self.scale_x = scale_x.abs * -1
         end
         super(0)
       else
-        self.scale_x = 1
+        self.scale_x = scale_x.abs
         super(0)
       end
     end
@@ -365,13 +367,20 @@ module Smalruby
       }
       opt = process_optional_arguments(option, defaults)
 
-      new_sound(opt[:name]).play
+      sound = new_sound(opt[:name])
+      sound.set_volume(calc_volume)
+      sound.play
     end
 
     # @!endgroup
 
     # @!group ペン
 
+    # Clears all pen marks from the Stage
+    def clear
+      world.current_stage.clear
+    end
+
     # ペンを下ろす
     def down_pen
       @enable_pen = true
@@ -382,8 +391,37 @@ module Smalruby
       @enable_pen = false
     end
 
-    # @!method pen_color=(val)
-    # ペンの色を（  ）にする
+    # set pen color
+    #
+    # @param [Array<Integer>|Symbol|Integer] val color
+    #   When color is Array<Integer>, it means [R, G, B].
+    #   When color is Symbol, it means the color code; like :white, :black, etc...
+    #   When color is Integer, it means hue.
+    def pen_color=(val)
+      if val.is_a?(Numeric)
+        val %= 201
+        _, s, l = Color.rgb_to_hsl(*pen_color)
+        val = Color.hsl_to_rgb(val, s, l)
+      end
+      @pen_color = val
+    end
+
+    # change pen color
+    #
+    # @param [Integer] val color
+    def change_pen_color_by(val)
+      h, s, l = Color.rgb_to_hsl(*pen_color)
+      @pen_color = Color.hsl_to_rgb(h + val, s, l)
+    end
+
+    # set pen shade
+    #
+    # @param Integer val shade
+    def pen_shade=(val)
+      val %= 101
+      h, s, = *Color.rgb_to_hsl(*pen_color)
+      @pen_color = Color.hsl_to_rgb(h, s, val)
+    end
 
     # @!endgroup
 
@@ -617,5 +655,11 @@ module Smalruby
       $stderr.puts("#{exception.class}: #{exception.message}")
       $stderr.puts("        #{exception.backtrace.join("\n        ")}")
     end
+
+    private
+
+    def calc_volume
+      (255 * @volume / 100.0).to_i
+    end
   end
 end

data/lib/smalruby/color.rb

@@ -148,6 +148,9 @@ module Smalruby
       'mediumslateblue' => [0x7b, 0x68, 0xee]
     }
 
+    # 3 = R, G, B,  2 = Up, Down
+    HUE_PER_6 = 200.0 / (3.0 * 2.0)
+
     # 色名の配列
     NAMES = NAME_TO_CODE.keys
 
@@ -168,5 +171,102 @@ module Smalruby
         color
       end
     end
+
+    # Convert RGB Color model to HSL Color model
+    #
+    # @param [Integer] red
+    # @param [Integer] green
+    # @param [Integer] blue
+    # @return [Array] hue, saturation, lightness
+    #   hue in the range [0,200],
+    #   saturation and lightness in the range [0, 100]
+    def rgb_to_hsl(red, green, blue)
+      red = round_rgb_color(red)
+      green = round_rgb_color(green)
+      blue = round_rgb_color(blue)
+
+      color_max = [red, green, blue].max
+      color_min = [red, green, blue].min
+      color_range = color_max - color_min
+      if color_range == 0
+        return [0, 0, (color_max * 100.0 / 255).to_i]
+      end
+      color_range = color_range.to_f
+      hue = (case color_max
+             when red then
+               HUE_PER_6 * ((green - blue) / color_range)
+             when green  then
+               HUE_PER_6 * ((blue - red) / color_range) + HUE_PER_6 * 2
+             else
+               HUE_PER_6 * ((red - green) / color_range) + HUE_PER_6 * 4
+             end)
+
+      cnt = color_range / 2.0
+      if cnt <= 127
+        saturation = color_range / (color_max + color_min) * 100
+      else
+        saturation = color_range / (510 - color_max - color_min) * 100
+      end
+      lightness = (color_max + color_min) / 2.0 / 255.0 * 100
+
+      [hue.round, saturation.round, lightness.round]
+    end
+
+    # Round rgb color 0 to 255
+    #
+    # @param [Integer] value RGB color
+    # @return [Integer] rounded RGB color
+    def round_rgb_color(value)
+      if value > 255
+        255
+      elsif value < 0
+        0
+      else
+        value
+      end
+    end
+
+    # Convert HSV Color model to RGB Color model
+    #
+    # @param [Integer] h
+    # @param [Integer] s
+    # @param [Integer] l
+    # @return [Array] red,green,blue color
+    #   red,green,blue in the range [0,255]
+    def hsl_to_rgb(h, s, l)
+      h %= 201
+      s %= 101
+      l %= 101
+      if l <= 49
+        color_max = 255.0 * (l + l * (s / 100.0)) / 100.0
+        color_min = 255.0 * (l - l * (s / 100.0)) / 100.0
+      else
+        color_max = 255.0 * (l + (100 - l) * (s / 100.0)) / 100.0
+        color_min = 255.0 * (l - (100 - l) * (s / 100.0)) / 100.0
+      end
+
+      if h < HUE_PER_6
+        base = h
+      elsif h < HUE_PER_6 * 3
+        base = (h - HUE_PER_6 * 2).abs
+      elsif h < HUE_PER_6 * 5
+        base = (h - HUE_PER_6 * 4).abs
+      else
+        base = (200 - h)
+      end
+      base = base / HUE_PER_6 * (color_max - color_min) + color_min
+
+      divide = (h / HUE_PER_6).to_i
+      red, green, blue = (case divide
+                          when 0 then  [color_max, base, color_min]
+                          when 1 then  [base, color_max, color_min]
+                          when 2 then  [color_min, color_max, base]
+                          when 3 then  [color_min, base, color_max]
+                          when 4 then  [base, color_min, color_max]
+                          else         [color_max, color_min, base]
+                          end)
+
+      [red.round, green.round, blue.round]
+    end
   end
 end

data/lib/smalruby/stage.rb

@@ -11,12 +11,19 @@ module Smalruby
 
       super(opts.reject { |k, _| defaults.keys.include?(k) })
 
+      @background_color = opts[:color]
+
       # HACK: ステージを一番最初に描画する
       World.instance.objects.delete(self)
       World.instance.objects.unshift(self)
       World.instance.current_stage = self
 
-      fill(color: opts[:color])
+      clear
+    end
+
+    # clear with background color or image
+    def clear
+      fill(color: @background_color)
     end
   end
 end

data/lib/smalruby/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module Smalruby
-  VERSION =  '0.1.10'
+  VERSION = '0.1.11'
 end

data/smalruby.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake', '~> 10.4'
   spec.add_development_dependency 'yard'
   spec.add_development_dependency 'redcarpet'
   spec.add_development_dependency 'rspec'
@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   if is_windows
     spec.add_runtime_dependency 'dxruby', '~> 1.4.0'
   else
-    spec.add_runtime_dependency 'dxruby_sdl', '~> 0.0.13'
+    spec.add_runtime_dependency 'dxruby_sdl', '~> 0.0.14'
   end
   spec.add_runtime_dependency 'smalrubot', '~> 0.0.6'
 end

data/spec/lib/smalruby/color_spec.rb

@@ -149,7 +149,7 @@ describe Smalruby::Color do
     }
 
     name_to_code.each do |name, code|
-      context '引数が #{ name.inspect } の場合' do
+      context "引数が #{ name.inspect } の場合" do
         let(:color_name) { name }
 
         it { should eq(code) }

data/spec/spec_helper.rb

@@ -12,7 +12,6 @@ Dir.glob(File.expand_path('../support/**/*.rb', __FILE__)).each do |path|
 end
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: x86-mingw32
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2017-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -330,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: 2D game development library for kids.