rubysketch 0.5.2 → 0.5.4

data/lib/rubysketch/sprite.rb

@@ -1,101 +1,409 @@
 module RubySketch
 
 
+  # Sprite object.
+  #
   class Sprite
 
-    extend Forwardable
+    # Initialize sprite object.
+    #
+    # @overload new(image: img)
+    #  pos: [0, 0], size: [image.width, image.height]
+    #  @param [Image] img sprite image
+    #
+    # @overload new(x, y, image: img)
+    #  pos: [x, y], size: [image.width, image.height]
+    #  @param [Numeric] x   x of sprite position
+    #  @param [Numeric] y   y of sprite position
+    #  @param [Image]   img sprite image
+    #
+    # @overload new(x, y, w, h)
+    #  pos(x, y), size: [w, h]
+    #  @param [Numeric] x x of sprite position
+    #  @param [Numeric] y y of sprite position
+    #  @param [Numeric] w width of sprite
+    #  @param [Numeric] h height of sprite
+    #
+    # @overload new(x, y, w, h, image: img, offset: off)
+    #  pos: [x, y], size: [w, h], offset: [offset.x, offset.x]
+    #  @param [Numeric] x   x of sprite position
+    #  @param [Numeric] y   y of sprite position
+    #  @param [Numeric] w   width of sprite
+    #  @param [Numeric] h   height of sprite
+    #  @param [Image]   img sprite image
+    #  @param [Vector]  off offset of sprite image
+    #
+    def initialize(x = 0, y = 0, w = nil, h = nil, image: nil, offset: nil)
+      w ||= (image&.width  || 0)
+      h ||= (image&.height || 0)
+      raise 'invalid size'  unless w >= 0 && h >= 0
+      raise 'invalid image' if image && !image.getInternal__.is_a?(Rays::Image)
 
-    def initialize(x = 0, y = 0, w = nil, h = nil, image: nil, offset: nil, dynamic: false)
-      w ||= image&.width  || 0
-      h ||= image&.height || 0
-      raise 'invalid size' unless w >= 0 && h >= 0
+      @view__ = SpriteView.new(self, x: x, y: y, w: w, h: h, back: :white)
 
-      @image__, @offset__ = image, offset
-      @view__ = View.new self, x: x, y: y, w: w, h: h, back: :white, dynamic: dynamic
+      self.image  = image  if image
+      self.offset = offset if offset
     end
 
-    def_delegators :@view__,
-      :x, :x=,
-      :y, :y=,
-      :w,     :h,
-      :width, :height,
-      :dynamic?,    :dynamic=,
-      :density,     :density=,
-      :friction,    :friction=,
-      :restitution, :restitution=
+    # Returns the position of the sprite.
+    #
+    # @return [Vector] position
+    #
+    def position()
+      @view__.position.toVector
+    end
 
-    def update(&block)
-      @view__.update = block
+    # Sets the position of the sprite.
+    #
+    # @overload position=(vec)
+    #  @param [Vector] vec position vector
+    #
+    # @overload position=(ary)
+    #  @param [Array<Numeric>] ary positionX, positionY
+    #
+    # @return [Vector] position
+    #
+    def position=(arg)
+      @view__.position = arg.is_a?(Vector) ? arg.getInternal__ : arg
+      arg
     end
 
-    def contact(&block)
-      @view__.contact = block
+    # Returns the x-coordinate position of the sprite.
+    #
+    # @return [Numeric] sprite position x
+    #
+    def x()
+      @view__.x
     end
 
-    def position()
-      @view__.position.toVector
+    # Set the x-coordinate position of the sprite.
+    #
+    # @param [Numeric] n sprite position x
+    #
+    # @return [Numeric] sprite position x
+    #
+    def x=(n)
+      @view__.x = n
+      n
     end
 
-    def position=(vector)
-      @view__.position = vector.getInternal__
+    # Returns the y-coordinate position of the sprite.
+    #
+    # @return [Numeric] sprite position y
+    #
+    def y()
+      @view__.y
     end
 
+    # Set the y-coordinate position of the sprite.
+    #
+    # @param [Numeric] n sprite position y
+    #
+    # @return [Numeric] sprite position y
+    #
+    def y=(n)
+      @view__.y = n
+      n
+    end
+
+    alias pos  position
+    alias pos= position=
+
+    # Returns the size of the sprite.
+    #
+    # @return [Vector] size
+    #
     def size()
       @view__.size.toVector
     end
 
