nyle 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 874f7f0908c736a7ce019bbbb4ef5e051e467bbbd678e258e76dcd6b5007c19a
-  data.tar.gz: efe32f88f521412100b605a33569506665f346ff8e852e49c3d63fa779858155
+  metadata.gz: d1ea6c2dc4893acc0c29c5670805d471eb5376086885b2180b7673745c5b5358
+  data.tar.gz: 150ed2bd0c2fb320bdcae3b1f158910f0aa92fb6362e7443dabf6d745510bd57
 SHA512:
-  metadata.gz: 948a2be8d3330f63f9066b10b41075cd87988b718c951cde2bb36bc544762779469a059b41ca692acd1eaf94b5134bacfc3511c8ff31aefcd57f7c7f84ab728d
-  data.tar.gz: a9a60aac68010cce74351a2dea287128fc4e00306602b23e87715f8976ea0b5c67236e70521ce08634d433fc768158024c0725d7489a8f916d0fb1cf8020d64c
+  metadata.gz: b1995964a2ddc2e9bed684cb42e40014d11856fd3e419aeec9a742c3f65fc1ee529f9eae24a9369994c1f49871942fa5cddad18e22ba8b6e0d3b50b623099a61
+  data.tar.gz: a35c20b4e7caeb0d23778a5f4adaf78e379c85bd75c706cb50a6312c7d26a171fe149dc92dadf8fc7070e4937f796959d1b7a21cb510d4bed250c73e996d2cfb

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### 0.7.3 (2019/05/26)
+#### New features
+* add `Nyle.layer` method
+
+#### Bug fixes, etc.
+* adjust `Nyle.draw_text`
+
+#### Samples
+* add `random_walk_trace_layer.rb`
+* add `fourier_series.rb`
+* adjust `pendulum.rb` to use `Nyle.layer`
+
+
 ### 0.7.2 (2019/04/14)
 #### Bug fixes, etc.
 * adjust color names due to update `rcairo 1.16.3`

data/lib/nyle.rb

@@ -171,6 +171,10 @@ module Nyle
     private def _clear_running_time
       @__running_time = 0
     end
+
+    private def _clear_layer
+      Screen::Layer.clear
+    end
   end
 
 
@@ -297,6 +301,7 @@ module Nyle
       delta = (Nyle.module_eval{ @__os } == :mac ? size * (72.0 / 96.0) : size)
       cr.move_to(x, y - delta)   # Why :mac?
       cr.show_pango_layout(pango_layout)
+      cr.new_path
     end
   end
 
@@ -405,6 +410,24 @@ module Nyle
     cr.scale(sx, sy)
   end
 
+  module_function def layer(id = :__)
+    if block_given?
+      cr = Nyle.cr
+      layer = Screen::Layer.create(id, Nyle.w, Nyle.h)
+      Cairo::Context.new(layer) do |cr_layer|
+        Nyle.module_eval {
+          _set_cr(cr_layer)
+        }
+        yield(layer)
+      end
+      Nyle.module_eval {
+        _set_cr(cr)
+      }
+      Nyle.cr.set_source(layer, 0, 0)
+      Nyle.cr.paint
+    end
+  end
+
   module_function def create_screen(*args)
     Nyle::Screen.new(*args)
   end

data/lib/nyle/frame.rb

@@ -149,6 +149,7 @@ module Nyle
         _clear_mouse_state
         _clear_key_state
         _clear_running_time
+        _clear_layer
       }
       self.hide
       Gtk.main_quit

data/lib/nyle/screen.rb

@@ -13,6 +13,30 @@ module Nyle
 
   # Screen
   class Screen < Gtk::DrawingArea
