reight 0.1.6 → 0.1.8

data/lib/reight/app/sprite/editor.rb

@@ -9,12 +9,16 @@ class Reight::SpriteEditor < Reight::App
       project.chips_image,
       project.chips_image_path
     ).tap do |canvas|
-      canvas. tool_changed {update_active_tool}
-      canvas.color_changed {update_active_color}
+      canvas.frame_changed do |old, new|
+        history.append [:frame, old, new]
+      end
+      canvas.selection_changed do |old, new|
+        history.append [new ? :select : :deselect, old, new]
+      end
     end
   end
 
-  def activated()
+  def setup()
     super
     history.disable do
       colors[7].click
@@ -32,7 +36,7 @@ class Reight::SpriteEditor < Reight::App
 
   def key_pressed()
     super
-    shift, ctrl, cmd = %i[shift control command].map {pressing? _1}
+    shift, ctrl, cmd = [SHIFT, CONTROL, COMMAND].map {pressing? _1}
     ch               = chips
     case key_code
     when LEFT  then ch.set_frame ch.x - ch.size, ch.y, ch.size, ch.size
@@ -54,39 +58,43 @@ class Reight::SpriteEditor < Reight::App
 
   def window_resized()
     super
-    [colors, tools, chip_sizes, brush_sizes].flatten.map(&:sprite)
+    [chip_sizes, tools, colors, brush_sizes].flatten.map(&:sprite)
       .each {|sp| sp.w = sp.h = BUTTON_SIZE}
 
+    chips_index.sprite.tap do |sp|
+      sp.w, sp.h = INDEX_SIZE, BUTTON_SIZE
+      sp.x       = SPACE
+      sp.y       = NAVIGATOR_HEIGHT + SPACE
+    end
+    chip_sizes.reverse.map {_1.sprite}.each.with_index do |sp, index|
+      sp.x = SPACE + CHIPS_WIDTH - (sp.w + (sp.w + 1) * index)
+      sp.y = chips_index.sprite.y
+    end
     chips.sprite.tap do |sp|
       sp.x      = SPACE
-      sp.y      = NAVIGATOR_HEIGHT + SPACE
-      sp.w      = CHIPS_WIDTH
+      sp.y      = chip_sizes.last.sprite.bottom + SPACE
+      sp.right  = chip_sizes.last.sprite.right
       sp.bottom = height - SPACE
     end
     colors.map {_1.sprite}.each.with_index do |sp, index|
-      sp.x = chips.sprite.right + SPACE + sp.w * (index % 4)
-      sp.y = height - (SPACE + sp.h * (4 - index / 4))
+      sp.h *= 0.8
+      sp.x  = chips.sprite.right + SPACE + sp.w * (index % 8)
+      sp.y  = height - (SPACE + sp.h * (4 - index / 8))
     end
     tools.map {_1.sprite}.each.with_index do |sp, index|
-      line   = index < 3 ? 0 : 1
-      index -= 3 if line == 1
-      sp.x   = colors.last.sprite.right + SPACE + (sp.w + 1) * index
-      sp.y   = colors.first.sprite.y + (sp.h + 1) * line
+      sp.x = colors.first.sprite.x + (sp.w + 1) * index
+      sp.y = colors.first.sprite.y - (SPACE / 2 + sp.h)
     end
     canvas.sprite.tap do |sp|
-      sp.x      = chips.sprite.right + SPACE
-      sp.y      = chips.sprite.y
-      sp.bottom = colors.first.sprite.top - SPACE
+      sp.x      = chip_sizes.last.sprite.right + SPACE
+      sp.y      = chip_sizes.last.sprite.y
+      sp.bottom = tools.first.sprite.top - SPACE / 2
       sp.w      = sp.h
     end
-    chip_sizes.map {_1.sprite}.each.with_index do |sp, index|
+    brush_sizes.map {_1.sprite}.each.with_index do |sp, index|
       sp.x = canvas.sprite.right + SPACE + (sp.w + 1) * index
       sp.y = canvas.sprite.y
     end
