reight 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 443639fd56ce2df76ee0d57d6bc4c61c0a121e2615a0511068a9b37cc41fd4d1
-  data.tar.gz: afcf2bf4c67f3e1712a375d654ed5583af9c3473659fedb1d1129511d2d9747b
+  metadata.gz: f71e95252b70e9d2cf1eb2ec6022d58912ccb4409a583b30f2bb9a63926d6216
+  data.tar.gz: b3abfeb44477f44f79eaea1323f47eeef1e41d9bdcff6bf8c67991a4362d7055
 SHA512:
-  metadata.gz: c293eb4bc9281f295f5adc22007fe1e5139b9fd1c26aeb6e19374769c6476e69c0417d7d897ef94f78ee40b893c9fbcb57ddc9776881b565ef6556ee42863cc0
-  data.tar.gz: d5dab9d239a2c161cf032fff213c894eafc7bc38410ecd5883207dee2f78d1502247dd7072649d9f6dd2f779afacac15f3a42da243a8c0a1fabddccfc2902116
+  metadata.gz: 254f31c3435558aac8e57f65346a4f4e5f72eef0bf6c2a70e6cba20c248111c5b7ea8896cf6d37ebfce7c40ec85f0b231c45f2a90dc7ac8c2bdd83b9586e36cf
+  data.tar.gz: 4cbcedca74269acc8f29ee80826a0691fff58b4c0c201c685f009ea09a6a2db76f78e5c17ba2f9b953c1f2ca21f3dc5b805d909ce8e209787d9a246425fd429d

data/ChangeLog.md

@@ -1,6 +1,58 @@
 # reight ChangeLog
 
 
+## [v0.1.7] - 2025-03-07
+
+- Add Reight::Context
+- Add docs for Reight::Context
+- Add Reight::Sprite class
+- Add sound editor
+- Add size() and createCanvas()
+- Add App#active?
+- Project: Add clear_all_sprites()
+- Map: Add to_sprites(), sprites(), sprites_at(), clear_sprites()
+- Map::Chunk: Add sprites(), clear_sprites(), and each()
+- Chip: Add sprite(), clear_sprites(), and each()
+- Add Map::SpriteArray class
+- Add SpriteWorld#offset and SpriteWorld#zoom
+
+- Define Sprite and Sound classes in the main context
+- Change pixelsPerMeter from 100 to 8
+- createSprite() creates a new Reight::Sprite instance
+- Map: delete/delete_chip -> Map#remove/remove_chip
+- Map::Chunk: Caches drawing contents
+- Disable the '<=>' operators for Map, Map::Chunk, Chip, ChipList
+- Sound: play() accepts a block parameter that is called when playback ends
+- Sound: play() can take gain parameter
+- Sound: Default gain: 0.1 -> 0.2
+- Sound: apply envelope and gain
+- Offset the button text while it is pressed
+
+- Runner: During game execution, the Run button re-runs the game
+- Runner: Delete F10 to restart
+- Runner: Delete restart button
+- Runner: Rescue exceptions raised by user script
+- Runner: Stop all timers on stop running user script
+- Runner: runner.rb does not use 'using Reight', so define funcs in runner context
+- Runner: User script paths are relative to project directory
+
+- SpriteEditor: Black is treated as a transparent color
+- SpriteEditor: Update color palette to 32 colors
+- SpriteEditor: Show color code
+
+- SoundEditor: Cancel attack and release on successive notes to avoid click noise
+- SoundEditor: Display tone colors on each tone button
+- SoundEditor: Canvas is scrollable
+
+- Fix pick_color fails to get pixel color
+- Fix crash on moving window
+- Fix crash on switching from editer to another editor
+- Fix yard crash caused by pattern matching rightward assginment
+- Fix misaligned mouse position on sound editor canvas
+- Fix error on drawing line tool at map editor
+- Fix the angle mode of Reight::Context does not sync with root context
+
+
 ## [v0.1.6] - 2025-01-30
 
 - Update dependencies: processing, rubysketch

data/Rakefile