+    class Layer < Cairo::ImageSurface
+      @@layers = {}
+      private_class_method :new   # refuse to make an instance using 'new' from outside, so 'create' instead.
+      def initialize(w, h)
+        super(w, h)
+      end
+      def self.create(id, w, h)
+        #puts "#{id} #{w} #{h}"
+        if @@layers.has_key?(id)
+          @@layers[id]            # existing instance
+        else
+          layer = new(w, h)
+          @@layers[id] = layer
+          layer                   # new instance
+        end
+      end
+      def self.clear
+        @@layers.clear
+      end
+      def self.status
+        p @@layers
+      end
+    end
+
     attr_reader :width, :height, :status
     def initialize(width = DEFAULT_WIDTH, height = DEFAULT_HEIGHT, bgcolor: :WHITE, trace: false)
       super()
@@ -80,8 +104,10 @@ module Nyle
 
     # Clear
     def clear_screen
-      Nyle.cr.set_operator(Cairo::Operator::CLEAR)
-      Nyle.cr.paint
+      Nyle.save do
+        Nyle.cr.set_operator(Cairo::Operator::CLEAR)
+        Nyle.cr.paint
+      end
     end
 
     # When single screen, create frame to show self

data/lib/nyle/version.rb

@@ -1,3 +1,3 @@
 module Nyle
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/samples/application/fourier_series.rb

@@ -0,0 +1,110 @@
+require 'nyle'
+
+
+class Slider
+  def initialize(low, high, default)
+    @low     = low
+    @high    = high 
+    @val     = default
+    @label   = ""
+  end
+
+  def position(x, y)
+    @x = x
+    @y = y
+    @rectx = @x + _map(@val, @low, @high, 0, 120)
+    @recty = @y - 10
+    self
+  end
+
+  def set_label(label)
+    @label = label
+    self
+  end
+
+  def value
+    Nyle.draw_line(@x, @y, @x + 120, @y, {color: :GRAY, weight: 4})
+
+    if Nyle.mouse_down?(MOUSE_L) and _dist(Nyle.mouse_x, Nyle.mouse_y, @rectx, @recty) < 20
+      @rectx = Nyle.mouse_x - 5
+    end
+    @rectx = _constrain(@rectx, (@x..@x + 120))
+
+    Nyle.draw_rect(@rectx, @recty, 10, 20, {color: :GRAY, fill: true})
+    Nyle.draw_rect(@rectx, @recty, 10, 20, {color: :BLACK, weight: 1})
+
+    @val = _map(@rectx, @x, @x + 120, @low, @high)
+    Nyle.draw_text(@rectx, @recty - 5, "#{@val.to_i}", {size: 12})
+    Nyle.draw_text(@x + 135, @y + 5, @label, {size: 12})
+
+    return @val
+  end
+
+  private def _dist(x1, y1, x2, y2)
+    diffx = x1 - x2
+    diffy = y1 - y2
+    Math.sqrt(diffx * diffx + diffy * diffy) 
+  end
+
+  private def _map(v, s1, e1, s2, e2)
+    v = v.to_f if v.integer?
+    (v - s1) / (e1 - s1) * (e2 - s2) + s2
+  end
+
+  private def _constrain(x, rang)
+    minx = rang.min
+    maxx = rang.max
+    x = minx if x <= minx
+    x = maxx if x >= maxx
+    x
+  end
+end
+
+
+class Screen < Nyle::Screen
+  def initialize
+    super(600, 400, {bgcolor: :WHITE})
+    @time   = 0
+    @wave   = []
+    @points = []
+    @slider = Slider.new(1, 20, 5).position(70, 50).set_label('N')
+  end
+
+  def draw
+    @n = @slider.value.to_i
+
+    Nyle.translate(150, 200)
+    x = 0
+    y = 0
+    @n.times do |i|
+      prevx = x
+      prevy = y
+      m = i * 2 + 1
+      radius = 75 * (4 / (m * Math::PI))
+      x += radius * Math.cos(m * @time)
+      y += radius * Math.sin(m * @time)
+
+      Nyle.draw_circle(prevx, prevy, radius, {color: :GRAY})
+      Nyle.draw_line(prevx, prevy, x, y, {color: :BLACK})
+    end
+
+    @wave.unshift(y)
+    Nyle.translate(200, 0)
+    Nyle.draw_circle(x - 200, y, 2, {color: :RED})
+    Nyle.draw_line(x - 200, y, 0, @wave[0], {color: :RED})
+    (0...@wave.size).each do |i|
+       @points << [i, @wave[i]]
+    end
+    Nyle.draw_shape(@points, {color: :BLUE})
+    @points.clear
+
+    @time += 0.05
+    @wave.pop if @wave.size > 250
+
+    Nyle.quit if Nyle.key_press?(KEY_Escape)
+  end
+end
+
+Screen.new.show_all
+Nyle.main
+

