mittsu-opengl 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e7dcdd16e617a5dba81651c8659900a50658a4afe821fd1c1a61becc1dbd16c
-  data.tar.gz: 76f40de34ce32ba54723c9dc01bae1c78069699e6382cd4f66201208e55df50e
+  metadata.gz: e62e95a332b6331b5f61233675726f151f1e213adf6de2e7b2c644ab9a067e9a
+  data.tar.gz: 647bc7862a275d145e9eff671a990bb6198a38564f17733451c6408846a58c58
 SHA512:
-  metadata.gz: 066d35853b5318962f280a29cdf4b6b84799372e474ed4adbbaf3f8debaa9212e151cec32c14ad7e63d03a467a5e6674e01504b721eabe71562c46e8cf8f6745
-  data.tar.gz: b7e4970b8cde00849fd17bfd6d35df48b3e8f60be789d631e60d05b8e85dd939e9b3973fe06b4fe326f9f3e2e261cc3e86f4e26222ac6d120df7803a64df58b1
+  metadata.gz: 889ed8f51df14f9a3d237882ce45e70e83e4fec5dd3e7af8a141580ed1c11123cf6e8bd686aa6b5b3ba6d195818aef352339884b0f643e84198076c47162bcf8
+  data.tar.gz: dccf5113e0f36c4829500d4884ac408690b72574af6d5c6a0efc9eb2c3b4f9e4c3e07edd42bd68cf3a5209286e16a2e0027c3527a3c4ce114d10b990d489f4ff

data/.github/workflows/build-workflow.yml

@@ -9,11 +9,12 @@ on:
 
 jobs:
   linux:
+    continue-on-error: ${{ matrix.ruby == 'head' }}
     name: Linux
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', 'head']
+        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4', head]
     steps:
       - uses: actions/checkout@v4
       - uses: awalsh128/cache-apt-pkgs-action@v1
@@ -24,8 +25,8 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - name: Test & publish code coverage
-        uses: paambaati/codeclimate-action@v2.2.1
-        if: github.event_name == 'push'
+        uses: paambaati/codeclimate-action@v9.0.0
+        if: github.event_name == 'push' && matrix.ruby == '3.4'
         env:
           CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
         with:
@@ -35,11 +36,12 @@ jobs:
         run: bundle exec rake test
 
   macos:
+    continue-on-error: ${{ matrix.ruby == 'head' || matrix.ruby == 'jruby-head' || matrix.ruby == 'truffleruby-head' }}
     name: macOS
     runs-on: macos-latest
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', 'head']
+        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4', head, jruby, jruby-head, truffleruby, truffleruby-head]
     steps:
       - uses: actions/checkout@v4
       - run: brew install glfw
@@ -50,13 +52,14 @@ jobs:
       - run: bundle exec rake test
 
   windows:
+    continue-on-error: ${{ matrix.ruby == 'head' }}
     name: Windows
     runs-on: windows-latest
     env:
       MITTSU_LIBGLFW_PATH: c:\projects\mittsu\glfw-3.3.1.bin.WIN32\lib-mingw
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', 'head']
+        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4', head]
     steps:
       - uses: actions/checkout@v4
       - run: .\install-glfw.ps1

data/.gitignore

@@ -10,3 +10,7 @@
 /test/reports
 *.gem
 .tool-versions
