mittsu 0.2.3 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48e91f3f5d995fce4f48d1ecc53ca8f1d6049e0e4553f95cf59d75840b8f3e2f
-  data.tar.gz: 7458897098e4b97dd6a84510c2d17ae38e993f9acf6ab0093a23c6632dc86d3c
+  metadata.gz: bce7b85c4911927e9f33bb5212d9011122a33356cc8811b33482af05577b9977
+  data.tar.gz: 23620dc7e242612382df2647df7b45f2a21364543deb0d64e389844d65a069c1
 SHA512:
-  metadata.gz: 7d5b7457d633e2cf32ff516f003509ff29b671c3b029ddf7e731f1fd3ee9e5120fbd7871ba3c26d047deb4cdd29c496d91c1b88ef2c5c771c8303292312d4351
-  data.tar.gz: 7efc8ac6edc4ad531609114a43a6d6e7986f1e451395840a4b5fcf019c8351b71bf60ba9af39a7cf4828afeadc393f7df495834ce377ded07480a66d631656d5
+  metadata.gz: 192b53dca3a2f7ecc79c22cdeae9410d7ce5dcf4af30803d9f0242bdc9caa10cef93cc8a1948932da102cbfe049e6d67951ce983e27ed40f20809fa18b044897
+  data.tar.gz: d08903f9f798c488b35f52f991e311bdbd2f95427094c10b55c5c6d67570d4956c8616d52ad025b9507945e57a5e3ecbff876c50472317493e778d6819286d8e

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

@@ -0,0 +1,95 @@
+name: Build
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  linux:
+    name: Linux
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['2.5.x', '2.6.x', '2.7.x', '3.0.x']
+    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
+        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
+      - name: Test & publish code coverage
+        uses: paambaati/codeclimate-action@v2.2.1
+        if: github.event_name == 'push'
+        env:
+          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+        with:
+          coverageCommand: bundle exec rake test
+      - name: Test
+        if: github.event_name != 'push'
+        run: bundle exec rake test
+
+  macos:
+    name: macOS
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        ruby: ['2.5.x', '2.6.x', '2.7.x', '3.0.x']
+    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
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: brew install glfw
+      - run: bundle install --path vendor/bundle
+      - 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
+    strategy:
+      matrix:
+        ruby: ['2.5.x', '2.6.x', '2.7.x', '3.0.x']
+    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
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: .\install-glfw.ps1
+      - run: gem install bundler
+      - run: bundle install --path vendor/bundle
+      - run: bundle exec rake test

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 /test/reports
 *.gem
+.tool-versions

data/Gemfile

@@ -2,5 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem "codeclimate-test-reporter", group: :test, require: false
-gem 'coveralls', group: :test, require: false
+if /darwin/ === RUBY_PLATFORM
+  gem 'ffi', '~> 1.9', '!= 1.11.1'
+end

data/README.md

