reight 0.1.2

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

@@ -0,0 +1,84 @@
+using Reight
+
+
+class Reight::MapEditor::Chips
+
+  def initialize(app, chips, size = 8)
+    @app, @chips = app, chips
+    @offset      = create_vector
+
+    @app.history.disable do
+      set_frame 0, 0, size, size
+    end
+  end
+
+  attr_reader :x, :y, :size
+
+  def chip = @chips.at(x, y, size, size)
+
+  def set_frame(x, y, w, h)
+    raise 'Chips: width != height' if w != h
+    @x    = align_to_grid(x).clamp(0..@chips.image.width)
+    @y    = align_to_grid(y).clamp(0..@chips.image.height)
+    @size = w
+  end
+
+  def draw()
+    sp = sprite
+
+    clip sp.x, sp.y, sp.w, sp.h
+    translate(*clamp_offset(@offset).to_a)
+    image @chips.image, 0, 0
+
+    no_fill
+    stroke 255, 255, 255
+    stroke_weight 1
+    rect @x, @y, @size, @size
+  end
+
+  def mouse_pressed(x, y)
+    @prev_pos = create_vector x, y
+  end
+
+  def mouse_released(x, y)
+    @offset = clamp_offset @offset
+  end
+
+  def mouse_dragged(x, y)
+    pos       = create_vector x, y
+    @offset  += pos - @prev_pos if @prev_pos
+    @prev_pos = pos
+  end
+
+  def mouse_clicked(x, y)
+    set_frame(
+      -@offset.x + align_to_grid(x),
+      -@offset.y + align_to_grid(y),
+      size,
+      size)
+  end
+
+  def sprite()
+    @sprite ||= 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}
+      sp.mouse_dragged  {mouse_dragged  sp.mouse_x, sp.mouse_y}
+      sp.mouse_clicked  {mouse_clicked  sp.mouse_x, sp.mouse_y}
+    end
+  end
+
+  private
+
+  def clamp_offset(offset)
+    sp = sprite
+    x  = offset.x.clamp([-(@chips.image.width  - sp.w), 0].min..0)
+    y  = offset.y.clamp([-(@chips.image.height - sp.h), 0].min..0)
+    create_vector align_to_grid(x), align_to_grid(y)
+  end
+
+  def align_to_grid(n)
+    n.to_i / 8 * 8
+  end
+
+end# Chips

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

@@ -0,0 +1,117 @@
+using Reight
+
+
+class Reight::MapEditor < Reight::App
+
+  def canvas()
+    @canvas ||= Canvas.new self, project.maps.first, project.maps_json_path
+  end
+
+  def chips()
+    @chips ||= Chips.new self, project.chips
+  end
+
+  def activated()
+    super
+    history.disable do
+      tools[0].click
+      chip_sizes[0].click
+    end
+  end
+
+  def draw()
+    background 200
+    sprite(*sprites)
+    super
+  end
+
+  def key_pressed()
+    super
+    shift, ctrl, cmd = %i[shift control command].map {pressing? _1}
+    case key_code
+    when LEFT  then canvas.x += SCREEN_WIDTH  / 2
+    when RIGHT then canvas.x -= SCREEN_WIDTH  / 2
+    when UP    then canvas.y += SCREEN_HEIGHT / 2
+    when DOWN  then canvas.y -= SCREEN_HEIGHT / 2
+    when :z    then shift ? self.redo : undo if ctrl || cmd
+    when :b    then  brush.click
+    when :l    then   line.click
+    when :r    then (shift ? fill_rect : stroke_rect).click
+    end
+  end
+
+  def window_resized()
+    super
+    chips.sprite.tap do |sp|
+      sp.x      = SPACE
+      sp.y      = NAVIGATOR_HEIGHT + SPACE
+      sp.w      = CHIPS_WIDTH
+      sp.bottom = height - SPACE
+    end
+    tools.map {_1.sprite}.each.with_index do |sp, index|
+      sp.w = sp.h = BUTTON_SIZE
+      sp.x = chips.sprite.right + SPACE + (sp.w + 1) * index
+      sp.y = height - (SPACE + sp.h)
+    end
+    chip_sizes.reverse.map {_1.sprite}.each.with_index do |sp, index|
+      sp.w = sp.h = BUTTON_SIZE
+      sp.x = width - (SPACE + sp.w * (index + 1) + index)
+      sp.y = height - (SPACE + sp.h)
+    end
+    canvas.sprite.tap do |sp|
+      sp.x      = chips.sprite.right + SPACE
+      sp.y      = chips.sprite.y
+      sp.right  = width - SPACE
+      sp.bottom = tools.first.sprite.top - SPACE
+    end
+  end
+
+  def undo(flash: true)
+    history.undo do |action|
+      case action
+      in [:put_chip,    x, y, id] then canvas.map.delete x, y
+      in [:delete_chip, x, y, id] then canvas.map.put    x, y, project.chips[id]
+      in [  :select, sel, _]      then sel ? canvas.select(*sel) : canvas.deselect
+      in [:deselect, sel]         then       canvas.select(*sel)
+      end
+      self.flash 'Undo!' if flash
+    end
+  end
+
+  def redo(flash: true)
+    history.redo do |action|
+      case action
+      in [:put_chip,    x, y, id] then canvas.map.put    x, y, project.chips[id]
+      in [:delete_chip, x, y, id] then canvas.map.delete x, y
+      in [  :select, _, sel]      then canvas.select(*sel)
+      in [:deselect, _]           then canvas.deselect
+      end
+      self.flash 'Redo!' if flash
+    end
+  end
+
+  private
+
+  def sprites()
+    [canvas, chips, *chip_sizes, *tools]
+      .map(&:sprite) + super
+  end
+
+  def chip_sizes()
+    @chip_sizes ||= group(*[8, 16, 32].map {|size|
+      Reight::Button.new name: "#{size}x#{size}", label: size do
+        chips.set_frame chips.x, chips.y, size, size
+      end
+    })
+  end
+
+  def tools()
+    @tools ||= group brush, line, stroke_rect, fill_rect
+  end
+
+  def brush        = @brush       ||= Brush.new(self)             {canvas.tool = _1}
+  def line         = @line        ||= Line.new(self)              {canvas.tool = _1}
+  def stroke_rect  = @stroke_rect ||= Rect.new(self, fill: false) {canvas.tool = _1}
+  def   fill_rect  =   @fill_rect ||= Rect.new(self, fill: true)  {canvas.tool = _1}
+
+end# MapEditor

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