data/samples/application/pendulum.rb

@@ -169,7 +169,8 @@ class Screen < Nyle::Screen
     @a2_v = 0
     @a1   = Math::PI / 2
     @a2   = Math::PI / 2
-    @points = []
+    @last_x = nil
+    @last_y = nil
   end
 
   def update
@@ -201,12 +202,14 @@ class Screen < Nyle::Screen
     x2 = x1 + @L2 * Math.sin(@a2)
     y2 = y1 + @L2 * Math.cos(@a2)
 
-    Nyle.save do
-     Nyle.translate(@cx, @cy)
-     Nyle.draw_shape(@points, {weight: 1, color: :BLUE})
+    Nyle.layer do
+      Nyle.save do
+       Nyle.translate(@cx, @cy)
+       Nyle.draw_line(@last_x, @last_y, x2, y2, {weight: 1, color: :BLUE}) if @last_x and @last_y
+      end
     end
-    @points << [x2, y2]
-    @points.shift if @points.length > 2000
+    @last_x = x2
+    @last_y = y2
 
     Nyle.save do
       Nyle.translate(@cx, @cy)
@@ -218,6 +221,8 @@ class Screen < Nyle::Screen
       Nyle.draw_line(x1, y1, x2, y2)
       Nyle.draw_circle(x2, y2, @M2, {color: :BLACK, fill: true})
     end
+
+    Nyle.quit if Nyle.key_press?(KEY_Escape)
   end
 end
 

data/samples/basic/random_walk.rb

@@ -2,12 +2,13 @@ require 'nyle'
 
 class Walker
   RADIUS = 4
-  def initialize(max_x, max_y)
+  def initialize(max_x, max_y, color = :YELLOW)
     @max_x = max_x
     @max_y = max_y
     @x = max_x / 2.0
     @y = max_y / 2.0
     @step = 5
+    @color = color
   end
 
   # Randomly move up, down, left, right
@@ -25,7 +26,7 @@ class Walker
   end
 
   def draw
-    Nyle.draw_circle(@x, @y, RADIUS, {color: :YELLOW, fill: true})
+    Nyle.draw_circle(@x, @y, RADIUS, {color: @color, fill: true})
   end
 end
 
@@ -33,7 +34,7 @@ end
 class Screen < Nyle::Screen
 
   def initialize
-    super(64 * 5, 48 * 5, {bgcolor: :BLACK})
+    super(320, 240, {bgcolor: :BLACK})
     @walker = Walker.new(@width, @height)
   end
 

data/samples/basic/random_walk_trace.rb

@@ -2,12 +2,13 @@ require 'nyle'
 
 class Walker
   RADIUS = 4
-  def initialize(max_x, max_y)
+  def initialize(max_x, max_y, color = :YELLOW)
     @max_x = max_x
     @max_y = max_y
     @x = max_x / 2.0
     @y = max_y / 2.0
     @step = 5
+    @color = color
   end
 
   # Randomly move up, down, left, right
@@ -25,7 +26,7 @@ class Walker
   end
 
   def draw
-    Nyle.draw_circle(@x, @y, RADIUS, {color: :YELLOW, fill: true})
+    Nyle.draw_circle(@x, @y, RADIUS, {color: @color, fill: true})
   end
 end
 
@@ -33,7 +34,7 @@ end
 class Screen < Nyle::Screen
 
   def initialize
-    super(64 * 5, 48 * 5, {bgcolor: :BLACK, trace: true})
+    super(320, 240, {bgcolor: :BLACK, trace: true})
     @walker = Walker.new(@width, @height)
   end
 

