rubysketch 0.3.21 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acfaff485263c8e6557c8610df2a4643e53d1046e55cf813c79b648492e84d52
-  data.tar.gz: d7beb5170988d554771d50d5a726b1f51c961cded8a3cf3370dc55ccc91059fb
+  metadata.gz: f9cecc3561d81fdd14730fcdbec957edaac4f5366a9777dc24666a529e539b8f
+  data.tar.gz: 588f15db62ccb22206347295c352786470c7d0fee1f3ad169763b6779742b94e
 SHA512:
-  metadata.gz: 95ce0e61b8db2f0046bfd43070dd9d10f24b48f7838b267509b98e9a4b6930aa8958c065ae7af253c3877c754a5187ce970b80722421c32e6fbb9de4d1ebc05a
-  data.tar.gz: a810edf5f210a8a505fc3830697a46a76a743860a90118d1de38e99192d0cf43639dd5410409baf040c4b6feb0275a90d2cb330230b7457890d8555b9f257d5e
+  metadata.gz: 379b68cba8c0d8323107092cadccf4cd9ccecb4608036ecac5cb34bf57f531f6e23a18d75aaf9f2dcb2da2da2018d04c182737d919455556204f784b906e9af1
+  data.tar.gz: f6427af7756e26b3394458c1701c59ff398dc31fac0faaf03b6f9aa7a4da1eb4c4b9db11121f4d000a7089aad63bffb38f004661e6c723402ab9ad1b52dfce3e

data/.github/workflows/{release.yml → release-gem.yml}

@@ -1,4 +1,4 @@
-name: Release
+name: Release Gem
 
 on:
   push:
@@ -9,46 +9,46 @@ jobs:
     runs-on: macos-latest
 
     steps:
+      - name: ruby 3.2
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+
       - name: checkout
         uses: actions/checkout@v2
 
-      - name: ruby 3.0
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 3.0.x
+      - name: setup dependencies
+        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
       - name: install gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
+        run: gem install yard
 
-      - name: version
-        id: version
-        run: |
-          echo ::set-output name=value::$(ruby -e 'print "${{ github.ref }}"[/\/v([\w\.\-]+)/, 1]')
+      - name: test
+        run: rake test
 
       - name: create gem
-        run: rake clean gem
+        id: gem
+        run: |
+          rake gem
+          echo path=$(ruby -e 'print Dir.glob("*.gem").first') >> $GITHUB_OUTPUT
 
-      - name: create release
-        id: create_release
+      - name: create github release
+        id: release
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref }}
           release_name: ${{ github.ref }}
-          draft: false
-          prerelease: false
 
-      - name: upload to releases
+      - name: upload to github release
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./rubysketch-${{ steps.version.outputs.value }}.gem
-          asset_name:   rubysketch-${{ steps.version.outputs.value }}.gem
+          upload_url: ${{ steps.release.outputs.upload_url }}
+          asset_path: ./${{ steps.gem.outputs.path }}
+          asset_name:   ${{ steps.gem.outputs.path }}
           asset_content_type: application/zip
 
       - name: upload to rubygems

data/.github/workflows/tag.yml

@@ -0,0 +1,35 @@
+name: Tag
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  tag:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: ruby 3.2
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+
+      - name: checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.PAT }}
+
+      - name: setup dependencies
+        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies only: :xot'"
+
+      - name: setup user name and email
+        run: |
+          git config --global user.email "xordog@gmail.com"
+          git config --global user.name "xord"
+
+      - name: tag versions
+        run: "ruby -I.github/workflows -rutils -e 'tag_versions'"
+
+      - name: push tags
+        run: git push origin --tags

data/.github/workflows/test.yml

@@ -11,17 +11,16 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v2
-
-      - name: ruby 3.0
-        uses: actions/setup-ruby@v1
+      - name: ruby 3.2
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.x
+          ruby-version: 3.2
+
+      - name: checkout
+        uses: actions/checkout@v2
 
-      - name: install gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
+      - name: setup dependencies
+        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
       - name: test
         run: rake test

data/.github/workflows/utils.rb

