mittsu 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7b8204b98ee764f5d16b7f05080fdfef61e40d9
-  data.tar.gz: f0414817f8f8d34396c8e2db3fc78940e1e9da5f
+  metadata.gz: 904b39d95b5ddd686b51b4b34d62c47e38747eda
+  data.tar.gz: 8d39e2085e02c706fcf05fc51d5ebf46d35135cf
 SHA512:
-  metadata.gz: 794ce9888d5bec3b342cdce1b06111f2d194467ad8b8964f81eb9f84d09540bf62b10dfe1b24aa241a402b31e5c0bfb76cc64e9eb35146e4407be4d8781cd8e6
-  data.tar.gz: f193740db7fd18fb93c31e7daaae4c1ccbab6b6de93a6eb03e806da99dd3eb88e8069b365546b14ec3ce4ba35dcdc2bab2bc08799c969fe6e3c43bc8139a1d06
+  metadata.gz: 83638f36f9019a0dfd6f03516fa7dde89233553fea9a8267401e67f6bb19855382aeea27be2df6c0afe21b42a8319f0e42f48ef4b532dee12a0602b634b69d9a
+  data.tar.gz: ab8740820fd6569365f52e4270c96a005df010f03dc64532ba08124954fce0d8aa376cb22b2b5d28b83f85ba34091204a772bdcc9058150ce5e7395779e7d599

data/README.md

