smalruby 0.0.20-x86-mingw32 → 0.0.21-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdaab45a6bf04fcef77d956c2c8ea1bb2f4530e5
-  data.tar.gz: 7e1ed4f7d250b1b18db3039835124a1a74e10397
+  metadata.gz: 011780bbacc86925ec636a2f6457cfce411df6c9
+  data.tar.gz: 836f8929844613b04593a2ead72db15b22295b97
 SHA512:
-  metadata.gz: 679da4edf328f3d3e6be94875115a0fcdf2aa526b70defd382679095837188af3dd87f55657aa92991b1cff218c8c5d7c0c25565b1313f2fb8e285a372a155ec
-  data.tar.gz: bcd71651d5e2e8a32dc0a1a9ca2b4fde4ef20009d857607c84fa7a95a738ed5c2423755bfe2c0b3705bc8412207bf6b81cbcbae3d77fb84781c9a17d23399caa
+  metadata.gz: 92587434753211c565f1ea77fe98defb12fbf54d88d1a29bd4e9754f9408752340de58219b61363a42cfe5e11bd6cb7ada13248aac0b981981d762bf622658bb
+  data.tar.gz: 26c79258c0d5757e0666e51b339cf9646d56333ce2f3d3b23cca2f9c6060a03a768ec2e7c71323e74b391c925b99a070b7c55129e9d8a5c161ae02dc796fc587

data/lib/smalruby/character.rb

@@ -22,7 +22,8 @@ module Smalruby
     attr_accessor :event_handlers
     attr_accessor :threads
     attr_accessor :checking_hit_targets
-    attr_accessor :angle unless Util.windows?
+    attr_accessor :costumes
+    attr_accessor :costume_index
     attr_reader :rotation_style
 
     def initialize(option = {})
@@ -36,11 +37,11 @@ module Smalruby
       }
       opt = process_optional_arguments(option, defaults)
 
-      # TODO: コスチュームの配列に対応する
-      if opt[:costume].is_a?(String)
-        opt[:costume] = Image.load(asset_path(opt[:costume]))
-      end
-      super(opt[:x], opt[:y], opt[:costume])
+      @costumes = [opt[:costume]].flatten.compact.map { |costume|
+        costume.is_a?(String) ? Image.load(asset_path(costume)) : costume
+      }
+      @costume_index = 0
+      super(opt[:x], opt[:y], @costumes[@costume_index])
 
       @event_handlers = {}
       @threads = []
@@ -57,10 +58,10 @@ module Smalruby
         end
       end
 
-      self.angle = opt[:angle] if opt[:angle] != 0
-
       self.rotation_style = opt[:rotation_style]
 
+      self.angle = opt[:angle] if opt[:angle] != 0
+
       # HACK: Windows XP SP3の環境でワーカースレッドで音声を読み込めな
       # い不具合が発生した。このためメインスレッドでプリロードしておく。
       %w(do re mi fa so ra si do_2).each do |n|
@@ -147,6 +148,10 @@ module Smalruby
         else
           self.scale_x = -1
         end
+        super(0)
+      else
+        self.scale_x = 1
+        super(0)
       end
     end
 
@@ -209,6 +214,13 @@ module Smalruby
       @balloon = Sprite.new(self.x, self.y, image)
     end
 
+    # 次のコスチュームにする
+    def next_costume
+      @costume_index += 1
+      @costume_index = @costume_index % @costumes.length
+      self.image = @costumes[@costume_index]
+    end
+
     # @!endgroup
 
     # @!group 調べる

data/lib/smalruby/version.rb

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

data/samples/car.rb

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'smalruby'
 
-car1 = Character.new(x: 0, y: 0, costume: 'car1.png')
-car1.rotation_style = :free
+car1 = Character.new(x: 0, y: 0, costume: 'car1.png', rotation_style: :left_right)
 
 car1.on(:start) do
   loop do

data/smalruby.gemspec

@@ -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.7'
+    spec.add_runtime_dependency 'dxruby_sdl', '~> 0.0.8'
   end
   spec.add_runtime_dependency 'dino', '~> 0.11.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: x86-mingw32
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -245,6 +245,10 @@ files:
 - assets/piano_re.wav
 - assets/piano_si.wav
 - assets/piano_so.wav
+- assets/ryu1.png
+- assets/ryu2.png
+- assets/taichi1.png
+- assets/taichi2.png
 - lib/smalruby.rb
 - lib/smalruby/canvas.rb
 - lib/smalruby/character.rb