+    # Returns the width of the sprite.
+    #
+    # @return [Numeric] width
+    #
+    def width()
+      @view__.width
+    end
+
+    # Returns the height of the sprite.
+    #
+    # @return [Numeric] height
+    #
+    def height()
+      @view__.height
+    end
+
+    alias w width
+    alias h height
+
+    # Returns the velocity of the sprite.
+    #
+    # @return [Vector] velocity
+    #
+    def velocity()
+      @view__.velocity.toVector
+    end
+
+    # Sets the velocity of the sprite.
+    #
+    # @overload velocity=(vec)
+    #  @param [Vector] vec velocity vector
+    #
+    # @overload velocity=(ary)
+    #  @param [Array<Numeric>] ary velocityX, velocityY
+    #
+    # @return [Vector] velocity
+    #
+    def velocity=(arg)
+      @view__.velocity = arg.is_a?(Vector) ? arg.getInternal__ : arg
+      arg
+    end
+
+    # Returns the x-axis velocity of the sprite.
+    #
+    # @return [Numeric] velocity.x
+    #
+    def vx()
+      @view__.velocity.x
+    end
+
+    # Sets the x-axis velocity of the sprite.
+    #
+    # @param [Numeric] n x-axis velocity
+    #
+    # @return [Numeric] velocity.x
+    #
+    def vx=(n)
+      @view__.velocity = @view__.velocity.tap {|v| v.x = n}
+      n
+    end
+
+    # Returns the y-axis velocity of the sprite.
+    #
+    # @return [Numeric] velocity.y
+    #
+    def vy()
+      @view__.velocity.y
+    end
+
+    # Sets the y-axis velocity of the sprite.
+    #
+    # @param [Numeric] n y-axis velocity
+    #
+    # @return [Numeric] velocity.y
+    #
+    def vy=(n)
+      @view__.velocity = @view__.velocity.tap {|v| v.y = n}
+      n
+    end
+
+    alias vel  velocity
+    alias vel= velocity=
+
+    # Returns the image of the sprite.
+    #
+    # @return [Image] sprite image
+    #
     def image()
       @image__
     end
 
+    # Sets the sprite image.
+    #
+    # @param [Image] img sprite image
+    #
+    # @return [Image] sprite image
+    #
+    def image=(img)
+      @image__ = img
+    end
+
+    # Returns the offset of the sprite image.
+    #
+    # @return [Vector] offset of the sprite image
+    #
     def offset()
       @offset__
     end
 
-    def velocity()
-      @view__.velocity.toVector
+    def offset=(arg)
+      @offset__ =
+        case arg
+        when Vector then arg
+        when Array  then Vector.new(*arg[0, 2])
+        when nil    then nil
+        else raise ArgumentError
+        end
+    end
+
+    # Returns whether the sprite is movable by the physics engine.
+    #
+    # @return [Boolean] true if dynamic
+    #
+    def dynamic?()
+      @view__.dynamic?
     end
 
-    def velocity=(vector)
-      @view__.velocity = vector.getInternal__
+    # Sets whether the sprite is movable by the physics engine.
+    #
+    # @param [Boolean] bool movable or not
+    #
+    # @return [Boolean] true if dynamic
+    #
+    def dynamic=(bool)
+      @view__.dynamic = bool
+      bool
+    end
+
+    # Returns the density of the sprite.
+    #
+    # @return [Numeric] density
+    #
+    def density()
+      @view__.density
+    end
+
+    # Sets the density of the sprite.
+    #
+    # @param [Numeric] n density
+    #
+    # @return [Numeric] density
+    #
+    def density=(n)
+      @view__.density = n
+      n
+    end
+
+    # Returns the friction of the sprite.
+    #
+    # @return [Numeric] friction
+    #
+    def friction()
+      @view__.friction
+    end
+
+    # Sets the friction of the sprite.
+    #
+    # @param [Numeric] n friction
+    #
+    # @return [Numeric] friction
+    #
+    def friction=(n)
+      @view__.friction = n
+      n
+    end
+
+    # Returns the restitution of the sprite.
+    #
+    # @return [Numeric] restitution
+    #
+    def restitution()
+      @view__.restitution
+    end
+
+    # Sets the restitution of the sprite.
+    #
+    # @param [Numeric] n restitution
+    #
+    # @return [Numeric] restitution
+    #
+    def restitution=(n)
+      @view__.restitution = n
+      n
     end
 
-    alias pos   position
-    alias pos=  position=
-    alias vel   velocity
-    alias vel=  velocity=
     alias dens  density
     alias dens= density=
     alias fric  friction
-    alias fric= friction
+    alias fric= friction=
     alias rest  restitution
     alias rest= restitution=
 
