mittsu 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 904b39d95b5ddd686b51b4b34d62c47e38747eda
-  data.tar.gz: 8d39e2085e02c706fcf05fc51d5ebf46d35135cf
+  metadata.gz: 14853ca4b6cc897edcdba73d196cc99ad2d80c9d
+  data.tar.gz: 857d141324a406aa0e420bbc0a0685348b373c5f
 SHA512:
-  metadata.gz: 83638f36f9019a0dfd6f03516fa7dde89233553fea9a8267401e67f6bb19855382aeea27be2df6c0afe21b42a8319f0e42f48ef4b532dee12a0602b634b69d9a
-  data.tar.gz: ab8740820fd6569365f52e4270c96a005df010f03dc64532ba08124954fce0d8aa376cb22b2b5d28b83f85ba34091204a772bdcc9058150ce5e7395779e7d599
+  metadata.gz: 4a85835765393ad611593a0cfb1980518edf6a1bb4e38d331fe5d6033323d6b4fada55f1daefab7f39badad07150446f51db732b4f12beff8acca56e53fbc59d
+  data.tar.gz: 45463c3e8276ca92a07965d117d3749a53202c16d99e8d810c13441d53e509325d08147ada69fe93904a7cde5b6d2f3b326e58be5f7d342f2766adfc40e2a4b7

data/README.md

@@ -1,6 +1,6 @@
 # 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) [![Circle CI](https://circleci.com/gh/jellymann/mittsu/tree/master.svg?style=shield)](https://circleci.com/gh/jellymann/mittsu/tree/master) [![Test Coverage](https://codeclimate.com/github/jellymann/mittsu/badges/coverage.svg)](https://codeclimate.com/github/jellymann/mittsu/coverage) [![Code Climate](https://codeclimate.com/github/jellymann/mittsu/badges/gpa.svg)](https://codeclimate.com/github/jellymann/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) [![Circle CI](https://circleci.com/gh/jellymann/mittsu/tree/master.svg?style=shield)](https://circleci.com/gh/jellymann/mittsu/tree/master) [![Build status](https://ci.appveyor.com/api/projects/status/x7k8r95m5f5fg9cu/branch/master?svg=true)](https://ci.appveyor.com/project/jellymann/mittsu/branch/master) [![Test Coverage](https://codeclimate.com/github/jellymann/mittsu/badges/coverage.svg)](https://codeclimate.com/github/jellymann/mittsu/coverage) [![Code Climate](https://codeclimate.com/github/jellymann/mittsu/badges/gpa.svg)](https://codeclimate.com/github/jellymann/mittsu)
 
 3D Graphics Library for Ruby
 
@@ -16,17 +16,22 @@ Mittsu makes 3D graphics easier by providing an abstraction over OpenGL, and is
 
 Install the prerequisites:
 
-Mittsu depends on Ruby 2.x, OpenGL 3.3+, GLFW 3.1.x and ImageMagick 6.4.9+
+Mittsu depends on Ruby 2.x, OpenGL 3.3+, and GLFW 3.1.x
 
 ```bash
 # OSX
-$ brew install glfw3 imagemagick
+$ brew install glfw3
 
 # Ubuntu
-$ sudo apt-get install libglfw3-dev libmagickwand-dev
+$ sudo apt-get install libglfw3-dev
 ```
 
