nyle 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42ab8fbeb3f524b4e03c3007e5021196296a4492e62ba78ae2b5a596dcb02a46
-  data.tar.gz: 365227d4c2aaf246b5ed0f17cc928b179c533cf90f258fd4533106e91701bd66
+  metadata.gz: 693c8de3045e3e2da3cf72a117fff8a29cad2e0952626e9af1dfe11f2d23576d
+  data.tar.gz: de724f1bf413b8dce0c3ae243ad108119179872905fbd975f5d175cd9db41f4e
 SHA512:
-  metadata.gz: 330e8bac463e481d5066c9313ca6ea94cde526727ec88b9e21f1e9bf27259dab1862dfc60bfd32714591e2ac0c2c3887a46c16262e3c6279bcc46bbd6cc5775a
-  data.tar.gz: 1b98f3ef0709b13780a335109c5e880a1c371c3993598585ff82845f8e66b966a4365809fd0427cb1cc647db7e444d3d8d7bbe44f1d42452b880a0e38f8d8d60
+  metadata.gz: 530eec7b56aa8713b663a770d9adc2f62dc1655b0286820d829598728fe132957d050044f9e21b3b2aaca1f041fc1bbd39e3eb8364f58698a61e18b9fd8d6afe
+  data.tar.gz: a83a81cb91efe31be12b009010b470cf722db8f109fe7fefe0a590153a66d1791ec562f09a04ae3f58f19abcf7b5e8e782cedd60d187b6543fe3cdc2cdfa4ee8

data/.gitignore

@@ -1,8 +1,10 @@
 desktop.ini
 *.gem
 bin/
