mittsu 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3a8c66b2c63737be22e4495e20bc62888391dc63907e604d31eb8cbbf5fa432
-  data.tar.gz: f88e54369ac3e9c2b0534135f485310469d5dd37889504cf049eb23223cf0f2a
+  metadata.gz: 806e8ad78d34edc7dfa72cbe35414c0fe765628b5dd074d691d5bf0f45dd52cb
+  data.tar.gz: b477a885ca405bd5ad8b71464b06ce794567c00abceb56738f3ace06885fe4d3
 SHA512:
-  metadata.gz: ea2ee4ab085e40061f432ed835f8f40948557467f85f33b7b4238a2d18cc4756ac43bb052d6631e4d8707f62d1ebce382cf5790727c28b257b73f71a08446458
-  data.tar.gz: fb77a518a9002b201a52590be84e13b9b57c1716b2e13d5c38b0d81265c6c26d8e440fb700d92e3759f8bfbd5323435c28dd780497da133fba4a09023800b3fd
+  metadata.gz: d65b207aaaf6136a1e6d7fd39237bd5710192748338eb388fd974d4128069cbc41b6df4132bc2597793f507ed7349abdb0f3d28e9df1584ff9d4e1f9a39c8bc2
+  data.tar.gz: b4eb049497dc7f46d4285d8d8d677f3221f08d904dcc21b1efa3e7044edea42a1d49e8979d74bd26c3bc9470598fd9755c460865cc324ce71b6c87fec036d07e

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

@@ -13,17 +13,16 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0', '3.1', 'head']
+        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', 'head']
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
+      - uses: awalsh128/cache-apt-pkgs-action@v1
+        with:
+          packages: libglfw3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - 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
       - name: Test & publish code coverage
         uses: paambaati/codeclimate-action@v2.2.1
         if: github.event_name == 'push'
@@ -40,15 +39,14 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0', '3.1', 'head']
+        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', 'head']
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
+      - run: brew install glfw
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - run: brew install glfw
-      - run: bundle install --path vendor/bundle
       - run: bundle exec rake test
 
   windows:
@@ -58,14 +56,12 @@ jobs:
       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', 'head']
+        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', 'head']
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
+      - run: .\install-glfw.ps1
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - run: .\install-glfw.ps1
-      - run: gem install bundler
-      - run: bundle install --path vendor/bundle
       - run: bundle exec rake test

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/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/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
@@ -36,11 +38,11 @@ module Mittsu
                       '/opt/homebrew/**']
 
       def path
-        File.dirname(match)
+        File.dirname(match.to_s)
       end
 
       def file
-        File.basename(match)
+        File.basename(match.to_s)
       end
 
       private

data/lib/mittsu/version.rb

@@ -1,3 +1,3 @@
 module Mittsu
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mittsu
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Danielle Smith
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2024-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opengl-bindings
@@ -411,7 +411,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker: https://github.com/danini-the-panini/mittsu/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -427,8 +427,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - OpenGL 3.3+ capable hardware and drivers
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.5.23
+signing_key:
 specification_version: 4
 summary: 3D Graphics Library for Ruby
 test_files: []