smalruby 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff2da1da5684a7dd0135070b9cbead350c2e1566
-  data.tar.gz: c120ea24d4c62b73dc66d757e98d52952299fd2c
+  metadata.gz: 89ba4b5b40b4f3996da696c9e32bf02e89313f8f
+  data.tar.gz: 92663b50f47ecc5e8abb24c9aa207ffb95927b8d
 SHA512:
-  metadata.gz: 9a5acb32d2671f68f36b53b140df20812b176330c70584ff49aef62be90af5ba19850660feaba535f10e4fef00fd69f794bde19303b76f9bb1a99b5cd441a6ad
-  data.tar.gz: 9621f4965d7f4ea7a8297053a9f8bc6c250979b30f29021effb749bf8a1e96913ce5b2e0e5123dd8e911531263225aefc6337ca2f4204bb795b5c8d57df84b58
+  metadata.gz: cf8487c7f40deaa049f2e3c7dcf283282ccc85b933baea57f078f7dc014855457af4ec6958958d24afaa599413c4d15341cce39265d11f904204e7c8b7dffc56
+  data.tar.gz: fc6edf78454fba2e181c4878da70268f3bb66c84ace6e6d1bc1052838174603be7f28a72b591fa18677fd0e66d653cf4ae35ab19eb4d46259a1efcd8ec4561da

data/lib/smalruby/character.rb

@@ -83,19 +83,51 @@ module Smalruby
 
     # (  )度回転する
     def rotate(angle)
-      radian = angle * Math::PI / 180
-      x, y = @vector[:x], @vector[:y]
-      @vector[:x] = x * Math.cos(radian) - y * Math.sin(radian)
-      @vector[:y] = x * Math.sin(radian) + y * Math.cos(radian)
-      self.angle = (self.angle + angle) % 360
+      self.angle += angle
+    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)
+    end
+
+    # (  )に向ける
+    def point_towards(target)
+      if target == :mouse
+        tx = Input.mouse_pos_x
+        ty = Input.mouse_pos_y
+      else
+        tx = target.x
+        ty = target.y
+      end
+      dx = tx - x
+      dy = ty - y
+      self.angle = Math.atan2(dy, dx) * 180 / Math::PI
     end
 
     # @!endgroup
 
     # @!group 見た目
 
-    def say(message)
-      lines = message.to_s.lines.map { |l| l.scan(/.{1,10}/) }.flatten
+    def say(options = {})
+      defaults = {
+        message: '',
+        second: 0,
+      }
+      opts = process_optional_arguments(options, defaults)
+
+      if @balloon
+        @balloon.vanish
+        @balloon = nil
+      end
+
+      return if opts[:message].empty?
+
+      lines = opts[:message].to_s.lines.map { |l| l.scan(/.{1,10}/) }.flatten
       font = new_font(16)
       width = lines.map { |l| font.get_width(l) }.max
       height = lines.length * (font.size + 1)
@@ -135,6 +167,10 @@ module Smalruby
         self.y < 0 || self.y >= (Window.height - image.height)
     end
 
+    def hit?(other)
+      check([other]).length > 0
+    end
+
     # @!endgroup
 
     # @!group 音

data/lib/smalruby/{scene.rb → stage.rb}

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 module Smalruby
-  # シーンを表現するクラス
-  class Scene < Canvas
+  # ステージを表現するクラス
+  class Stage < Canvas
     def initialize(options = {})
       defaults = {
         color: 'black'

data/lib/smalruby/version.rb

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

data/lib/smalruby.rb

@@ -16,7 +16,7 @@ module Smalruby
 
   autoload :Console
   autoload :Canvas
-  autoload :Scene
+  autoload :Stage
   autoload :Hardware
 
   module_function

data/samples/cat.rb

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+require 'smalruby'
+
+cat1 = Character.new(costume: 'cat1.png', x: 300, y: 200)
+
+cat1.on(:click) do
+  say(message: 'こんにちは')
+end

data/samples/hardware_led.rb

@@ -10,9 +10,9 @@ require 'smalruby'
 
 init_hardware
 
-scene1 = Scene.new(color: 'white')
+stage1 = Stage.new(color: 'white')
 
-scene1.on(:start) do
+stage1.on(:start) do
   draw_font(string: DESCRIPTION, color: 'black')
 
   loop do

data/samples/hardware_rgb_led_anode.rb

@@ -11,9 +11,9 @@ require 'smalruby'
 
 init_hardware
 
-scene1 = Scene.new(color: 'white')
+stage1 = Stage.new(color: 'white')
 
-scene1.on(:start) do
+stage1.on(:start) do
   draw_font(string: DESCRIPTION, color: 'black')
 
   loop do

data/samples/hardware_rgb_led_cathode.rb

@@ -11,9 +11,9 @@ require 'smalruby'
 
 init_hardware
 
-scene1 = Scene.new(color: 'white')
+stage1 = Stage.new(color: 'white')
 
-scene1.on(:start) do
+stage1.on(:start) do
   draw_font(string: DESCRIPTION, color: 'black')
 
   loop do

data/samples/hardware_sensor.rb

@@ -4,9 +4,9 @@ require 'smalruby'
 
 init_hardware
 
-scene1 = Scene.new(color: 'white')
+stage1 = Stage.new(color: 'white')
 
-scene1.on(:sensor_change, 'A0') do |value|
+stage1.on(:sensor_change, 'A0') do |value|
   v = sensor('A0').value
   if 0 <= v && v <= 255
     fill(color: 'red')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -258,13 +258,14 @@ files:
 - lib/smalruby/hardware/rgb_led_anode.rb
 - lib/smalruby/hardware/rgb_led_cathode.rb
 - lib/smalruby/hardware/sensor.rb
-- lib/smalruby/scene.rb
+- lib/smalruby/stage.rb
 - lib/smalruby/util.rb
 - lib/smalruby/version.rb
 - lib/smalruby/world.rb
 - samples/.rubocop.yml
 - samples/canvas.rb
 - samples/car.rb
+- samples/cat.rb
 - samples/console.rb
 - samples/costume.rb
 - samples/extra_car.png