+pkg/
 doc/*.docx
 samples/.bundle/
 samples/Gemfile
 samples/Gemfile.lock
-samples/readme_torun.txt
+samples/sketch.png
+samples/t_*.rb

data/CHANGELOG.md

@@ -0,0 +1,71 @@
+
+### 0.6.0 (2018/12/01)
+#### New features
+* add `Nyle.pixel` method
+* add `Nyle.pixel?` method
+* add `Nyle.save` method
+* enhance `Nyle::Frame#set_current` to use container widget of GTK3
+
+#### Bug fixes, etc.
+* add defintion of key names
+* define constant of mouse buttons
+* move key/mouse state process to :draw signal handler in `Nyle::Screen`
+
+#### Reference manual
+* revise
+
+#### Samples
+* use `MOUSE_L` `MOUSE_R`
+* add `nyle_click.rb`
+* add `nyle_clock.rb`
+* add `nyle_flight.rb`
+* add `nyle_pixel.rb`
+* add `nyle_sugar.rb`
+
+
+### 0.5.2 (2018/11/11)
+#### New features
+* release as RubyGems
+* add `Nyle.draw_shape` method
+* add `a`(alpha value) option in `Nyle.draw_*`
+* add `Nyle::Scneen#suspend` method and `Nyle::Scneen#resume` method
+* give `?` letter to method which returns true ot false
+
+
+### 0.4.0 (2018/11/04)
+#### New features
+
+* add `Nyle.load_image_tiles` method
+* add `Nyle.screen_width` method
+* add `Nyle.screen_height` method
+* add `cw` and `ch` option in `Nyle.load_image` method
+
+#### Bug fixes, etc.
+* delete `set_default_size` (using gtk3-3.3.0)
+
+#### Samples
+* adjust calling `Nyle.load_image` method at `initialize`
+
+
+### 0.3.0 (2018/11/02)
+#### Bug fixes, etc.
+
+* change `_set_cr(widget.window.create_cairo_context)` to `_set_cr(cairo_context)`  
+  (`Class Nyle::Screen` `signal_connect(:draw)`)
+* change `set_default_size` to `set_size_request` (except on Windows)  
+  (`Class Nyle::frame` `initialize`)
+* add `Nyle.os` (for internal)
+* delete `NYLE_SCALE` environment variable
+
+
+### 0.2.0 (2018/11/01)
+* Bug fixes, etc.
+
+
+### 0.1.0 (2018/10/28)
+* release
+
+
+### 0.0.1 (2018/09/16)
+* trial release
+

data/README.md

@@ -5,7 +5,6 @@
 ## Requirements
 
 * Ruby/GTK3
-* rsvg2 (for Windows only)
 
 ## Installation
 
@@ -13,11 +12,6 @@ Install it yourself as:
 
     $ gem install nyle
 
-Or for Windows
-
-    $ gem install nyle
-    $ gem rsvg2
-
 ## Usage
 
 ```ruby
@@ -30,7 +24,7 @@ Reference manual: https://github.com/spoolkitamura/nyle/tree/master/doc/Nyle_ref
 
 ## Samples
 
-Reference manual: https://github.com/spoolkitamura/nyle/tree/master/samples
+Sample programs: https://github.com/spoolkitamura/nyle/tree/master/samples
 
 ## License
 

data/lib/nyle.rb

@@ -15,6 +15,15 @@ require 'nyle/version'
 require 'nyle/frame'
 require 'nyle/screen'
 
+Gdk::Keyval.constants.each do |c|
+ #puts "#{c} #{Gdk::Keyval.const_get(c)}"
+  eval("#{c} = #{Gdk::Keyval.const_get(c)}")   # key name definication to omit 'Gdk::Keyval::'
+end
+
+MOUSE_L = 1
+MOUSE_M = 2
+MOUSE_R = 3
+
 module Nyle
   class Error < StandardError; end
 
@@ -133,6 +142,13 @@ module Nyle
   module_function def mask_shift?             ;  Nyle.module_eval{ @__mask_shift                    } ; end
   module_function def os                      ;  Nyle.module_eval{ @__os                            } ; end
 
+  module_function def save
+    cr = Nyle.module_eval{ @__cr }
+    cr.save do
+      yield
+    end
+  end
+
   module_function def draw_line(x1, y1, x2, y2, weight: 2, cap: :BUTT, color: :BLACK, a: 1.0)
     cr = Nyle.module_eval{ @__cr }
     cr.save do
@@ -295,6 +311,32 @@ module Nyle
     cr.target.write_to_png(filename)
   end
 
+  module INNER
+    # for Nyle.pixel* methods
+    class << self
+      private def _pixel(x, y)
+        cr = Nyle.module_eval{ @__cr }
+        surface = cr.target
+        address = surface.width * (y * 4) + (x * 4)
+        color   = surface.data.byteslice(address, 4).unpack("H*").first.upcase   # e.g. '\xcc\x77\x00\xff -> ['cc7700ff'] -> 'CC7700FF'
+        color   = '#'               +
+                  color.slice(4, 2) +
+                  color.slice(2, 2) +
+                  color.slice(0, 2) +
+                  color.slice(6, 2)     # BBGGRRAA -> #RRGGBBAA
+      end
+    end
+  end
+
+  module_function def pixel(x, y)
+    Nyle::INNER.module_eval{ _pixel(x, y) }
+  end
+
+  module_function def pixel?(x, y, color)
+    c = Nyle::INNER.module_eval{ _pixel(x, y) }
+    return (c == Cairo::Color.parse(color).to_s ? true : false)
+  end
+
   module_function def translate(tx, ty)
     cr = Nyle.module_eval{ @__cr }
     cr.translate(tx, ty)

data/lib/nyle/frame.rb

@@ -24,10 +24,6 @@ module Nyle
       @interval_time = 15 if @interval_time < 5 or @interval_time > 60
       GLib::Timeout.add(@interval_time) do
         if @current_screen
-          Nyle.module_eval {
-            _update_mouse_state
-            _update_key_state
-          }
           update
           @current_screen.queue_draw unless @current_screen.destroyed?
         end
@@ -80,10 +76,25 @@ module Nyle
       _set_current(screen)
     end
 
-    private def _set_current(screen)
-      self.remove(@current_screen) if @current_screen
-      @current_screen = screen
-      self.add(@current_screen)
+    private def _set_current(widget)
+      if widget.is_a?(Nyle::Screen)
+        self.remove(@current_screen) if @current_screen
+        @current_screen = widget
+        self.add(@current_screen)     # add instance which is kind of Nyle::Screen
+      else
+        screen = nil
+        widget.each do |child|
+          if child.is_a?(Nyle::Screen)
+            screen = child            # get instance which is kind of Nyle::Screen from container
+            break
+          end
+        end
+        if screen
+          self.remove(@current_screen) if @current_screen
+          @current_screen = screen
+          self.add(widget)            # add container
+        end
+      end
       w = @current_screen.width
       h = @current_screen.height
       Nyle.module_eval {

data/lib/nyle/screen.rb

@@ -13,7 +13,6 @@ module Nyle
 
   # Screen
   class Screen < Gtk::DrawingArea
-    include Gdk::Keyval                       # Include key definication to omit 'Gdk::Keyval::' for subclass
     attr_reader :width, :height, :status
     def initialize(width = DEFAULT_WIDTH, height = DEFAULT_HEIGHT, bgcolor: :WHITE, trace: false)
       super()
@@ -24,25 +23,20 @@ module Nyle
       @running_count = 0
       @status        = nil
 
+      @fill_done     = false
+
       # Draw to 'CairoContext' of ImageSurface once, and copy to 'CairoContext' of DrawingArea
-      if @trace
-        # specified color background
-        # [WARN] Segmentation Fault happen after a while
-        #data = sprintf("%02X%02X%02X%02X", Cairo::Color.parse(@bgcolor).b * 255,
-        #                                   Cairo::Color.parse(@bgcolor).g * 255,
-        #                                   Cairo::Color.parse(@bgcolor).r * 255, 255)   # Hex            (e.g. CC7700FF; b=CC, g=77, r=00, a=FF)
-        #data = [data].pack("H*")                                                        # Pack as binary (e.g. \xCC\x77\x00\xFF)
-        #@canvas = Cairo::ImageSurface.new(data * @width * @height, :ARGB32, @width, @height, @width * 4)
-        @canvas = Cairo::ImageSurface.new(@width, @height)
-      else
-        # transparent background
-        @canvas = Cairo::ImageSurface.new(@width, @height)
-      end
+      @canvas = Cairo::ImageSurface.new(@width, @height)
+
       self.signal_connect(:configure_event) do |widget, event|
         ;   # For resizing and so on
       end
 
       self.signal_connect(:draw) do |widget, cairo_context|
+        Nyle.module_eval {
+          _update_mouse_state
+          _update_key_state
+        }
         # Draw to 'CairoContext' of ImageSurface
         Cairo::Context.new(@canvas) do |cr|
           Nyle.module_eval {
@@ -51,6 +45,12 @@ module Nyle
           unless @trace                       # If not trace, fill screen each time
             Nyle.cr.set_source_color(@bgcolor)
             Nyle.cr.paint
+          else
+            unless @fill_done
+              Nyle.cr.set_source_color(@bgcolor)  # fill once
+              Nyle.cr.paint
+              @fill_done = true
+            end
           end
           update
           draw
@@ -73,7 +73,7 @@ module Nyle
       # Signal handler for mouse position
       self.signal_connect(:motion_notify_event) do |widget, event|
         Nyle.module_eval {
-          _set_mouse_pos(event.x, event.y)
+          _set_mouse_pos(event.x.to_i, event.y.to_i)
         }
         false
       end
@@ -83,11 +83,6 @@ module Nyle
     def show_all(title = DEFAULT_TITLE)
       f = Nyle::Frame.new(@width, @height, {title: title})
       f.set_current(self)
-
-      # Workaround for Segmentation Fault when ImageSureface instance create by using RGBA32 data at Screen.initialize
-      f.override_background_color(:normal, Gdk::RGBA::new(Cairo::Color.parse(@bgcolor).r,
-                                                          Cairo::Color.parse(@bgcolor).g,
-                                                          Cairo::Color.parse(@bgcolor).b, 1.0))
       f.show_all
       f
     end

data/lib/nyle/version.rb

@@ -1,3 +1,3 @@
 module Nyle
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

data/nyle.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Koki Kitamura"]
   spec.email         = ["spool.kitamura@nifty.ne.jp"]
 
-  spec.summary       = %q{minimal graphics framework using Ruby/GTK3 with Cairo}
-  spec.description   = %q{'Nyle' is a minimal graphics framework using Ruby/GTK3 with Cairo}
+  spec.summary       = %q{minimal graphics framework using Ruby/GTK3 and Cairo}
+  spec.description   = %q{'Nyle' is a minimal graphics framework using Ruby/GTK3 and Cairo}
   spec.homepage      = "https://github.com/spoolkitamura/nyle"
   spec.license       = "MIT"
 

data/samples/nyle_basics.rb

@@ -32,7 +32,7 @@ class Screen < Nyle::Screen
     Nyle.draw_rect(540, 200, 60, 30, {color: :ORANGE, fill: true, round: 5, a: 0.6})
 
     Nyle.draw_rect( 45, 250, 50, 30, {weight: 3, color: :GOLD})
-    Nyle.cr.save do
+    Nyle.save do
       for i in (1..5) do
         # rectangle (coordinate transformation)
         Nyle.rotate(Math::PI / 80)
@@ -55,7 +55,7 @@ class Screen < Nyle::Screen
     puts "[ctrl] + [shift]" if Nyle.mask_control? and Nyle.mask_shift?
 
     # mouse status
-    for k in (1..3)
+    [MOUSE_L, MOUSE_M, MOUSE_R].each do |k|
       puts "Nyle.mouse_press?(#{k})" if Nyle.mouse_press?(k)
     end
 

data/samples/nyle_basics2.rb

@@ -33,7 +33,7 @@ class Screen < Nyle::Screen
     draw_rect(540, 200, 60, 30, {color: :ORANGE, fill: true, round: 5, a: 0.6})
 
     draw_rect( 45, 250, 50, 30, {weight: 3, color: :GOLD})
-    cr.save do
+    save do
       for i in (1..5) do
         # rectangle (coordinate transformation)
         rotate(Math::PI / 80)
@@ -56,7 +56,7 @@ class Screen < Nyle::Screen
     puts "[ctrl] + [shift]" if mask_control? and mask_shift?
 
     # mouse status
-    for k in (1..3)
+    [MOUSE_L, MOUSE_M, MOUSE_R].each do |k|
       puts "mouse_press?(#{k})" if mouse_press?(k)
     end
 

data/samples/nyle_block.rb

@@ -97,10 +97,10 @@ class Ball
     @x  =  x
     @y  =  y
     @r  = 10
-    @dx =  4
-    @dy = -4
+    @dx =  5
+    @dy = -5
   end
- 
+
   def update(walls, blocks, paddle)
     @x +=@dx
     if _atari_array?(walls) or _atari?(paddle)

data/samples/nyle_click.rb

@@ -0,0 +1,34 @@
+
+require 'nyle'
+
+class Screen < Nyle::Screen
+  def initialize
+    super
+    @image1 = Nyle.load_image("./image/n_f_strawberry.png")
+    calc_xy
+  end
+
+  def draw
+    Nyle.draw_image(@x, @y, @image1)
+    calc_xy if clicked?
+    Nyle.quit if Nyle.key_press?(KEY_Escape)
+  end
+
+  def calc_xy
+    @x = rand(Nyle.screen_width  - @image1.width)
+    @y = rand(Nyle.screen_height - @image1.height)
+  end
+
+  def clicked?
+    Nyle.mouse_press?(MOUSE_L)          and
+    Nyle.mouse_x >= @x                  and
+    Nyle.mouse_x <= @x + @image1.width  and
+    Nyle.mouse_y >= @y                  and
+    Nyle.mouse_y <= @y + @image1.height
+  end
+end
+
+
+Screen.new.show_all
+Gtk.main
+

data/samples/nyle_clock.rb

@@ -0,0 +1,57 @@
+
+require 'nyle'
+
+class Screen < Nyle::Screen
+  def initialize
+    super(240, 240, {bgcolor: :FOREST_GREEN})
+    @radius = 0.42
+  end
+
+  def draw
+    Nyle.scale(Nyle.screen_width, Nyle.screen_height);
+    Nyle.translate(0.5, 0.5);
+
+    Nyle.draw_circle(0, 0, @radius, {color: :WHITE, fill: true})
+    Nyle.draw_circle(0, 0, @radius, {weight: 0.05})
+
+    # clock ticks
+    for i in (0...12) do 
+      inset = (i % 3 == 0 ? 0.05 : 0.03)
+      Nyle.draw_line((@radius - inset) * Math::cos(i * Math::PI / 6),
+                     (@radius - inset) * Math::sin(i * Math::PI / 6),
+                     (@radius)         * Math::cos(i * Math::PI / 6),
+                     (@radius)         * Math::sin(i * Math::PI / 6), {cap: :ROUND, weight: inset})
+    end
+
+    # store the current time
+    tm = Time.now
+    # puts "#{tm.hour} #{tm.min} #{tm.sec}"
+
+    # compute the angles of the indicators of our clock
+    hours   = tm.hour * Math::PI /  6;
+    minutes = tm.min  * Math::PI / 30;
+    seconds = tm.sec  * Math::PI / 30;
+
+    # draw the hours hand
+    Nyle.draw_line(0, 0,  Math::sin(hours + minutes / 12) * (@radius * 0.5),
+                         -Math::cos(hours + minutes / 12) * (@radius * 0.5), {cap: :ROUND, color: :FOREST_GREEN, weight: 0.05})
+
+    # draw the minutes hand
+    Nyle.draw_line(0, 0,  Math::sin(minutes + seconds / 60) * (@radius * 0.8),
+                         -Math::cos(minutes + seconds / 60) * (@radius * 0.8), {cap: :ROUND, color: :BLUE, weight: 0.05})
+
+    # draw the seconds hand
+    Nyle.draw_line(0, 0,  Math::sin(seconds) * (@radius * 0.9),
+                         -Math::cos(seconds) * (@radius * 0.9), {cap: :ROUND, color: :RED, weight: 0.05 / 3})
+
+    # draw a little dot in the middle
+    Nyle.draw_circle(0, 0, 0.05 / 2, {fill: true})
+
+    Nyle.quit if Nyle.key_press?(KEY_Escape)
+  end
+end
+
+
+Screen.new.show_all
+Gtk.main
+