reight 0.1.7 → 0.1.9

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

@@ -7,7 +7,15 @@ class Reight::SpriteEditor < Reight::App
     @canvas ||= Canvas.new(
       self,
       project.chips_image,
-      project.chips_image_path)
+      project.chips_image_path
+    ).tap do |canvas|
+      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 setup()
@@ -50,13 +58,22 @@ 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|
@@ -69,19 +86,15 @@ class Reight::SpriteEditor < Reight::App
       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.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
@@ -163,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
 
@@ -182,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,
@@ -204,15 +227,6 @@ 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 brush_sizes()
-    @brush_sizes ||= group(*[1, 2, 3, 5, 10].map {|size|
-      Reight::Button.new name: "Button Size #{size}", label: size do
-        brush.size = size
-        flash "Brush Size #{size}"
-      end
-    })
-  end
-
   def colors()
     @colors ||= project.palette_colors.map {|color|
       rgb = self.color(color)
@@ -225,6 +239,15 @@ class Reight::SpriteEditor < Reight::App
     }
   end
 
+  def brush_sizes()
+    @brush_sizes ||= group(*[1, 2, 3, 5, 10].map {|size|
+      Reight::Button.new name: "Button Size #{size}", label: size do
+        brush.size = size
+        flash "Brush Size #{size}"
+      end
+    })
+  end
+
   def shapes()
     @shapes ||= group(
       Reight::Button.new(name: 'No Shape', label: 'None') {
@@ -251,6 +274,7 @@ 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

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,6 +8,7 @@ class Reight::App
 
   SPACE            = 6
   BUTTON_SIZE      = 12
+  INDEX_SIZE       = 36
   NAVIGATOR_HEIGHT = BUTTON_SIZE + 2
   CHIPS_WIDTH      = 128
 
@@ -25,6 +26,10 @@ class Reight::App
 
   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
@@ -46,10 +51,6 @@ class Reight::App
     pressing_keys.include? key
   end
 
-  def name()
-    self.class.name
-  end
-
   def history()
     @history ||= Reight::History.new
   end

data/lib/reight/button.rb

@@ -25,7 +25,7 @@ class Reight::Button
 
     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?
@@ -44,9 +44,9 @@ class Reight::Button
       y = pressing? ? 1 : 0
       text_size r8.project.font_size - 1
       text_align CENTER, CENTER
-      fill 100, 100, 100
+      fill active? ? 250 : 230
       text @label, 0, y + 1, sp.w, sp.h
-      fill 255, 255, 255
+      fill active? ? 70  : 50
       text @label, 0, y,     sp.w, sp.h
     end
   end

data/lib/reight/chip.rb

@@ -77,6 +77,10 @@ class Reight::Chip
     end
   end
 
+  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]
@@ -134,6 +138,10 @@ class Reight::ChipList
     @id2chip[id]
   end
 
+  def inspect()
+    "#<#{self.class.name}:0x#{object_id}>"
+  end
+
   # @private
   def cmp__(o)
     a =                  [@image, @next_id, @id2chip, @frame2chip]

data/lib/reight/index.rb

@@ -7,34 +7,48 @@ class Reight::Index
   include Reight::Hookable
   include Reight::HasHelp
 
-  def initialize(index = 0, &changed)
+  def initialize(index = 0, min: 0, max: nil, &changed)
+    hook :changed
+
     super()
-    @index = index
+    @min, @max = min, max
 
-    hook :changed
     self.changed(&changed) if changed
+    self.index = index
   end
 
   attr_reader :index
 
-  def draw()
-    sp                 = sprite
-    button_w, button_h = sp.h, sp.h
+  def index=(index)
+    index = index.clamp(@max ? (@min..@max) : (@min..))
+    return if index == @index
+    @index = index.to_i
+    changed! @index
+  end
 
+  def draw()
     no_stroke
 
-    fill 230
-    if pressing? && prev?
-      rect 0,        0, sp.w / 2, button_h
-    elsif pressing? && next?
-      rect sp.w / 2, 0, sp.w / 2, button_h
-    end
+    sp   = sprite
+    w, h = sp.w, sp.h
+    dec  = pressing? && prev?
+    inc  = pressing? && next?
+    decy = dec ? 1 : 0
+    incy = inc ? 1 : 0
+
+    fill 220
+    rect 0,     decy, h, h, 2 if dec
+    rect w - h, incy, h, h, 2 if inc
 
-    fill 50
     text_align CENTER, CENTER
-    text '<',   0,               0, button_w, button_h
-    text '>',   sp.w - button_w, 0, button_w, button_h
-    text index, 0,               0, sp.w,     sp.h
+    fill 220
+    text '<',   0,     decy + 1, h, h
+    text '>',   w - h, incy + 1, h, h
+    text index, 0,     1,        w, h
+    fill 50
+    text '<',   0,     decy,     h, h
+    text '>',   w - h, incy,     h, h
+    text index, 0,     0,        w, h
   end
 
   def prev? = sprite.mouse_x < sprite.w / 2
@@ -56,11 +70,8 @@ class Reight::Index
   end
 
   def clicked()
-    old     = @index
-    @index += 1 if next?
-    @index -= 1 if prev?
-    @index  = 0 if @index < 0
-    changed! @index if @index != old
+    self.index += 1 if next?
+    self.index -= 1 if prev?
   end
 
   def sprite()

data/lib/reight/map.rb

@@ -84,6 +84,10 @@ class Reight::Map
     chunk_at(x, y)&.[](x, y)
   end
 
+  def inspect()
+    "#<#{self.class.name}:0x#{object_id}>"
+  end
+
   # @private
   def cmp__(o)
     a =                  [@chip_size, @chunk_size, @chunks]
@@ -187,9 +191,7 @@ class Reight::Map::Chunk
   attr_reader :x, :y, :w, :h
 
   def sprites()
-    @sprites ||= map {|chip|
-      chip.to_sprite.tap {|sp| sp.map_chunk = self}
-    }
+    @sprites ||= map(&:sprite).each {_1.map_chunk = self}
   end
 
   def clear_sprites()
@@ -266,6 +268,10 @@ class Reight::Map::Chunk
     @chips[index]
   end
 
+  def inspect()
+    "#<#{self.class.name}:0x#{object_id}>"
+  end
+
   # @private
   def cmp__(o)
     a =                  [@x, @y, @w, @h, @chip_size, @chips]
@@ -377,6 +383,10 @@ class Reight::Map::SpriteArray < Array
     super
   end
 
+  def inspect()
+    "#<#{self.class.name}:0x#{object_id}>"
+  end
+
   def drawSprite__(context)
     (@chunks&.each || each).each {_1.drawSprite__ context}
   end

data/lib/reight/project.rb

@@ -51,6 +51,17 @@ class Reight::Project
     }.call
   end
 
