reight 0.1.6 → 0.1.7

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

@@ -3,23 +3,183 @@ using Reight
 
 class Reight::SoundEditor < Reight::App
 
+  def canvas()
+    @canvas ||= Canvas.new self
+  end
+
+  def setup()
+    super
+    history.disable do
+      tones[0].click
+      tools[0].click
+    end
+  end
+
   def draw()
     background 200
+    sprite(*sprites)
+    super
+  end
 
-    push do
-      text_align LEFT, CENTER
+  def key_pressed()
+    super
+    case key_code
+    when ENTER then play_or_stop.click
+    when :b    then  brush.click
+    when :e    then eraser.click
+    when /^[#{(1..Reight::Sound::Note::TONES.size).to_a.join}]$/
+      tones[key_code.to_s.to_i - 1].click
+    end
+  end
 
-      text_size 10
-      fill 220; text "Sound Editor", 150, 1, 200, height
-      fill 150; text "Sound Editor", 150, 0, 200, height
+  def window_resized()
+    super
+    index.sprite.tap do |sp|
+      sp.w, sp.h = 32, BUTTON_SIZE
+      sp.x       = SPACE
+      sp.y       = NAVIGATOR_HEIGHT + SPACE
+    end
+    bpm.sprite.tap do |sp|
+      sp.w, sp.h = 40, BUTTON_SIZE
+      sp.x       = index.sprite.right + SPACE
+      sp.y       = index.sprite.y
+    end
+    edits.map(&:sprite).each.with_index do |sp, i|
+      sp.w, sp.h = 32, BUTTON_SIZE
+      sp.x       = bpm.sprite.right + SPACE + (sp.w + 1) * i
+      sp.y       = bpm.sprite.y
+    end
+    controls.map(&:sprite).each.with_index do |sp, i|
+      sp.w, sp.h = 32, BUTTON_SIZE
+      sp.x       = SPACE + (sp.w + 1) * i
+      sp.y       = height - (SPACE + sp.h)
+    end
+    tools.map(&:sprite).each.with_index do |sp, i|
+      sp.w = sp.h = BUTTON_SIZE
+      sp.x        = controls.last.sprite.right + SPACE * 2 + (sp.w + 1) * i
+      sp.y        = controls.last.sprite.y
+    end
+    tones.map(&:sprite).each.with_index do |sp, i|
+      sp.w = sp.h = BUTTON_SIZE
+      sp.x        = tools.last.sprite.right + SPACE * 2 + (sp.w + 1) * i
+      sp.y        = tools.last.sprite.y
+    end
+    canvas.sprite.tap do |sp|
+      sp.x      = SPACE
+      sp.y      = index.sprite.bottom + SPACE
+      sp.right  = width  - SPACE
+      sp.bottom = tools.first.sprite.y - SPACE
+    end
+  end
 
-      text_size 8
-      dots = '.' * (frame_count / 60 % 4).to_i
-      fill 220; text "is under construction#{dots}", 150, 11, 200, height
-      fill 150; text "is under construction#{dots}", 150, 10, 200, height
+  def undo(flash: true)
+    history.undo do |action|
+      case action
+      in [:put_note,    ti, ni, _]    then canvas.sound.remove ti, ni
+      in [:delete_note, ti, ni, tone] then canvas.sound.add    ti, ni, tone
+      end
+      self.flash 'Undo!' if flash
     end
+  end
 
-    super
+  def redo(flash: true)
+    history.redo do |action|
+      case action
+      in [:put_note,    ti, ni, tone] then canvas.sound.add    ti, ni, tone
+      in [:delete_note, ti, ni, _]    then canvas.sound.remove ti, ni
+      end
+      self.flash 'Redo!' if flash
+    end
+  end
+
+  private
+
+  def sprites()
+    [index, bpm, *edits, *controls, *tools, *tones, canvas]
+      .map(&:sprite) + super
+  end
+
+  def index()
+    @index ||= Reight::Index.new do |index|
+      canvas.sound = project.sounds[index] ||= Reight::Sound.new
+    end
+  end
+
+  def bpm()
+    @bpm ||= Reight::Text.new(
+      canvas.sound.bpm, label: 'BPM ', regexp: /^\-?\d+$/
+    ) do |str, text|
+      bpm = str.to_i.clamp(0, Reight::Sound::BPM_MAX)
+      next text.revert if bpm <= 0
+      text.value = canvas.sound.bpm = bpm
+      canvas.save
+    end.tap do |text|
+      canvas.sound_changed {text.value = _1.bpm}
+    end
+  end
+
+  def edits()
+    @edits ||= [
+      Reight::Button.new(name: 'Clear All Notes', label: 'Clear') {
+        canvas.sound.clear
+        canvas.save
+      },
+      Reight::Button.new(name: 'Delete Sound', label: 'Delete') {
+        project.sounds.delete_at index.index
+        canvas.sound = project.sounds[index.index] ||= Reight::Sound.new
+        canvas.save
+      },
+    ]
+  end
+
+  def controls()
+    @controls ||= [play_or_stop]
+  end
+
+  def play_or_stop()
+    @play_or_stop ||= Reight::Button.new(name: 'Play Sound', label: 'Play') {|b|
+      played  = -> {b.name, b.label = 'Stop Sound', 'Stop'}
+      stopped = -> {b.name, b.label = 'Play Sound', 'Play'}
+      if canvas.sound.playing?
+        canvas.sound.stop
+        stopped.call
+      else
+        canvas.sound.play {stopped.call}
+        played.call
+      end
+    }
+  end
+
+  def tools()
+    @tools ||= group brush, eraser
+  end
+
+  def brush  = @brush  ||= Brush.new(self)  {canvas.tool = _1}
+  def eraser = @eraser ||= Eraser.new(self) {canvas.tool = _1}
+
+  def tones()
+    @tones ||= group(*Reight::Sound::Note::TONES.map.with_index {|tone, index|
+      name  = tone.to_s.capitalize.gsub('_', '.')
+      name += ' Wave' if name !~ /noise/i
+      color = Canvas::TONE_COLORS[tone]
+      Reight::Button.new name: name, icon: icon(index, 3, 8) do
+        canvas.tone = tone
+        Reight::Sound::Note.new(60, tone).play 120 if active?
+      end.tap do |b|
+        b.instance_variable_set :@color, color
+        class << b
+          alias draw_ draw
+          def draw
+            draw_
+            no_fill
+            stroke @color
+            stroke_weight 1
+            w, h = sprite.width, sprite.height
+            line 3, h - 1, w - 3, h - 1
+          end
+        end
+      end
+    })
   end
 
 end# SoundEditor

data/lib/reight/app/sound/eraser.rb

@@ -0,0 +1,28 @@
+class Reight::SoundEditor::Eraser < Reight::SoundEditor::Tool
+
+  def initialize(app, &block)
+    super app, icon: app.icon(3, 2, 8), &block
+    set_help left: name
+  end
+
+  def erase(x, y, button)
+    canvas.delete x, y
+  end
+
+  def canvas_pressed(x, y, button)
+    return unless button == LEFT
+    canvas.begin_editing
+    erase x, y, button
+  end
+
+  def canvas_released(x, y, button)
+    return unless button == LEFT
+    canvas.end_editing
+  end
+
+  def canvas_dragged(x, y, button)
+    return unless button == LEFT
+    erase x, y, button
+  end
+
+end# Eraser

data/lib/reight/app/sound/tool.rb

@@ -0,0 +1,29 @@
+using Reight
+
+
+class Reight::SoundEditor::Tool < Reight::Button
+
+  def initialize(app, *a, **k, &b)
+    super(*a, **k, &b)
+    @app = app
+  end
+
+  attr_reader :app
+
+  def canvas  = app.canvas
+
+  def history = app.history
+
+  def name = self.class.name.split('::').last
+
+  def pick_tone(x, y)
+    canvas.tone = canvas.tone_at x, y
+  end
+
+  def canvas_pressed( x, y, button) = nil
+  def canvas_released(x, y, button) = nil
+  def canvas_moved(   x, y)         = nil
+  def canvas_dragged( x, y, button) = nil
+  def canvas_clicked( x, y, button) = nil
+
+end# Tool

data/lib/reight/app/sound.rb

@@ -1 +1,5 @@
 require 'reight/app/sound/editor'
+require 'reight/app/sound/canvas'
+require 'reight/app/sound/tool'
+require 'reight/app/sound/brush'
+require 'reight/app/sound/eraser'

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

@@ -6,17 +6,19 @@ class Reight::SpriteEditor::Canvas
   include Reight::Hookable
 
   def initialize(app, image, path)
-    hook :tool_changed, :color_changed
+    hook :color_changed
 
     @app, @image, @path       = app, image, path
-    @tool, @color, @selection = nil, [255, 255, 255], nil
+    @tool, @color, @selection = nil, [255, 255, 255, 255], nil
 
     @app.history.disable do
       set_frame 0, 0, 16, 16
     end
   end
 
-  attr_reader :x, :y, :w, :h, :tool, :color
+  attr_accessor :tool
+
+  attr_reader :x, :y, :w, :h, :color
 
   def width  = @image.width
 
@@ -27,11 +29,6 @@ class Reight::SpriteEditor::Canvas
     @app.project.save
   end
 
-  def tool=(tool)
-    @tool = tool
-    tool_changed! tool
-  end
-
   def set_frame(x, y, w, h)
     old            = [@x, @y, @w, @h]
     new            = correct_bounds x, y, w, h
@@ -76,6 +73,7 @@ class Reight::SpriteEditor::Canvas
       g.clip(*(selection || frame))
       g.push do
         g.translate x, y
+        g.blend_mode REPLACE
         block.call g
       end
     end
@@ -85,24 +83,24 @@ class Reight::SpriteEditor::Canvas
     tmp = sub_image x, y, w, h
     tmp.update_pixels {|pixels| block.call pixels}
     @image.begin_draw do |g|
-      g.copy tmp, 0, 0, w, h, x, y, w, h
+      g.blend tmp, 0, 0, w, h, x, y, w, h, REPLACE
     end
   end
 
   def sub_image(x, y, w, h)
     create_graphics(w, h).tap do |g|
-      g.begin_draw {g.copy @image, x, y, w, h, 0, 0, w, h}
+      g.begin_draw {g.blend @image, x, y, w, h, 0, 0, w, h, REPLACE}
     end
   end
 
   def pixel_at(x, y)
-    img = sub_image x, y, 1, 1
+    img = sub_image self.x + x, self.y + y, 1, 1
     img.load_pixels
     c = img.pixels[0]
     [red(c), green(c), blue(c), alpha(c)].map &:to_i
   end
 
-  def clear(frame, color: [0, 0, 0])
+  def clear(frame, color:)
     paint do |g|
       g.fill(*color)
       g.no_stroke
@@ -127,7 +125,7 @@ class Reight::SpriteEditor::Canvas
     x, y, w, h = frame
     create_graphics(w, h).tap do |g|
       g.begin_draw do
-        g.copy @image, x, y, w, h, 0, 0, w, h
+        g.blend @image, x, y, w, h, 0, 0, w, h, REPLACE
       end
     end
   end
@@ -135,13 +133,13 @@ class Reight::SpriteEditor::Canvas
   def apply_frame(image, x, y)
     @image.begin_draw do |g|
       w, h = image.width, image.height
-      g.copy image, 0, 0, w, h, x, y, w, h
+      g.blend image, 0, 0, w, h, x, y, w, h, REPLACE
     end
     save
   end
 
   def sprite()
-    @sprite ||= Sprite.new.tap do |sp|
+    @sprite ||= RubySketch::Sprite.new.tap do |sp|
       pos = -> {to_image sp.mouse_x, sp.mouse_y}
       sp.draw           {draw}
       sp.mouse_pressed  {tool&.canvas_pressed( *pos.call, sp.mouse_button)}
@@ -171,6 +169,11 @@ class Reight::SpriteEditor::Canvas
   def draw()
     sp = sprite
     clip sp.x, sp.y, sp.w, sp.h
+
+    fill 0
+    no_stroke
+    rect 0, 0, sp.w, sp.h
+
     copy @image, x, y, w, h, 0, 0, sp.w, sp.h if @image && x && y && w && h
 
     sx, sy = sp.w / w, sp.h / h

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

@@ -31,6 +31,11 @@ class Reight::SpriteEditor::Chips
   def draw()
     sp = sprite
     clip sp.x, sp.y, sp.w, sp.h
+
+    fill 0
+    no_stroke
+    rect 0, 0, sp.w, sp.h
+
     translate(*clamp_offset(@offset).to_a)
     image @image, 0, 0
 
@@ -63,7 +68,7 @@ class Reight::SpriteEditor::Chips
   end
 
   def sprite()
-    @sprite ||= Sprite.new.tap do |sp|
+    @sprite ||= RubySketch::Sprite.new.tap do |sp|
       sp.draw           {draw}
       sp.mouse_pressed  {mouse_pressed  sp.mouse_x, sp.mouse_y}
       sp.mouse_released {mouse_released sp.mouse_x, sp.mouse_y}

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

@@ -4,8 +4,9 @@ using Reight
 class Reight::SpriteEditor::Color < Reight::Button
 
   def initialize(color, &clicked)
-    super name: '', &clicked
+    super name: color[0, 3].map {_1.to_s(16).upcase}.join, &clicked
     @color = color
+    set_help name: "##{name}"
   end
 
   attr_reader :color
@@ -15,6 +16,7 @@ class Reight::SpriteEditor::Color < Reight::Button
 
     fill(*color)
     no_stroke
+    blend_mode REPLACE
     rect 0, 0, sp.w, sp.h
 
     if active?

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

@@ -7,14 +7,10 @@ class Reight::SpriteEditor < Reight::App
     @canvas ||= Canvas.new(
       self,
       project.chips_image,
-      project.chips_image_path
-    ).tap do |canvas|
-      canvas. tool_changed {update_active_tool}
-      canvas.color_changed {update_active_color}
-    end
+      project.chips_image_path)
   end
 