+    # Defines update block.
+    #
+    # @example vx is updated every frame
+    #  sprite.update do
+    #    self.vx *= 0.9
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def update(&block)
+      @view__.update = block
+    end
+
+    # Defines contact block.
+    #
+    # @example Score increases when the player sprite touches a coin
+    #  playerSprite.contact do |o|
+    #    score += 1 if o.coin?
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def contact(&block)
+      @view__.contact = block
+    end
+
+    # Defines contact? block.
+    #
+    # @example only collide with an enemy
+    #  playerSprite.contact? do |o|
+    #    o.enemy?
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def contact?(&block)
+      @view__.will_contact = block
+    end
+
+    # @private
+    def on_draw__(x, y, w, h)
+      img, off = frame, @image__, @offset__
+      if img && off
+        copy img, off.x, off.y, f.w, h, x, y, w, h
+      elsif img
+        image img, x, y
+      else
+        rect x, y, w, h
+      end
+    end
+
     # @private
     def getInternal__()
       @view__
     end
 
-    class View < Reflex::View
-      attr_accessor :update, :contact
-      attr_reader :sprite
+  end# Sprite
 
-      def initialize(sprite, *a, **k, &b)
-        @sprite = sprite
-        super(*a, **k, &b)
-      end
 
-      def on_update(e)
-        @update.call if @update
-      end
+  # @private
+  class SpriteView < Reflex::View
 
-      def on_contact(e)
-        v = e.view
-        @contact.call v.sprite, e.action if @contact && v.is_a?(View)
-      end
+    attr_accessor :update, :contact, :will_contact
+    attr_reader :sprite
+
+    def initialize(sprite, *a, **k, &b)
+      @sprite = sprite
+      super(*a, **k, &b)
     end
 
-  end# Sprite
+    def on_update(e)
+      @update.call if @update
+    end
+
+    def on_contact(e)
+      v = e.view
+      @contact.call v.sprite, e.action if @contact && v.is_a?(SpriteView)
+    end
+
+    def will_contact?(v)
+      return true if !@will_contact || !v.is_a?(SpriteView)
+      @will_contact.call v.sprite
+    end
+
+  end# SpriteView
 
 
 end# RubySketch

data/lib/rubysketch/window.rb

@@ -0,0 +1,14 @@
+module RubySketch
+
+
+  # @private
+  class Window < Processing::Window
+
+    def on_update(e)
+      Beeps.process_streams!
+    end
+
+  end# Window
+
+
+end# RubySketch

data/lib/rubysketch.rb

@@ -2,7 +2,7 @@ require 'rubysketch/all'
 
 
 module RubySketch
-  WINDOW  = Processing::Window.new {start}
+  WINDOW  = RubySketch::Window.new {start}
   CONTEXT = RubySketch::Context.new WINDOW
 
   refine Object do
@@ -25,6 +25,6 @@ begin
   w.__send__ :begin_draw
   at_exit do
     w.__send__ :end_draw
-    Processing::App.new {w.show}.start if c.hasDrawBlock__ && !$!
+    Processing::App.new {w.show}.start if c.hasUserBlocks__ && !$!
   end
 end

data/pod.rake

