smalruby 0.0.14-x86-mingw32 → 0.0.15-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 662d38eef7ff8574fe13fb00d76e20d833a9c58c
-  data.tar.gz: 5454a19803cb7d3d8dece7c60cd7875ff31a36f6
+  metadata.gz: 39f0d10c95336ce5758416b2e1532bb54d6afae6
+  data.tar.gz: 8a2501660615da3974f957144bea28c52c6e2012
 SHA512:
-  metadata.gz: e0b2a61ed1a60e51d53f0caf21296b9bce9d50101d25d33de83e33a3f4d961ce21876abb53fa7205dc2dfd5bad8ca726ffad83e02eb5f3c5d564ea8f80c39fd7
-  data.tar.gz: f6ec10eefbbd9d62f89470ca1bc9d3422318c1fee79d6849ee1416c54b7fb548ce189c6b99dee18a9c96d497dca30f5c0710e5d9b8e954424ba57bd5fa3943c8
+  metadata.gz: 9db6d5935373c7fe352a8261c867338cf2aecba1f0296eb29c5adfbe6c4bfa0d1cc0686901e6c1ade184c41901376d41a3db20b88883ab2f097bd81169f365c6
+  data.tar.gz: 3a736a2847ce564b91f68e9f2cbed297cebf7c569d5ad3f8564e3ad64f38d0902523aba070a8641830be3e3bb941322958d83af41dfa18ab450155a99681aa62

data/lib/smalruby/character.rb

@@ -18,6 +18,7 @@ module Smalruby
     attr_accessor :event_handlers
     attr_accessor :threads
     attr_accessor :checking_hit_targets
