mittsu 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14853ca4b6cc897edcdba73d196cc99ad2d80c9d
-  data.tar.gz: 857d141324a406aa0e420bbc0a0685348b373c5f
+  metadata.gz: 888b8fed281195b187add2cce25a4ef54f737a11
+  data.tar.gz: 5416e8ec76e74ab04725f9e79d5b1b2a0f744b28
 SHA512:
-  metadata.gz: 4a85835765393ad611593a0cfb1980518edf6a1bb4e38d331fe5d6033323d6b4fada55f1daefab7f39badad07150446f51db732b4f12beff8acca56e53fbc59d
-  data.tar.gz: 45463c3e8276ca92a07965d117d3749a53202c16d99e8d810c13441d53e509325d08147ada69fe93904a7cde5b6d2f3b326e58be5f7d342f2766adfc40e2a4b7
+  metadata.gz: 6bda9102f024f4c5f611ae1e46c603bc16fa0d7d73e7c5665d57c9711bc29767d9de6a6c79928cebe8362eeb5bbb2125b17b54cc39c28b3804a431e5393cc472
+  data.tar.gz: dab44a21708d30c12eac2ba653e59114f5a3c61b68624ba98b3bc6b11277c435a03fcda783acf67cfe33dfd71dfdfd81dc44673be7bd2621363a90e83dd66aee

data/README.md

@@ -23,7 +23,7 @@ Mittsu depends on Ruby 2.x, OpenGL 3.3+, and GLFW 3.1.x
 $ brew install glfw3
 
 # Ubuntu
