rhex 2.0.3 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d90bcb5012b56d62255885e20da656a2b6be751
-  data.tar.gz: b2e452c8f88b2157229e31d2e9d8cf8ef6c6625e
+  metadata.gz: 6c2fae8bfcec85bb6d40cdd93c5b3fb9aa4b0c6f
+  data.tar.gz: 941154bdc0bae0a5cd8b57ac08d1afdbb6c211b7
 SHA512:
-  metadata.gz: 8f8a15e4917422316690266295573c076ab615c88051af523b5026dc7f0641825e49872966406636f431a0040bcdbba5631c9deb55ff59b64656d82f7288a656
-  data.tar.gz: cab8437bf7021c059691908bed06d8ecd2d3b812c10cb39bbf98caf0cfb9d2c31c4b72df198e649daab80d72b8b2ec0b2fd24efbfe4e3f9b4399373ff4495513
+  metadata.gz: 1d5c99ed7299f9c35f3b896151c6900bbc77bca5cfc9bcf20adfb99b04b44c07439bdb6d9a018eda9278c2e257145e774efadf6d300b93229e66a8115d58e61c
+  data.tar.gz: b2bdb4cf22ddaa34757d79644353967032d4eb316b52a1ce600018a9e1fec878d1e839c816a359a6ed786bfd4f6f4e072941db754d88e98026da6ee95952f971

data/lib/hex/axial_grid.rb

@@ -1,6 +1,6 @@
 require_relative 'axial_hex'
-require_relative 'modules/ascii_to_grid'
 require_relative 'modules/grid_to_pic'
+require_relative 'modules/ascii_to_grid_flat'
 
 # This class represents a grid of hexagons stored in an axial coordinate system.
 #
@@ -17,6 +17,8 @@ require_relative 'modules/grid_to_pic'
 #
 class AxialGrid
 
+  include AsciiToGridFlat
+
   attr_reader :hex_ray, :hex_height, :hex_width, :quarter_height, :half_width
 
   # Create an axial hexagon grid
@@ -97,21 +99,15 @@ class AxialGrid
   #
   # @return [Array<AxialHex>] all surrounding hexes
   def h_surrounding_hexes( h )
-    h.surrounding_hexes.map{ |sh| hget( sh ) }
+    h.surrounding_hexes.map{ |sh| hget( sh ) }.compact
   end
 
-  # 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
+  # Return the grid as a json string
+  #
+  # @return [Array] the grid as a json string
+  def to_json
+    a = @hexes.map{ |e| { q: e[0][0], r: e[0][1], c: e[1].color, b: e[1].border } }
+    a.to_json
   end
 
 end

data/lib/hex/base_hex.rb

@@ -9,8 +9,8 @@ class BaseHex
   attr_accessor :color, :border, :data
 
   def initialize( color = nil, border = nil, data = nil )
-    @color = color if color
-    @border = border if border
+    @color = color
+    @border = border
     @data = data
   end
 end

data/lib/hex/modules/ascii_to_grid_flat.rb

@@ -0,0 +1,77 @@
+# This module contains the methods relatives to ascii map reading
+module AsciiToGridFlat
+
+  # Read an ascii file and load it into the hexagon grid. The input grid is supposed to be odd flat topped (odd-q) and will be stored into an axial representation.
+  #
+  # @param file_path [String] the name of the ascii file to read. For how to create this file, please see : https://github.com/czuger/rhex#reading-a-grid-from-an-ascii-file
+  def read_ascii_file_flat_topped_odd( file_path )
+    File.open( file_path ) do |file|
+
+      odd = 0
+      base_q = 0
+      line_q = 0
+
+      file.each_line do |line|
+        elements = line.split
+        elements.each_with_index do |element, index|
+          # puts "element = %c, index = %d || q = %d, r = %d" % [element, index, index*2 + odd, base_q - index]
+          # cset( index*2 + odd, base_q - index, color: element.to_sym, border: nil )
+          q = index*2 + odd
+          r = base_q - index
+          @hexes[ [ q, r ] ] = AxialHex.new( q, r, color: element.to_sym )
+        end
+
+        odd = ( odd.odd? ? 0 : 1 )
+
+        line_q += 1
+        if line_q >= 2
+          line_q = 0
+          base_q += 1
+        end
+
+      end
+    end
+  end
+
+
+  # Write an ascii file representing an axial hex grid as an flat topped (odd-q) hex representation.
+  #
+  # @param file_path [String] the name of the ascii file to read. For how to create this file, please see : https://github.com/czuger/rhex#reading-a-grid-from-an-ascii-file
+  def write_ascii_file_flat_topped_odd( file_path )
+    File.open( file_path, 'w' ) do |file|
+
+      base_r = 0
+      base_q = 0
+      line_q = 0
+      line = []
+
+
+      loop do
+        r = base_r
+        q = base_q
+        odd = ( base_q == 0 ? '' : ' ' )
+
+        while( ( hex = cget( q, r ) ) ) do
+          line << hex.color
+          q += 2
+          r -= 1
+        end
+
+        break if line.empty?
+
+        file.puts( odd + line.join( ' ' ) )
+
+        base_q = ( base_q == 0 ? 1 : 0 )
+
+        line_q += 1
+        if line_q >= 2
+          line_q = 0
+          base_r += 1
+        end
+        line = []
+      end
+
+    end
+  end
+
+end