+**/*screenshot*.png
+*.dylib
+*.dll
+*.so

data/Gemfile

@@ -1,9 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-gem 'mittsu', path: '../mittsu'
-
-if /darwin/ === RUBY_PLATFORM
-  gem 'ffi', '~> 1.9', '!= 1.11.1'
-end

data/README.md

@@ -1,8 +1,8 @@
-# Mittsu
+# Mittsu OpenGL Renderer
 
 [![Gem Version](https://badge.fury.io/rb/mittsu-opengl.svg)](https://badge.fury.io/rb/mittsu-opengl)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/XXX/test_coverage)](https://codeclimate.com/github/danini-the-panini/mittsu-opengl/test_coverage)
-[![Maintainability](https://api.codeclimate.com/v1/badges/XXX/maintainability)](https://codeclimate.com/github/danini-the-panini/mittsu-opengl/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/dd4137d5afd04077f4ec/test_coverage)](https://codeclimate.com/github/danini-the-panini/mittsu-opengl/test_coverage)
+[![Maintainability](https://api.codeclimate.com/v1/badges/dd4137d5afd04077f4ec/maintainability)](https://codeclimate.com/github/danini-the-panini/mittsu-opengl/maintainability)
 [![Build Status](https://github.com/danini-the-panini/mittsu-opengl/workflows/Build/badge.svg)](https://github.com/danini-the-panini/mittsu-opengl/actions?query=workflow%3A%22Build%22)
 
 OpenGL renderer for Mittsu
@@ -184,6 +184,14 @@ end
 
 If you just want to see what Mittsu can do and how to do it, take a peek inside the `examples` folder.
 
+### JRuby
+
+JRuby support is still a work in progress. This is mainly due to subtle behavioural differences in Fiddle.
+
+On macOS JRuby must be started with the `-J-XstartOnFirstThread` argument for GLFW to work. This is necessary because most GLFW functions must be called on the main thread and the Cocoa API requires that thread to be the first thread in the process. GLFW windows and the GLFW event loop are incompatible with other window toolkits (such as AWT/Swing or JavaFX).
+
+(Otherwise you have to extract and use the custom `libglfw_async.dylib` from [LWJGL3](https://www.lwjgl.org))
+
 ## Contributing
 
 1. Fork it ( https://github.com/danini-the-panini/mittsu-opengl/fork )

data/lib/mittsu/generic_lib.rb

@@ -4,7 +4,7 @@ require 'open3'
 module Mittsu
   module GenericLib
     def discover
-      case GL.get_platform
+      case ::GL.get_platform
       when :OPENGL_PLATFORM_WINDOWS
         self::Windows.new
       when :OPENGL_PLATFORM_MACOSX
@@ -12,7 +12,7 @@ module Mittsu
       when :OPENGL_PLATFORM_LINUX
         self::Linux.new
       else
-        warn "WARNING: Unsupported platform: #{GL.get_platform}"
+        warn "WARNING: Unsupported platform: #{::GL.get_platform}"
         Base.new
       end
     end

data/lib/mittsu/glfw/debug.rb

@@ -0,0 +1,28 @@
+require 'glfw'
+
+OriginalGLFW = ::GLFW
+
+module GLFWDebug
+
+  OriginalGLFW.constants.each do |c|
+    const_set c, OriginalGLFW.const_get(c)
+  end
+
+  class << self
+    def load_lib(*args)
+      OriginalGLFW.load_lib(*args)
+    end
+
+    def method_missing(m, *args, **kwargs, &block)
+      argstr = args.map { |s| s.inspect[0..20] }
+      kwargstr = kwargs.map { |k, v| "#{k}: #{v.inspect[0..20]}" }
+      print "GLFW.#{m}(#{[*argstr, *kwargstr].join(', ')})"
+      r = OriginalGLFW.send(m, *args, **kwargs, &block)
+      ret = r ? '' : " => #{r}"
+      puts "#{ret} (#{caller[0]})"
+      r
+    end
+  end
+end
+
+GLFW = GLFWDebug

data/lib/mittsu/glfw/lib.rb

@@ -4,19 +4,19 @@ module Mittsu
   module GLFW
     module Lib
       extend GenericLib
-  
+
       class Linux < GenericLib::Linux
         def initialize(loader = Linux)
           @loader = loader
         end
-  
+
         class << self
           def lib_paths
             Dir.glob('/usr/lib*/**/libglfw*.so*')
           rescue
             []
           end
-  
+
           def ldconfig
             out, stderr, _status = Open3.capture3("ldconfig -p | grep 'libglfw3\\?\\.so'")
             puts stderr if DEBUG
@@ -26,29 +26,28 @@ module Mittsu
           end
         end
       end
-  
+
       class Windows < GenericLib::Base
         def path
           'glfw3.dll'
         end
       end
-  
+
       class MacOS < GenericLib::Base
-        SEARCH_GLOBS = ['/usr/local/lib/**',
-                        '/usr/lib/**',
-                        '/opt/homebrew/**']
-  
+        SEARCH_GLOBS = ['/usr/local/Cellar/glfw/**',
+                        '/opt/homebrew/Cellar/glfw/**']
+
         def path
           @_path ||= find_match&.to_s
         end
-  
+
         private
-  
+
           def find_match
             SEARCH_GLOBS.each do |glob|
               matches = Dir.glob("#{glob}/libglfw*.dylib")
               next if matches.empty?
-  
+
               return matches.find { |m| m.end_with?('libglfw3.dylib') || m.end_with?('libglfw.3.dylib') } || matches.first
             end
           end

data/lib/mittsu/glfw/window.rb