+  def chips_page_width  = settings[__method__] || 256
+
+  def chips_page_height = settings[__method__] || 256
+
+  def chips_npages()
+    w = chips_image_width  / chips_page_width .to_f
+    h = chips_image_height / chips_page_height.to_f
+    raise unless w == w.to_i && h == h.to_i
+    (w * h).to_i
+  end
+
   def maps_json_name = settings[__method__] || 'maps.json'
 
   def maps_json_path = "#{project_dir}/#{maps_json_name}"

data/lib/reight/reight.rb

@@ -3,31 +3,29 @@ using Reight
 
 class Reight::R8
 
-  def initialize(path)
+  def initialize(path, edit: false)
     raise if $r8__
     $r8__ = self
 
-    @path        = path
+    @path, @edit = path, edit
     self.current = apps.first
   end
 
   attr_reader :current
 
-  def version()
-    '0.1'
-  end
+  def edit? = @edit
 
   def project()
     @project ||= Reight::Project.new @path
   end
 
   def apps()
-    @apps ||= [
-      Reight::Runner.new(project),
-      Reight::SpriteEditor.new(project),
-      Reight::MapEditor.new(project),
-      Reight::SoundEditor.new(project)
-    ]
+    @apps ||= [].tap {|a|
+      a << Reight::Runner      .new(project)
+      a << Reight::SpriteEditor.new(project) if edit?
+      a << Reight::MapEditor   .new(project) if edit?
+      a << Reight::SoundEditor .new(project) if edit?
+    }
   end
 
   def flash(...) = current.flash(...)