data/lib/hex/square_grid.rb

@@ -1,5 +1,6 @@
 require_relative 'axial_grid'
 require_relative 'cube_hex'
+require_relative 'modules/ascii_to_grid'
 
 # This class represents a grid of hexagons stored in an axial coordinate system but manage the conversion to a square representation (what finally you want)
 #
@@ -29,37 +30,37 @@ class SquareGrid < AxialGrid
     set_hex_dimensions
   end
 
-  # Create an hexagon at a given position (col, row)
+  # Create an hexagon at a given position (q, r)
   #
-  # @param col [Integer] the col coordinate of the hexagon
-  # @param row [Integer] the row coordinate of the hexagon
+  # @param q [Integer] the col coordinate of the hexagon
+  # @param r [Integer] the r coordinate of the hexagon
   # @param color [String] a colorstring that can be used by ImageMagic
   # @param border [Boolean] is the hex on the border of the screen (not fully draw)
   # @param data [Unknown] some data associated with the hexagone. Everything you want, it is up to you
   #
   # @return [AxialHex] an hexagon
   #
-  def cset( col, row, color: nil, border: false, data: nil )
-    hset( even_q_to_axial_hex( col, row, color: color, border: border, data: data ) )
+  def cset( q, r, color: nil, border: false, data: nil )
+    hset( even_q_to_axial_hex( q, r, color: color, border: border, data: data ) )
   end
 
-  # Get the hexagon at a given position (col, row)
+  # Get the hexagon at a given position (q, r)
   #
-  # @param col [Integer] the col coordinate of the hexagon
-  # @param row [Integer] the row coordinate of the hexagon
+  # @param q [Integer] the col coordinate of the hexagon
+  # @param r [Integer] the r coordinate of the hexagon
   #
   # @return [AxialHex] the hexagon at the requested position. nil if nothing
   #
-  def cget( col, row )
-    hget( even_q_to_axial_hex( col, row ) )
+  def cget( q, r )
+    hget( even_q_to_axial_hex( q, r ) )
   end
 
   private
 
-  def even_q_to_axial_hex( col, row, color: nil, border: false, data: nil  )
+  def even_q_to_axial_hex( q, r, color: nil, border: false, data: nil  )
     # convert odd-r offset to cube
-    x = col - (row - (row&1)) / 2
-    z = row
+    x = q - (r - (r&1)) / 2
+    z = r
     y = -x-z
 
     tmp_cube = CubeHex.new( x, y, z, color: color, border: border, data: data )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhex
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - Cédric ZUGER
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2019-07-02 00:00:00.000000000 Z
 dependencies: []
 description: |2
       A library providing hexagons management and hexagonal grids for ruby.
@@ -24,6 +24,7 @@ files:
 - lib/hex/base_hex.rb
 - lib/hex/cube_hex.rb
 - lib/hex/modules/ascii_to_grid.rb
+- lib/hex/modules/ascii_to_grid_flat.rb
 - lib/hex/modules/grid_to_pic.rb
 - lib/hex/square_grid.rb
 - lib/rhex.rb
@@ -37,17 +38,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby HEXagonal grid