@@ -6,6 +6,8 @@ require 'mittsu/glfw/lib'
 glfw_lib = Mittsu::GLFW::Lib.discover
 ::GLFW.load_lib(ENV["MITTSU_LIBGLFW_PATH"] || glfw_lib.path, Mittsu.debug?) unless Mittsu.test?
 
+require 'mittsu/glfw/debug' if Mittsu.debug?
+
 module Mittsu
   module GLFW
     class Window

data/lib/mittsu/opengl/renderer.rb

@@ -8,7 +8,7 @@ opengl_lib = Mittsu::OpenGL::Lib.discover
 GL.load_lib(ENV["MITTSU_LIBGL_PATH"] || opengl_lib.path, Mittsu.debug?)
 
 require 'mittsu/glfw/window'
-require 'mittsu/opengl/gl_debug' if ENV['DEBUG']
+require 'mittsu/opengl/gl_debug' if Mittsu.debug?
 require 'mittsu/opengl/implementation'
 require 'mittsu/opengl/gl_extensions'
 require 'mittsu/opengl/helper'
@@ -35,7 +35,7 @@ module Mittsu
     attr_reader :logarithmic_depth_buffer, :programs, :light_renderer, :proj_screen_matrix
 
     def initialize(parameters = {})
-      puts "Mittsu OpenGL Renderer #{VERSION}"
+      puts "Mittsu OpenGL Renderer #{OpenGL::VERSION} (Mittsu #{Mittsu::VERSION})"
 
       fetch_parameters(parameters)
 
@@ -318,6 +318,16 @@ module Mittsu
       @_opengl_objects.delete(object.id)
     end
 
+    def take_screenshot(filename, x: 0, y: 0, width: self.width, height: self.height)
+      type_nb_bytes = 1 # for GL_UNSIGNED_BYTE (0 to 255)
+      nb_channels = 3 # for GL_RGB
+      pixels = ' ' * width * height * type_nb_bytes * nb_channels
+      GL.ReadPixels(x, y, width, height, GL::RGB, GL::UNSIGNED_BYTE, pixels)
+      png = ChunkyPNG::Image.from_rgb_stream(width, height, pixels)
+      png.flip_horizontally!
+      png.save(filename)
+    end
+
     private
 
     def clear_color(r, g, b, a)

data/lib/mittsu/opengl/version.rb

@@ -1,5 +1,5 @@
 module Mittsu
   module OpenGL
-    VERSION = '0.5.0'
+    VERSION = '0.5.2'
   end
 end

data/lib/mittsu/opengl_implementation/core/geometry.rb

@@ -296,7 +296,7 @@ module Mittsu
           group_hash = "#{hash_map[material_index][:hash]}_#{hash_map[material_index][:counter]}"
 
           if !groups.include? group_hash
-            group = OpenGLGeometryGroup.new(material_index, num_morph_targets, num_morph_normals, @renderer)
+            group = OpenGL::GeometryGroup.new(material_index, num_morph_targets, num_morph_normals, @renderer)
 
             groups[group_hash] = group
             groups_list << group

data/mittsu-opengl.gemspec

@@ -24,13 +24,13 @@ Gem::Specification.new do |spec|
   spec.requirements << 'OpenGL 3.3+ capable hardware and drivers'
 
   spec.add_runtime_dependency 'opengl-bindings2'
-  spec.add_runtime_dependency 'fiddle'
-  spec.add_runtime_dependency 'mittsu'
+  spec.add_runtime_dependency 'fiddle', '~> 1.0'
+  spec.add_runtime_dependency 'mittsu', '~> 0.5.0'
 
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'minitest-reporters'
-  spec.add_development_dependency 'benchmark-ips'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'minitest-reporters', '~> 1.7'
+  spec.add_development_dependency 'benchmark-ips', '~> 2.14'
   spec.add_development_dependency 'simplecov', '0.17.1'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mittsu-opengl
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Danielle Smith
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opengl-bindings2
@@ -28,100 +27,100 @@ dependencies:
   name: fiddle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: mittsu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +155,7 @@ files:
 - bin/setup
 - install-glfw.ps1
 - lib/mittsu/generic_lib.rb
+- lib/mittsu/glfw/debug.rb
 - lib/mittsu/glfw/lib.rb
 - lib/mittsu/glfw/window.rb
 - lib/mittsu/opengl.rb
@@ -291,7 +291,6 @@ licenses:
 - MIT
 metadata:
   bug_tracker: https://github.com/danini-the-panini/mittsu/issues
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -307,8 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - OpenGL 3.3+ capable hardware and drivers
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: OpenGL renderer for Mittsu
 test_files: []