@@ -0,0 +1,35 @@
+# -*- mode: ruby -*-
+
+
+github  = 'https://github.com/xord'
+renames = {reflexion: 'reflex'}
+regexp  = /add\w+dependency.*['"](\w+)['"].*['"]\s*~>\s*([\d\.]+)\s*['"]/
+repos   = File.readlines('rubysketch.gemspec', chomp: true)
+  .map {|s| regexp.match(s)&.values_at 1, 2}
+  .compact
+  .to_h
+  .transform_keys {|name| renames[name.to_sym].then {|s| s || name}}
+
+
+task :clobber do
+  sh %( rm -rf #{repos.keys.join ' '} )
+end
+
+task :setup
+
+repos.each do |repo, ver|
+  rakefile = "#{repo}/Rakefile"
+  opts     = [
+    '-c advice.detachedHead=false',
+    '--no-single-branch',
+    '--depth 1',
+    "--branch #{ENV['RUBYSKETCH_BRANCH'] || ('v' + ver)}"
+  ]
+
+  task :setup => rakefile
+
+  file rakefile do
+    sh %( git clone #{opts.join ' '} #{github}/#{repo} )
+    sh %( cd #{repo} && VENDOR_NOCOMPILE=1 rake vendor erb )
+  end
+end

data/rubysketch.gemspec

@@ -28,12 +28,12 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.7.0'
 
-  s.add_runtime_dependency 'xot',        '~> 0.1.32'
-  s.add_runtime_dependency 'rucy',       '~> 0.1.32'
-  s.add_runtime_dependency 'beeps',      '~> 0.1.32'
-  s.add_runtime_dependency 'rays',       '~> 0.1.32'
-  s.add_runtime_dependency 'reflexion',  '~> 0.1.32'
-  s.add_runtime_dependency 'processing', '~> 0.5.2'
+  s.add_runtime_dependency 'xot',        '~> 0.1.34'
+  s.add_runtime_dependency 'rucy',       '~> 0.1.34'
+  s.add_runtime_dependency 'beeps',      '~> 0.1.35'
+  s.add_runtime_dependency 'rays',       '~> 0.1.34'
+  s.add_runtime_dependency 'reflexion',  '~> 0.1.35'
+  s.add_runtime_dependency 'processing', '~> 0.5.5'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/src/RubySketch.h

@@ -0,0 +1,22 @@
+// -*- mode: objc -*-
+#import <Foundation/Foundation.h>
+#import <CRBValue.h>
+
+
+@interface RubySketch : NSObject
+
+	typedef void (^RescueBlock) (CRBValue* exception);
+
+	+ (void) setup;
+
+	+ (BOOL) start;
+	+ (BOOL) startWithRescue: (RescueBlock) rescue;
+
+	+ (BOOL) start: (NSString*) path;
+	+ (BOOL) start: (NSString*) path rescue: (RescueBlock) rescue;
+
+	+ (void) setActiveReflexViewController: (id) reflexViewController;
+
+	+ (void) resetActiveReflexViewController;
+
+@end

data/src/RubySketch.mm

@@ -0,0 +1,92 @@
+// -*- mode: objc -*-
+#import <CRuby.h>
+#import "RubySketch.h"
+#include "../reflex/src/ios/view_controller.h"
+
+
+extern "C"
+{
+	void Init_beeps_native ();
+	void Init_rays_native ();
+	void Init_reflex_native ();
+}
+
+
+static ReflexViewController* active_reflex_view_controller = nil;
+
+static ReflexViewController*
+ReflexViewController_create()
+{
+	return active_reflex_view_controller;
+}
+
+static void
+ReflexViewController_show (UIViewController*, ReflexViewController*)
+{
+}
+
+
+@implementation RubySketch
+
+	+ (void) setup
+	{
+		static BOOL done = NO;
+		if (done) return;
+		done = YES;
+
+		[CRuby addExtension:@"beeps/native"  init:^{Init_beeps_native();}];
+		[CRuby addExtension:@"rays/native"   init:^{Init_rays_native();}];
+		[CRuby addExtension:@"reflex/native" init:^{Init_reflex_native();}];
+
+		for (NSString *ext in @[
+			@"Xot",
+			@"Rucy",
+			@"Beeps",
+			@"Rays",
+			@"Reflex",
+			@"Processing",
+			@"RubySketch"
+		]) [CRuby addLibrary:ext bundle:[NSBundle bundleForClass:RubySketch.class]];
+
+		ReflexViewController_set_create_fun(ReflexViewController_create);
+		ReflexViewController_set_show_fun(ReflexViewController_show);
+	}
+
+	+ (BOOL) start
+	{
+		return [self start:@"main.rb" rescue:nil];
+	}
+
+	+ (BOOL) startWithRescue: (RescueBlock) rescue
+	{
+		return [self start:@"main.rb" rescue:rescue];
+	}
+
+	+ (BOOL) start: (NSString*) path
+	{
+		return [self start:path rescue:nil];
+	}
+
+	+ (BOOL) start: (NSString*) path rescue: (RescueBlock) rescue
+	{
+		CRBValue* ret = [CRuby evaluate:[NSString stringWithFormat:@
+			"raise 'already started' unless require 'rubysketch'\n"
+			"load '%@'\n"
+			"RubySketch::WINDOW.__send__ :end_draw\n"
+			"RubySketch::WINDOW.show",
+			path
+		]];
+		return ret && ret.toBOOL;
+	}
+
+	+ (void) setActiveReflexViewController: (id) reflexViewController
+	{
+		active_reflex_view_controller = reflexViewController;
+	}
+
+	+ (void) resetActiveReflexViewController
+	{
+		active_reflex_view_controller = nil;
+	}
+
+@end

data/test/helper.rb

@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 
 
-%w[../xot ../rucy ../rays ../reflex ../processing .]
+%w[../xot ../rucy ../beeps ../rays ../reflex ../processing .]
   .map  {|s| File.expand_path "../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
-require 'test/unit'
 require 'xot/test'
 require 'rubysketch/all'
 
+require 'test/unit'
+
 include Xot::Test