@@ -48,9 +46,9 @@ class Reight::R8
 
     set_title [
       self.class.name.split('::').first,
-      version,
+      Reight::Extension.version,
       '|',
-      current.class.name.split('::').last
+      current.label
     ].join ' '
   end
 

data/lib/reight/text.rb

@@ -7,30 +7,36 @@ class Reight::Text
   include Reight::Hookable
   include Reight::HasHelp
 
-  def initialize(text = '', label: nil, regexp: nil, &changed)
+  def initialize(text = '', editable: false, align: LEFT, label: nil, regexp: nil, &changed)
     hook :changed
 
     super()
-    @label, @regexp = label, regexp
-    @shake          = 0
+    @editable, @align, @label, @regexp = editable, align, label, regexp
+    @shake                             = 0
     self.changed(&changed) if changed
 
     self.value = text
   end
 
-  attr_accessor :label
+  attr_accessor :editable, :align, :label
 
   attr_reader :value
 
+  alias editable? editable
+
   def revert()
     self.value = @old_value
     @shake     = 6
   end
 
-  def focus=(bool)
-    sprite.capture = bool
-    revert unless valid? value
-    changed! value, self if value != @old_value
+  def focus=(focus)
+    return if focus && !editable?
+    return if focus == focus?
+    sprite.capture = focus
+    unless focus
+      revert unless valid? value
+      changed! value, self if value != @old_value
+    end
   end
 
   def focus?()
@@ -68,15 +74,17 @@ class Reight::Text
 
     show_old = value == ''
     text     = show_old ? @old_value : value
-    text     = label + text unless focus?
+    text     = label.to_s + text unless focus?
+    x        = 2
     fill show_old ? 200 : 50
-    text_align CENTER, CENTER
-    text text, 0, 0, sp.w, sp.h
+    text_align @align, CENTER
+    text text, x, 0, sp.w - x * 2, sp.h
 
     if focus? && (frame_count % 60) < 30
       fill 100
       bounds = text_font.text_bounds value
-      rect (sp.w + bounds.w) / 2 - 1, (sp.h - bounds.h) / 2, 2, bounds.h
+      xx     = (@align == LEFT ? x + bounds.w : (sp.w + bounds.w) / 2) - 1
+      rect xx, (sp.h - bounds.h) / 2, 2, bounds.h
     end
   end
 
@@ -92,9 +100,9 @@ class Reight::Text
   def clicked(x, y)
     if focus?
       return if hit? x, y
-      self.value = @old_value if !valid?(ignore_regexp: false)
+      self.value = @old_value if value == '' && !valid?(ignore_regexp: false)
       self.focus = false
-    else
+    elsif editable?
       self.focus         = true
       @old_value, @value = @value.dup, ''
     end

data/reight.gemspec

@@ -25,13 +25,13 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_dependency 'xot',        '~> 0.3.4', '>= 0.3.4'
-  s.add_dependency 'rucy',       '~> 0.3.4', '>= 0.3.4'
-  s.add_dependency 'beeps',      '~> 0.3.4', '>= 0.3.4'
-  s.add_dependency 'rays',       '~> 0.3.4', '>= 0.3.4'
-  s.add_dependency 'reflexion',  '~> 0.3.4', '>= 0.3.4'
-  s.add_dependency 'processing', '~> 1.1',   '>= 1.1.6'
-  s.add_dependency 'rubysketch', '~> 0.7.7', '>= 0.7.7'
+  s.add_dependency 'xot',        '~> 0.3.6', '>= 0.3.6'
+  s.add_dependency 'rucy',       '~> 0.3.6', '>= 0.3.6'
+  s.add_dependency 'beeps',      '~> 0.3.6', '>= 0.3.6'
+  s.add_dependency 'rays',       '~> 0.3.6', '>= 0.3.6'
+  s.add_dependency 'reflexion',  '~> 0.3.6', '>= 0.3.6'
+  s.add_dependency 'processing', '~> 1.1',   '>= 1.1.8'
+  s.add_dependency 'rubysketch', '~> 0.7.9', '>= 0.7.9'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}