-$ sudo apt-get install libglfw3-dev
+$ sudo apt-get install libglfw3
 ```
 
 **NOTE:** On Windows, you will have to manually specify the glfw3.dll path in an environment variable

data/lib/mittsu/extras/image_utils.rb

@@ -1,11 +1,11 @@
 module Mittsu
   module ImageUtils
     class << self
-      def load_texture(url, mapping = Texture::DEFAULT_MAPPING)
+      def load_texture(url, mapping = Texture::DEFAULT_MAPPING, flip: true, flop: false)
         loader = ImageLoader.new
 
         Texture.new(nil, mapping).tap do |texture|
-          image = loader.load(url, flip: true)
+          image = loader.load(url, flip: flip, flop: flop)
           texture.image = image
           texture.needs_update = true
 

data/lib/mittsu/loaders/image_loader.rb

@@ -11,12 +11,12 @@ module Mittsu
 
     def load(url, flip: false, flop: false)
       chache_url = "#{url}?flip=#{flip}&flop=#{flop}"
-      cached = Cache.get(chache_url )
+      cached = Cache.get(chache_url)
       return cached unless cached.nil?
 
       png_image = ChunkyPNG::Image.from_file(url)
-      png_image = png_image.flip_vertically if flip
-      png_image = png_image.flip_horizontally if flop
+      png_image.flip_horizontally! if flip
+      png_image.flip_vertically! if flop
       rgba_data = png_image.to_rgba_stream
 
       image = Image.new(png_image.width, png_image.height, rgba_data)

data/lib/mittsu/renderers/generic_lib.rb

@@ -0,0 +1,116 @@
+module Mittsu
+  module GenericLib
+    def discover
+      case OpenGL.get_platform
+      when :OPENGL_PLATFORM_WINDOWS
+        self::Windows.new
+      when :OPENGL_PLATFORM_MACOSX
+        self::MacOS.new
+      when :OPENGL_PLATFORM_LINUX
+        self::Linux.new
+      else
+        fail "Unsupported platform."
+      end
+    end
+
+    class Linux
+      def path
+        return nil if file_path.nil?
+        File.dirname file_path
+      end
+
+      def file
+        return nil if file_path.nil?
+        File.basename file_path
+      end
+
+      class << self
+        def kernel_module_in_use
+          lspci_line = `lspci -nnk | grep -i vga -A3 | grep 'in use'`
+          /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 DEBUG
+          end
+        end
+
+        def ldconfig_lib
+          return nil if ldconfig.empty?
+          @_debug = { source: 'ldconfig', info: ldconfig.inspect } if 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 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 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 DEBUG
+          libs.first
+        end
+
+        def give_up
+          @_debug = { source: 'none', info: nil } if 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
+  end
+end

data/lib/mittsu/renderers/glfw_lib.rb

@@ -0,0 +1,42 @@
+require 'mittsu/renderers/generic_lib'
+
+module Mittsu
+  module GLFWLib
+    extend GenericLib
+
+    class Linux < GenericLib::Linux
+      def initialize(loader = Linux)
+        @loader = loader
+      end
+
+      class << self
+        def libgl_paths
+          Dir.glob('/usr/lib*/**/libglfw*.so*')
+        rescue
+          []
+        end
+
+        def ldconfig
+          `ldconfig -p | grep 'libglfw3\\?\\.so'`.lines
+        rescue
+          []
+        end
+      end
+    end
+
+    class Windows
+      def path; nil; end
+      def file; nil; end
+    end
+
+    class MacOS
+      def path
+        '/usr/local/lib'
+      end
+
+      def file
+        'libglfw3.dylib'
+      end
+    end
+  end
+end

data/lib/mittsu/renderers/glfw_window.rb

@@ -1,24 +1,12 @@
 require 'opengl'
 require 'glfw'
 
-GLFW_LIB_EXT = OpenGL.get_platform == :OPENGL_PLATFORM_MACOSX ? 'dylib' : 'so'
-if OpenGL.get_platform != :OPENGL_PLATFORM_TEST
-  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 = ENV["MITTSU_LIBGLFW_PATH"] || begin
-    s = `pkg-config glfw3 --libs-only-L`.gsub(/^-L/, '').chomp.strip
-    s.empty? ? nil : s
-  rescue
-    nil
-  end
+require 'mittsu'
+require 'mittsu/renderers/glfw_lib'
+glfw_lib = Mittsu::GLFWLib.discover
+GLFW.load_lib(ENV["MITTSU_LIBGLFW_FILE"] || glfw_lib.file, ENV["MITTSU_LIBGLFW_PATH"] || glfw_lib.path)
 
-  GLFW.load_lib GLFW_LIB, GLFW_LIB_PATH
-
-  include GLFW
-end
+include GLFW
 
 module Mittsu
   module GLFW

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

@@ -1,130 +1,23 @@
-module OpenGLLib
-  def self.discover
-    case OpenGL.get_platform
-    when :OPENGL_PLATFORM_WINDOWS
-      Windows.new
-    when :OPENGL_PLATFORM_MACOSX
-      MacOS.new
-    when :OPENGL_PLATFORM_LINUX
-      Linux.new
-    else
-      fail "Unsupported platform."
-    end
-  end
+require 'mittsu/renderers/generic_lib'
 
-  class Linux
-    def initialize(loader = Linux)
-      @loader = loader
-    end
+module Mittsu
+  module OpenGLLib
+    extend GenericLib
 
-    def path
-      return nil if file_path.nil?
-      File.dirname file_path
+    class Linux < GenericLib::Linux
+      def initialize(loader = Linux)
+        @loader = loader
+      end
     end
 
-    def file
-      return nil if file_path.nil?
-      File.basename file_path
+    class Windows
+      def path; nil; end
+      def file; nil; end
     end
 
-    class << self
-      def kernel_module_in_use
-        lspci_line = `lspci -nnk | grep -i vga -A3 | grep 'in use'`
-        /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
+    class MacOS
+      def path; nil; end
+      def file; nil; 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
-
-  # TODO
-  class Windows
-    def path; nil; end
-    def file; nil; end
-  end
-
-  # TODO
-  class MacOS
-    def path; nil; end
-    def file; nil; end
   end
 end

data/lib/mittsu/renderers/opengl_renderer.rb

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

data/lib/mittsu/version.rb

@@ -1,4 +1,4 @@
 module Mittsu
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
   REVISION = "71"
 end

data/mittsu.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = '>= 2.0.0'
-  spec.requirements << 'ImageMagick 6.4.9 or later'
   spec.requirements << 'OpenGL 3.3+ capable hardware and drivers'
 
   spec.add_runtime_dependency 'opengl-bindings', "~> 1.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mittsu
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Daniel Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opengl-bindings
@@ -235,6 +235,8 @@ files:
 - lib/mittsu/objects/line.rb
 - lib/mittsu/objects/mesh.rb
 - lib/mittsu/renderers.rb
+- lib/mittsu/renderers/generic_lib.rb
+- lib/mittsu/renderers/glfw_lib.rb
 - lib/mittsu/renderers/glfw_window.rb
 - lib/mittsu/renderers/opengl/core/geometry.rb
 - lib/mittsu/renderers/opengl/core/object_3d.rb
@@ -380,10 +382,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- ImageMagick 6.4.9 or later
 - OpenGL 3.3+ capable hardware and drivers
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 3D Graphics Library for Ruby