@@ -0,0 +1,35 @@
+using Reight
+
+
+class Reight::MapEditor::Line < Reight::MapEditor::BrushBase
+
+  def initialize(app, &block)
+    super app, icon: app.icon(3, 2, 8), &block
+    set_help left: name, right: 'Pick Chip'
+  end
+
+  def brush(cursor_from, cursor_to, chip)
+    result = false
+    canvas.begin_editing do
+      fromx, fromy = cursor_from[...2]
+      tox,   toy   = cursor_to[...2]
+      dx           = fromx < tox ? chip.w : -chip.w
+      dy           = fromy < toy ? chip.h : -chip.h
+      if (tox - fromx).abs > (toy - fromy).abs
+        (fromx..tox).step(dx).each do |x|
+          y = map x, fromx, tox, fromy, toy
+          y = y / chip.h * chip.h
+          result |= put_or_delete_chip x, y, chip
+        end
+      else
+        (fromy..toy).step(dy).each do |y|
+          x = map y, fromy, toy, fromx, tox
+          x = x / chip.w * chip.w
+          result |= put_or_delete_chip x, y, chip
+        end
+      end
+    end
+    result
+  end
+
+end# Line

data/lib/reight/app/map/rect.rb

@@ -0,0 +1,29 @@
+using Reight
+
+
+class Reight::MapEditor::Rect < Reight::MapEditor::BrushBase
+
+  def initialize(app, fill:, &block)
+    @fill = fill
+    super app, icon: app.icon(fill ? 5 : 4, 2, 8), &block
+    set_help left: "#{fill ? 'Fill' : 'Stroke'} #{name}", right: 'Pick Chip'
+  end
+
+  def brush(cursor_from, cursor_to, chip)
+    result = false
+    canvas.begin_editing do
+      fromx, fromy = cursor_from[...2]
+      tox,   toy   = cursor_to[...2]
+      fromx, tox   = tox, fromx if fromx > tox
+      fromy, toy   = toy, fromy if fromy > toy
+      (fromy..toy).step(chip.h).each do |y|
+        (fromx..tox).step(chip.w).each do |x|
+          next if !@fill && fromx < x && x < tox && fromy < y && y < toy
+          result |= put_or_delete_chip x, y, chip
+        end
+      end
+    end
+    result
+  end
+
+end# Rect

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

@@ -0,0 +1,32 @@
+using Reight
+
+
+class Reight::MapEditor::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 chips   = app.chips
+
+  def name = self.class.name.split('::').last
+
+  def pick_chip(x, y)
+    chip = canvas.chip_at_cursor or return
+    chips.mouse_clicked chip.x, chip.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/map.rb

@@ -0,0 +1,8 @@
+require 'reight/app/map/editor'
+require 'reight/app/map/canvas'
+require 'reight/app/map/chips'
+require 'reight/app/map/tool'
+require 'reight/app/map/brush_base'
+require 'reight/app/map/brush'
+require 'reight/app/map/line'
+require 'reight/app/map/rect'

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

@@ -0,0 +1,25 @@
+using Reight
+
+
+class Reight::MusicEditor < Reight::App
+
+  def draw()
+    background 200
+
+    push do
+      text_align LEFT, CENTER
+
+      text_size 10
+      fill 220; text "Music Editor", 150, 1, 200, height
+      fill 150; text "Music Editor", 150, 0, 200, height
+
+      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
+    end
+
+    super
+  end
+
+end# MusicEditor

data/lib/reight/app/music.rb

@@ -0,0 +1 @@
+require 'reight/app/music/editor'

data/lib/reight/app/navigator.rb

