smalruby 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e78acfab23aac318a7c3b7d1ce6b5a28f40eb75f
-  data.tar.gz: ff6cf5103f4b72403318bcbc5ef1cb2a444645df
+  metadata.gz: fa28b7b90c3b367e69c381f63c600e9a51d0bcca
+  data.tar.gz: 2ecf984ee583d7876501a390b9094c3f511a15d1
 SHA512:
-  metadata.gz: fb47053cbdbc54a55079475f2f4d288f6bb5451c331810a7928c1645ffb21dbf315b5542c8a7d9994a85255f4102cd51e1480de9e6ff3a4652606cd508481138
-  data.tar.gz: 19433d235b9115fcaee73d1b55db2ba53f3426b5eaf29d3362818e8d409401d62e1edbbbbe972bff506a06bceb6d0468ef5e04d634e0d69e6703e6f6136d82b8
+  metadata.gz: 466edcdba9b9da5d83b708fcf35d0a228c1d8e22f8a31e2f7fde45abca91586e3d530f519cdc9aa6d7c941bfadd5e5fb8d949749190a4be6b032f886a1ff4445
+  data.tar.gz: 4c95e2202fe00353cd7d5d006f51cd7b8328e409adf1b4ac067ea0a2c4fa585e8a2cca620c3d4db1b93096db5c03d9dbcfb0b0bc20dd4ec83455feaa45165880

data/LEGAL

@@ -8,4 +8,8 @@ mentioned below.
 assets/car1.png, assets/car2.png, assets/car3.png, assets/car4.png,
 assets/cat1.png, assets/cat2.png, assets/cat3.png, assets/frog1.png:
 
-  This is downloaded from ICON HOIHOI http://iconhoihoi.oops.jp/.
+  These are downloaded from ICON HOIHOI http://iconhoihoi.oops.jp/.
+
+assets/piano_*.wav
+
+  These are downloaded from 魔王魂 http://maoudamashii.jokersounds.com/.

data/Rakefile

@@ -36,7 +36,7 @@ end
 
 task :rubocop do
   files = `git ls-files | grep -e '.rb$' | grep -v '^samples/'`
-  sh "rubocop #{files.split(/\s+/m).join(' ')}"
+  sh "rubocop -d #{files.split(/\s+/m).join(' ')}"
 end
 
 task :default => [:rubocop, :spec]

data/lib/smalruby.rb

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'smalruby/version'
 require 'active_support/all'
-require 'active_support/concurrency/latch'
 require 'dxruby'
 
 require 'smalruby/world'
@@ -21,60 +20,9 @@ module Smalruby
     @started = true
     begin
       if world.objects.any? { |o| /console/i !~ o.class.name }
-        # ウィンドウアプリケーション
-        Window.caption = File.basename($PROGRAM_NAME)
-        first = true
-        Window.fps = 15
-        Window.loop do
-          lock do
-            if first
-              world.objects.each do |object|
-                object.start
-              end
-              first = false
-            end
-            if Input.key_down?(K_ESCAPE)
-              exit
-            end
-            if Input.mouse_push?(M_LBUTTON) || Input.mouse_push?(M_RBUTTON) ||
-                Input.mouse_push?(M_MBUTTON)
-              x, y = Input.mouse_pos_x, Input.mouse_pos_y
-              s = Sprite.new(x, y)
-              s.collision = [0, 0, 1, 1]
-              buttons = []
-              if Input.mouse_down?(M_LBUTTON)
-                buttons << :left
-              end
-              if Input.mouse_down?(M_RBUTTON)
-                buttons << :right
-              end
-              if Input.mouse_down?(M_MBUTTON)
-                buttons << :center
-              end
-              s.check(world.objects).each do |o|
-                if o.respond_to?(:click)
-                  o.click(buttons)
-                end
-              end
-            end
-            if (keys = Input.keys).length > 0
-              key_down_and_push(keys)
-            end
-            world.objects.delete_if { |o|
-              if !o.alive?
-                o.join
-              end
-              o.vanished?
-            }
-            Sprite.draw(world.objects)
-          end
-        end
+        start_window_application
       else
-        # コンソールアプリケーション
-        world.objects.each do |object|
-          object.start
-        end
-        world.objects.each(&:join)
+        start_console_application
       end
     rescue SystemExit
     end
@@ -101,9 +49,60 @@ module Smalruby
   @draw_cv = ConditionVariable.new
 
   class << self
-
     private
 