-**NOTE**: On Ubuntu, you may need to install `libgl1-mesa-dev` for the OpenGL dependency.
+**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
+> set MITTSU_LIBGLFW_PATH=C:\path\to\glfw3.dll
+> ruby your_awesome_mittsu_app.rb
+```
 
 Add this line to your application's Gemfile:
 

data/appveyor.yml

@@ -0,0 +1,23 @@
+version: '{build}'
+
+clone_folder: c:\projects\mittsu
+
+environment:
+  MITTSU_LIBGLFW_FILE: c:\projects\mittsu\glfw-3.2.1.bin.WIN32\lib-mingw\glfw3.dll
+
+install:
+  - ps: c:\projects\mittsu\install_glfw.ps1
+  - set PATH=C:\Ruby22\bin;%PATH%
+  - bundle install
+
+build: off
+
+
+before_test:
+  - dir c:\projects\mittsu\glfw-3.2.1.bin.WIN32
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+test_script:
+  - bundle exec rake test

data/install_glfw.ps1

@@ -0,0 +1,11 @@
+Invoke-WebRequest https://github.com/glfw/glfw/releases/download/3.2.1/glfw-3.2.1.bin.WIN32.zip -OutFile "$pwd\glfw-3.2.1.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-3.2.1.bin.WIN32.zip" "$pwd"

data/lib/mittsu/loaders/image_loader.rb

@@ -1,4 +1,4 @@
-require 'rmagick'
+require 'chunky_png'
 require 'mittsu/extras/image'
 
 module Mittsu
@@ -11,18 +11,15 @@ module Mittsu
 
     def load(url, flip: false, flop: false)
       chache_url = "#{url}?flip=#{flip}&flop=#{flop}"
-      cached = Cache.get(url)
+      cached = Cache.get(chache_url )
       return cached unless cached.nil?
 
-      rm_image = Magick::Image.read(url).first
-      rm_image = rm_image.flip if flip
-      rm_image = rm_image.flop if flop
-      rgba_data = rm_image.to_blob { |i|
-        i.format = "RGBA"
-        i.depth = 8
-      }
+      png_image = ChunkyPNG::Image.from_file(url)
+      png_image = png_image.flip_vertically if flip
+      png_image = png_image.flip_horizontally if flop
+      rgba_data = png_image.to_rgba_stream
 
-      image = Image.new(rm_image.columns, rm_image.rows, rgba_data)
+      image = Image.new(png_image.width, png_image.height, rgba_data)
 
       Cache.add(url, image)
       @manager.item_start(url)

data/lib/mittsu/materials/mesh_basic_material.rb

@@ -33,9 +33,10 @@ require 'mittsu/materials/material'
 #  fog: <bool>
 # }
 module Mittsu
-  attr_accessor :color, :map, :light_map, :specular_map, :alpha_map, :env_map, :combine, :reflectivity, :refraction_ratio, :shading, :wireframe, :wireframe_linewidth, :wireframe_linecap, :wireframe_linejoin, :vertex_colors, :skinning, :morph_targets, :fog
-
   class MeshBasicMaterial < Material
+
+    attr_accessor :color, :map, :light_map, :specular_map, :alpha_map, :env_map, :combine, :reflectivity, :refraction_ratio, :shading, :wireframe, :wireframe_linewidth, :wireframe_linecap, :wireframe_linejoin, :vertex_colors, :skinning, :morph_targets, :fog
+
     def initialize(parameters = {})
       super()
 

data/lib/mittsu/renderers/opengl/objects/mesh.rb

@@ -7,7 +7,7 @@ module Mittsu
 
       # wireframe
       if material.wireframe
-        @renderer.state.set_line_width(material.wireframe_linewidth * @pixel_ratio)
+        @renderer.state.set_line_width(material.wireframe_linewidth * @renderer.pixel_ratio)
 
         glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, geometry_group.line_buffer) if update_buffers
         glDrawElements(GL_LINES, geometry_group.line_count, type, 0)

data/lib/mittsu/version.rb

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

data/mittsu.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'opengl-bindings', "~> 1.5"
   spec.add_runtime_dependency 'ffi', "~> 1.9"
-  spec.add_runtime_dependency 'rmagick', "~> 2.15"
+  spec.add_runtime_dependency 'chunky_png', "~> 1.3"
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mittsu
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Daniel Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opengl-bindings
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: rmagick
+  name: chunky_png
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -154,9 +154,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- appveyor.yml
 - bin/console
 - bin/setup
 - circle.yml
+- install_glfw.ps1
 - lib/mittsu.rb
 - lib/mittsu/cameras.rb
 - lib/mittsu/cameras/camera.rb
@@ -381,7 +383,7 @@ requirements:
 - ImageMagick 6.4.9 or later
 - OpenGL 3.3+ capable hardware and drivers
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: 3D Graphics Library for Ruby