nyle 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 693c8de3045e3e2da3cf72a117fff8a29cad2e0952626e9af1dfe11f2d23576d
-  data.tar.gz: de724f1bf413b8dce0c3ae243ad108119179872905fbd975f5d175cd9db41f4e
+  metadata.gz: 9dcd520326cf46949be1823ade42380cdd10da5f6018f6cad5bf9d699cb15e59
+  data.tar.gz: c5e0eb9530dfd5db88fbe4c04b4ca30c411f3344c299b03ae87ff24961fc2dbb
 SHA512:
-  metadata.gz: 530eec7b56aa8713b663a770d9adc2f62dc1655b0286820d829598728fe132957d050044f9e21b3b2aaca1f041fc1bbd39e3eb8364f58698a61e18b9fd8d6afe
-  data.tar.gz: a83a81cb91efe31be12b009010b470cf722db8f109fe7fefe0a590153a66d1791ec562f09a04ae3f58f19abcf7b5e8e782cedd60d187b6543fe3cdc2cdfa4ee8
+  metadata.gz: a7f64c6526220dd9be63dafd38f55af02b73d1759252fdbd968bc36946c65712df3ff1816ed658525f53e6c210befdb0a704e73966ed75e0e4353958fcd25ff3
+  data.tar.gz: 545b7ca4dcbe72dad395ec6c6e364bed3f90ea0075f6743b1c855f2a9c9506edd518839484afadf6bf64e9ec45a1b7865a9ec3b01538d52d8b7c46b134c77aba

data/.gitignore

@@ -2,9 +2,8 @@ desktop.ini
 *.gem
 bin/
 pkg/