@@ -0,0 +1,55 @@
+RENAMES = {reflex: 'reflexion'}
+
+def sh(cmd)
+  puts cmd
+  system cmd
+end
+
+def setup_dependencies(build: true, only: nil)
+  gemspec_path = `git ls-files`.lines(chomp: true).find {|l| l =~ /\.gemspec$/}
+  return unless gemspec_path
+
+  gemspec = File.read gemspec_path
+  name    = File.basename gemspec_path, '.gemspec'
+
+  exts = File.readlines('Rakefile')
+    .map {|l| l[%r|^\s*require\W+(\w+)/extension\W+$|, 1]}
+    .compact
+    .reject {|ext| ext == name}
+  exts = exts & [only].flatten.map(&:to_s) if only
+
+  exts.each do |ext|
+    gem   = RENAMES[ext.to_sym].then {|s| s || ext}
+    clone = "git clone --depth 1 https://github.com/xord/#{ext}.git ../#{ext}"
+    ver   = gemspec[/add_runtime_dependency.*['"]#{gem}['"].*['"]\s*~>\s*([\d\.]+)\s*['"]/, 1]
+
+    # 'rake subtree:push' pushes all subrepos, so cloning by new tag
+    # often fails before tagging each new tag
+    sh %( #{clone} --branch v#{ver} || #{clone} )
+    sh %( cd ../#{ext} && rake ext )
+  end
+end
+
+def tag_versions()
+  tags = `git tag`.lines chomp: true
+  vers = `git log --oneline ./VERSION`
+    .lines(chomp: true)
+    .map {|line| line.split.first[/^\w+$/]}
+    .map {|hash| [`git cat-file -p #{hash}:./VERSION 2>/dev/null`[/[\d\.]+/], hash]}
+    .select {|ver, hash| ver && hash}
+    .reverse
+    .to_h
+
+  changes = File.read('ChangeLog.md')
+    .split(/^\s*##\s*\[\s*v([\d\.]+)\s*\].*$/)
+    .slice(1..-1)
+    .each_slice(2)
+    .to_h
+    .transform_values(&:strip!)
+
+  vers.to_a.reverse.each do |ver, hash|
+    tag = "v#{ver}"
+    break if tags.include?(tag)
+    sh %( git tag -a -m \"#{changes[ver]&.gsub '"', '\\"'}\" #{tag} #{hash} )
+  end
+end

data/ChangeLog.md

@@ -1,159 +1,16 @@
-# RubySketch ChangeLog
+# rubysketch ChangeLog
 
 
-## [0.3.21] - 2022-x-x
+## [v0.5.1] - 2023-03-01
 
-- add rubysketch-glsl.rb
-- add blend(), createImage(), setTitle(), tint() and noTint()
-- add save() that saves screen image to file
-- circle() function is affected by ellipseMode()
-- point() draws by line(x, y, x, y)
-- change initial values for strokeCap and strokeJoin to ROUND and MITER
+- fix bugs
 
 
-## [0.3.20] - 2022-07-24
+## [v0.5.0] - 2023-02-09
 
-- add mouseClicked()
-- add blendMode()
-- add clip() and noClip()
-- translate() can take 'z' parameter
-- fix that resizing canvas consumes too much memory
+- add Sprite class
 
 
-## [0.3.19] - 2021-12-5
+## [v0.4.0] - 2023-02-08
 
-- fix runtime error
-
-
-## [0.3.18] - 2021-12-5
-
-- add 'mouseButton'
-- pointer cancel event calls pointer_up block
-
-
-## [0.3.17] - 2021-12-5
-
-- add Touch#id
-
-
-## [0.3.16] - 2021-2-14
-
-- add key, keyCode and keyPressed system values
-- add keyPressed(), keyReleased() and keyTyped() functions
-- add motionGravity value and motion() function
-
-
-## [0.3.15] - 2020-12-12
-
-- delete temporary directory on launch
-
-
-## [0.3.14] - 2020-12-12
-
-- fix loadImage() fails when Encoding.default_internal is not nil
-
-
-## [0.3.13] - 2020-12-12
-
-- size(), createCanvas(): default pixelDensity is same as current value
-
-
-## [0.3.12] - 2020-12-10
-
-- size() and createCanvas() take 'pixelDensity' parameter and default value is 1
-
-
-## [0.3.11] - 2020-12-9
-
-- add size(), createCanvas() and pixelDensity()
-
-
-## [0.3.10] - 2020-12-1
-
-- invert angle parameter value for arc() to fix compatibility to processing API
-
-
-## [0.3.9] - 2020-11-30
-
-- Graphics#beginDraw() can take block to call endDraw automatically
-- Capture#start() always returns nil
-- add delay_camera.rb
-
-
-## [0.3.8] - 2020-11-27
-
-- Capture#initialize() can take requestWidth, requestHeight and cameraName
-- add Capture#width and Capture#height
-
-
-## [0.3.7] - 2020-11-18
-
-- add Capture class
-- add log(), exp(), sqrt() and PI
-- add examples/camera.rb
-- add examples/breakout.rb
-- fix error on calling image()
-
-
-## [0.3.6] - 2020-08-02
-
-- random() can take array or nothing
-- use github actions to release gem package
-
-
-## [0.3.5] - 2020-08-02
-
-- add random()
-- add sin(), cos(), tan(), asin(), acos(), atan() and atan2()
-- make Vector class accessible from user script context
-- fix error on calling rotate()
-
-
-## [0.3.4] - 2020-08-02
-
-- delete Utility module
-
-
-## [0.3.3] - 2020-08-01
-
-- add Vector class
-
-
-## [0.3.2] - 2020-07-22
-
-- text() draws to the baseline by default
-- add textWidth(), textAscent(), textDescent() and textAlign()
-- change initial color for fill() and stroke()
-- change initial background color to grayscale 0.8
-
-
-## [0.3.1] - 2020-07-17
-
-- add touchStarted(), touchEnded(), touchMoved() and touches()
-- make all event handler drawable
-- limit font max size to 256
-
-
-## [0.3.0] - 2020-05-21
-
-- add createGraphics()
-
-
-## [0.2.7] - 2020-04-17
-
-- add strokeCap() and strokeJoin()
-
-
-## [0.2.6] - 2020-04-17
-
-- push(), pushMatrix() and pushStyle() take block to automatic pop
-- refine startup process
-- add curve() and bezier()
-- add imageMode(), Image#resize(), Image#copy() and copy()
-- add loop(), noLoop() and redraw()
-
-
-## [0.2.5] - 2020-03-29
-
-- delete debug prints
-- show unsupported image type
+- first version

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 xord.org
+Copyright (c) 2023 xord.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,4 +1,4 @@
-# RubySketch - Processing compatible Creative Coding Framework
+# RubySketch - A game engine based on the Processing API
 
 by xordog@gmail.com
 

data/Rakefile

@@ -1,50 +1,26 @@
 # -*- mode: ruby -*-
 
 
-%w[../xot ../rucy ../rays ../reflex .]
+%w[../xot ../rucy ../beeps ../rays ../reflex ../processing .]
   .map  {|s| File.expand_path "#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'rucy/rake'
 
-require 'xot/module'
-require 'rucy/module'
-require 'rays/module'
-require 'reflex/module'
-require 'rubysketch/module'
+require 'xot/extension'
+require 'rucy/extension'
+require 'beeps/extension'
+require 'rays/extension'
+require 'reflex/extension'
+require 'processing/extension'
+require 'rubysketch/extension'
 
 
-MODULES = [Xot, Rucy, Rays, Reflex, RubySketch]
+EXTENSIONS = [Xot, Rucy, Beeps, Rays, Reflex, Processing, RubySketch]
 
 ENV['RDOC'] = 'yardoc --no-private'
 
+default_tasks
 test_ruby_extension
 generate_documents
 build_ruby_gem
-
-task :default
-
-
-namespace :version do
-
-  namespace :bump do
-
-    task :major do
-      update_and_tag_version 0
-    end
-
-    task :minor do
-      update_and_tag_version 1
-    end
-
-    task :patch do
-      update_and_tag_version 2
-    end
-
-    task :build do
-      update_and_tag_version 3
-    end
-
-  end# bump
-
-end# version

data/RubySketch.podspec

@@ -3,9 +3,9 @@
 
 Pod::Spec.new do |s|
   s.name         = "RubySketch"
-  s.version      = File.readlines(File.expand_path 'VERSION', __dir__)[0].chomp
-  s.summary      = "Yet Another Processing implementation for Ruby"
-  s.description  = "Yet Another Processing implementation for Ruby"
+  s.version      = File.read(File.expand_path 'VERSION', __dir__)[/[\d\.]+/]
+  s.summary      = "A game engine based on the Processing API"
+  s.description  = "A game engine based on the Processing API"
   s.license      = "MIT"
   s.source       = {:git => "https://github.com/xord/rubysketch.git"}
   s.author       = {"xordog" => "xordog@gmail.com"}
@@ -18,6 +18,7 @@ Pod::Spec.new do |s|
     #{s.name}/src
     CRuby/CRuby/include
     Reflexion/reflex/include
+    RubyProcessing/src
   ].map {|s| "${PODS_ROOT}/#{s}"}
 
   s.preserve_paths = "src"

data/VERSION

@@ -1 +1 @@
-0.3.21
+0.5.1

data/examples/hello.rb

@@ -1,12 +1,12 @@
-%w[xot rays reflex rubysketch]
+%w[xot rays reflex processing rubysketch]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
-require 'rubysketch-processing'
-
+require 'rubysketch'
+using RubySketch
 
 draw do
-  background 0, 10
-  textSize 50
-  text 'hello, world!', mouseX, mouseY
+  background 0
+  textSize 30
+  text "hello, rubysketch!", 10, 100
 end

data/lib/rubysketch/all.rb

@@ -0,0 +1,9 @@
+require 'forwardable'
+require 'processing/all'
+
+require 'rubysketch/extension'
+require 'rubysketch/helper'
+
+require 'rubysketch/sprite'
+require 'rubysketch/graphics_context'
+require 'rubysketch/context'

data/lib/rubysketch/context.rb

@@ -0,0 +1,47 @@
+module RubySketch
+
+
+  class Context < Processing::Context
+
+    include GraphicsContext
+
+    def initialize(window)
+      super
+      @sprites__ = window.add SpritesView.new
+    end
+
+    def createSprite(*args, **kwargs)
+      addSprite Sprite.new(*args, **kwargs)
+    end
+
+    def addSprite(sprite)
+      @sprites__.add sprite.getInternal__ if sprite
+      sprite
+    end
+
+    def removeSprite(sprite)
+      @sprites__.remove sprite.getInternal__ if sprite
+      sprite
+    end
+
+    def gravity(*args)
+      x, y =
+        case args
+        when Processing::Vector then args.array
+        else args
+        end
+      @sprites__.then do |v|
+        v.gravity x * v.meter, y * v.meter
+      end
+    end
+
+    class SpritesView < Reflex::View
+      def on_draw(e)
+        e.block
+      end
+    end
+
+  end# Context
+
+
+end# RubySketch

data/lib/rubysketch/{module.rb → extension.rb}

@@ -1,7 +1,7 @@
 module RubySketch
 
 
-  module Module
+  module Extension
 
     module_function
 
@@ -10,14 +10,14 @@ module RubySketch
     end
 
     def version()
-      open(root_dir 'VERSION') {|f| f.readline.chomp}
+      File.read(root_dir 'VERSION')[/[\d\.]+/]
     end
 
     def root_dir(path = '')
       File.expand_path "../../#{path}", __dir__
     end
 
-  end# Module
+  end# Extension
 
 
 end# RubySketch

data/lib/rubysketch/graphics_context.rb

@@ -0,0 +1,37 @@
+module RubySketch
+
+
+  module GraphicsContext
+
+    def sprite(*sprites)
+      sprites.flatten! if sprites.first&.is_a? Array
+      sprites.each do |sp|
+        v = sp.getInternal__
+        f, angle, img, offset = v.frame, v.angle, sp.image, sp.offset
+        if angle == 0
+          drawSprite__ f.x, f.y, f.w, f.h, img, offset
+        else
+          pushMatrix do
+            translate f.x, f.y
+            rotate radians(angle)
+            drawSprite__ 0, 0, f.w, f.h, img, offset
+          end
+        end
+      end
+    end
+
+    def drawSprite__(x, y, w, h, img, offset)
+      if img && offset
+        ox, oy = offset
+        copy img, ox, oy, w, h, x, y, w, h
+      elsif img
+        image img, x, y
+      else
+        rect x, y, w, h
+      end
+    end
+
+  end# GraphicsContext
+
+
+end# RubySketch

data/lib/rubysketch/helper.rb

@@ -0,0 +1,5 @@
+class Rays::Point
+  def toVector()
+    Processing::Vector.new x, y, z
+  end
+end