rhex 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4495c4b3d933607b7ea7e0b10bc42a122ff74c0c
-  data.tar.gz: ddd8919e2e5507048aba10dcd760f5bc89e862a0
+  metadata.gz: 5a2e40d08cd8b0af78d794a06edabe792d504d1d
+  data.tar.gz: 5f4c074aa457e00505c5c5bad0a2721d55a27180
 SHA512:
-  metadata.gz: de3022c9dc1cb096435ec471bc0adf61769abe5d2a4fae5f86d787e172f5b8e9ec70896543b38e4d31a559d2eea673d7b2189fa4be662ada04d4b1d102daddfe
-  data.tar.gz: c37e4bff873ef76137a4ee0d31164598af1c1ae2d50d53cc89e6f5c7f0828b31bd8ca305f234610615b0a7232324cecdb48d9f64bc12c1743fa9215aff324362
+  metadata.gz: a2bf038530231da4e29dc9626062a0d2935b522de5b84bb60aa39aa5faffd0f65888571fd3c125fe20d97e850424e81c503eb25ac98c4b9943e298b43345c82b
+  data.tar.gz: 131308282edb5a1a3bb3b6e408884eb1a18c04e3f8b73b6d952014cf879e526e59b74ccbf2566a3e87bcef493db57cf1936093c48ebc0f4e444a2f79e656692e

data/lib/hex/ascii_to_grid.rb

@@ -6,30 +6,29 @@ module AsciiToGrid
   def read_ascii_file( file_path )
     File.open( file_path ) do |file|
 
-      r = max_q = max_r = 0
+      r = max_r = 0
+
       file.each_line do |line|
         elements = line.split
         q = 0
         elements.each do |element|
           border = true if ( r == 0 || q == 0 )
-          cset( q, r, val: element, border: border )
+          shifted_q = q - ( r/2 )
+          cset( shifted_q, r, val: element, border: border )
           q += 1
-          max_q = [ max_q, q ].max
         end
         r += 1
         max_r = [ max_r, r ].max
       end
 
-      0.upto( max_q - 1 ).each do |q|
-        hex = cget( q, max_r - 1 )
-        hex.border! if hex
-      end
-
       0.upto( max_r - 1 ).each do |row|
-        hex = cget( max_q - 1, row )
+        maxq = @hexes.map{ |key, e| e.q if e.r == row }.compact.max
+        hex = cget( maxq, row )
         hex.border! if hex
       end
 
+      @hexes.each{ |key, e| e.border! if e.r == ( max_r - 1 ) }
+
     end
   end
 end

data/lib/hex/grid.rb

@@ -71,14 +71,14 @@ module Hex
       q = (x * Math.sqrt(3)/3.0 - y/3.0) / @hex_ray
       r = y * 2.0/3.0 / @hex_ray
       hex = Hex::Axial.new(q, r).round
-      hget( hex )
+      cget( hex.q, hex.r )
     end
 
     # Give the position of an hexagon object in pixel.
     #
     # *Returns* : an array of x, y positions.
     def to_xy( hex )
-      tmp_q = hex.q - ( hex.r/2.0 ).floor
+      tmp_q = hex.q
       x = @hex_ray * Math.sqrt(3) * ( tmp_q + hex.r/2.0 )
       y = @hex_ray * 3.0/2.0 * hex.r
       [ x, y ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhex
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Cédric ZUGER
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies: []
 description: |2
       A library providing hexagons management and hexagonal grids for ruby.
@@ -25,7 +25,7 @@ files:
 - lib/hex/grid.rb
 - lib/hex/grid_to_pic.rb
 - lib/rhex.rb
-homepage: http://rubygems.org/gems/rhex
+homepage: https://github.com/czuger/rhex
 licenses:
 - MIT
 metadata: {}