@@ -4,7 +4,7 @@
   .map  {|s| File.expand_path "#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
-require 'xot/rake'
+require 'rucy/rake'
 
 require 'xot/extension'
 require 'rucy/extension'
@@ -18,8 +18,11 @@ require 'reight/extension'
 
 EXTENSIONS = [Xot, Rucy, Beeps, Rays, Reflex, Processing, RubySketch, Reight]
 
+ENV['RDOC'] = 'yardoc --no-private'
+
 default_tasks
 test_ruby_extension
+generate_documents
 build_ruby_gem
 
 

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/reight/all.rb

@@ -21,17 +21,21 @@ end# Reight
 
 require 'reight/extension'
 require 'reight/helpers'
-require 'reight/project'
 require 'reight/history'
 require 'reight/button'
+require 'reight/text'
+require 'reight/index'
 
 require 'reight/reight'
+require 'reight/context'
+require 'reight/project'
+require 'reight/sprite'
 require 'reight/chip'
 require 'reight/map'
+require 'reight/sound'
 require 'reight/app'
 require 'reight/app/navigator'
 require 'reight/app/runner'
 require 'reight/app/sprite'
 require 'reight/app/map'
 require 'reight/app/sound'
-require 'reight/app/music'

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

@@ -10,7 +10,7 @@ class Reight::MapEditor::Brush < Reight::MapEditor::BrushBase
 
   def brush(cursor_from, cursor_to, chip)
     x, y, = cursor_to
-    put_or_delete_chip x, y, chip
+    put_or_remove_chip x, y, chip
     false
   end
 

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

@@ -5,15 +5,15 @@ class Reight::MapEditor::BrushBase < Reight::MapEditor::Tool
 
   def brush(cursor_from, cursor_to, chip) = nil
 
-  def put_or_delete_chip(x, y, chip)
+  def put_or_remove_chip(x, y, chip)
     return false unless x && y && chip
     m = canvas.map
     return false if !@deleting && m[x, y]&.id == chip.id
 
     result = false
     m.each_chip x, y, chip.w, chip.h do |ch|
-      m.delete_chip ch
-      result |= history.append [:delete_chip, ch.pos.x, ch.pos.y, ch.id]
+      m.remove_chip ch
+      result |= history.append [:remove_chip, ch.pos.x, ch.pos.y, ch.id]
     end
     unless @deleting
       m.put x, y, chip

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

@@ -3,28 +3,19 @@ using Reight
 
 class Reight::MapEditor::Canvas
 
-  include Reight::Hookable
-
   def initialize(app, map, path)
-    hook :tool_changed
-
     @app, @map, @path      = app, map, path
     @x, @y, @tool, @cursor = 0, 0, nil, nil, nil
   end
 
-  attr_accessor :x, :y
+  attr_accessor :x, :y, :tool
 
-  attr_reader :map, :tool, :cursor
+  attr_reader :map, :cursor
 
   def save()
     @app.project.save
   end
 
-  def tool=(tool)
-    @tool = tool
-    tool_changed! tool
-  end
-
   def set_cursor(x, y, w, h)
     @cursor = correct_bounds x, y, w, h
   end
@@ -47,7 +38,7 @@ class Reight::MapEditor::Canvas
   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  {mouse_pressed( *pos.call, sp.mouse_button)}
@@ -76,7 +67,7 @@ class Reight::MapEditor::Canvas
     clip sp.x, sp.y, sp.w, sp.h
     translate @x, @y
 
-    fill 0, 0, 0
+    fill 0
     no_stroke
     rect(-@x, -@y, sp.w, sp.h)
 

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

@@ -25,8 +25,12 @@ class Reight::MapEditor::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 @chips.image, 0, 0
 
@@ -59,7 +63,7 @@ class Reight::MapEditor::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/map/editor.rb

@@ -11,7 +11,7 @@ class Reight::MapEditor < Reight::App
     @chips ||= Chips.new self, project.chips
   end
 
-  def activated()
+  def setup()
     super
     history.disable do
       tools[0].click
@@ -69,8 +69,8 @@ class Reight::MapEditor < Reight::App
   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 [:put_chip,    x, y, id] then canvas.map.remove x, y
+      in [:remove_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
@@ -82,7 +82,7 @@ class Reight::MapEditor < Reight::App
     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 [:remove_chip, x, y, id] then canvas.map.remove x, y
       in [  :select, _, sel]      then canvas.select(*sel)
       in [:deselect, _]           then canvas.deselect
       end

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

@@ -4,7 +4,7 @@ using Reight
 class Reight::MapEditor::Line < Reight::MapEditor::BrushBase
 
   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 Chip'
   end
 
@@ -17,15 +17,15 @@ class Reight::MapEditor::Line < Reight::MapEditor::BrushBase
       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 = fromy == toy ? toy : map(x, fromx, tox, fromy, toy)
           y = y / chip.h * chip.h
-          result |= put_or_delete_chip x, y, chip
+          result |= put_or_remove_chip x, y, chip
         end
       else
         (fromy..toy).step(dy).each do |y|
-          x = map y, fromy, toy, fromx, tox
+          x = fromx == tox ? tox : map(y, fromy, toy, fromx, tox)
           x = x / chip.w * chip.w
-          result |= put_or_delete_chip x, y, chip
+          result |= put_or_remove_chip x, y, chip
         end
       end
     end

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

@@ -5,7 +5,7 @@ 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
+    super app, icon: app.icon(fill ? 6 : 5, 2, 8), &block
     set_help left: "#{fill ? 'Fill' : 'Stroke'} #{name}", right: 'Pick Chip'
   end
 
@@ -19,7 +19,7 @@ class Reight::MapEditor::Rect < Reight::MapEditor::BrushBase
       (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
+          result |= put_or_remove_chip x, y, chip
         end
       end
     end

data/lib/reight/app/navigator.rb

@@ -36,10 +36,11 @@ class Reight::Navigator
   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
+    [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
@@ -47,20 +48,23 @@ class Reight::Navigator
     app_buttons.map {_1.sprite}.each do |sp|
       sp.x = x + 1
       x    = sp.right
+    end.tap do
+      x += space unless _1.empty?
     end
-    x += space
 
     history_buttons.map {_1.sprite}.each do |sp|
       sp.x = x + 1
       x    = sp.right
+    end.tap do
+      x += space unless _1.empty?
     end
-    x += space unless history_buttons.empty?
 
     edit_buttons.map {_1.sprite}.each do |sp|
       sp.x = x + 1
       x    = sp.right
+    end.tap do
+      x += space unless _1.empty?
     end
-    x += space unless edit_buttons.empty?
 
     message.sprite.tap do |sp|
       sp.x     = x + space
@@ -86,50 +90,46 @@ class Reight::Navigator
       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)) {
+    @history_buttons ||= [].tap do |buttons|
+      next unless @app.respond_to? :undo
+      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)) {
+      }
+      buttons << Reight::Button.new(name: 'Redo', icon: @app.icon(4, 1, 8)) {
         @app.redo flash: false
       }.tap {|b|
         b.enabled? {@app.history.can_redo?}
       }
-    ] : []
+    end
   end
 
   def edit_buttons()
-    @edit_buttons ||= edit_buttons? ? [
-      Reight::Button.new(name: 'Cut',   icon: @app.icon(0, 1, 8)) {
+    @edit_buttons ||= [].tap do |buttons|
+      next unless @app.respond_to? :paste
+      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)) {
+      }
+      buttons << 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)) {
+      }
+      buttons << Reight::Button.new(name: 'Paste', icon: @app.icon(2, 1, 8)) {
         @app.paste flash: false
       }.tap {|b|
         b.enabled? {@app.can_paste?}
-      },
-    ] : []
+      }
+    end
   end
 
-  def history_buttons? = @app.respond_to? :undo
-  def    edit_buttons? = @app.respond_to? :cut
-
   def message()
     @message ||= Message.new
   end
@@ -159,7 +159,7 @@ class Reight::Navigator::Message
   end
 
   def sprite()
-    @sprite ||= Sprite.new.tap do |sp|
+    @sprite ||= RubySketch::Sprite.new.tap do |sp|
       sp.draw do
         next unless @text
         fill 100