+    def init_window_application
+      Window.caption = File.basename($PROGRAM_NAME)
+      Window.fps = 15
+
+      # HACK: DXRubyのためのサウンド関係の初期化処理。こうしておかな
+      # いとDirectSoundの初期化でエラーが発生する
+      begin
+        Sound.new('')
+      rescue
+      end
+    end
+
+    def start_window_application
+      init_window_application
+
+      first = true
+      Window.loop do
+        lock do
+          if Input.key_down?(K_ESCAPE)
+            exit
+          end
+
+          if first
+            world.objects.each do |object|
+              object.start
+            end
+            first = false
+          end
+
+          mouse_down_and_push
+
+          key_down_and_push
+
+          world.objects.delete_if do |o|
+            if !o.alive?
+              o.join
+            end
+            o.vanished?
+          end
+
+          Sprite.draw(world.objects)
+        end
+      end
+    end
+
+    def start_console_application
+      world.objects.each do |object|
+        object.start
+      end
+      world.objects.each(&:join)
+    end
+
     def lock(&block)
       @draw_mutex.synchronize do
         yield
@@ -111,17 +110,42 @@ module Smalruby
       end
     end
 
-    def key_down_and_push(keys)
-      world.objects.each do |o|
-        if o.respond_to?(:key_down)
-          o.key_down(keys)
+    def mouse_down_and_push
+      clickable_objects = world.objects.select { |o| o.respond_to?(:click) }
+      if clickable_objects.length > 0 &&
+          (Input.mouse_push?(M_LBUTTON) || Input.mouse_push?(M_RBUTTON) ||
+           Input.mouse_push?(M_MBUTTON))
+        buttons = []
+        {
+          left: M_LBUTTON,
+          right: M_RBUTTON,
+          center: M_MBUTTON,
+        }.each do |sym, const|
+          if Input.mouse_down?(const)
+            buttons << sym
+          end
+        end
+        s = Sprite.new(Input.mouse_pos_x, Input.mouse_pos_y)
+        s.collision = [0, 0, 1, 1]
+        s.check(clickable_objects).each do |o|
+          o.click(buttons)
         end
       end
-      pushed_keys = keys.select { |key| Input.key_push?(key) }
-      if pushed_keys.length > 0
+    end
+
+    def key_down_and_push
+      if (keys = Input.keys).length > 0
         world.objects.each do |o|
-          if o.respond_to?(:key_push)
-            o.key_push(pushed_keys)
+          if o.respond_to?(:key_down)
+            o.key_down(keys)
+          end
+        end
+        pushed_keys = keys.select { |key| Input.key_push?(key) }
+        if pushed_keys.length > 0
+          world.objects.each do |o|
+            if o.respond_to?(:key_push)
+              o.key_push(pushed_keys)
+            end
           end
         end
       end

data/lib/smalruby/canvas.rb

@@ -25,7 +25,7 @@ module Smalruby
         size: 32,
         color: "white",
       }.merge(option)
