smalruby 0.0.22-x86-mingw32 → 0.0.23-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f518d1d8f3f71fe7e74b3b32cafb935fa088860
-  data.tar.gz: c41217f77564dba0bba84fff46fcf3d7360e7dfb
+  metadata.gz: 78d19450dfa546889002c205ad81b0228d8e35d5
+  data.tar.gz: 993ec64f69bed187fdd26ed33fcc04523bdcd2d3
 SHA512:
-  metadata.gz: e80331fcd13299fd86619702b8672f52c0f7609cc56f17c2844f9433afc4978ae3f573d360c416073bb9cfa7b016d9b96de39be96e99d96a79d0010e6d741cdb
-  data.tar.gz: c6f96694a7a69141a7c0dc56cb346f217666968696153d02ba3c43c4c51f460075cfbcda214ee2948677e73bbb25e8437228f362ef1e2b303d99df4fb16621d7
+  metadata.gz: aee92328282d3605d4a7e5c027472c65bfa50fd67faea81021cba381d2346fc0c82327ce43cfc70f83dd7d76eb07620e1e675362569d2da83bdf24896d3cc5f7
+  data.tar.gz: 5d789d7a22c4b0c1242f1b800c16d8aa0b28c9e2767ee72acf3c7db32c79fadb3f909d4f515a34213f276502a1f34bd6904acfc2fe813c441f152f865f8a4f4e

data/lib/smalruby/canvas.rb

@@ -80,7 +80,7 @@ module Smalruby
     private
 
     DEFAULT_COLOR_OPTION = {
-      color: 'white'
+      color: 'black'
     }
     private_constant :DEFAULT_COLOR_OPTION
 

data/lib/smalruby/character.rb

@@ -25,6 +25,8 @@ module Smalruby
     attr_accessor :costumes
     attr_accessor :costume_index
     attr_reader :rotation_style
+    attr_reader :enable_pen
+    attr_accessor :pen_color
 
     def initialize(option = {})
       defaults = {
@@ -47,6 +49,8 @@ module Smalruby
       @threads = []
       @checking_hit_targets = []
       @angle = 0 unless Util.windows?
+      @enable_pen = false
+      @pen_color = 'black'
 
       self.scale_x = 1.0
       self.scale_y = 1.0
@@ -75,8 +79,7 @@ module Smalruby
 
     # (  )歩動かす
     def move(val = 1)
-      self.x += @vector[:x] * val
-      self.y += @vector[:y] * val
+      self.position = [x + @vector[:x] * val, y + @vector[:y] * val]
     end
 
     # (  )歩後ろに動かす
@@ -84,6 +87,58 @@ module Smalruby
       move(-val)
     end
 
+    # X座標を(  )にする
+    def x=(val)
+      left = x + center_x
+      top = y + center_y
+
+      if val < 0
+        val = 0
+      elsif val + image.width >= Window.width
+        val = Window.width - image.width
+      end
+
+      super(val)
+
+      draw_pen(left, top, x + center_x, y + center_y) if @enable_pen
+    end
+
+    # Y座標を(  )にする
+    def y=(val)
+      left = x + center_x
+      top = y + center_y
+
+      if val < 0
+        val = 0
+      elsif val + image.height >= Window.height
+        val = Window.height - image.height
+      end
+      super(val)
+
+      draw_pen(left, top, x + center_x, y + center_y) if @enable_pen
+    end
+
+    # X座標を(  )、Y座標を(  )にする
+    def position=(val)
+      if @enable_pen
+        @enable_pen = false
+        left = x + center_x
+        top = y + center_y
+        self.x = val[0]
+        self.y = val[1]
+        draw_pen(left, top, x + center_x, y + center_y)
+        @enable_pen = true
+      else
+        self.x = val[0]
+        self.y = val[1]
+      end
+    end
+
+    # X座標、Y座標
+    def position
+      [x, y]
+    end
+
     # くるっと振り返る
     def turn
       sync_angle(@vector[:x] * -1, @vector[:y] * -1)
@@ -191,12 +246,16 @@ module Smalruby
       }
       opts = process_optional_arguments(options, defaults)
 
+      message = opts[:message].to_s
+      return if message == @current_message
+
+      @current_message = message
+
       if @balloon
         @balloon.vanish
         @balloon = nil
       end
 
-      message = opts[:message].to_s
       return if message.empty?
 
       lines = message.to_s.lines.map { |l| l.scan(/.{1,10}/) }.flatten
@@ -222,7 +281,7 @@ module Smalruby
                         frame_size + margin_size + (font.size + 1) * row,
                         line, font, [0, 0, 0])
       end
-      @balloon = Sprite.new(self.x, self.y, image)
+      @balloon = Sprite.new(x, y, image)
     end
 
     # 次のコスチュームにする
@@ -249,12 +308,12 @@ module Smalruby
 
     # 左右の端に着いた?
     def reach_left_or_right_wall?