+    attr_accessor :angle unless Util.windows?
 
     def initialize(option = {})
       defaults = {
@@ -38,6 +39,7 @@ module Smalruby
       @event_handlers = {}
       @threads = []
       @checking_hit_targets = []
+      @angle = 0 unless Util.windows?
 
       self.scale_x = 1.0
       self.scale_y = 1.0
@@ -213,6 +215,11 @@ module Smalruby
       Hardware.create_hardware(Hardware::Servo, pin)
     end
 
+    # 2WD車
+    def two_wheel_drive_car(pin)
+      Hardware.create_hardware(Hardware::TwoWheelDriveCar, pin)
+    end
+
     # ボタン
     def button(pin)
       Hardware.create_hardware(Hardware::Button, pin)

data/lib/smalruby/hardware/two_wheel_drive_car.rb

@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+require 'smalruby/hardware'
+
+module Smalruby
+  module Hardware
+    # 2WD車のモーターを表現するクラス
+    class TwoWheelDriveCar < Dino::Components::BaseComponent
+      def initialize(options)
+        pin = Pin.smalruby_to_dino(options[:pin])
+        case pin
+        when 2..10
+          super(board: world.board, pin: (pin...(pin + 4)).to_a)
+        else
+          fail "モーターのピン番号が間違っています: {options[:pin]}"
+        end
+      end
+
+      # 前進する
+      def forward
+        digital_write_pins(true, false, true, false)
+      end
+
+      # 後退する
+      def backward
+        digital_write_pins(false, true, false, true)
+      end
+
+      # 左に曲がる
+      def turn_left
+        digital_write_pins(false, true, true, false)
+      end
+
+      # 右に曲がる
+      def turn_right
+        digital_write_pins(true, false, false, true)
+      end
+
+      # 停止する
+      def stop
+        digital_write_pins(false, false, false, false)
+      end
+
+      private
+
+      def after_initialize(options = {})
+        pins.each do |pin|
+          set_pin_mode(pin, :out)
+        end
+        stop
+      end
+
+      def digital_write_pins(*level_flags)
+        level_flags.each.with_index do |level_flag, i|
+          level = level_flag ? Dino::Board::HIGH : Dino::Board::LOW
+          digital_write(pins[i], level)
+        end
+      end
+    end
+  end
+end

data/lib/smalruby/hardware.rb

@@ -13,6 +13,7 @@ module Smalruby
     autoload :RgbLedAnode
     autoload :RgbLedCathode
     autoload :Servo
+    autoload :TwoWheelDriveCar
 
     autoload :Button
     autoload :Sensor
@@ -29,12 +30,17 @@ module Smalruby
       fail 'already started.' if @started
 
       defaults = {
-        device: nil
+        device: nil,
+        baud: 115_200
       }
       opt = Util.process_options(options, defaults)
 
-      txrx = Dino::TxRx.new
-      txrx.io = opt[:device] if opt[:device]
+      if Dino::VERSION >= '0.11'
+        txrx = Dino::TxRx.new(opt)
+      elsif Dino::VERSION >= '0.10'
+        txrx = Dino::TxRx.new
+        txrx.io = opt[:device] if opt[:device]
+      end
       world.board = Dino::Board.new(txrx)
 
       @initialized_hardware = true

data/lib/smalruby/version.rb

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

data/samples/hardware_two_wheel_drive_car.rb

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+
+DESCRIPTION = <<EOS
+2WD車のタイヤ(モーター)を操作します
+EOS
+
+# デジタルの2番・3番ピンに左のモーター、4番・5番ピンに右のモーターを接
+# 続してください。
+
+require 'smalruby'
+
+init_hardware
+
+stage1 = Stage.new(color: 'white')
+
+stage1.on(:start) do
+  draw_font(string: DESCRIPTION, color: 'black')
+
+  loop do
+    two_wheel_drive_car('D2').forward
+    sleep(3)
+    two_wheel_drive_car('D2').backward
+    sleep(3)
+    two_wheel_drive_car('D2').turn_left
+    sleep(3)
+    two_wheel_drive_car('D2').turn_right
+    sleep(3)
+    two_wheel_drive_car('D2').stop
+    sleep(3)
+  end
+end

data/samples/tree.rb

@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+require 'smalruby'
+
+# @author: Akihiro Sada
+# @license: MIT Lisence
+class Tree
+  def initialize(canvas)
+    @x = 320
+    @y = 480
+    @radian = -Math::PI / 2
+    @canvas = canvas
+  end
+
+  def draw(level)
+    if level <= 0
+      return
+    end
+    length = level * 5
+    forward(length)
+    degree = 20
+    turn(degree)
+    draw(level - 1)
+    turn(-degree * 2)
+    draw(level - 1)
+    turn(degree)
+    backward(length)
+  end
+
+  private
+
+  def forward(length)
+    x = @x
+    y = @y
+    @x += Math.cos(@radian) * length
+    @y += Math.sin(@radian) * length
+    @canvas.line(x1: x, y1: y, x2: @x, y2: @y, color: "white")
+  end
+
+  def backward(length)
+    @x -= Math.cos(@radian) * length
+    @y -= Math.sin(@radian) * length
+  end
+
+  def turn(degree)
+    @radian += degree * Math::PI / 180
+  end
+end
+
+background = Canvas.new
+tree = Tree.new(background)
+background.on(:start) do
+  tree.draw(12)
+end

data/smalruby.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   if is_windows
     spec.add_runtime_dependency 'dxruby'
   else
-    spec.add_runtime_dependency 'dxruby_sdl'
+    spec.add_runtime_dependency 'dxruby_sdl', '~> 0.0.6'
   end
-  spec.add_runtime_dependency 'dino'
+  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.14
+  version: 0.0.15
 platform: x86-mingw32
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -196,16 +196,16 @@ dependencies:
   name: dino
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.2
 description: smalruby is a 2D game development library. This is part of "Smalruby"
   project that is a learning ruby programming environment for kids.
 email:
@@ -260,6 +260,7 @@ files:
 - lib/smalruby/hardware/rgb_led_cathode.rb
 - lib/smalruby/hardware/sensor.rb
 - lib/smalruby/hardware/servo.rb
+- lib/smalruby/hardware/two_wheel_drive_car.rb
 - lib/smalruby/stage.rb
 - lib/smalruby/util.rb
 - lib/smalruby/version.rb
@@ -278,8 +279,10 @@ files:
 - samples/hardware_rgb_led_cathode.rb
 - samples/hardware_sensor.rb
 - samples/hardware_servo.rb
+- samples/hardware_two_wheel_drive_car.rb
 - samples/hit_car.rb
 - samples/piano.rb
+- samples/tree.rb
 - smalruby.gemspec
 - spec/lib/smalruby/color_spec.rb
 - spec/lib/smalruby/world_spec.rb