data/samples/basic/random_walk_trace_fadeout.rb

@@ -2,12 +2,13 @@ require 'nyle'
 
 class Walker
   RADIUS = 4
-  def initialize(max_x, max_y)
+  def initialize(max_x, max_y, color = :YELLOW)
     @max_x = max_x
     @max_y = max_y
     @x = max_x / 2.0
     @y = max_y / 2.0
     @step = 5
+    @color = color
   end
 
   # Randomly move up, down, left, right
@@ -25,7 +26,7 @@ class Walker
   end
 
   def draw
-    Nyle.draw_circle(@x, @y, RADIUS, {color: :YELLOW, fill: true})
+    Nyle.draw_circle(@x, @y, RADIUS, {color: @color, fill: true})
   end
 end
 
@@ -33,7 +34,7 @@ end
 class Screen < Nyle::Screen
 
   def initialize
-    super(64 * 5, 48 * 5, {bgcolor: :BLACK, trace: true})
+    super(320, 240, {bgcolor: :BLACK, trace: true})
     @walker = Walker.new(@width, @height)
   end
 

data/samples/basic/random_walk_trace_layer.rb

@@ -0,0 +1,72 @@
+require 'nyle'
+
+class Walker
+  RADIUS = 4
+  def initialize(max_x, max_y, color = :YELLOW)
+    @max_x = max_x
+    @max_y = max_y
+    @x = max_x / 2.0
+    @y = max_y / 2.0
+    @step = 5
+    @color = color
+  end
+
+  # Randomly move up, down, left, right
+  def move
+    stepx = rand(3) - 1
+    stepy = rand(3) - 1
+    @x += stepx * @step
+    @y += stepy * @step
+
+    # x,y limitter
+    @x = 0      if @x < 0
+    @x = @max_x if @x > @max_x
+    @y = 0      if @y < 0
+    @y = @max_y if @y > @max_y
+  end
+
+  def draw
+    Nyle.draw_circle(@x, @y, RADIUS, {color: @color, fill: true})
+  end
+end
+
+
+class Screen < Nyle::Screen
+
+  def initialize
+    super(320, 240, {bgcolor: :BLACK, trace: false})
+    @walker1 = Walker.new(@width, @height, :YELLOW)
+    @walker2 = Walker.new(@width, @height, :GREEN)
+    @walker3 = Walker.new(@width, @height, :BLUE)
+    @walker4 = Walker.new(@width, @height, :RED)
+  end
+
+  def draw
+    Nyle.layer(:L1) do
+      @walker1.draw
+      Nyle.draw_rect(0, 0, @width, @height, {fill: true, color: :BLACK, a: 0.02})
+    end
+    Nyle.layer(:L2) do
+      @walker2.draw
+    end
+    Nyle.layer(:L3) do
+      Nyle.clear
+      @walker3.draw
+    end
+    @walker4.draw
+  end
+
+  def update
+    @walker1.move
+    @walker2.move
+    @walker3.move
+    @walker4.move
+    Nyle.quit if Nyle.key_press?(KEY_Escape)
+  end
+
+end
+
+
+Screen.new.show_all({interval: 30})
+Nyle.main
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyle
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Koki Kitamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-14 00:00:00.000000000 Z
+date: 2019-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3
@@ -52,6 +52,7 @@ files:
 - samples/application/clock.rb
 - samples/application/falling.rb
 - samples/application/flight.rb
+- samples/application/fourier_series.rb
 - samples/application/pendulum.rb
 - samples/application/sketch.rb
 - samples/application/sugar.rb
@@ -71,6 +72,7 @@ files:
 - samples/basic/random_walk.rb
 - samples/basic/random_walk_trace.rb
 - samples/basic/random_walk_trace_fadeout.rb
+- samples/basic/random_walk_trace_layer.rb
 - samples/basic/rotation.rb
 - samples/image/n_b_crocodile.png
 - samples/image/n_c_mogura.png