mittsu 0.3.3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bce7b85c4911927e9f33bb5212d9011122a33356cc8811b33482af05577b9977
-  data.tar.gz: 23620dc7e242612382df2647df7b45f2a21364543deb0d64e389844d65a069c1
+  metadata.gz: 806e8ad78d34edc7dfa72cbe35414c0fe765628b5dd074d691d5bf0f45dd52cb
+  data.tar.gz: b477a885ca405bd5ad8b71464b06ce794567c00abceb56738f3ace06885fe4d3
 SHA512:
-  metadata.gz: 192b53dca3a2f7ecc79c22cdeae9410d7ce5dcf4af30803d9f0242bdc9caa10cef93cc8a1948932da102cbfe049e6d67951ce983e27ed40f20809fa18b044897
-  data.tar.gz: d08903f9f798c488b35f52f991e311bdbd2f95427094c10b55c5c6d67570d4956c8616d52ad025b9507945e57a5e3ecbff876c50472317493e778d6819286d8e
+  metadata.gz: d65b207aaaf6136a1e6d7fd39237bd5710192748338eb388fd974d4128069cbc41b6df4132bc2597793f507ed7349abdb0f3d28e9df1584ff9d4e1f9a39c8bc2
+  data.tar.gz: b4eb049497dc7f46d4285d8d8d677f3221f08d904dcc21b1efa3e7044edea42a1d49e8979d74bd26c3bc9470598fd9755c460865cc324ce71b6c87fec036d07e

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

@@ -13,25 +13,16 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.5.x', '2.6.x', '2.7.x', '3.0.x']
+        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', 'head']
     steps:
-      - uses: actions/checkout@v1
-      - name: Cache gems
-        uses: actions/cache@v1
+      - uses: actions/checkout@v4
+      - uses: awalsh128/cache-apt-pkgs-action@v1
         with:
-          path: vendor/bundle
-          key: gems-v1-${{ runner.os }}-${{ hashFiles('**/Gemfile') }}-${{ hashFiles('**/*.gemspec') }}-
-          restore-keys: |
-            gems-v1-${{ runner.os }}-${{ hashFiles('**/Gemfile') }}-${{ hashFiles('**/*.gemspec') }}-
-            gems-v1-${{ runner.os }}-${{ hashFiles('**/Gemfile') }}-
-            gems-v1-${{ runner.os }}-
-      - uses: actions/setup-ruby@v1
+          packages: libglfw3
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: sudo apt-get update; sudo apt-get install cmake xorg-dev libgl1-mesa-dev
-      - run: bash install-glfw.sh
-      - run: gem install bundler
-      - run: bundle install --path vendor/bundle
+          bundler-cache: true
       - name: Test & publish code coverage
         uses: paambaati/codeclimate-action@v2.2.1
         if: github.event_name == 'push'
@@ -48,48 +39,29 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        ruby: ['2.5.x', '2.6.x', '2.7.x', '3.0.x']
+        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', 'head']
     steps:
-      - uses: actions/checkout@v1
-      - name: Cache gems
-        uses: actions/cache@v1
-        with:
-          path: vendor/bundle
-          key: gems-v1-${{ runner.os }}-${{ hashFiles('**/Gemfile') }}-${{ hashFiles('**/*.gemspec') }}-
-          restore-keys: |
-            gems-v1-${{ runner.os }}-${{ hashFiles('**/Gemfile') }}-${{ hashFiles('**/*.gemspec') }}-
-            gems-v1-${{ runner.os }}-${{ hashFiles('**/Gemfile') }}-
-            gems-v1-${{ runner.os }}-
-      - uses: actions/setup-ruby@v1
+      - uses: actions/checkout@v4
+      - run: brew install glfw
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: brew install glfw
-      - run: bundle install --path vendor/bundle
+          bundler-cache: true
       - run: bundle exec rake test
 
   windows:
     name: Windows
     runs-on: windows-latest
     env:
-      MITTSU_LIBGLFW_FILE: c:\projects\mittsu\glfw-3.3.1.bin.WIN32\lib-mingw\glfw3.dll
+      MITTSU_LIBGLFW_PATH: c:\projects\mittsu\glfw-3.3.1.bin.WIN32\lib-mingw
     strategy:
       matrix:
-        ruby: ['2.5.x', '2.6.x', '2.7.x', '3.0.x']
+        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', 'head']
     steps:
-      - uses: actions/checkout@v1
-      - name: Cache gems
-        uses: actions/cache@v1
-        with:
-          path: vendor/bundle
-          key: gems-v1-${{ runner.os }}-${{ hashFiles('**/Gemfile') }}-${{ hashFiles('**/*.gemspec') }}-
-          restore-keys: |
-            gems-v1-${{ runner.os }}-${{ hashFiles('**/Gemfile') }}-${{ hashFiles('**/*.gemspec') }}-
-            gems-v1-${{ runner.os }}-${{ hashFiles('**/Gemfile') }}-
-            gems-v1-${{ runner.os }}-
-      - uses: actions/setup-ruby@v1
+      - uses: actions/checkout@v4
+      - run: .\install-glfw.ps1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: .\install-glfw.ps1
-      - run: gem install bundler
-      - run: bundle install --path vendor/bundle
+          bundler-cache: true
       - run: bundle exec rake test

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2016 Daniel Smith
+Copyright (c) 2015-2022 Danielle Smith
 
 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,9 +1,9 @@
 # Mittsu
 
 [![Gem Version](https://badge.fury.io/rb/mittsu.svg)](https://badge.fury.io/rb/mittsu)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/22be300984d81fa10af8/test_coverage)](https://codeclimate.com/github/jellymann/mittsu/test_coverage)
-[![Maintainability](https://api.codeclimate.com/v1/badges/22be300984d81fa10af8/maintainability)](https://codeclimate.com/github/jellymann/mittsu/maintainability)
-[![Build Status](https://github.com/jellymann/mittsu/workflows/Build/badge.svg)](https://github.com/jellymann/mittsu/actions?query=workflow%3A%22Build%22)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/22be300984d81fa10af8/test_coverage)](https://codeclimate.com/github/danini-the-panini/mittsu/test_coverage)
+[![Maintainability](https://api.codeclimate.com/v1/badges/22be300984d81fa10af8/maintainability)](https://codeclimate.com/github/danini-the-panini/mittsu/maintainability)
+[![Build Status](https://github.com/danini-the-panini/mittsu/workflows/Build/badge.svg)](https://github.com/danini-the-panini/mittsu/actions?query=workflow%3A%22Build%22)
 
 3D Graphics Library for Ruby
 
@@ -15,7 +15,7 @@ Mittsu makes 3D graphics easier by providing an abstraction over OpenGL, and is
 ![Point Light](https://cloud.githubusercontent.com/assets/1171825/18411861/4531bb4c-7781-11e6-92b4-b6ebda60e2c9.gif)
 ![Tank Demo](https://cloud.githubusercontent.com/assets/1171825/18411862/4531fe9a-7781-11e6-9665-b172df1a3645.gif)
 
-(You can find the source for the Tank Demo [here](https://github.com/jellymann/mittsu-tank-demo))
+(You can find the source for the Tank Demo [here](https://github.com/danini-the-panini/mittsu-tank-demo))
 
 ## Installation
 
@@ -34,6 +34,7 @@ $ sudo apt-get install libglfw3
 **NOTE:** On Windows, you will have to manually specify the glfw3.dll path in an environment variable
 (you can download it [here](http://www.glfw.org/download.html))
 ```bash
+# ex) set MITTSU_LIBGLFW_PATH=C:\Users\username\lib-mingw-w64
 > set MITTSU_LIBGLFW_PATH=C:\path\to\glfw3.dll
 > ruby your_awesome_mittsu_app.rb
 ```
@@ -212,7 +213,7 @@ If you just want to see what Mittsu can do and how to do it, take a peek inside
 
 ## Contributing
 
-1. Fork it ( https://github.com/jellymann/mittsu/fork )
+1. Fork it ( https://github.com/danini-the-panini/mittsu/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/mittsu/core/buffer_attribute.rb

@@ -50,6 +50,18 @@ module Mittsu
       self
     end
 
+    def get_x(index)
+      @array[index * @item_size]
+    end
+
+    def get_y(index)
+      @array[index * @item_size + 1]
+    end
+
+    def get_z(index)
+      @array[index * @item_size + 2]
+    end
+
     def set_xy(index, x, y)
       index *= @item_size
 

data/lib/mittsu/core/geometry.rb

@@ -397,7 +397,7 @@ module Mittsu
     end
 
     def merge_mesh(mesh)
-      if mesh instanceof Mittsu::Mesh == false
+      if mesh.is_a?(Mittsu::Mesh) == false
         puts('ERROR: Mittsu::Geometry#merge_mesh: mesh not an instance of Mittsu::Mesh.', mesh.inspect)
         return
       end
@@ -469,7 +469,7 @@ module Mittsu
       end
       vertices = []
       @vertices.each do |vert|
-        vertices << vertex.x << vertex.y << vertex.z
+        vertices << vert.x << vert.y << vert.z
       end
       faces = []
       normals = []
@@ -507,7 +507,7 @@ module Mittsu
           faces << get_uv_index(face_vertex_uvs[2], uvs_hash, uvs)
         end
         if has_face_normal
-          faces << get_normal_index(face.normal)
+          faces << get_normal_index(face.normal, normals_hash, normals)
         end
         if has_face_vertex_normal
           vertex_normals = face.vertex_normals

data/lib/mittsu/core/object_3d.rb

@@ -305,17 +305,13 @@ module Mittsu
     end
 
     def to_json
-      @_output = {
+      {
         metadata: {
           version: 4.3,
           type: 'Object',
           generator: 'ObjectExporter'
-        }
-      }
-      @_geometries = {}
-      @_materials = {}
-      @_output[:object] = self.jsonify
-      @_output
+        },
+      }.merge(jsonify)
     end
 
     def clone(object = nil, recursive = true)
@@ -346,46 +342,32 @@ module Mittsu
     protected
 
     def jsonify
-      data = {
-        uuid: @uuid,
-        type: @type,
-        matrix: @matrix.to_a
-      }
-      data[:name] = @name unless @name.nil? || @name.empty?
-      data[:user_data] = @user_data unless @user_data.nil? || @user_data.empty?
-      data[:visible] = @visible unless @visible
-
-      if !self.children.empty?
-        data[:children] = @children.map do |child|
-          child.jsonify
-        end
-      end
-
-      # TODO: implement jsonify for PointCloud
-
-      data
-    end
-
-    def jsonify_geometry(geometry)
-      @_output[:geometries] ||= []
-      if @_geometries[geometry.uuid].nil?
-        json = geometry.to_json
-        json.delete :metadata
-        @_geometries[geometry.uuid] = json
-        @_output[:geometries] << json
-      end
-      geometry.uuid
-    end
-
-    def jsonify_material(material)
-      @_output[:materials] ||= []
-      if @_materials[material.uuid].nil?
-        json = material.to_json
-        json.delete :metadata
-        @_materials[material.uuid] = json
-        @_output[:materials] << json
-      end
-      material.uuid
+      children = @children.map(&:to_json)
+      {
+        object: {
+          uuid: @uuid,
+          type: @type,
+          matrix: @matrix.to_a,
+          geometry: @geometry&.uuid,
+          material: @material&.uuid,
+          name: @name&.empty? ? nil : @name,
+          user_data: @user_data&.empty? ? nil : @user_data,
+          visible: @visible ? nil : @visible,
+          children: children.map { |x| x[:object] }.flatten
+        }.reject { |k,v| v.nil? || v == [] },
+        geometries: ([jsonify_geometry] + children.map { |x| x[:geometries] }).flatten.compact,
+        materials: ([jsonify_material] + children.map { |x| x[:materials] }).flatten.compact
+      }.reject { |k,v| v.nil? || v == [] }
+    end
+
+    def jsonify_geometry
+      return nil if @geometry.nil?
+      @geometry.to_json.delete_if {|k, v| k == :metadata }
+    end
+
+    def jsonify_material
+      return nil if @material.nil?
+      @material.to_json.delete_if {|k, v| k == :metadata }
     end
   end
 end

data/lib/mittsu/extras/geometries/polyhedron_geometry.rb

@@ -27,7 +27,6 @@ module Mittsu
         v1 = @vertices[indices[i]]
         v2 = @vertices[indices[i + 1]]
         v3 = @vertices[indices[i + 2]]
-        binding.irb if v1.nil? || v2.nil? || v3.nil?
 
         faces[j] = Face3.new(v1.index, v2.index, v3.index, [v1.clone, v2.clone, v3.clone])
 

data/lib/mittsu/loaders/obj_loader.rb

@@ -53,7 +53,7 @@ module Mittsu
 
       when FACE_PATTERN         then parse_face(line)
 
-      when OBJECT_PATTERN       then new_object($1) and reset_vertices
+      when OBJECT_PATTERN       then handle_object($1)
       when GROUP_PATTERN        # ignore
       when SMOOTH_GROUP_PATTERN # ignore
 
@@ -105,9 +105,15 @@ module Mittsu
       raw_lines.split("\n").map(&:strip).reject(&:empty?).reject{|l| l.start_with? '#'}
     end
 
-    def new_object(object_name = '')
-      end_object
-      @object = Object3D.new
+    def handle_object(object_name = '')
+      # Reset if we're already working on a named object
+      # otherwise, just name the one we have in progress
+      unless @object&.name.nil?
+        end_object
+        reset_vertices
+        @object = nil
+      end
+      @object ||= Object3D.new
       @object.name = object_name
     end
 
@@ -120,7 +126,7 @@ module Mittsu
 
     def new_mesh
       end_mesh
-      new_object if @object.nil?
+      handle_object if @object.nil?
       @geometry = Geometry.new
       @mesh = Mesh.new(@geometry, @material || MeshLambertMaterial.new)
       @mesh.name = @object.name

data/lib/mittsu/math/box3.rb

@@ -38,18 +38,18 @@ module Mittsu
       object.traverse do |node|
         geometry = node.geometry
         if geometry != nil
-          if geometry instanceof Mittsu::Geometry
+          if geometry.is_a?(Mittsu::Geometry)
             vertices = geometry.vertices
             vertices.each do |vertex|
               v1.copy(vertex)
-              v1.apply_matrix4(node.matrixWorld)
+              v1.apply_matrix4(node.matrix_world)
               scope.expand_by_point(v1)
             end
-          elsif geometry instanceof Mittsu::BufferGeometry && geometry.attributes['position'] != nil
+          elsif geometry.is_a?(Mittsu::BufferGeometry) && geometry.attributes['position'] != nil
             positions = geometry.attributes['position'].array
             positions.each_slice(3) do |postition|
               v1.set(position[0], position[1], position[2])
-              v1.apply_matrix4(node.matrixWorld)
+              v1.apply_matrix4(node.matrix_world)
               scope.expand_by_point(v1)
             end
           end

data/lib/mittsu/math/vector3.rb

@@ -187,6 +187,114 @@ module Mittsu
       self
     end
 
+    def set_scalar(scalar)
+      set(scalar, scalar, scalar)
+
+      self
+    end
+
+    def set_component(index, value)
+      _x, _y, _z = *@elements
+
+      case index
+      when 0
+        set(value, _y, _z)
+      when 1
+        set(_x, value, _z)
+      when 2
+        set(_x, _y, value)
+      else
+        raise ArgumentError, "index is out of range: #{index}"
+      end
+
+      self
+    end
+
+    def get_component(index)
+      _x, _y, _z = *@elements
+
+      case index
+      when 0
+        return _x
+      when 1
+        return _y
+      when 2
+        return _z
+      else
+        raise ArgumentError, "index is out of range: #{index}"
+      end
+    end
+
+    def add_scaled_vector(vector, scalar)
+      set(vector.x * scalar, vector.y * scalar, vector.z * scalar)
+
+      self
+    end
+
+    def set_from_spherical(sphere)
+      set_from_spherical_coords(sphere.radius, sphere.phi, sphere.theta)
+    end
+
+    def set_from_spherical_coords(radius, phi, theta)
+      sin_phi_radius = ::Math.sin(phi) * radius
+      set(sin_phi_radius * ::Math.sin(theta), ::Math.cos(phi) * radius, sin_phi_radius * ::Math.cos(theta))
+
+      self
+    end
+
+    def set_from_cylindrical(cylinder)
+      set_from_cylindrical_coords(cylinder.radius, cylinder.theta, cylinder.y)
+    end
+
+    def set_from_cylindrical_coords(radius, theta, y)
+      set(radius * ::Math.sin(theta), y, radius * ::Math.sin(theta))
+
+      self
+    end
+
+    def set_from_matrix3_column(matrix, index)
+      from_array(matrix.elements, index * 3)
+    end
+
+    def equals(vector)
+      _x, _y, _z = *@elements
+
+      ((vector.x == _x) && (vector.y == _y) && (vector.z == _z ))
+    end
+
+    def from_buffer_attribute(attribute, index)
+      set(attribute.get_x(index), attribute.get_y(index), attribute.get_z(index))
+
+      self
+    end
+
+    def clamp_length(min, max)
+      divide_scalar(length || 1).multiply_scalar([min, [max, length].min].max)
+    end
+
+    def manhattan_distance_to(vector)
+      _x, _y, _z = *@elements
+
+      (_x - vector.x).abs + (_y - vector.y).abs + (_z - vector.z).abs
+    end
+
+    # TODO: maybe add range 3 values as arguments (range_x, range_y, range_z) to this method
+    def random()
+      set(Random.new.rand, Random.new.rand, Random.new.rand)
+
+      self
+    end
+
+    def random_direction()
+      u = (Random.new.rand - 0.5) *2
+      t = Random.new.rand * ::Math::PI * 2
+      f = ::Math.sqrt(1 - u ** 2)
+
+      set(f * ::Math.cos(t), f * ::Math.sin(t), u)
+
+      self
+    end
+
     def from_attribute(attribute, index, offset = 0)
       index = index * attribute.itemSize + offset
 

data/lib/mittsu/objects/line.rb

@@ -143,9 +143,7 @@ module Mittsu
 
     def jsonify
       data = super
-      data[:geometry] = jsonify_geometry(self.geometry)
-      data[:material] = jsonify_material(self.material)
-      data[:mode] = self.mode
+      data[:object][:mode] = self.mode
       data
     end
   end

data/lib/mittsu/objects/mesh.rb

@@ -98,7 +98,7 @@ module Mittsu
       @_ray.copy(raycaster.ray).apply_matrix4(@_inverse_matrix)
 
       if !geometry.bounding_box.nil?
-        return unless ray.intersection_box?(geometry.bounding_box)
+        return unless @_ray.intersection_box?(geometry.bounding_box)
       end
 
 
@@ -132,16 +132,16 @@ module Mittsu
               v_c.from_array(positions, c * 3)
 
               if material.side == BackSide
-                intersection_point = ray.intersect_triangle(v_c, v_b, v_a, true)
+                intersection_point = @_ray.intersect_triangle(v_c, v_b, v_a, true)
               else
-                intersection_point = ray.intersect_triangle(v_a, v_b, v_c, material.side != DoubleSide)
+                intersection_point = @_ray.intersect_triangle(v_a, v_b, v_c, material.side != DoubleSide)
               end
 
               next if intersection_point.nil?
 
               intersection_point.apply_matrix4(@matrix_world)
 
-              distance = racaster.ray.origin.distance_to(intersection_point)
+              distance = raycaster.ray.origin.distance_to(intersection_point)
 
               next if distance < precision || distance < raycaster.near || distance > raycaster.far
 
@@ -170,17 +170,17 @@ module Mittsu
             v_b.from_array(positions, j + 3)
             v_c.from_array(positions, j + 6)
 
-            if material.side = BackSide
-              intersection_point = ray.intersect_triangle(v_c, v_b, v_a, true)
+            if material.side == BackSide
+              intersection_point = @_ray.intersect_triangle(v_c, v_b, v_a, true)
             else
-              intersection_point = ray.intersect_triangle(v_a, v_b, v_c, material.side != DoubleSide)
+              intersection_point = @_ray.intersect_triangle(v_a, v_b, v_c, material.side != DoubleSide)
             end
 
             next if intersection_point.nil?
 
             intersection_point.apply_matrix4(@matrix_world)
 
-            distance = racaster.ray.origin.distance_to(intersection_point)
+            distance = raycaster.ray.origin.distance_to(intersection_point)
 
             next if distance < precision || distance < raycaster.near || distance > raycaster.far
 
@@ -269,10 +269,7 @@ module Mittsu
     protected
 
     def jsonify
-      data = super
-      data[:geometry] = jsonify_geometry(@geometry)
-      data[:material] = jsonify_material(@material)
-      data
+      super
     end
   end
 end

data/lib/mittsu/objects/point_cloud.rb

@@ -16,11 +16,11 @@ module Mittsu
 
     def raycast(raycaster, intersects)
       threshold = raycaster.params[:point_cloud][:threshold]
-      @_inverse_matrix.inverse(self.materix_world)
+      @_inverse_matrix.inverse(self.matrix_world)
       @_ray.copy(raycaster.ray).apply_matrix4(@_inverse_matrix)
 
       if !geometry.bounding_box.nil?
-        return if ray.intersection_box?(geometry.bounding_box) == false
+        return if @_ray.intersection_box?(geometry.bounding_box) == false
       end
 
       local_threshold = threshold / ((self.scale.x + self.scale.y + self.scale.z) / 3.0)
@@ -82,7 +82,7 @@ module Mittsu
     def test_point(point, index, local_threshold, raycaster, intersects)
       ray_point_distance = @_ray.distance_to_point(point)
       if ray_point_distance < local_threshold
-        intersect_point = @_ray.closes_point_to_point(point)
+        intersect_point = @_ray.closest_point_to_point(point)
         intersect_point.apply_matrix4(self.matrix_world)
 
         distance = raycaster.ray.origin.distance_to(intersect_point)

data/lib/mittsu/renderers/generic_lib.rb

@@ -1,3 +1,5 @@
+require 'open3'
+
 module Mittsu
   module GenericLib
     def discover
@@ -32,7 +34,8 @@ module Mittsu
 
       class << self
         def kernel_module_in_use
-          lspci_line = `lspci -nnk | grep -i vga -A3 | grep 'in use'`
+          lspci_line, stderr, _status = Open3.capture3("lspci -nnk | grep -i vga -A3 | grep 'in use'")
+          puts stderr if DEBUG
           /in use:\s*(\S+)/ =~ lspci_line && $1
         rescue
           ''

data/lib/mittsu/renderers/glfw_lib.rb

@@ -17,7 +17,9 @@ module Mittsu
         end
 
         def ldconfig
-          `ldconfig -p | grep 'libglfw3\\?\\.so'`.lines
+          out, stderr, _status = Open3.capture3("ldconfig -p | grep 'libglfw3\\?\\.so'")
+          puts stderr if DEBUG
+          out.lines
         rescue
           []
         end
@@ -25,17 +27,38 @@ module Mittsu
     end
 
     class Windows < GenericLib::Base
+      def file
+        'glfw3.dll'
+      end
     end
 
     class MacOS < GenericLib::Base
+      SEARCH_GLOBS = ['/usr/local/lib/**',
+                      '/usr/lib/**',
+                      '/opt/homebrew/**']
+
       def path
-        '/usr/local/lib'
+        File.dirname(match.to_s)
       end
 
       def file
-        matches = Dir.glob('/usr/local/lib/libglfw*.dylib').map { |path| File.basename(path) }
-        return matches.find { |m| m == 'libglfw3.dylib' || m == 'libglfw.3.dylib' } || matches.first
+        File.basename(match.to_s)
       end
+
+      private
+
+        def match
+          @match ||= find_match
+        end
+
+        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
     end
   end
 end

data/lib/mittsu/renderers/glfw_window.rb

@@ -13,7 +13,7 @@ module Mittsu
     class Window
       attr_accessor :key_press_handler, :key_release_handler, :key_repeat_handler, :char_input_handler, :cursor_pos_handler, :mouse_button_press_handler, :mouse_button_release_handler, :scroll_handler, :framebuffer_size_handler
 
-      def initialize(width, height, title)
+      def initialize(width, height, title, antialias: 0)
         glfwInit
 
         glfwWindowHint GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE
@@ -22,6 +22,10 @@ module Mittsu
         glfwWindowHint GLFW_CONTEXT_VERSION_MINOR, 3
         glfwWindowHint GLFW_CONTEXT_REVISION, 0
 
+        if antialias > 0
+          glfwWindowHint GLFW_SAMPLES, antialias
+        end
+
         @width, @height, @title = width, height, title
         @handle = glfwCreateWindow(@width, @height, @title, nil, nil)
         if @handle.null?

data/lib/mittsu/renderers/opengl/textures/texture.rb

@@ -61,14 +61,14 @@ module Mittsu
         glTexParameteri(texture_type, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE)
 
         if wrap_s != ClampToEdgeWrapping || wrap_t != ClampToEdgeWrapping
-          puts "WARNING: Mittsu::Texture: Texture is not power of two. Texture.wrap_s and Texture.wrap_t should be set to Mittsu::ClampToEdgeWrapping. (#{texture.source_file})"
+          puts "WARNING: Mittsu::Texture: Texture is not power of two. Texture.wrap_s and Texture.wrap_t should be set to Mittsu::ClampToEdgeWrapping. (#{source_file})"
         end
 
         glTexParameteri(texture_type, GL_TEXTURE_MAG_FILTER, filter_fallback(mag_filter))
         glTexParameteri(texture_type, GL_TEXTURE_MIN_FILTER, filter_fallback(min_filter))
 
         if min_filter != NearestFilter && min_filter != LinearFilter
-          puts "WARNING: Mittsu::Texture: Texture is not a power of two. Texture.min_filter should be set to Mittsu::NearestFilter or Mittsu::LinearFilter. (#{texture.source_file})"
+          puts "WARNING: Mittsu::Texture: Texture is not a power of two. Texture.min_filter should be set to Mittsu::NearestFilter or Mittsu::LinearFilter. (#{source_file})"
         end
 
         # TODO: anisotropic extension ???

data/lib/mittsu/renderers/opengl_renderer.rb

@@ -35,7 +35,7 @@ module Mittsu
     attr_reader :logarithmic_depth_buffer, :programs, :light_renderer, :proj_screen_matrix
 
     def initialize(parameters = {})
-      puts "OpenGLRenderer (Revision #{REVISION})"
+      puts "Mittsu OpenGL Renderer #{VERSION}"
 
       fetch_parameters(parameters)
 
@@ -935,14 +935,14 @@ module Mittsu
       @_alpha = parameters.fetch(:alpha, false)
       @_depth = parameters.fetch(:depth, true)
       @_stencil = parameters.fetch(:stencil, true)
-      @_antialias = parameters.fetch(:antialias, false)
       @_premultiplied_alpha = parameters.fetch(:premultiplied_alpha, true)
       @_preserve_drawing_buffer = parameters.fetch(:preserve_drawing_buffer, false)
       @logarithmic_depth_buffer = parameters.fetch(:logarithmic_depth_buffer, false)
 
       @width = parameters.fetch(:width, 800)
       @height = parameters.fetch(:height, 600)
-      @title = parameters.fetch(:title, "Mittsu #{REVISION}")
+      @title = parameters.fetch(:title, "Mittsu #{VERSION}")
+      @antialias = parameters.fetch(:antialias, 0)
     end
 
     def get_gpu_capabilities
@@ -974,7 +974,7 @@ module Mittsu
       #   preserve_drawing_buffer: _preserve_drawing_buffer
       # }
 
-      @window = GLFW::Window.new(@width, @height, @title)
+      @window = GLFW::Window.new(@width, @height, @title, antialias: @antialias)
 
       default_target.set_viewport_size(*(@window.framebuffer_size))
 

data/lib/mittsu/version.rb

@@ -1,4 +1,3 @@
 module Mittsu
-  VERSION = "0.3.3"
-  REVISION = "71"
+  VERSION = "0.4.1"
 end

data/mittsu.gemspec

@@ -6,15 +6,15 @@ require 'mittsu/version'
 Gem::Specification.new do |spec|
   spec.name          = "mittsu"
   spec.version       = Mittsu::VERSION
-  spec.authors       = ["Daniel Smith"]
-  spec.email         = ["jellymann@gmail.com"]
+  spec.authors       = ["Danielle Smith"]
+  spec.email         = ["danini@hey.com"]
 
   spec.summary       = %q{3D Graphics Library for Ruby}
   spec.description   = %q{Mittsu makes 3D graphics easier by providing an abstraction over OpenGL, and is based heavily off of THREE.js. No more weird pointers and wondering about the difference between a VAO and a VBO (besides the letter). Simply think of something awesome and make it!}
-  spec.homepage      = "https://github.com/jellymann/mittsu"
+  spec.homepage      = "https://github.com/danini-the-panini/mittsu"
   spec.license       = "MIT"
   spec.metadata = {
-    "bug_tracker" => "https://github.com/jellymann/mittsu/issues"
+    "bug_tracker" => "https://github.com/danini-the-panini/mittsu/issues"
   }
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{(^(test|examples)/|\.sh$)}) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mittsu
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.1
 platform: ruby
 authors:
-- Daniel Smith
+- Danielle Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2024-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opengl-bindings
@@ -155,7 +155,7 @@ description: Mittsu makes 3D graphics easier by providing an abstraction over Op
   the difference between a VAO and a VBO (besides the letter). Simply think of something
   awesome and make it!
 email:
-- jellymann@gmail.com
+- danini@hey.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -406,11 +406,11 @@ files:
 - lib/mittsu/utils.rb
 - lib/mittsu/version.rb
 - mittsu.gemspec
-homepage: https://github.com/jellymann/mittsu
+homepage: https://github.com/danini-the-panini/mittsu
 licenses:
 - MIT
 metadata:
-  bug_tracker: https://github.com/jellymann/mittsu/issues
+  bug_tracker: https://github.com/danini-the-panini/mittsu/issues
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -427,7 +427,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - OpenGL 3.3+ capable hardware and drivers
-rubygems_version: 3.2.3
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: 3D Graphics Library for Ruby