-      self.x < 0 || self.x >= (Window.width - image.width)
+      x <= 0 || x >= (Window.width - image.width)
     end
 
     # 上下の端に着いた?
     def reach_top_or_bottom_wall?
-      self.y < 0 || self.y >= (Window.height - image.height)
+      y <= 0 || y >= (Window.height - image.height)
     end
 
     def hit?(other)
@@ -265,6 +324,7 @@ module Smalruby
 
     # @!group 音
 
+    # (  )の音を鳴らす
     def play(option = {})
       defaults = {
         name: 'piano_do.wav'
@@ -276,6 +336,23 @@ module Smalruby
 
     # @!endgroup
 
+    # @!group ペン
+
+    # ペンを下ろす
+    def down_pen
+      @enable_pen = true
+    end
+
+    # ペンを上げる
+    def up_pen
+      @enable_pen = false
+    end
+
+    # @!method pen_color=(val)
+    # ペンの色を（  ）にする
+
+    # @!endgroup
+
     # @!group ハードウェア
 
     # LED
@@ -318,16 +395,6 @@ module Smalruby
     def draw
       draw_balloon
 
-      if self.x < 0
-        self.x = 0
-      elsif self.x + image.width >= Window.width
-        self.x = Window.width - image.width
-      end
-      if self.y < 0
-        self.y = 0
-      elsif self.y + image.height >= Window.height
-        self.y = Window.height - image.height
-      end
       super
     end
 
@@ -453,6 +520,12 @@ module Smalruby
 
     private
 
+    def draw_pen(left, top, right, bottom)
+      world.current_stage.line(left: left, top: top,
+                               right: right, bottom: bottom,
+                               color: @pen_color)
+    end
+
     def sync_angle(x, y)
       a = Math.acos(x / Math.sqrt(x**2 + y**2)) * 180 / Math::PI
       a = 360 - a if y < 0
@@ -482,13 +555,13 @@ module Smalruby
 
     def draw_balloon
       if @balloon
-        @balloon.x = self.x + image.width / 2
+        @balloon.x = x + image.width / 2
         if @balloon.x < 0
           @balloon.x = 0
         elsif @balloon.x + @balloon.image.width >= Window.width
           @balloon.x = Window.width - @balloon.image.width
         end
-        @balloon.y = self.y - @balloon.image.height
+        @balloon.y = y - @balloon.image.height
         if @balloon.y < 0
           @balloon.y = 0
         elsif @balloon.y + @balloon.image.height >= Window.height

data/lib/smalruby/color.rb

@@ -155,8 +155,8 @@ module Smalruby
 
     # Smalrubyの色名からDXRubyの色コードに変換する
     def smalruby_to_dxruby(color)
-      if color.is_a?(String)
-        color = color.downcase
+      if color.is_a?(String) || color.is_a?(Symbol)
+        color = color.to_s.downcase
         if color == 'random'
           [rand(0..0xff), rand(0..0xff), rand(0..0xff)]
         elsif NAME_TO_CODE.key?(color)

data/lib/smalruby/hardware/led.rb

@@ -14,6 +14,10 @@ module Smalruby
 
       # @!method off
       # LEDをオフにする
+
+      def stop
+        off
+      end
     end
   end
 end

data/lib/smalruby/hardware/rgb_led_anode.rb

@@ -36,6 +36,10 @@ module Smalruby
         digital_write(pins[3], Dino::Board::LOW)
       end
 
+      def stop
+        off
+      end
+
       private
 
       def after_initialize(_ = {})

data/lib/smalruby/hardware/rgb_led_cathode.rb

@@ -38,6 +38,10 @@ module Smalruby
         analog_write(pins[2], calc_value(color[2]))
       end
 
+      def stop
+        off
+      end
+
       private
 
       def after_initialize(_ = {})

data/lib/smalruby/hardware/sensor.rb

@@ -15,6 +15,10 @@ module Smalruby
         super(board: world.board, pin: Pin.smalruby_to_dino(options[:pin]))
       end
 
+      def stop
+        @board.remove_analog_hardware(self)
+      end
+
       private
 
       def after_initialize(options = {})

data/lib/smalruby/hardware.rb

@@ -46,6 +46,16 @@ module Smalruby
       @initialized_hardware = true
     end
 
+    # ハードウェアを停止させる
+    def stop
+      @hardware_cache.synchronize do
+        @hardware_cache.values.each do |h|
+          h.stop if h.respond_to?(:stop)
+        end
+        @hardware_cache.clear
+      end
+    end
+
     # ハードウェアのインスタンスを生成する
     #
     # 作成したハードウェアのインスタンスはキャッシュする

data/lib/smalruby/stage.rb

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

data/lib/smalruby/version.rb

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

data/lib/smalruby/world.rb

@@ -8,6 +8,7 @@ module Smalruby
 
     attr_accessor :objects
     attr_accessor :board
+    attr_accessor :current_stage
     attr_reader :sensor_change_queue
     attr_reader :button_change_queue
 

data/lib/smalruby.rb

@@ -25,7 +25,11 @@ module Smalruby
     @started = true
     begin
       if world.objects.any? { |o| /console/i !~ o.class.name }
-        start_window_application
+        begin
+          start_window_application
+        ensure
+          Hardware.stop
+        end
       else
         start_console_application
       end
@@ -114,6 +118,9 @@ module Smalruby
           end
 
           if first
+            unless world.objects.any? { |o| o.is_a?(Stage) }
+              Stage.new(color: 'white')
+            end
             world.objects.each do |object|
               object.start
             end

data/samples/canvas.rb

@@ -4,6 +4,6 @@ require 'smalruby'
 canvas1 = Canvas.new
 canvas1.on(:start) do
   draw_font(x: 0, y: 0, string: 'こんにちは', size: 32)
-  line(x1: 0, y1: 100, x2: 100, y2: 200, color: "white")
+  line(x1: 0, y1: 100, x2: 100, y2: 200, color: "red")
   box_fill(left: 0, top: 300, right: 100, bottom: 400, color: "green")
 end

data/samples/finding_cars.rb

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 require "smalruby"
 
-canvas1 = Canvas.new
+canvas1 = Stage.new(color: 'black')
 
-car1 = Character.new(x: 0, y: 148, costume: "car1.png", visible: false)
-car2 = Character.new(x: 639, y: 148, costume: "car2.png", visible: false)
-car3 = Character.new(x: 0, y: 348, costume: "car3.png", visible: false)
-car4 = Character.new(x: 639, y: 348, costume: "car4.png", visible: false)
+car1 = Character.new(x: 0, y: 148, costume: "car1.png", visible: false, rotation_style: :left_right)
+car2 = Character.new(x: 639, y: 148, costume: "car2.png", visible: false, rotation_style: :left_right)
+car3 = Character.new(x: 0, y: 348, costume: "car3.png", visible: false, rotation_style: :left_right)
+car4 = Character.new(x: 639, y: 348, costume: "car4.png", visible: false, rotation_style: :left_right)
 
 canvas1.on(:start) do
   draw_font(x: 0, y: 0, string: "画面をクリックして隠れている車を4つ探してね", size: 32)

data/samples/pen.rb

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+require 'smalruby'
+
+car1 = Character.new(x: 0, y: 0, costume: 'car1.png', rotation_style: :left_right)
+
+car1.on(:start) do
+  loop do
+    if enable_pen
+      say(message: 'ペンを下げる')
+    else
+      say(message: 'ペンを上げる')
+    end
+  end
+end
+
+car1.on(:click) do
+  if enable_pen
+    up_pen
+  else
+    down_pen
+  end
+end
+
+car1.on(:key_down, K_LEFT) do
+  self.x -= 10
+end
+
+car1.on(:key_down, K_RIGHT) do
+  self.x += 10
+end
+
+car1.on(:key_down, K_UP) do
+  self.y -= 10
+end
+
+car1.on(:key_down, K_DOWN) do
+  self.y += 10
+end

data/samples/pen2.rb

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+require 'smalruby'
+
+car1 = Character.new(x: 0, y: 0, costume: 'car1.png', rotation_style: :free)
+
+car1.on(:start) do
+  loop do
+    if enable_pen
+      say(message: 'ペンを下げる')
+    else
+      say(message: 'ペンを上げる')
+    end
+  end
+end
+
+car1.on(:click) do
+  if enable_pen
+    up_pen
+  else
+    down_pen
+  end
+end
+
+car1.on(:key_push, K_1) do
+  self.pen_color = 'red'
+end
+
+car1.on(:key_push, K_2) do
+  self.pen_color = 'blue'
+end
+
+car1.on(:key_push, K_3) do
+  self.pen_color = 'green'
+end
+
+car1.on(:key_push, K_4) do
+  self.pen_color = 'black'
+end
+
+car1.on(:key_down, K_LEFT) do
+  rotate(-15)
+end
+
+car1.on(:key_down, K_RIGHT) do
+  rotate(15)
+end
+
+car1.on(:key_down, K_UP) do
+  move(30)
+end
+
+car1.on(:key_down, K_DOWN) do
+  move(-30)
+end

data/samples/tree.rb

@@ -33,7 +33,7 @@ class Tree
     y = @y
     @x += Math.cos(@radian) * length
     @y += Math.sin(@radian) * length
-    @canvas.line(x1: x, y1: y, x2: @x, y2: @y, color: "white")
+    @canvas.line(x1: x, y1: y, x2: @x, y2: @y, color: "green")
   end
 
   def backward(length)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: x86-mingw32
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -286,6 +286,8 @@ files:
 - samples/hardware_servo.rb
 - samples/hardware_two_wheel_drive_car.rb
 - samples/hit_car.rb
+- samples/pen.rb
+- samples/pen2.rb
 - samples/piano.rb
 - samples/tree.rb
 - smalruby.gemspec