rhex 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ac3d4d8d088a7768944a17333a84e919cccbe90
-  data.tar.gz: efe7f5882be4b63ab5d82f6a8c04c43412914700
+  metadata.gz: 6deb19b3fa7658e30adc918242cfd55c6c96a831
+  data.tar.gz: e9c1ac59f2faec0c63ba0515d45552964d4eb114
 SHA512:
-  metadata.gz: e810250b0a6685019323ca1b531650a388ea24c78669709bda722b806f9842523d8919ceafa1512c8d48fde754221433832c8116e9c088aeaaa95707d0a4c83e
-  data.tar.gz: d08dc31236178532f633264c7963e717d8ec381f90b36ebc1a350451864c397cc75ae1377cf1b35c4a3efa3bc82c7eed3798556fb7fc37b375befcf3851c64df
+  metadata.gz: 98ea9582bb07c5312714d37f0e36be129eca200e1c538d8a9a728adafee915dc64209bcc26d708576fd01f0cae17f6a3927e870bf71c1ecde81b9f1500bbb746
+  data.tar.gz: c7a8f7d08d20ab059c16f553b72a0b72784e57d7509f89f9d509518d96455cef935a9877188d8952b0f76416adcb9c4c69b6b98d8463dc38cf2e75609cfe55d7

data/lib/hex/ascii_to_grid.rb

@@ -0,0 +1,18 @@
+module AsciiToGrid
+
+  def read_ascii_file( file_path )
+    File.open( file_path ) do |file|
+      r = 0
+      file.each_line do |line|
+        elements = line.split
+        q = 0
+        elements.each do |element|
+          set( q, r, element )
+          q += 1
+        end
+        r += 1
+      end
+    end
+  end
+
+end

data/lib/hex/axial.rb

@@ -1,10 +1,11 @@
 # -*- encoding : utf-8 -*-
-require 'hex/cube'
+
+require_relative 'cube'
 
 module Hex
   class Axial
 
-    attr_reader :q, :r
+    attr_reader :q, :r, :val
 
     R = 16
 
@@ -12,12 +13,13 @@ module Hex
     DIRECTIONS = [ [0,-1], [1,-1], [1,0], [0,1], [-1,+1], [-1,0] ]
 
     # Create a new flat topped axial represented hexagon object
-    def initialize(q,r)
+    def initialize( q, r, val = nil)
       @q = q
       @r = r
+      @val = val.to_sym if val
     end
 
-    # Equality between two hexagones
+    # Equality between two hexagons
     def ==(h)
       @q==h.q && @r==h.r
     end
@@ -33,8 +35,9 @@ module Hex
 
     # Give the position of an hexagone object in pixel
     def to_xy
+      pix_r = r - ( @q/2 )
       x = R * 3/2 * @q
-      y = ( ( R.to_f * Math.sqrt(3) ).round * (@r.to_f + @q.to_f/2.to_f) )
+      y = ( ( R.to_f * Math.sqrt(3) ).round * (pix_r.to_f + @q.to_f/2.to_f) )
       [ x, y ]
     end
 

data/lib/hex/grid.rb

@@ -1,9 +1,16 @@
-require 'hex/axial'
+require_relative 'axial'
+require_relative 'grid_to_pic'
+require_relative 'ascii_to_grid'
 
 module Hex
   class Grid
-    def initialize
+
+    include GridToPic
+    include AsciiToGrid
+
+    def initialize( element_to_color_hash = {} )
       @hexes={}
+      @element_to_color_hash = element_to_color_hash
     end
 
     # Position aa value at hexagon coordinate
@@ -14,18 +21,17 @@ module Hex
       raise ArgumentError, 'Incorrect number of arguments' if args.length < 1 || args.length > 3
       fa=args.shift
       if fa.class == Hex::Axial
-        @hexes[ [ fa.q, fa.r ] ] = args.shift
+        @hexes[ [ fa.q, fa.r ] ] = Hex::Axial.new( fa.q, fa.r, args.shift )
       else
         q=fa
         r=args.shift
-        @hexes[ [ q, r ] ] = args.shift
+        @hexes[ [ q, r ] ] = Hex::Axial.new( q, r, args.shift )
       end
     end
 
     # Get the value of stored at hexagon coordinate
-    # You can use the form set( q, r, value )
-    # Or set( hex, value )
-    # In both case value can be nil.
+    # You can use the form get( q, r )
+    # Or get( hex )
     def get( *args )
       raise( ArgumentError, 'Incorrect number of arguments' ) if args.length < 1 || args.length > 2
       fa=args.shift

data/lib/hex/grid_to_pic.rb

@@ -0,0 +1,46 @@
+# A module to transform hex grid to bitmap
+
+begin
+  gem 'rmagick'
+  require 'rmagick'
+rescue Gem::LoadError
+  puts 'Caution : Rmagick is not installed'
+end
+
+module GridToPic
+
+  def to_pic( pic_name, exit_on_error = true )
+    unless defined?( Magick::Image ) && defined?( Magick::HatchFill ) && defined?( Magick::Draw )
+      puts 'Rmagick is not installed !!! You can\'t dump hex grid to pic'
+      exit if exit_on_error
+    end
+
+    canvas = Magick::Image.new( 500, 500 )
+    gc = Magick::Draw.new
+    width = Hex::Axial::R * 2
+    quarter_width = width / 4.0
+    height = Math.sqrt(3)/2 * width
+    half_height = height / 2.0
+
+    @hexes.each do |pos, hex|
+      x, y = hex.to_xy
+
+      color = get_color( hex )
+      gc.stroke( 'black' )
+      gc.fill( color.to_s )
+      gc.polygon( x-quarter_width, y-half_height, x+quarter_width, y-half_height, x+quarter_width*2, y,
+                  x+quarter_width, y+half_height, x-quarter_width, y+half_height, x-quarter_width*2, y )
+    end
+
+    gc.draw(canvas)
+    canvas.write( pic_name )
+  end
+
+  private
+
+  def get_color( hex )
+    color = @element_to_color_hash[ hex.val ]
+    color ? color : :white
+  end
+
+end

metadata

@@ -1,24 +1,26 @@
 --- !ruby/object:Gem::Specification
 name: rhex
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Cédric ZUGER
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-12-27 00:00:00.000000000 Z
 dependencies: []
 description: A library designed to provide hexagonal grids for ruby
-email: zuger.cedric@gmail.com
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/hex/ascii_to_grid.rb
 - lib/hex/axial.rb
 - lib/hex/cube.rb
 - lib/hex/grid.rb
+- lib/hex/grid_to_pic.rb
 - lib/rhex.rb
 homepage: http://rubygems.org/gems/rhex
 licenses:
@@ -40,8 +42,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby HEXagonal grid
 test_files: []
+has_rdoc: