smalruby 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa28b7b90c3b367e69c381f63c600e9a51d0bcca
-  data.tar.gz: 2ecf984ee583d7876501a390b9094c3f511a15d1
+  metadata.gz: 7b4e041e1339e93000745877678c14cef4a65259
+  data.tar.gz: 008b2e5051dbb6bb5c18a7f23befd3d7a68d9bc1
 SHA512:
-  metadata.gz: 466edcdba9b9da5d83b708fcf35d0a228c1d8e22f8a31e2f7fde45abca91586e3d530f519cdc9aa6d7c941bfadd5e5fb8d949749190a4be6b032f886a1ff4445
-  data.tar.gz: 4c95e2202fe00353cd7d5d006f51cd7b8328e409adf1b4ac067ea0a2c4fa585e8a2cca620c3d4db1b93096db5c03d9dbcfb0b0bc20dd4ec83455feaa45165880
+  metadata.gz: a063982bd0fa45e6aa5aa591899e15c501884ca2736c4c93fcceaec61c6b7325783535455a4c42c9ce22e9bd5334c5522bf5f89d4428a63c578cb35819188672
+  data.tar.gz: 67ed9dd5e0ac013130194208b35df444d7940387006a31d758ee9f86d364e5952b4dda1d13bc6f2d536b691f575fba1efc42ee7d8f390bc100c0dd0437b843e7

data/.rubocop.yml

@@ -37,3 +37,6 @@ SymbolName:
 
 StringLiterals:
   Enabled: false
+
+EndOfLine:
+  Enabled: false

data/LEGAL

@@ -6,7 +6,8 @@ smalruby's license (see the file LICENSE) except some files
 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:
+assets/cat1.png, assets/cat2.png, assets/cat3.png, assets/frog1.png,
+samples/extra_car.png:
 
   These are downloaded from ICON HOIHOI http://iconhoihoi.oops.jp/.
 

data/README.md

@@ -1,5 +1,8 @@
 # smalruby
 
+[![Gem Version](https://badge.fury.io/rb/smalruby.png)](http://badge.fury.io/rb/smalruby)
+[![Build Status](https://travis-ci.org/smalruby/smalruby.png?branch=master)](https://travis-ci.org/smalruby/smalruby)
+
 smalruby is a 2D game development library. This is part of "Smalruby"
 project that is a learning ruby programming environment for kids.
 

data/Rakefile

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

data/lib/smalruby/character.rb

@@ -13,6 +13,7 @@ module Smalruby
 
     attr_accessor :event_handlers
     attr_accessor :threads
+    attr_accessor :checking_hit_targets
 
     def initialize(option = {})
       opt = {
@@ -30,6 +31,7 @@ module Smalruby
 
       @event_handlers = {}
       @threads = []
+      @checking_hit_targets = []
 
       self.scale_x = 1.0
       self.scale_y = 1.0
@@ -52,6 +54,11 @@ module Smalruby
       self.y += @vector[:y] * val
     end
 
+    # (  )歩後ろに動かす
+    def move_back(val = 1)
+      move(-val)
+    end
+
     # 振り返る
     def turn
       @vector[:x] *= -1
@@ -61,14 +68,16 @@ module Smalruby
 
     # もし端に着いたら、跳ね返る
     def turn_if_reach_wall
-      max_width = Window.width - image.width
-      if self.x < 0
-        self.x = 0
-        turn
-      elsif self.x >= max_width
-        self.x = max_width - 1
-        turn
-      end
+      turn if reach_wall?
+    end
+
+    # (  )度回転する
+    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
     end
 
     # @!endgroup
@@ -104,10 +113,16 @@ module Smalruby
 
     # @!group 調べる
 
+    # 距離
     def distance(x, y)
-      res = Math.sqrt((self.x + center_x - x).abs**2 +
-                      (self.y + center_y - y).abs**2).to_i
-      return res
+      Math.sqrt((self.x + center_x - x).abs**2 +
+                (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)
     end
 
     # @!endgroup
@@ -144,8 +159,13 @@ module Smalruby
       h = EventHandler.new(self, options, &block)
       @event_handlers[event] << h
 
-      if Smalruby.started?
-        @threads << h.call
+      case event
+      when :start
+        @threads << h.call if Smalruby.started?
+      when :hit
+        @checking_hit_targets << options
+        @checking_hit_targets.flatten!
+        @checking_hit_targets.uniq!
       end
     end
 
@@ -182,6 +202,19 @@ module Smalruby
       end
     end
 
+    def hit
+      # TODO: なんでもいいからキャラクターに当たった場合に対応する
+      @checking_hit_targets &= World.instance.objects
+      objects = check(@checking_hit_targets)
+      return if objects.empty?
+      @event_handlers[:hit].try(:each) do |h|
+        if h.options.length == 0 && !h.options.any? { |o| objects.include?(o) }
+          next
+        end
+        @threads << h.call(objects)
+      end
+    end
+
     def alive?
       return @threads.any?(&:alive?)
     end
@@ -200,7 +233,10 @@ module Smalruby
     private
 
     def asset_path(name)
-      return File.expand_path("../../../assets/#{name}", __FILE__)
+      program_path = Pathname($PROGRAM_NAME).expand_path(Dir.pwd)
+      paths = [Pathname("../#{name}").expand_path(program_path),
+               Pathname("../../../assets/#{name}").expand_path(__FILE__)]
+      paths.find { |path| path.file? }.to_s
     end
 
     def new_font(size)

data/lib/smalruby/version.rb

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

data/lib/smalruby.rb

@@ -2,6 +2,8 @@
 require 'smalruby/version'
 require 'active_support/all'
 require 'dxruby'
+require 'English'
+require 'pathname'
 
 require 'smalruby/world'
 require 'smalruby/color'
@@ -84,6 +86,8 @@ module Smalruby
 
           key_down_and_push
 
+          hit
+
           world.objects.delete_if do |o|
             if !o.alive?
               o.join
@@ -150,6 +154,14 @@ module Smalruby
         end
       end
     end
+
+    def hit
+      world.objects.each do |o|
+        if o.respond_to?(:hit)
+          o.hit
+        end
+      end
+    end
   end
 end
 

data/samples/car.rb

@@ -11,5 +11,5 @@ car1.on(:start) do
 end
 
 car1.on(:click) do
-  turn
+  rotate(45)
 end

data/samples/costume.rb

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+require 'smalruby'
+
+car1 = Character.new(x: 0, y: 0, costume: 'extra_car.png')
+
+car1.on(:start) do
+  loop do
+    move(5)
+    if reach_wall?
+      turn
+    end
+  end
+end

data/samples/hit_car.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+require 'smalruby'
+
+car1 = Character.new(x: 0, y: 0, costume: 'car1.png')
+car2 = Character.new(x: 639, y: 0, costume: 'car2.png')
+
+car1.on(:start) do
+  loop do
+    move(5)
+    if reach_wall?
+      turn
+    end
+  end
+end
+
+car1.on(:hit, car2) do
+  move_back(20)
+  turn
+end
+
+car2.on(:start) do
+  loop do
+    move(10)
+    if reach_wall?
+      turn
+    end
+  end
+end
+
+car2.on(:hit, car1) do
+  move_back(20)
+  turn
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -223,7 +223,10 @@ files:
 - samples/canvas.rb
 - samples/car.rb
 - samples/console.rb
+- samples/costume.rb
+- samples/extra_car.png
 - samples/finding_cars.rb
+- samples/hit_car.rb
 - samples/piano.rb
 - smalruby.gemspec
 - spec/lib/smalruby/color_spec.rb
@@ -249,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: 2D game development library for kids.