-doc/*.docx
 samples/.bundle/
+samples/_RC
 samples/Gemfile
 samples/Gemfile.lock
-samples/sketch.png
-samples/t_*.rb
+samples/application/sketch.png

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+### 0.6.1 (2019/01/27)
+#### New features
+* add `Nyle.cursor_x` method
+* add `Nyle.cursor_y` method
+* enhance `Nyle.draw_image` to be able to specify option `pos`
+
+#### Bug fixes, etc.
+* adjust `Nyle.pixel` and `Nyle.pixel?` to apply 'to_i'
+* change format of color code from #RRGGBBAA to #RRGGBB
+* change maxinum value of @NYLE_INTERVAL` to '1000'
+* change `Nyle.quit` to close `Nyle::Frame` instead of `Gtk.main_quit`
+
+#### Reference manual
+* change PDF to WEB(wiki)
+
+#### Samples
+* use `Nyle.cursor_x` and `Nyle.cursor_y`
+* use option `pos` of `Nyle.draw_image`
+* prepare `launcher.rb` to run samples
+* ...and revise a lot
+
 
 ### 0.6.0 (2018/12/01)
 #### New features

data/Gemfile.lock

@@ -0,0 +1,61 @@
+PATH
+  remote: .
+  specs:
+    nyle (0.6.0)
+      gtk3 (~> 3.2.0, >= 3.2.0)
+      rsvg2 (~> 3.2.0, >= 3.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    atk (3.2.9-x86-mingw32)
+      glib2 (= 3.2.9)
+    cairo (1.15.13-x86-mingw32)
+      native-package-installer (>= 1.0.3)
+      pkg-config (>= 1.2.2)
+    cairo-gobject (3.2.9-x86-mingw32)
+      cairo
+      glib2 (= 3.2.9)
+    gdk3 (3.2.9-x86-mingw32)
+      cairo-gobject (= 3.2.9)
+      gdk_pixbuf2 (= 3.2.9)
+      pango (= 3.2.9)
+    gdk_pixbuf2 (3.2.9-x86-mingw32)
+      gio2 (= 3.2.9)
+    gio2 (3.2.9-x86-mingw32)
+      glib2 (= 3.2.9)
+      gobject-introspection (= 3.2.9)
+    glib2 (3.2.9-x86-mingw32)
+      cairo (>= 1.15.9)
+      native-package-installer (>= 1.0.3)
+      pkg-config (>= 1.2.2)
+    gobject-introspection (3.2.9-x86-mingw32)
+      glib2 (= 3.2.9)
+    gtk3 (3.2.9-x86-mingw32)
+      atk (= 3.2.9)
+      gdk3 (= 3.2.9)
+      gdk_pixbuf2 (= 3.2.9)
+      gio2 (= 3.2.9)
+      pango (= 3.2.9)
+      rsvg2 (= 3.2.9)
+    native-package-installer (1.0.6)
+    pango (3.2.9-x86-mingw32)
+      cairo-gobject (= 3.2.9)
+      gobject-introspection (= 3.2.9)
+    pkg-config (1.3.2)
+    rake (10.4.2)
+    rsvg2 (3.2.9-x86-mingw32)
+      cairo-gobject (= 3.2.9)
+      gdk_pixbuf2 (= 3.2.9)
+      pango (>= 3.2.9)
+
+PLATFORMS
+  x86-mingw32
+
+DEPENDENCIES
+  bundler (~> 1.17)
+  nyle!
+  rake (~> 10.0)
+
+BUNDLED WITH
+   1.17.1

data/README.md

@@ -1,6 +1,6 @@
 # Nyle
 
-'Nyle' is a minimal graphics framework using Ruby/GTK3 and Cairo.
+'Nyle' is a minimal graphics framework using Ruby/GTK3 and rcairo.
 
 ## Requirements
 
@@ -20,7 +20,7 @@ require 'nyle'
 
 ## Documents
 
-Reference manual: https://github.com/spoolkitamura/nyle/tree/master/doc/Nyle_reference.pdf
+Reference manual: https://github.com/spoolkitamura/nyle/wiki
 
 ## Samples
 

data/lib/nyle.rb

@@ -1,7 +1,7 @@
 
 =begin
     'Nyle'
-      minimal graphics framework using Ruby/GTK3 and Cairo
+      minimal graphics framework using Ruby/GTK3 and rcairo
 
       Copyright (c) 2018 Koki Kitamura
       Released under the MIT license
@@ -46,6 +46,8 @@ module Nyle
   @__key_release     = {}
   @__mask_control    = false
   @__mask_shift      = false
+  @__cursor_x        = 0
+  @__cursor_y        = 0
 
   @__os = (
     host_os = RbConfig::CONFIG['host_os']
@@ -60,11 +62,15 @@ module Nyle
       :unknown
     end
   )
-
+  @__frame = nil   # main frame
 
   # Singleton class
   class << self
     # private methods for classes in module 'Nyle'
+    private def _set_frame(frame)
+      @__frame = frame
+    end
+
     private def _set_cr(cr)
       @__cr = cr
     end
@@ -120,6 +126,23 @@ module Nyle
         else
           @__mask_shift = false                                  # Set false to mask_shift status
         end
+
+        if @__key_down[Gdk::Keyval::KEY_Right]
+          @__cursor_x = +1                                       # Set +1 to cursor_x value
+        elsif @__key_down[Gdk::Keyval::KEY_Left]
+          @__cursor_x = -1                                       # Set -1 to cursor_x value
+        else
+          @__cursor_x =  0
+        end
+
+        if @__key_down[Gdk::Keyval::KEY_Down]
+          @__cursor_y = +1                                       # Set +1 to cursor_y value
+        elsif @__key_down[Gdk::Keyval::KEY_Up]
+          @__cursor_y = -1                                       # Set -1 to cursor_y value
+        else
+          @__cursor_y =  0
+        end
+
       end
     end
   end
@@ -140,6 +163,8 @@ module Nyle
   module_function def key_release?(keyval)    ;  Nyle.module_eval{ @__key_release  [keyval] == true } ; end
   module_function def mask_control?           ;  Nyle.module_eval{ @__mask_control                  } ; end
   module_function def mask_shift?             ;  Nyle.module_eval{ @__mask_shift                    } ; end
+  module_function def cursor_x                ;  Nyle.module_eval{ @__cursor_x                      } ; end
+  module_function def cursor_y                ;  Nyle.module_eval{ @__cursor_y                      } ; end
   module_function def os                      ;  Nyle.module_eval{ @__os                            } ; end
 
   module_function def save
@@ -154,13 +179,9 @@ module Nyle
     cr.save do
       cr.line_width = weight
       cr.line_cap   = cap
-      if a == 1.0
-        cr.set_source_color(color)
-      else
-        cr.set_source_rgba(Cairo::Color.parse(color).r, 
-                           Cairo::Color.parse(color).g, 
-                           Cairo::Color.parse(color).b, a)
-      end
+      cr.set_source_rgba(Cairo::Color.parse(color).r, 
+                         Cairo::Color.parse(color).g, 
+                         Cairo::Color.parse(color).b, a)
       cr.move_to(x1, y1)
       cr.line_to(x2, y2)
       cr.stroke
@@ -172,13 +193,9 @@ module Nyle
     cr.save do
       cr.line_width = weight
       cr.line_cap   = cap
-      if a == 1.0
-        cr.set_source_color(color)
-      else
-        cr.set_source_rgba(Cairo::Color.parse(color).r, 
-                           Cairo::Color.parse(color).g, 
-                           Cairo::Color.parse(color).b, a)
-      end
+      cr.set_source_rgba(Cairo::Color.parse(color).r, 
+                         Cairo::Color.parse(color).g, 
+                         Cairo::Color.parse(color).b, a)
       if round
         cr.rounded_rectangle(x, y, w, h, round, round)
       else
@@ -196,13 +213,9 @@ module Nyle
     cr = Nyle.module_eval{ @__cr }
     cr.save do
       cr.line_width = weight
-      if a == 1.0
-        cr.set_source_color(color)
-      else
-        cr.set_source_rgba(Cairo::Color.parse(color).r, 
-                           Cairo::Color.parse(color).g, 
-                           Cairo::Color.parse(color).b, a)
-      end
+      cr.set_source_rgba(Cairo::Color.parse(color).r, 
+                         Cairo::Color.parse(color).g, 
+                         Cairo::Color.parse(color).b, a)
       cr.circle(x, y, r)
       if fill
         cr.fill
@@ -217,13 +230,9 @@ module Nyle
     cr.save do
       cr.line_width = weight
       cr.line_cap   = cap
-      if a == 1.0
-        cr.set_source_color(color)
-      else
-        cr.set_source_rgba(Cairo::Color.parse(color).r, 
-                           Cairo::Color.parse(color).g, 
-                           Cairo::Color.parse(color).b, a)
-      end
+      cr.set_source_rgba(Cairo::Color.parse(color).r, 
+                         Cairo::Color.parse(color).g, 
+                         Cairo::Color.parse(color).b, a)
       vertex = points.dup
       vertex << vertex.first if close   # closed shape
       vertex.each do |v|
@@ -242,13 +251,9 @@ module Nyle
     cr.save do
       cr.select_font_face("+")   # Temporaly use "+"  [TODO] (Need to confirm font name)
       cr.font_size = size
-      if a == 1.0
-        cr.set_source_color(color)
-      else
-        cr.set_source_rgba(Cairo::Color.parse(color).r, 
-                           Cairo::Color.parse(color).g, 
-                           Cairo::Color.parse(color).b, a)
-      end
+      cr.set_source_rgba(Cairo::Color.parse(color).r, 
+                         Cairo::Color.parse(color).g, 
+                         Cairo::Color.parse(color).b, a)
       cr.move_to(x, y)
       cr.show_text(str)
     end
@@ -298,10 +303,14 @@ module Nyle
     tiles
   end
 
-  module_function def draw_image(x, y, pixbuf)
+  module_function def draw_image(x, y, pixbuf, pos: :CORNER)
     cr = Nyle.module_eval{ @__cr }
     cr.save do
-      cr.set_source_pixbuf(pixbuf, x, y)
+      if pos == :CENTER
+        cr.set_source_pixbuf(pixbuf, x - pixbuf.width / 2, y - pixbuf.height / 2)
+      else
+        cr.set_source_pixbuf(pixbuf, x, y)   # :CORNER
+      end
       cr.paint
     end
   end
@@ -317,13 +326,12 @@ module Nyle
       private def _pixel(x, y)
         cr = Nyle.module_eval{ @__cr }
         surface = cr.target
-        address = surface.width * (y * 4) + (x * 4)
+        address = surface.width * (y.to_i * 4) + (x.to_i * 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
+                  color.slice(0, 2)     # #BBGGRR -> #RRGGBB
       end
     end
   end
@@ -334,7 +342,7 @@ module Nyle
 
   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)
+    return (c == Cairo::Color.parse(color).to_s[0, 7] ? true : false)
   end
 
   module_function def translate(tx, ty)
@@ -353,7 +361,8 @@ module Nyle
   end
 
   module_function def quit
-    Gtk.main_quit
+    @__frame.close if @__frame   # destroy
+#    Gtk.main_quit
   end
 
 end

data/lib/nyle/frame.rb

@@ -1,7 +1,7 @@
 
 =begin
     'Nyle'
-      minimal graphics framework using Ruby/GTK3 and Cairo
+      minimal graphics framework using Ruby/GTK3 and rcairo
 
       Copyright (c) 2018 Koki Kitamura
       Released under the MIT license
@@ -21,7 +21,7 @@ module Nyle
       self.title     = title
       @transition    = []                          # Screen transition table
       @interval_time = ENV['NYLE_INTERVAL'].to_i   # milli seconds
-      @interval_time = 15 if @interval_time < 5 or @interval_time > 60
+      @interval_time = 15 if @interval_time < 5 or @interval_time > 1000
       GLib::Timeout.add(@interval_time) do
         if @current_screen
           update
@@ -29,6 +29,12 @@ module Nyle
         end
       end
 
+      # Nyle main frame
+      me = self
+      Nyle.module_eval {
+        _set_frame(me)
+      }
+
       # Mouse events
       self.add_events([:button_press_mask,
                        :button_release_mask])
@@ -68,10 +74,14 @@ module Nyle
       end
 
       self.signal_connect(:destroy) do
-        Gtk.main_quit
+        _quit
       end
     end
 
+    def close
+      _quit
+    end
+
     def set_current(screen)
       _set_current(screen)
     end
@@ -102,6 +112,11 @@ module Nyle
       }
     end
 
+    private def _quit
+      self.hide
+      Gtk.main_quit
+    end
+
     private def update
       @transition.each do |tr|
         if tr[:current] == @current_screen and tr[:status] == @current_screen.status

data/lib/nyle/screen.rb

@@ -1,7 +1,7 @@
 
 =begin
     'Nyle'
-      minimal graphics framework using Ruby/GTK3 and Cairo
+      minimal graphics framework using Ruby/GTK3 and rcairo
 
       Copyright (c) 2018 Koki Kitamura
       Released under the MIT license
@@ -25,6 +25,10 @@ module Nyle
 
       @fill_done     = false
 
+      Nyle.module_eval {
+        _set_screen_size(width, height)
+      }
+
       # Draw to 'CairoContext' of ImageSurface once, and copy to 'CairoContext' of DrawingArea
       @canvas = Cairo::ImageSurface.new(@width, @height)
 
@@ -96,6 +100,3 @@ module Nyle
 
 end
 
-
-# [TODO] :draw counter (for waiting, sleeping, idling)
-

data/lib/nyle/version.rb

@@ -1,3 +1,3 @@
 module Nyle
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 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 and Cairo}
-  spec.description   = %q{'Nyle' is a minimal graphics framework using Ruby/GTK3 and Cairo}
+  spec.summary       = %q{minimal graphics framework using Ruby/GTK3 and rcairo}
+  spec.description   = %q{'Nyle' is a minimal graphics framework using Ruby/GTK3 and rcairo}
   spec.homepage      = "https://github.com/spoolkitamura/nyle"
   spec.license       = "MIT"
 

data/samples/{nyle_block.rb → application/block.rb}

@@ -1,4 +1,3 @@
-
 require 'nyle'
 
 class Blocks < Array

data/samples/{nyle_clock.rb → application/clock.rb}

@@ -1,4 +1,3 @@
-
 require 'nyle'
 
 class Screen < Nyle::Screen

data/samples/{nyle_falling.rb → application/falling.rb}

@@ -1,4 +1,3 @@
-
 require 'nyle'
 
 class Field
@@ -91,13 +90,13 @@ end
 
 class Weapon < Item
   def initialize
-    super("image/n_f_weapon.png", 7, 0.4, 0.4)
+    super("../image/n_f_weapon.png", 7, 0.4, 0.4)
   end
 end
 
 class Banana < Item
   def initialize
-    super("image/n_f_banana.png", 0, 0.6, 0.6)
+    super("../image/n_f_banana.png", 0, 0.6, 0.6)
   end
 
   def get_score
@@ -107,7 +106,7 @@ end
 
 class Strawberry < Item
   def initialize
-    super("image/n_f_strawberry.png", 0, 0.6, 0.6)
+    super("../image/n_f_strawberry.png", 0, 0.6, 0.6)
   end
 
   def get_score
@@ -120,7 +119,7 @@ class Hero
   MOVING_RANGE_X = 640
 
   def initialize(x, y)
-    @image = Nyle.load_image("./image/n_f_panda.png", {sx: 0.3, sy: 0.3, color_key: :WHITE})
+    @image = Nyle.load_image("../image/n_f_panda.png", {sx: 0.3, sy: 0.3, color_key: :WHITE})
     @x = x - @image.width / 2
     @y = y - @image.height
     @speed = 3.5
@@ -227,8 +226,7 @@ class Screen_Play < Nyle::Screen
     @bananas.each      { |banana|      banana.drop      }
     @strawberries.each { |strawberrie| strawberrie.drop }
     _detect
-    @hero.move( 1, 0) if Nyle.key_down?(KEY_Right)
-    @hero.move(-1, 0) if Nyle.key_down?(KEY_Left)
+    @hero.move(Nyle.cursor_x, 0)
     Nyle.quit if Nyle.key_press?(KEY_Escape)
   end