smalruby 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45bc7ad1f92a68a0bc1eaee2aa49f19c4bf8ec61
-  data.tar.gz: c88545a47e726b4c1cffbeaed9776bf538697103
+  metadata.gz: cba3ddc24f7ab06b5ea74040e8953236bbdcf20a
+  data.tar.gz: f6547d37b48a49e46e63cd7b39fd255a0676bdff
 SHA512:
-  metadata.gz: 4f39b3118b85b581f98fa180efb497d1325bfdb70c0a5d960acada2047e6f53dd7ff6383cd61a4265c8ee9da4ef825dcef0e8657a1abb534c7ec32f632e7937e
-  data.tar.gz: b364b8027a045d8fefd34074547cc10712c10efaa64eb16d7fab3e139469b28015673d383afa06bdadf20d23a5cae1f6620662ba675d89daea70a713f00993e5
+  metadata.gz: d7a6adc8c509559769f7bba5a5e1bdc2603b30cce107d0b371204fed69e3c2a89f6af8d0efbbf06b4311dc622031ccb8156db725f2e6f268f88c45226c4c06c8
+  data.tar.gz: 814c60608e78bffbe272cdd0b4b19fbd9eda5f997914191e1f68011cc0acb1f93603c0ab14f9649439f6407922637ee1f170125ae29400d8d420ebac336a8377

data/lib/smalruby/character.rb

@@ -11,6 +11,10 @@ module Smalruby
     self.font_cache = {}
     font_cache.extend(Mutex_m)
 
+    cattr_accessor :sound_cache
+    self.sound_cache = {}
+    sound_cache.extend(Mutex_m)
+
     cattr_accessor :hardware_cache
     self.hardware_cache = {}
     hardware_cache.extend(Mutex_m)
@@ -19,6 +23,7 @@ module Smalruby
     attr_accessor :threads
     attr_accessor :checking_hit_targets
     attr_accessor :angle unless Util.windows?
+    attr_reader :rotation_style
 
     def initialize(option = {})
       defaults = {
@@ -40,6 +45,7 @@ module Smalruby
       @threads = []
       @checking_hit_targets = []
       @angle = 0 unless Util.windows?
+      @rotation_style = :free
 
       self.scale_x = 1.0
       self.scale_y = 1.0
@@ -55,6 +61,12 @@ module Smalruby
         rotate(opt[:angle])
       end
 
+      # HACK: Windows XP SP3の環境でワーカースレッドで音声を読み込めな
+      # い不具合が発生した。このためメインスレッドでプリロードしておく。
+      %w(do re mi fa so ra si do_2).each do |n|
+        new_sound("piano_#{n}.wav")
+      end
+
       World.instance.objects << self
     end
 
@@ -71,16 +83,32 @@ module Smalruby
       move(-val)
     end
 
-    # 振り返る
+    # くるっと振り返る
     def turn
-      @vector[:x] *= -1
-      @vector[:y] *= -1
-      self.scale_x *= -1
+      sync_angle(@vector[:x] * -1, @vector[:y] * -1)
+    end
+
+    # 横に振り返る
+    def turn_x
+      sync_angle(@vector[:x] * -1, @vector[:y])
+    end
+
+    # 縦に振り返る
+    def turn_y
+      sync_angle(@vector[:x], @vector[:y] * -1)
     end
 
     # もし端に着いたら、跳ね返る
     def turn_if_reach_wall
-      turn if reach_wall?
+      lr = reach_left_or_right_wall?
+      tb = reach_top_or_bottom_wall?
+      if lr && tb
+        turn
+      elsif lr
+        turn_x
+      elsif tb
+        turn_y
+      end
     end
 
     # (  )度回転する
@@ -88,13 +116,38 @@ module Smalruby
       self.angle += angle
     end
 
+    def rotation_style=(val)
+      @rotation_style = val
+      sync_angle(@vector[:x], @vector[:y])
+    end
+
+    # 角度
+    def angle
+      return super if @rotation_style == :free
+
+      x, y = @vector[:x], @vector[:y]
+      a = Math.acos(x / Math.sqrt(x**2 + y**2)) * 180 / Math::PI
+      a = 360 - a if y < 0
+      a
+    end
+
     # (　)度に向ける
     def angle=(val)
       val %= 360
       radian = val * Math::PI / 180
-      @vector[:x] = self.scale_x * Math.cos(radian)
-      @vector[:y] = self.scale_x * Math.sin(radian)
-      super(val)
+      @vector[:x] = Math.cos(radian)
+      @vector[:y] = Math.sin(radian)
+
+      if @rotation_style == :free
+        self.scale_x = 1
+        super(val)
+      elsif @rotation_style == :left_right
+        if @vector[:x] >= 0
+          self.scale_x = 1
+        else
+          self.scale_x = -1
+        end
+      end
     end
 
     # (  )に向ける
@@ -166,10 +219,19 @@ module Smalruby
                 (self.y + center_y - y).abs**2).to_i
     end
 
-    # 端に着いた
+    # 端に着いた?
     def reach_wall?
-      self.x < 0 || self.x >= (Window.width - image.width) ||
-        self.y < 0 || self.y >= (Window.height - image.height)
+      reach_left_or_right_wall? || reach_top_or_bottom_wall?
+    end
+
+    # 左右の端に着いた?
+    def reach_left_or_right_wall?
+      self.x < 0 || self.x >= (Window.width - image.width)
+    end
+
+    # 上下の端に着いた?
+    def reach_top_or_bottom_wall?
+      self.y < 0 || self.y >= (Window.height - image.height)
     end
 
     def hit?(other)
@@ -186,9 +248,7 @@ module Smalruby
       }
       opt = process_optional_arguments(option, defaults)
 
-      @sound_cache ||= {}
-      (@sound_cache[opt[:name]] ||= Sound.new(asset_path(opt[:name])))
-        .play
+      new_sound(opt[:name]).play
     end
 
     # @!endgroup
@@ -365,6 +425,12 @@ module Smalruby
 
     private
 
+    def sync_angle(x, y)
+      a = Math.acos(x / Math.sqrt(x**2 + y**2)) * 180 / Math::PI
+      a = 360 - a if y < 0
+      self.angle = a
+    end
+
     def asset_path(name)
       program_path = Pathname($PROGRAM_NAME).expand_path(Dir.pwd)
       paths = [Pathname("../#{name}").expand_path(program_path),
@@ -376,7 +442,14 @@ module Smalruby
       self.class.font_cache.synchronize do
         self.class.font_cache[size] ||= Font.new(size)
       end
-      return self.class.font_cache[size]
+      self.class.font_cache[size]
+    end
+
+    def new_sound(name)
+      self.class.sound_cache.synchronize do
+        self.class.sound_cache[name] ||= Sound.new(asset_path(name))
+      end
+      self.class.sound_cache[name]
     end
 
     def draw_balloon

data/lib/smalruby/version.rb

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

data/samples/car.rb

@@ -2,14 +2,27 @@
 require 'smalruby'
 
 car1 = Character.new(x: 0, y: 0, costume: 'car1.png')
+car1.rotation_style = :free
 
 car1.on(:start) do
   loop do
-    move(5)
+    move(15)
     turn_if_reach_wall
   end
 end
 
 car1.on(:click) do
-  rotate(45)
+  rotate(15)
+end
+
+car1.on(:key_push, K_1) do
+  self.rotation_style = :free
+end
+
+car1.on(:key_push, K_2) do
+  self.rotation_style = :left_right
+end
+
+car1.on(:key_push, K_3) do
+  self.rotation_style = :none
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smalruby
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Kouji Takao