-    brush_sizes.map {_1.sprite}.each.with_index do |sp, index|
-      sp.x = chip_sizes.first.sprite.x + (sp.w + 1) * index
-      sp.y = chip_sizes.last.sprite.bottom + SPACE
-    end
     shapes.map {_1.sprite}.each.with_index do |sp, index|
       sp.w = 30
       sp.h = BUTTON_SIZE
@@ -149,7 +157,7 @@ class Reight::SpriteEditor < Reight::App
       canvas.deselect
       canvas.begin_editing do
         canvas.paint do |g|
-          g.copy image, 0, 0, w, h, x, y, w, h
+          g.blend image, 0, 0, w, h, x, y, w, h, REPLACE
         end
       end
       canvas.select canvas.x + x, canvas.y + y, w, h
@@ -168,14 +176,13 @@ class Reight::SpriteEditor < Reight::App
   private
 
   def sprites()
-    [canvas, chips, *chip_sizes, *colors, *tools, *brush_sizes, *shapes, *types]
+    [chips_index, *chip_sizes, chips, *tools, *colors, canvas, *brush_sizes, *shapes, *types]
       .map(&:sprite) + super
   end
 
-  def chips()
-    @chips ||= Chips.new self, project.chips_image do |x, y, w, h|
-      canvas.set_frame x, y, w, h
-      chip_changed x, y, w, h
+  def chips_index()
+    @chips_index ||= Reight::Index.new max: project.chips_npages - 1 do |index|
+      chips.offset = chips.index2offset index if index != chips.offset2index
     end
   end
 
@@ -187,6 +194,17 @@ class Reight::SpriteEditor < Reight::App
     })
   end
 