-      image.draw_font(opt[:x], opt[:y], opt[:string], Font.new(opt[:size]),
+      image.draw_font(opt[:x], opt[:y], opt[:string], new_font(opt[:size]),
                       Color.smalruby_to_dxruby(opt[:color]))
     end
 

data/lib/smalruby/character.rb

@@ -1,11 +1,16 @@
 # -*- coding: utf-8 -*-
 require 'forwardable'
+require 'mutex_m'
 
 module Smalruby
   # キャラクターを表現するクラス
   class Character < Sprite
     extend Forwardable
 
+    cattr_accessor :font_cache
+    self.font_cache = {}
+    font_cache.extend(Mutex_m)
+
     attr_accessor :event_handlers
     attr_accessor :threads
 
@@ -72,7 +77,7 @@ module Smalruby
 
     def say(message)
       lines = message.to_s.lines.map { |l| l.scan(/.{1,10}/) }.flatten
-      font = Font.new(16)
+      font = new_font(16)
       width = lines.map { |l| font.get_width(l) }.max
       height = lines.length * (font.size + 1)
       frame_size = 3
@@ -107,22 +112,19 @@ module Smalruby
 
     # @!endgroup
 
+    # @!group 音
+
+    def play(option = {})
+      @sound_cache ||= {}
+      (@sound_cache[option[:name]] ||= Sound.new(asset_path(option[:name])))
+        .play
+    end
+
+    # @!endgroup
+
     def draw
-      if @balloon
-        @balloon.x = self.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
-        if @balloon.y < 0
-          @balloon.y = 0
-        elsif @balloon.y + @balloon.image.height >= Window.height
-          @balloon.y = Window.height - @balloon.image.height
-        end
-        @balloon.draw
-      end
+      draw_balloon
+
       if self.x < 0
         self.x = 0
       elsif self.x + image.width >= Window.width
@@ -200,5 +202,30 @@ module Smalruby
     def asset_path(name)
       return File.expand_path("../../../assets/#{name}", __FILE__)
     end
+
+    def new_font(size)
+      self.class.font_cache.synchronize do
+        self.class.font_cache[size] ||= Font.new(size)
+      end
+      return self.class.font_cache[size]
+    end
+
+    def draw_balloon
+      if @balloon
+        @balloon.x = self.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
+        if @balloon.y < 0
+          @balloon.y = 0
+        elsif @balloon.y + @balloon.image.height >= Window.height
+          @balloon.y = Window.height - @balloon.image.height
+        end
+        @balloon.draw
+      end
+    end
   end
 end

data/lib/smalruby/console.rb

@@ -17,7 +17,7 @@ module Smalruby
   #    start
   class Console < Character
     def initialize
-      super(0, 0)
+      super
     end
 
     def loop(&block)

data/lib/smalruby/version.rb

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

data/samples/piano.rb

@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+# 電子ピアノをつくろう
+
+require "smalruby"
+
+# ドの鍵盤を作る
+key_do = Canvas.new(x: 200, y: 200, width: 30, height: 100)
+
+# (ドの鍵盤) プログラムがはじまった時
+key_do.on(:start) do
+  # (0, 0)-(29, 99)、"white" 色、四角く塗りつぶす
+  box_fill(x1: 0, y1: 0,
+           x2: 29, y2: 99,
+           color: "white")
+
+  # (0, 0)-(29, 99)、"gray" 色、四角を描く
+  box(x1: 0, y1: 0,
+      x2: 29, y2: 99,
+      color: "gray")
+end
+
+# (ドの鍵盤) クリックしたとき
+key_do.on(:click) do |x, y|
+  play(name: 'piano_do.wav')
+end
+
+# レの鍵盤を作る
+key_re = Canvas.new(x: 230, y: 200, width: 30, height: 100)
+
+# (レの鍵盤) プログラムがはじまった時
+key_re.on(:start) do
+  # (0, 0)-(29, 99)、"white" 色、四角く塗りつぶす
+  box_fill(x1: 0, y1: 0,
+           x2: 29, y2: 99,
+           color: "white")
+
+  # (0, 0)-(29, 99)、"gray" 色、四角を描く
+  box(x1: 0, y1: 0,
+      x2: 29, y2: 99,
+      color: "gray")
+end
+
+# (レの鍵盤) クリックしたとき
+key_re.on(:click) do |x, y|
+  play(name: 'piano_re.wav')
+end
+
+# ミの鍵盤を作る
+key_mi = Canvas.new(x: 260, y: 200, width: 30, height: 100)
+
+# (ミの鍵盤) プログラムがはじまった時
+key_mi.on(:start) do
+  # (0, 0)-(29, 99)、"white" 色、四角く塗りつぶす
+  box_fill(x1: 0, y1: 0,
+           x2: 29, y2: 99,
+           color: "white")
+
+  # (0, 0)-(29, 99)、"gray" 色、四角を描く
+  box(x1: 0, y1: 0,
+      x2: 29, y2: 99,
+      color: "gray")
+end
+
+# (ミの鍵盤) クリックしたとき
+key_mi.on(:click) do |x, y|
+  play(name: 'piano_mi.wav')
+end
+
+# ファ、ソ、ラ、シ、ドを一度に作成する
+['fa', 'so', 'ra', 'si', 'do_2'].each.with_index do |name, i|
+  key = Canvas.new(x: 290 + i * 30, y: 200, width: 30, height: 100)
+
+  key.on(:start) do
+    box_fill(x1: 0, y1: 0, x2: 29, y2: 99, color: "white")
+    box(x1: 0, y1: 0, x2: 29, y2: 99, color: "gray")
+  end
+
+  key.on(:click) do |x, y|
+    play(name: "piano_#{name}.wav")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-16 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -203,6 +203,14 @@ files:
 - assets/cat2.png
 - assets/cat3.png
 - assets/frog1.png
+- assets/piano_do.wav
+- assets/piano_do_2.wav
+- assets/piano_fa.wav
+- assets/piano_mi.wav
+- assets/piano_ra.wav
+- assets/piano_re.wav
+- assets/piano_si.wav
+- assets/piano_so.wav
 - lib/smalruby.rb
 - lib/smalruby/canvas.rb
 - lib/smalruby/character.rb
@@ -216,6 +224,7 @@ files:
 - samples/car.rb
 - samples/console.rb
 - samples/finding_cars.rb
+- samples/piano.rb
 - smalruby.gemspec
 - spec/lib/smalruby/color_spec.rb
 - spec/lib/smalruby/world_spec.rb