@@ -0,0 +1,172 @@
+using Reight
+
+
+class Reight::Navigator
+
+  def initialize(app)
+    @app, @visible = app, true
+  end
+
+  def flash(...) = message.flash(...)
+
+  def visible=(visible)
+    return if visible == @visible
+    @visible = visible
+    sprites.each {|sp| visible ? sp.show : sp.hide}
+  end
+
+  def visible? = @visible
+
+  def sprites()
+    [*app_buttons, *history_buttons, *edit_buttons, message]
+      .map &:sprite
+  end
+
+  def draw()
+    return unless visible?
+    fill 220
+    no_stroke
+    rect 0, 0, width, Reight::App::NAVIGATOR_HEIGHT
+    sprite(*sprites)
+  end
+
+  def key_pressed()
+    index = [F1, F2, F3, F4, F5].index(key_code)
+    app_buttons[index].click if index
+  end
+
+  def window_resized()
+    [app_buttons, history_buttons, edit_buttons].flatten.map(&:sprite).each do |sp|
+      sp.w = sp.h = Reight::App::NAVIGATOR_HEIGHT
+      sp.y = 0
+    end
+
+    space = Reight::App::SPACE
+    x     = space
+
+    app_buttons.map {_1.sprite}.each do |sp|
+      sp.x = x + 1
+      x    = sp.right
+    end
+    x += space
+
+    history_buttons.map {_1.sprite}.each do |sp|
+      sp.x = x + 1
+      x    = sp.right
+    end
+    x += space unless history_buttons.empty?
+
+    edit_buttons.map {_1.sprite}.each do |sp|
+      sp.x = x + 1
+      x    = sp.right
+    end
+    x += space unless edit_buttons.empty?
+
+    message.sprite.tap do |sp|
+      sp.x     = x + space
+      sp.y     = 0
+      sp.h     = Reight::App::NAVIGATOR_HEIGHT
+      sp.right = width - space
+    end
+  end
+
+  private
+
+  def app_buttons()
+    @app_buttons ||= [
+      Reight::Button.new(name: 'Run',           icon: @app.icon(0, 0, 8)) {
+        switch_app Reight::Runner
+      },
+      Reight::Button.new(name: 'Sprite Editor', icon: @app.icon(1, 0, 8)) {
+        switch_app Reight::SpriteEditor
+      },
+      Reight::Button.new(name: 'Map Editor',    icon: @app.icon(2, 0, 8)) {
+        switch_app Reight::MapEditor
+      },
+      Reight::Button.new(name: 'Sound Editor',  icon: @app.icon(3, 0, 8)) {
+        switch_app Reight::SoundEditor
+      },
+      Reight::Button.new(name: 'Music Editor',  icon: @app.icon(4, 0, 8)) {
+        switch_app Reight::MusicEditor
+      },
+    ]
+  end
+
+  def history_buttons()
+    @history_buttons ||= history_buttons? ? [
+      Reight::Button.new(name: 'Undo', icon: @app.icon(3, 1, 8)) {
+        @app.undo flash: false
+      }.tap {|b|
+        b.enabled? {@app.history.can_undo?}
+      },
+      Reight::Button.new(name: 'Redo', icon: @app.icon(4, 1, 8)) {
+        @app.redo flash: false
+      }.tap {|b|
+        b.enabled? {@app.history.can_redo?}
+      }
+    ] : []
+  end
+
+  def edit_buttons()
+    @edit_buttons ||= edit_buttons? ? [
+      Reight::Button.new(name: 'Cut',   icon: @app.icon(0, 1, 8)) {
+        @app.cut   flash: false
+      }.tap {|b|
+        b.enabled? {@app.can_cut?}
+      },
+      Reight::Button.new(name: 'Copy',  icon: @app.icon(1, 1, 8)) {
+        @app.copy  flash: false
+      }.tap {|b|
+        b.enabled? {@app.can_copy?}
+      },
+      Reight::Button.new(name: 'Paste', icon: @app.icon(2, 1, 8)) {
+        @app.paste flash: false
+      }.tap {|b|
+        b.enabled? {@app.can_paste?}
+      },
+    ] : []
+  end
+
+  def history_buttons? = @app.respond_to? :undo
+  def    edit_buttons? = @app.respond_to? :cut
+
+  def message()
+    @message ||= Message.new
+  end
+
+  def switch_app(klass)
+    app        = r8.apps.find {_1.class == klass}
+    r8.current = app if app
+  end
+
+end# Navigator
+
+
+class Reight::Navigator::Message
+
+  def initialize()
+    @priority = 0
+  end
+
+  attr_accessor :text
+
+  def flash(str, priority: 1)
+    return if priority < @priority
+    @text, @priority = str, priority
+    set_timeout 2, id: :message_flash do
+      @text, @priority = '', 0
+    end
+  end
+
+  def sprite()
+    @sprite ||= Sprite.new.tap do |sp|
+      sp.draw do
+        next unless @text
+        fill 100
+        text_align LEFT, CENTER
+        draw_text @text, 0, 0, sp.w, sp.h
+      end
+    end
+  end
+
+end# Message