+  def chips()
+    @chips ||= Chips.new(self, project.chips).tap do |chips|
+      chips.frame_changed do |x, y, w, h|
+        chip_changed x, y, w, h
+      end
+      chips.offset_changed do |offset|
+        chips_index.index = chips.offset2index offset
+      end
+    end
+  end
+
   def tools()
     @tools ||= group(
       select,
@@ -209,6 +227,18 @@ class Reight::SpriteEditor < Reight::App
   def stroke_ellipse = @stroke_ellipse ||= Shape.new(self, :ellipse, false) {canvas.tool = _1}
   def   fill_ellipse =   @fill_ellipse ||= Shape.new(self, :ellipse, true)  {canvas.tool = _1}
 
+  def colors()
+    @colors ||= project.palette_colors.map {|color|
+      rgb = self.color(color)
+        .then {[red(_1), green(_1), blue(_1), alpha(_1)]}.map &:to_i
+      Color.new(rgb) do
+        canvas.color = rgb
+      end.tap do |c|
+        canvas.color_changed {c.active = _1 == rgb}
+      end
+    }
+  end
+
   def brush_sizes()
     @brush_sizes ||= group(*[1, 2, 3, 5, 10].map {|size|
       Reight::Button.new name: "Button Size #{size}", label: size do
@@ -218,14 +248,6 @@ class Reight::SpriteEditor < Reight::App
     })
   end
 
-  def colors()
-    @colors ||= project.palette_colors.map {|color|
-      rgb = self.color(color)
-        .then {[red(_1), green(_1), blue(_1), alpha(_1)]}.map &:to_i
-      Color.new(rgb) {canvas.color = rgb}
-    }
-  end
-
   def shapes()
     @shapes ||= group(
       Reight::Button.new(name: 'No Shape', label: 'None') {
@@ -252,21 +274,10 @@ class Reight::SpriteEditor < Reight::App
   end
 
   def chip_changed(x, y, w, h)
+    canvas.set_frame x, y, w, h
     chip = project.chips.at x, y, w, h
     shapes[[nil, :rect, :circle].index(chip.shape)].click
     types[chip.sensor? ? 1 : 0].click
   end
 
-  def update_active_tool()
-    tools.each do |tool|
-      tool.active = tool == canvas.tool
-    end
-  end
-
-  def update_active_color()
-    colors.each do |button|
-      button.active = button.color == canvas.color
-    end
-  end
-
 end# SpriteEditor

data/lib/reight/app/sprite/line.rb

@@ -4,7 +4,7 @@ using Reight
 class Reight::SpriteEditor::Line < Reight::SpriteEditor::Tool
 
   def initialize(app, &block)
-    super app, icon: app.icon(3, 2, 8), &block
+    super app, icon: app.icon(4, 2, 8), &block
     set_help left: name, right: 'Pick Color'
   end
 

data/lib/reight/app/sprite/shape.rb

@@ -6,7 +6,7 @@ class Reight::SpriteEditor::Shape < Reight::SpriteEditor::Tool
   def initialize(app, shape, fill, &block)
     @shape, @fill = shape, fill
     icon_index = [:rect, :ellipse].product([false, true]).index([shape, fill])
-    super app, icon: app.icon(icon_index + 4, 2, 8), &block
+    super app, icon: app.icon(icon_index + 5, 2, 8), &block
     set_help left: name, right: 'Pick Color'
   end
 

data/lib/reight/app/sprite.rb

@@ -1,6 +1,5 @@
 require 'reight/app/sprite/editor'
 require 'reight/app/sprite/canvas'
-require 'reight/app/sprite/chips'
 require 'reight/app/sprite/color'
 require 'reight/app/sprite/tool'
 require 'reight/app/sprite/select'

data/lib/reight/app.rb

@@ -8,15 +8,28 @@ class Reight::App
 
   SPACE            = 6
   BUTTON_SIZE      = 12
+  INDEX_SIZE       = 36
   NAVIGATOR_HEIGHT = BUTTON_SIZE + 2
   CHIPS_WIDTH      = 128
 
+  PALETTE_COLORS   = %w[
+    #00000000 #742f29 #ab5236 #f18459 #f7cca9 #ee044e #b8023f #7e2553
+    #452d32   #5f574f #a28879 #c2c3c7 #fdf1e8 #f6acc5 #f277a8 #e40dab
+    #1d2c53   #3363b0 #42a5a1 #56adff #64dff6 #bd9adf #83759c #644788
+    #1e5359   #2d8750 #3eb250 #4fe436 #95f041 #f8ec27 #f3a207 #e26b02
+  ]
+
   def initialize(project)
     @project = project
+    @active  = false
   end
 
   attr_reader :project
 
+  def label()
+    self.class.name.split('::').last.gsub(/([a-z])([A-Z])/) {"#{$1} #{$2}"}
+  end
+
   def flash(...)
     navigator.flash(...) if history.enabled?
   end
@@ -30,12 +43,12 @@ class Reight::App
     buttons
   end
 
-  def pressing?(key)
-    pressing_keys.include? key
+  def active?()
+    @active
   end
 
-  def name()
-    self.class.name
+  def pressing?(key)
+    pressing_keys.include? key
   end
 
   def history()
@@ -57,12 +70,18 @@ class Reight::App
 
   def activated()
     add_world world if world
+    @setup ||= true.tap {setup}
+    @active  = true
   end
 
   def deactivated()
+    @active = false
     remove_world world if world
   end
 
+  def setup()
+  end
+
   def draw()
     navigator.draw
   end
@@ -112,7 +131,7 @@ class Reight::App
 
   def world()
     @world ||= SpriteWorld.new.tap do |w|
-      w.add_sprite(*sprites)
+      sprites.each {w.add_sprite _1}
     end
   end
 

data/lib/reight/button.rb

@@ -13,17 +13,19 @@ class Reight::Button
     super()
 
     hook :clicked
-    self.clicked(&clicked)
+    self.clicked(&clicked) if clicked
     self.clicked {r8.flash name}
   end
 
+  attr_accessor :name, :icon, :label
+
   def draw()
     sp = sprite
     no_stroke
 
     if @label
       fill 210
-      rect 0, pressing? ? 2 : 1, sp.w, sp.h - 1, 2
+      rect 0, pressing? ? 1 : 0, sp.w, sp.h, 2
     end
 
     if active?
@@ -39,12 +41,13 @@ class Reight::Button
     end
 
     if @label
+      y = pressing? ? 1 : 0
       text_size r8.project.font_size - 1
       text_align CENTER, CENTER
-      fill 100, 100, 100
-      text @label, 0, 1, sp.w, sp.h
-      fill 255, 255, 255
-      text @label, 0, 0, sp.w, sp.h
+      fill active? ? 250 : 230
+      text @label, 0, y + 1, sp.w, sp.h
+      fill active? ? 70  : 50
+      text @label, 0, y,     sp.w, sp.h
     end
   end
 
@@ -72,7 +75,7 @@ class Reight::Button
   def disabled? = !enabled?
 
   def sprite()
-    @sprite ||= Sprite.new(physics: false).tap do |sp|
+    @sprite ||= RubySketch::Sprite.new(physics: false).tap do |sp|
       sp.draw           {draw}
       sp.mouse_pressed  {pressed  sp.mouse_x, sp.mouse_y}
       sp.mouse_released {released sp.mouse_x, sp.mouse_y}

data/lib/reight/chip.rb

@@ -7,7 +7,7 @@ class Reight::Chip
 
   def initialize(id, image, x, y, w, h, pos: nil, shape: nil, sensor: nil)
     @id, @image, @x, @y, @w, @h, @pos, @shape, @sensor =
-      id, image, x, y, w, h, pos, shape, (sensor || false)
+     id,  image,  x,  y,  w,  h,  pos,  shape, (sensor || false)
   end
 
   attr_accessor :shape
@@ -27,6 +27,7 @@ class Reight::Chip
   def with(**kwargs)
     id, image, x, y, w, h, pos, shape, sensor =
       kwargs.values_at :id, :image, :x, :y, :w, :h, :pos, :shape, :sensor
+    #kwargs => {id:, image:, x:, y:, w:, h:, pos:, shape:, sensor:}
     self.class.new(
       id    || @id,
       image || @image,
@@ -46,8 +47,9 @@ class Reight::Chip
       when :circle then [true,  RubySketch::Circle.new(0, 0, w)]
       else              [false, nil]
       end
-    Sprite.new(
-      0, 0, w, h, image: image, offset: [x, y], shape: shape, physics: physics
+    Reight::Sprite.new(
+      0, 0, w, h, chip: self,
+      image: image, offset: [x, y], shape: shape, physics: physics
     ).tap do |sp|
       sp.x, sp.y = pos.x, pos.y if pos
       if physics
@@ -57,6 +59,14 @@ class Reight::Chip
     end
   end
 
+  def sprite()
+    @sprite ||= to_sprite
+  end
+
+  def clear_sprite()
+    @sprite = nil
+  end
+
   def to_hash()
     {
       id: id, x: x, y: y, w: w, h: h
@@ -67,7 +77,12 @@ class Reight::Chip
     end
   end
 
-  def <=>(o)
+  def inspect()
+    "#<#{self.class.name}:0x#{object_id}>"
+  end
+
+  # @private
+  def cmp__(o)
     a =                  [@id, @image.object_id, @x, @y, @w, @h, @pos, @shape, @sensor]
     b = o.instance_eval {[@id, @image.object_id, @x, @y, @w, @h, @pos, @shape, @sensor]}
     a <=> b
@@ -76,6 +91,7 @@ class Reight::Chip
   def self.restore(hash, image)
     id, x, y, w, h, pos, shape, sensor =
       hash.values_at :id, :x, :y, :w, :h, :pos, :shape, :sensor
+    #hash => {id:, x:, y:, w:, h:, pos:, shape:, sensor:}
     new(
       id, image, x, y, w, h, pos: pos&.then {create_vector(*_1)},
       shape: shape&.to_sym, sensor: sensor || false)
@@ -110,6 +126,10 @@ class Reight::ChipList
     @frame2chip[[x, y, w, h]] ||= create_chip x, y, w, h
   end
 
+  def each(&block)
+    @id2chip.values.each(&block)
+  end
+
   def to_hash()
     {next_id: @next_id, chips: @id2chip.values.map {_1.to_hash}}
   end
@@ -118,14 +138,20 @@ class Reight::ChipList
     @id2chip[id]
   end
 
-  def <=>(o)
+  def inspect()
+    "#<#{self.class.name}:0x#{object_id}>"
+  end
+
+  # @private
+  def cmp__(o)
     a =                  [@image, @next_id, @id2chip, @frame2chip]
     b = o.instance_eval {[@image, @next_id, @id2chip, @frame2chip]}
     a <=> b
   end
 
   def self.restore(hash, image)
-    hash => {next_id:, chips:}
+    next_id, chips = hash.values_at :next_id, :chips
+    #hash => {next_id:, chips:}
     new(image).tap do |obj|
       obj.instance_eval do
         @next_id    = next_id

data/lib/reight/context.rb

@@ -0,0 +1,168 @@
+module Reight::Context
+
+  include Processing::GraphicsContext
+  include RubySketch::GraphicsContext
+
+  TIMER_PREFIX__ = '__r8__'
+
+  # @private
+  def initialize(rootContext, project)
+    @rootContext__, @project__ = rootContext, project
+    init__ Rays::Image.new(@rootContext__.width, @rootContext__.height)
+  end
+
+  # Returns the project object.
+  #
+  def project()
+    @project__
+  end
+
+  # @private
+  def screenOffset(*args)
+    unless args.empty?
+      args    = args.flatten
+      x, y, z =
+        case arg = args.first
+        when Vector  then [arg.x,   arg.y,        arg.z]
+        when Numeric then [args[0], args[1] || 0, args[2] || 0]
+        when nil     then [0,       0,            0]
+        else raise ArgumentError
+        end
+      cx, cy, = @canvasFrame__
+      if cx && cy
+        zoom = spriteWorld__.zoom
+        x   += cx / zoom
+        y   += cy / zoom
+      end
+      spriteWorld__.offset = [x, y, z]
+    end
+    spriteWorld__.offset
+  end
+
+  # @see https://rubydoc.info/gems/rubysketch/RubySketch/Context#size-instance_method
+  def size(width, height, **)
+    return if width == self.width || height == self.height
+    @resizeCanvas__ = [width, height]
+  end
+
+  # @see https://rubydoc.info/gems/rubysketch/RubySketch/Context#createCanvas-instance_method
+  alias createCanvas size
+
+  # @see https://www.rubydoc.info/gems/processing/Processing/Context#mouseX-instance_method
+  def mouseX()
+    x, (cx, _) = @rootContext__.mouseX,  @canvasFrame__
+    cx ? (x - cx) / spriteWorld__.zoom : x
+  end
+
+  # @see https://www.rubydoc.info/gems/processing/Processing/Context#mouseY-instance_method
+  def mouseY()
+    y, (_, cy) = @rootContext__.mouseY,  @canvasFrame__
+    cy ? (y - cy) / spriteWorld__.zoom : y
+  end
+
+  # @see https://www.rubydoc.info/gems/processing/Processing/Context#pmouseX-instance_method
+  def pmouseX()
+    x, (cx, _) = @rootContext__.pmouseX, @canvasFrame__
+    cx ? (x - cx) / spriteWorld__.zoom : x
+  end
+
+  # @see https://www.rubydoc.info/gems/processing/Processing/Context#pmouseY-instance_method
+  def pmouseY()
+    y, (_, cy) = @rootContext__.pmouseY, @canvasFrame__
+    cy ? (y - cy) / spriteWorld__.zoom : y
+  end
+
+  # @see https://rubydoc.info/gems/rubysketch/RubySketch/Context#createSprite-instance_method
+  def createSprite(*args, klass: nil, **kwargs, &block)
+    klass ||= Reight::Sprite
+    spriteWorld__.createSprite(*args, klass: klass, **kwargs, &block)
+  end
+
+  # @see https://rubydoc.info/gems/rubysketch/RubySketch/Context#addSprite-instance_method
+  def addSprite(...)
+    spriteWorld__.addSprite(...)
+  end
+
+  # @see https://rubydoc.info/gems/rubysketch/RubySketch/Context#removeSprite-instance_method
+  def removeSprite(...)
+    spriteWorld__.removeSprite(...)
+  end
+
+  # @see https://rubydoc.info/gems/rubysketch/RubySketch/Context#gravity-instance_method
+  def gravity(...)
+    spriteWorld__.gravity(...)
+  end
+
+  # @see https://rubydoc.info/gems/rubysketch/RubySketch/Context#setTimeout-instance_method
+  def setTimeout( *a, id: @rootContext__.nextTimerID__, **k, &b)
+    id = [TIMER_PREFIX__, id]
+    @rootContext__.setTimeout(*a, id: id, **k, &b)
+  end
+
+  # @see https://rubydoc.info/gems/rubysketch/RubySketch/Context#setInterval-instance_method
+  def setInterval(*a, id: @rootContext__.nextTimerID__, **k, &b)
+    id = [TIMER_PREFIX__, id]
+    @rootContext__.setInterval(*a, id: id, **k, &b)
+  end
+
+  # @see https://rubydoc.info/gems/rubysketch/RubySketch/Context#clearTimer-instance_method
+  def clearTimer(id)
+    @rootContext__.clearTimer [TIMER_PREFIX__, id]
+  end
+
+  # @see https://rubydoc.info/gems/rubysketch/RubySketch/Context#clearTimeout-instance_method
+  def clearTimeout(id)
+    @rootContext__.clearTimeout [TIMER_PREFIX__, id]
+  end
+
+  # @see https://rubydoc.info/gems/rubysketch/RubySketch/Context#clearInterval-instance_method
+  def clearInterval(id)
+    @rootContext__.clearInterval [TIMER_PREFIX__, id]
+  end
+
+  # @private
+  def beginDraw__()
+    super
+    @painter__.__send__ :begin_paint
+  end
+
+  # @private
+  def endDraw__()
+    @painter__.__send__ :end_paint
+    super
+    resizeCanvas__
+  end
+
+  # @private
+  def spriteWorld__()
+    @spriteWorld__ ||= SpriteWorld.new(pixelsPerMeter: 8)
+  end
+
+  # @private
+  def resizeCanvas__()
+    w, h            = @resizeCanvas__ || return
+    @resizeCanvas__ = nil
+    updateCanvas__ Rays::Image.new(w.to_i, h.to_i)
+
+    rootw, rooth = @rootContext__.width, @rootContext__.height
+    if w == rootw && h == rooth
+      @canvasFrame__ = nil
+    else
+      wide           = w.to_f / h >= rootw.to_f / rooth
+      canvasw        = wide ? rootw                : rooth * (w.to_f / h)
+      canvash        = wide ? rootw * (h.to_f / w) : rooth
+      @canvasFrame__ = [
+        (rootw - canvasw) / 2,
+        (rooth - canvash) / 2,
+        canvasw,
+        canvash
+      ].map(&:to_i)
+    end
+
+    spriteWorld__.zoom = wide ? rootw.to_f / w : rooth.to_f / h
+  end
+
+  # @private
+  attr_reader :canvasFrame__
+
+end# Context

data/lib/reight/helpers.rb

@@ -33,8 +33,8 @@ module Reight::Hookable
         @hookable_hooks ||= {}
         (@hookable_hooks[name] ||= []).push block
       end
-      singleton_class.__send__ :define_method, "#{name}!" do |*args|
-        @hookable_hooks&.[](name)&.each {|block| block.call(*args)}
+      singleton_class.__send__ :define_method, "#{name}!" do |*args, &block|
+        @hookable_hooks&.[](name)&.each {_1.call(*args, &block)}
       end
     end
   end