@@ -6,6 +6,12 @@
 
 Mittsu makes 3D graphics easier by providing an abstraction over OpenGL, and is based heavily off of [THREE.js](http://threejs.org). 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!
 
+## GIFs!
+
+![Normal-mapped Earth](https://cloud.githubusercontent.com/assets/1171825/18411863/45328540-7781-11e6-986b-6e3f2551c719.gif)
+![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)
+
 ## Installation
 
 Install the prerequisites:
@@ -14,7 +20,7 @@ Mittsu depends on Ruby 2.x, OpenGL 3.3+, GLFW 3.1.x and ImageMagick 6.4.9+
 
 ```bash
 # OSX
-$ brew intall glfw3 imagemagick
+$ brew install glfw3 imagemagick
 
 # Ubuntu
 $ sudo apt-get install libglfw3-dev libmagickwand-dev

data/lib/mittsu/renderers/glfw_window.rb

@@ -3,12 +3,12 @@ require 'glfw'
 
 GLFW_LIB_EXT = OpenGL.get_platform == :OPENGL_PLATFORM_MACOSX ? 'dylib' : 'so'
 if OpenGL.get_platform != :OPENGL_PLATFORM_TEST
-  GLFW_LIB = begin
+  GLFW_LIB = ENV["MITTSU_LIBGLFW_FILE"] || begin
     "lib#{`pkg-config --libs-only-l glfw3`.gsub(/^-l/, '').chomp.strip}.#{GLFW_LIB_EXT}"
   rescue
     "libglfw.#{GLFW_LIB_EXT}"
   end
-  GLFW_LIB_PATH = begin
+  GLFW_LIB_PATH = ENV["MITTSU_LIBGLFW_PATH"] || begin
     s = `pkg-config glfw3 --libs-only-L`.gsub(/^-L/, '').chomp.strip
     s.empty? ? nil : s
   rescue

data/lib/mittsu/renderers/opengl/opengl_lib.rb

@@ -13,38 +13,106 @@ module OpenGLLib
   end
 
   class Linux
+    def initialize(loader = Linux)
+      @loader = loader
+    end
+
     def path
-      # http://www.pilotlogic.com/sitejoom/index.php/wiki?id=398<F37>
-      # 32              64
-      # /usr/lib        /usr/lib64       redhat, mandriva
-      # /usr/lib32      /usr/lib64       arch, gento
-      # /usr/lib        /usr/lib64       slackware
-      # /usr/lib/i386.. /usr/libx86_64/  debian
-      libs = Dir.glob("/usr/lib*/**/libGL.so")
-      if libs.size == 0
-        puts "no libGL.so"
-        exit 1
-      end
-      case kernel_module_in_use
-      when /nvidia/
-        return File.dirname(libs.grep(/nvidia/)[0])
-      end
-      # Get the same architecture that the runnning ruby
-      if 1.size == 8 # 64 bits
-        File.dirname(libs.grep(/64/)[0])
-      else # 32 bits
-        File.dirname(libs[0])
-      end
+      return nil if file_path.nil?
+      File.dirname file_path
     end
 
     def file
-      'libGL.so'
+      return nil if file_path.nil?
+      File.basename file_path
     end
 
-    private
+    class << self
       def kernel_module_in_use
         lspci_line = `lspci -nnk | grep -i vga -A3 | grep 'in use'`
-        return /in use:\s*(\S+)/ =~ lspci_line && $1
+        /in use:\s*(\S+)/ =~ lspci_line && $1
+      rescue
+        ''
+      end
+
+      def libgl_paths
+        Dir.glob('/usr/lib*/**/libGL.so*')
+      rescue
+        []
+      end
+
+      def sixtyfour_bits?
+        1.size == 8
+      end
+
+      def ldconfig
+        `ldconfig -p | grep 'libGL\\.so'`.lines
+      rescue
+        []
+      end
+    end
+
+    private
+      def file_path
+        @_file_path ||= begin
+          ldconfig_lib || driver_specific_lib || sixtyfour_bit_lib || fallback_lib || give_up
+        end.tap do |result|
+          print_debug_info(result) if Mittsu::DEBUG
+        end
+      end
+
+      def ldconfig_lib
+        return nil if ldconfig.empty?
+        @_debug = { source: 'ldconfig', info: ldconfig.inspect } if Mittsu::DEBUG
+        ldconfig_for_arch = ldconfig.reject { |lib| @loader.sixtyfour_bits? ^ ldconfig_64?(lib) }
+        ldconfig_for_arch.first.match(/=> (\/.*)$/)[1]
+      end
+
+      def ldconfig_64?(lib)
+        lib =~ /\([^\)]*64[^\)]*\) =>/
+      end
+
+      def driver_specific_lib
+        return nil if libs.empty?
+        @_debug = { source: 'driver', info: kernel_module } if Mittsu::DEBUG
+        libs.select { |lib| lib =~ /nvidia/ }.first if kernel_module =~ /nvidia/
+      end
+
+      def sixtyfour_bit_lib
+        return nil if libs.empty?
+        sixtyfour_bit_libs = libs.select { |lib| lib =~ /64/ }
+        @_debug = { source: '64', info: sixtyfour_bit_libs.inspect } if Mittsu::DEBUG
+        sixtyfour_bit_libs.first if @loader.sixtyfour_bits?
+      end
+
+      def fallback_lib
+        return nil if libs.empty?
+        @_debug = { source: 'fallback', info: libs.inspect } if Mittsu::DEBUG
+        libs.first
+      end
+
+      def give_up
+        @_debug = { source: 'none', info: nil } if Mittsu::DEBUG
+        nil
+      end
+
+      def kernel_module
+        @_kernel_module ||= @loader.kernel_module_in_use
+      end
+
+      def libs
+        @_libs ||= @loader.libgl_paths.sort_by(&:length)
+      end
+
+      def ldconfig
+        @_ldconfig ||= @loader.ldconfig
+      end
+
+      def print_debug_info(result)
+        puts "Loading lib path: #{result.inspect}"
+        puts "Source: #{@_debug[:source]}"
+        puts "Info: #{@_debug[:info]}"
+        puts "64-bit? #{@loader.sixtyfour_bits?}"
       end
   end
 

data/lib/mittsu/renderers/opengl_renderer.rb

@@ -5,7 +5,7 @@ require 'fiddle'
 
 require 'mittsu/renderers/opengl/opengl_lib'
 opengl_lib = OpenGLLib.discover
-OpenGL.load_lib(opengl_lib.file, opengl_lib.path)
+OpenGL.load_lib(ENV["MITTSU_LIBGL_FILE"] || opengl_lib.file, ENV["MITTSU_LIBGL_PATH"] || opengl_lib.path)
 
 require 'mittsu'
 require 'mittsu/renderers/glfw_window'

data/lib/mittsu/version.rb

@@ -1,4 +1,4 @@
 module Mittsu
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
   REVISION = "71"
 end

data/mittsu.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
     "bug_tracker" => "https://github.com/jellymann/mittsu/issues"
   }
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|examples)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{(^(test|examples)/|\.sh$)}) }
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = '>= 2.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mittsu
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Daniel Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opengl-bindings
@@ -157,7 +157,6 @@ files:
 - bin/console
 - bin/setup
 - circle.yml
-- install-glfw-3.1.2.sh
 - lib/mittsu.rb
 - lib/mittsu/cameras.rb
 - lib/mittsu/cameras/camera.rb
@@ -359,7 +358,6 @@ files:
 - lib/mittsu/textures/video_texture.rb
 - lib/mittsu/version.rb
 - mittsu.gemspec
-- run_all_examples.sh
 homepage: https://github.com/jellymann/mittsu
 licenses:
 - MIT

data/install-glfw-3.1.2.sh

@@ -1,14 +0,0 @@
-set -x
-set -e
-if [ ! -e glfw-3.1.2/include/GLFW/glfw3.h ]; then
-  wget https://github.com/glfw/glfw/releases/download/3.1.2/glfw-3.1.2.zip
-  unzip glfw-3.1.2.zip;
-fi
-cd glfw-3.1.2
-if [ ! -e src/libglfw3.so ]; then
-  cmake -D BUILD_SHARED_LIBS=ON .
-  make;
-fi
-if [ ! -e /usr/local/lib/libglfw.so ]; then
-  sudo make install;
-fi

data/run_all_examples.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -x
-set -e
-
-cd examples
-
-ls *.rb | grep '^[0-9]' | xargs -n 1 ruby