@@ -1,13 +1,9 @@
 # Mittsu
 
 [![Gem Version](https://badge.fury.io/rb/mittsu.svg)](https://badge.fury.io/rb/mittsu)
-[![Dependency Status](https://gemnasium.com/jellymann/mittsu.svg)](https://gemnasium.com/jellymann/mittsu)
-[![Coverage Status](https://coveralls.io/repos/github/jellymann/mittsu/badge.svg?branch=master)](https://coveralls.io/github/jellymann/mittsu?branch=master)
-[![Code Climate](https://codeclimate.com/github/jellymann/mittsu/badges/gpa.svg)](https://codeclimate.com/github/jellymann/mittsu)
-
-🍎 [![Circle CI Build Status (macOS)](https://circleci.com/gh/jellymann/mittsu/tree/master.svg?style=shield)](https://circleci.com/gh/jellymann/mittsu/tree/master)
-  🐧 [![Travis Build Status (Ubuntu)](https://travis-ci.org/jellymann/mittsu.svg?branch=master)](https://travis-ci.org/jellymann/mittsu)
-  🖼 [![AppVeyor Build status (Windows)](https://ci.appveyor.com/api/projects/status/x7k8r95m5f5fg9cu/branch/master?svg=true)](https://ci.appveyor.com/project/jellymann/mittsu/branch/master)
+[![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)
 
 3D Graphics Library for Ruby
 

data/Rakefile

@@ -4,4 +4,5 @@ require 'rake/testtask'
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.pattern = "test/**/test_*.rb"
+  t.warning = false
 end

data/install-glfw.ps1

@@ -0,0 +1,13 @@
+$glfwversion="3.3.1"
+
+Invoke-WebRequest "https://github.com/glfw/glfw/releases/download/$glfwversion/glfw-$glfwversion.bin.WIN32.zip" -OutFile "$pwd\glfw-$glfwversion.bin.WIN32.zip"
+
+Add-Type -AssemblyName System.IO.Compression.FileSystem
+function Unzip
+{
+    param([string]$zipfile, [string]$outpath)
+
+    [System.IO.Compression.ZipFile]::ExtractToDirectory($zipfile, $outpath)
+}
+
+Unzip "$pwd\glfw-$glfwversion.bin.WIN32.zip" "$pwd"

data/lib/mittsu.rb

@@ -1,19 +1,4 @@
-module Mittsu
-  DEBUG = ENV["DEBUG"] == "true"
-
-  def self.debug?
-    DEBUG
-  end
-
-  def self.env
-    ENV["MITTSU_ENV"]
-  end
-
-  def self.test?
-    env == 'test'
-  end
-end
-
+require "mittsu/utils"
 require "mittsu/version"
 require "mittsu/math"
 require "mittsu/core"

data/lib/mittsu/cameras/camera.rb

@@ -1,5 +1,3 @@
-require 'mittsu'
-
 module Mittsu
   class Camera < Object3D
     attr_accessor :projection_matrix, :matrix_world_inverse

data/lib/mittsu/cameras/cube_camera.rb

@@ -1,5 +1,3 @@
-require 'mittsu'
-
 module Mittsu
   class CubeCamera < Object3D
     attr_accessor :render_target

data/lib/mittsu/cameras/orthographic_camera.rb

@@ -1,5 +1,3 @@
-require 'mittsu'
-
 module Mittsu
   class OrthographicCamera < Camera
     attr_accessor :zoom, :left, :right, :top, :bottom, :near, :far
@@ -25,8 +23,8 @@ module Mittsu
     def update_projection_matrix
       dx = (right - left) / (2.0 * zoom)
       dy = (top - bottom) / (2.0 * zoom)
-      cx = (right - left) / 2.0
-      cy = (top - bottom) / 2.0
+      cx = (right + left) / 2.0
+      cy = (top + bottom) / 2.0
 
       projection_matrix.make_orthographic(cx - dx, cx + dx, cy + dy, cy - dy, near, far)
     end

data/lib/mittsu/cameras/perspective_camera.rb

@@ -1,5 +1,3 @@
-require 'mittsu'
-
 module Mittsu
   class PerspectiveCamera < Camera
     attr_accessor :zoom, :fov, :aspect, :near, :far
@@ -15,6 +13,7 @@ module Mittsu
       @aspect = aspect.to_f
       @near = near.to_f
       @far = far.to_f
+      @full_width = nil
 
       update_projection_matrix
     end
@@ -23,7 +22,7 @@ module Mittsu
     # 35mm (fullframe) camera is used if frame size is not specified;
     # Formula based on http://www.bobatkins.com/photography/technical/field_of_view.html
     def set_lens(focal_length, frame_height = 24.0)
-      @fov = 2.0 * Math.rad_to_deg(Math.atan(frame_height / (focal_length * 2.0)))
+      @fov = 2.0 * Math.rad_to_deg(::Math.atan(frame_height / (focal_length * 2.0)))
       update_projection_matrix
     end
 
@@ -73,11 +72,11 @@ module Mittsu
     end
 
     def update_projection_matrix
-      new_fov = Math.rad_to_deg(2.0 * Math.atan(Math.tan(Math.deg_to_rad(@fov) * 0.5) / @zoom))
+      new_fov = Math.rad_to_deg(2.0 * ::Math.atan(::Math.tan(Math.deg_to_rad(@fov) * 0.5) / @zoom))
 
       if @full_width
         aspect = @full_width / @full_height
-        top = Math.tan(Math.deg_to_rad(new_fov * 0.5)) * @near
+        top = ::Math.tan(Math.deg_to_rad(new_fov * 0.5)) * @near
         bottom = -top
         left = aspect * bottom
         right = aspect * top

data/lib/mittsu/core/buffer_geometry.rb

@@ -1,5 +1,4 @@
 require 'securerandom'
-require 'mittsu'
 require 'mittsu/core/event_dispatcher'
 
 module Mittsu
@@ -21,6 +20,7 @@ module Mittsu
       @attributes = {}
 
       @draw_calls = []
+      @_listeners = {}
     end
 
     def keys
@@ -179,7 +179,7 @@ module Mittsu
           max_radius_sq = [max_radius_sq, center.distance_to_squared(vector)].max
         end
 
-        @bounding_sphere.radius = Math.sqrt(max_radius_sq)
+        @bounding_sphere.radius = ::Math.sqrt(max_radius_sq)
 
         if @bounding_radius.nan?
           puts 'ERROR: Mittsu::BufferGeometry#computeBoundingSphere: Computed radius is NaN. The "position" attribute is likely to have NaN values.'
@@ -558,7 +558,7 @@ module Mittsu
       normals.each_slice(3).with_index do |normal, i|
         x, y, z = *normal
 
-        n = 1.0 / Math.sqrt(x * x + y * y + z * z)
+        n = 1.0 / ::Math.sqrt(x * x + y * y + z * z)
 
         i *= 3
         normals[i] *= n

data/lib/mittsu/core/geometry.rb

@@ -1,5 +1,4 @@
 require 'securerandom'
-require 'mittsu'
 
 module Mittsu
   class Geometry
@@ -19,6 +18,8 @@ module Mittsu
 
       @id = (@@id ||= 1).tap { @@id += 1 }
 
+      @uuid = SecureRandom.uuid
+
       @name = ''
       @type = 'Geometry'
 
@@ -49,6 +50,8 @@ module Mittsu
       @colors_need_update = false
       @line_distances_need_update = false
       @groups_need_update = false
+
+      @_listeners = {}
     end
 
     def apply_matrix(matrix)
@@ -105,7 +108,7 @@ module Mittsu
       }
       if indices
         draw_calls = geometry.draw_calls
-        if !draw_calls.length.empty?
+        if !draw_calls.empty?
           draw_calls.each do |draw_call|
             start = draw_call.start
             count = draw_call.count
@@ -119,7 +122,7 @@ module Mittsu
           end
         else
           indices.each_slice(3).with_index do |index|
-            add_face(*index)
+            add_face[*index]
           end
         end
       else
@@ -130,10 +133,10 @@ module Mittsu
         end
       end
       self.compute_face_normals
-      if geometry.boundingBox
+      if geometry.bounding_box
         @bounding_box = geometry.bounding_box.clone
       end
-      if geometry.boundingSphere
+      if geometry.bounding_sphere
         @bounding_sphere = geometry.bounding_sphere.clone
       end
       self
@@ -160,12 +163,12 @@ module Mittsu
       end
     end
 
-    def compute_vertex_normals(area_weigted)
+    def compute_vertex_normals(area_weighted = false)
       vertices = Array.new(@vertices.length)
       @vertices.length.times do |v|
         vertices[v] = Mittsu::Vector3.new
       end
-      if area_weigted
+      if area_weighted
         # vertex normals weighted by triangle areas
         # http:#www.iquilezles.org/www/articles/normals/normals.htm
         cb = Mittsu::Vector3.new, ab = Mittsu::Vector3.new
@@ -426,12 +429,10 @@ module Mittsu
         face.b = changes[face.b]
         face.c = changes[face.c]
         indices = [face.a, face.b, face.c]
-        dup_index = -1
         # if any duplicate vertices are found in a Face3
         # we have to remove the face as nothing can be saved
         3.times do |n|
           if indices[n] == indices[(n + 1) % 3]
-            dup_index = n
             face_indices_to_remove << i
             break
           end

data/lib/mittsu/core/object_3d.rb

@@ -1,5 +1,4 @@
 require 'securerandom'
-require 'mittsu'
 
 module Mittsu
   class Object3D
@@ -22,6 +21,8 @@ module Mittsu
       @type = 'Object3D'
 
       @children = []
+      @parent = nil
+      @name = nil
 
       @up = DefaultUp.clone
 
@@ -55,6 +56,7 @@ module Mittsu
       @render_order = 0
 
       @user_data = {}
+      @_listeners = {}
     end
 
     def name
@@ -95,18 +97,18 @@ module Mittsu
     end
 
     def rotate_x(angle)
-      @_v1 ||= Vector3.new(1, 0, 0)
-      self.rotate_on_axis(@_v1, angle)
+      @_x_axis ||= Vector3.new(1, 0, 0)
+      self.rotate_on_axis(@_x_axis, angle)
     end
 
     def rotate_y(angle)
-      @_v1 ||= Vector3.new(0, 1, 0)
-      self.rotate_on_axis(@_v1, angle)
+      @_y_axis ||= Vector3.new(0, 1, 0)
+      self.rotate_on_axis(@_y_axis, angle)
     end
 
     def rotate_z(angle)
-      @_v1 ||= Vector3.new(0, 0, 1)
-      self.rotate_on_axis(@_v1, angle)
+      @_z_axis ||= Vector3.new(0, 0, 1)
+      self.rotate_on_axis(@_z_axis, angle)
     end
 
     def translate_on_axis(axis, distance)

data/lib/mittsu/core/raycaster.rb

@@ -1,5 +1,3 @@
-require 'mittsu'
-
 module Mittsu
   class Raycaster
     attr_accessor :near, :far, :ray, :params, :precision

data/lib/mittsu/extras/geometries.rb

@@ -1,2 +1,15 @@
 require 'mittsu/extras/geometries/box_geometry'
 require 'mittsu/extras/geometries/sphere_geometry'
+require 'mittsu/extras/geometries/ring_geometry'
+require 'mittsu/extras/geometries/circle_geometry'
+require 'mittsu/extras/geometries/cylinder_geometry'
+require 'mittsu/extras/geometries/dodecahedron_geometry'
+require 'mittsu/extras/geometries/icosahedron_geometry'
+require 'mittsu/extras/geometries/octahedron_geometry'
+require 'mittsu/extras/geometries/tetrahedron_geometry'
+require 'mittsu/extras/geometries/plane_buffer_geometry'
+require 'mittsu/extras/geometries/plane_geometry'
+require 'mittsu/extras/geometries/torus_geometry'
+require 'mittsu/extras/geometries/torus_knot_geometry'
+require 'mittsu/extras/geometries/parametric_geometry'
+require 'mittsu/extras/geometries/lathe_geometry'

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

@@ -0,0 +1,48 @@
+require 'mittsu/core'
+require 'mittsu/math'
+
+module Mittsu
+  class CircleGeometry < Geometry
+    def initialize(radius = 50.0, segments = 8, theta_start = 0.0, theta_length = (::Math::PI * 2.0))
+      super()
+
+      @type = 'CircleGeometry'
+
+      @parameters = {
+        radius:       radius,
+        segments:     segments,
+        theta_start:  theta_start,
+        theta_length: theta_length
+      }
+
+      segments = [3, segments].max
+
+      center = Vector3.new
+      center_uv = Vector2.new(0.5, 0.5)
+
+      @vertices << center
+      uvs = [center_uv]
+
+      for i in 0..segments do
+        vertex = Vector3.new
+        segment = theta_start + i.to_f / segments.to_f * theta_length
+
+        vertex.x = radius * ::Math.cos(segment)
+        vertex.y = radius * ::Math.sin(segment)
+
+        @vertices << vertex
+        uvs << Vector2.new((vertex.x / radius + 1.0) / 2.0, (vertex.y / radius + 1.0) / 2.0)
+      end
+
+      n = Vector3.new
+
+      for i in 1..segments do
+        @faces << Face3.new(i, i + 1, 0, [n.clone, n.clone, n.clone])
+        @face_vertex_uvs[0] << [uvs[i].clone, uvs[i + 1].clone, center_uv.clone]
+      end
+
+      compute_face_normals
+      @bounding_sphere = Sphere.new(Vector3.new, radius)
+    end
+  end
+end