gosu_texture_packer 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af48671121a22d94b41d7515d590a35d5cb69efa
-  data.tar.gz: 4a78ca27ca52ab4e8d9b0bb8d6318e09c8d26aec
+  metadata.gz: 046d95ce5242ce706baeace9c3f6c19352653e69
+  data.tar.gz: e42056791386d088d652c4aa92b1e88e3870b058
 SHA512:
-  metadata.gz: 1376f1f0358f8ca3f3550c92163a13ef170c208b451f7c43a6058e1ee4dea1d8606e82672a9b81abec3544890d22c19cf1a05a3f2d4dba7b5e717a9d56c15d01
-  data.tar.gz: b5a6936182ef3d2029e07ef4b7908e51557262f54fab2991ad7308191077affb0ff2a43969015f2e4fe6f34a6a985848c4c53fe1ba1a03655c20a1b0ca3fe2cb
+  metadata.gz: c4c5d8fe9097783475afc48cceab860d3e69ddeafdbbc1c00f9e2e566541f1bb8fcc8d8806888ea8fbb1ad1b5a41291f253c79d19f6959b0675428ae72eaa9e7
+  data.tar.gz: fe16383639f2bd4fb094c4f34498eeb5d8b5850eec8d847d3ba5d4d4b974575f9b0918bf33fe31ad6a1d00cb8593871f096abd500c146bb6f9a46535f4a80a46

data/README.md