-  def activated()
+  def setup()
     super
     history.disable do
       colors[7].click
@@ -32,7 +28,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
@@ -64,19 +60,18 @@ class Reight::SpriteEditor < Reight::App
       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.bottom = tools.first.sprite.top - SPACE / 2
       sp.w      = sp.h
     end
     chip_sizes.map {_1.sprite}.each.with_index do |sp, index|
@@ -149,7 +144,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
@@ -222,7 +217,11 @@ class Reight::SpriteEditor < Reight::App
     @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}
+      Color.new(rgb) do
+        canvas.color = rgb
+      end.tap do |c|
+        canvas.color_changed {c.active = _1 == rgb}
+      end
     }
   end
 
@@ -257,16 +256,4 @@ class Reight::SpriteEditor < Reight::App
     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.rb

@@ -11,8 +11,16 @@ class Reight::App
   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
@@ -30,6 +38,10 @@ class Reight::App
     buttons
   end
 
+  def active?()
+    @active
+  end
+
   def pressing?(key)
     pressing_keys.include? key
   end
@@ -57,12 +69,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 +130,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,10 +13,12 @@ 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
@@ -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
+      text @label, 0, y + 1, sp.w, sp.h
       fill 255, 255, 255
-      text @label, 0, 0, sp.w, sp.h
+      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,8 @@ class Reight::Chip
     end
   end
 
-  def <=>(o)
+  # @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 +87,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 +122,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 +134,16 @@ class Reight::ChipList
     @id2chip[id]
   end
 
-  def <=>(o)
+  # @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