rhex 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89e0d43ab123768693ec204a0cd35d135e6b9d30
-  data.tar.gz: 04ed10011307c6e8543c1e69c11c6e0f7ce9bafd
+  metadata.gz: 8d90bcb5012b56d62255885e20da656a2b6be751
+  data.tar.gz: b2e452c8f88b2157229e31d2e9d8cf8ef6c6625e
 SHA512:
-  metadata.gz: 745370f83e96bef9357943e9a5006ec1fc2dd0b87702007c0b8ec0388e9082e55d114c47e47f080a3cfa57a0efa1173face5e80ad177e40f70ba8a330744b2b3
-  data.tar.gz: bf649584d26204efd93770a8c054216d02d8143684d4ea31319307d05df9b19f3aca1cd1c453484c15e0fc39c4bbd5d6248e5f2da169e401f8d99d23c8077e50
+  metadata.gz: 8f8a15e4917422316690266295573c076ab615c88051af523b5026dc7f0641825e49872966406636f431a0040bcdbba5631c9deb55ff59b64656d82f7288a656
+  data.tar.gz: cab8437bf7021c059691908bed06d8ecd2d3b812c10cb39bbf98caf0cfb9d2c31c4b72df198e649daab80d72b8b2ec0b2fd24efbfe4e3f9b4399373ff4495513

data/lib/hex/axial_grid.rb

@@ -100,37 +100,18 @@ class AxialGrid
     h.surrounding_hexes.map{ |sh| hget( sh ) }
   end
 
-  # Get the hexagon at (x,y) coordinate.
-  #
-  # @param x [Integer] the x coordinate of the hexagon you want to get
-  # @param y [Integer] the y coordinate of the hexagon you want to get
-  #
-  # @return [AxialGrid] the corresponding hex
-  #
-  def hex_at_xy(x, y)
-    q = (x * Math.sqrt(3)/3.0 - y/3.0) / @hex_ray
-    r = y * 2.0/3.0 / @hex_ray
-    hex = AxialHex.new(q, r).round
-    cget( hex.q, hex.r )
-  end
-
-  #
-  # Get the (x, y) position of an hexagon object
-  #
-  # @param hex [AxialHex] the hexagon you want to get the position
-  #
-  # @return [Array<Integer>] an array of two integers corrsponding respectively to the x, y values
-  #
-  def to_xy( hex )
-
-    tmp_q = hex.q
-    # x = ( @hex_ray * Math.sqrt(3) * ( tmp_q + hex.r/2.0 ) ) - @hex_width
-    # y = ( @hex_ray * 3.0/2.0 * hex.r ) - ( @quarter_height * 2 )
-
-    x = ( @hex_ray * Math.sqrt(3) * ( tmp_q + hex.r/2.0 ) )
-    y = ( @hex_ray * 3.0/2.0 * hex.r ) - ( @quarter_height * 2 )
-
-    [ x, y ]
+  # Return the grid as a hash object
+  #
+  # @return [Hash] the grid as a hash object
+  def to_hash
+    h = @hexes.clone
+    # p hash
+    h.each do |k, v|
+      # p k
+      h[ k ] = v.to_hash
+    end
+    # p h
+    h
   end
 
 end

data/lib/hex/axial_hex.rb

@@ -1,5 +1,7 @@
 # -*- encoding : utf-8 -*-
 
+require 'json'
+
 require_relative 'cube_hex'
 
 # This class represents an hexagon stored in axial coordinate system.
@@ -135,4 +137,11 @@ class AxialHex < BaseHex
     [ q, r ]
   end
 
+  # Return an hex as a hash object
+  #
+  # @return [Hash] the hex as a hash object
+  def to_hash
+    { q: @q, r: @r, color: @color, border: @border, data: @data.to_hash }
+  end
+
 end

data/lib/hex/modules/grid_to_pic.rb

@@ -22,8 +22,8 @@ module GridToPic
       exit if exit_on_error
     end
 
-    maxx = ( @hexes.keys.map{ |k| k[0] + k[1]/2 }.max ) * @hex_width - ( @hex_width / 2 ) + 1 + @hex_width
-    maxy = @hexes.keys.map{ |k| k[1] }.max * ( ( @hex_height * 3.0 )/ 4.0 ).ceil - ( @hex_width / 4 ).ceil - 2
+    maxx = ( @hexes.keys.map{ |k| k[0] + k[1]/2 }.max ) * @hex_width + ( @hex_width + @half_width + 1 )
+    maxy = @hexes.keys.map{ |k| k[1] }.max * ( ( @hex_height * 3.0 )/ 4.0 ).ceil + ( @hex_height + 1 )
 
     # maxx = ( ( @hexes.keys.map{ |k| k[0] + k[1]/2 }.max ) + 0.5 ) * @hex_width
     # maxy = ( ( @hexes.keys.map{ |k| k[1] }.max * 3.0/4.0 ) + 0.5 ) + @hex_heig
@@ -54,17 +54,32 @@ module GridToPic
     canvas.write( pic_name )
   end
 
+  # Get the (x, y) position of an hexagon object
+  #
+  # @param hex [AxialHex] the hexagon you want to get the position
+  #
+  # @return [Array<Integer>] an array of two integers corrsponding respectively to the x, y values
+  #
+  def to_xy( hex )
+    x = ( @hex_ray * Math.sqrt(3) * ( hex.q + hex.r/2.0 ) )
+    y = ( @hex_ray * 3.0/2.0 * hex.r )
+
+    x += @half_width
+    y += @half_height
+
+    [ x, y ]
+  end
+
   private
 
   def set_hex_dimensions
 
-    # p :call
-
     @hex_height = @hex_ray * 2.0
-    @hex_width =  Math.sqrt(3)/2.0 * @hex_height
+    @half_height = @hex_ray
+    @quarter_height = @hex_height / 4.0
 
+    @hex_width =  Math.sqrt(3)/2.0 * @hex_height
     @half_width = @hex_width / 2.0
-    @quarter_height = @hex_height / 4.0
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhex
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Cédric ZUGER