@@ -28,6 +28,17 @@ tile = tileset.frame(frame_names.first)
 tile.draw(0, 0, 0) # tile is Gosu::Image
 ```
 
+You may find that your tiles have "bleeding edges" when you stack them together. To avoid that,
+either use `--extrude 1` or `--reduce-border-artifacts` when exporting Texture Packer tileset, or
+provide `:precise` mode parameter to `load_json`:
+
+```ruby
+tileset = Gosu::TexturePacker.load_json(gosu_window, '/path/to/tileset.json', :precise)
+```
+
+However, loading with `:precise` mode will significantly increase memory consumption and reduce
+load time, so use it carefully.
+
 ## Example Code
 
 Run

data/examples/random_map.rb

@@ -14,7 +14,7 @@ class GameWindow < Gosu::Window
     super(WIDTH, HEIGHT, false)
     self.caption = 'Click space to toggle random redraws'
     json_path = File.join(ROOT_DIR, 'spec', 'files', 'ground.json')
-    @tileset = Gosu::TexturePacker.load_json(self, json_path)
+    @tileset = Gosu::TexturePacker.load_json(self, json_path, :precise)
   end
 
   def needs_cursor?

data/lib/gosu_texture_packer.rb

@@ -4,8 +4,8 @@ require 'gosu_texture_packer/tileset'
 
 module Gosu
   module TexturePacker
-    def self.load_json(window, path)
-      Tileset.load_json(window, path)
+    def self.load_json(window, path, mode = :fast)
+      Tileset.load_json(window, path, mode)
     end
   end
 end

data/lib/gosu_texture_packer/tileset.rb

@@ -1,18 +1,18 @@
 require 'json'
-require 'rmagick'
 module Gosu
   module TexturePacker
     class Tileset
 
-      def self.load_json(window, json)
-        self.new(window, json)
+      def self.load_json(window, json, mode = :fast)
+        self.new(window, json, mode)
       end
 
-      def initialize(window, json)
+      def initialize(window, json, mode)
+        @mode = mode
         @window = window
         @json = JSON.parse(File.read(json))
         @source_dir = File.dirname(json)
-        @main_image = Magick::ImageList.new(image_file).first
+        @main_image = build_main_image(mode)
         @tile_cache = {}
       end
 
@@ -33,8 +33,24 @@ module Gosu
 
       private
 
+      def build_main_image(mode)
+        case mode
+        when :fast
+          Gosu::Image.new(@window, image_file, true)
+        when :precise
+          require 'rmagick' unless defined?(Magick)
+          Magick::ImageList.new(image_file).first
+        else
+          raise "Unsupported mode #{mode}. Use :fast or :precise."
+        end
+      end
+
       def build_tile(f)
-        Gosu::Image.new(@window, @main_image, true, f['x'], f['y'], f['w'], f['h'])
+        if @mode == :fast
+          @main_image.subimage(f['x'], f['y'], f['w'], f['h'])
+        else
+          Gosu::Image.new(@window, @main_image, true, f['x'], f['y'], f['w'], f['h'])
+        end
       end
 
       def image_file
@@ -48,7 +64,6 @@ module Gosu
       def frames
         @json['frames']
       end
-
     end
   end
 end

data/lib/gosu_texture_packer/version.rb

@@ -1,5 +1,5 @@
 module Gosu
   module TexturePacker
-    VERSION = "0.1.2"
+    VERSION = '0.1.3'
   end
 end

data/spec/gosu_texture_packer/tileset_spec.rb

@@ -7,51 +7,65 @@ RSpec.describe Gosu::TexturePacker::Tileset do
   let(:game_window) { Gosu::Window.new(640, 480, false) }
   let(:target_frame) { 'alientech.png' }
   let(:tileset) { File.join(media_dir, '_UI.json') }
+  let(:mode) { :fast }
 
   subject(:instance) do
-    tileset_class.load_json(game_window, tileset)
+    tileset_class.load_json(game_window, tileset, mode)
   end
 
-  describe '.load_json' do
-    it 'loads existing file' do
-      expect { subject }.to_not raise_error
+  shared_examples 'tileset' do
+
+    describe '.load_json' do
+      it 'loads existing file' do
+        expect { subject }.to_not raise_error
+      end
     end
-  end
 
-  describe '#frame_list' do
-    subject(:frame_list) { instance.frame_list }
+    describe '#frame_list' do
+      subject(:frame_list) { instance.frame_list }
 
-    it 'contains all the frames' do
-      expect(frame_list.size).to be 514
-    end
+      it 'contains all the frames' do
+        expect(frame_list.size).to be 514
+      end
 
-    it 'includes target frame' do
-      expect(frame_list).to include target_frame
+      it 'includes target frame' do
+        expect(frame_list).to include target_frame
+      end
     end
-  end
 
-  # Frame format in JSON:
-  # {"frame"=>{"x"=>129, "y"=>0, "w"=>32, "h"=>32}, "rotated"=>false, "trimmed"=>false,
-  # "spriteSourceSize"=>{"x"=>0, "y"=>0, "w"=>32, "h"=>32}, "sourceSize"=>{"w"=>32, "h"=>32}}
-  describe '#frame' do
-    subject(:loaded_frame) { instance.frame(target_frame) }
-    let(:source_size) { instance.send(:frames)[target_frame]['sourceSize'] }
+    # Frame format in JSON:
+    # {"frame"=>{"x"=>129, "y"=>0, "w"=>32, "h"=>32}, "rotated"=>false, "trimmed"=>false,
+    # "spriteSourceSize"=>{"x"=>0, "y"=>0, "w"=>32, "h"=>32}, "sourceSize"=>{"w"=>32, "h"=>32}}
+    describe '#frame' do
+      subject(:loaded_frame) { instance.frame(target_frame) }
+      let(:source_size) { instance.send(:frames)[target_frame]['sourceSize'] }
 
-    it 'loads' do
-      expect { subject }.to_not raise_error
-    end
+      it 'loads' do
+        expect { subject }.to_not raise_error
+      end
 
-    it 'produces a Gosu::Image' do
-      should be_a(Gosu::Image)
-    end
+      it 'produces a Gosu::Image' do
+        should be_a(Gosu::Image)
+      end
 
-    it 'produces correctly sized image' do
-      expect(loaded_frame.width).to be source_size['w']
-      expect(loaded_frame.height).to be source_size['h']
-    end
+      it 'produces correctly sized image' do
+        expect(loaded_frame.width).to be source_size['w']
+        expect(loaded_frame.height).to be source_size['h']
+      end
 
-    it 'caches the image' do
-      expect(instance.frame(target_frame)).to eq instance.frame(target_frame)
+      it 'caches the image' do
+        expect(instance.frame(target_frame)).to eq instance.frame(target_frame)
+      end
     end
   end
+
+  context 'default mode' do
+    it_behaves_like 'tileset'
+  end
+
+  context 'precise mode' do
+    let(:mode) { :precise }
+    it_behaves_like 'tileset'
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu_texture_packer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tomas Varaneckas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu