ruby-perlin-2D-map-generator 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bef2e8554e39c0e315b940f4a98a8927348ae576a7f12168c86c74f969c241b
-  data.tar.gz: b3debfe8269979c1f1f0be2a8def6a86de9fcd2a8ad6f548295113068ec04566
+  metadata.gz: 25ba5741714e7132250486cdb48c6d0114e858aa272bdb68d90289af12643e3a
+  data.tar.gz: cc4ffc80e85167443d92fbf0755c7a70db4e5ef9cb824e86b98ec83792d82715
 SHA512:
-  metadata.gz: c91f9810eda61b360e26b31944820b2587ff9e6a10776cdc84347475470573b381853e63b629781fbc0f18eb9fc33299fad31e2a436ef7f7a66d67db8dbb2ea2
-  data.tar.gz: 8c12388e0e7965165557bc5680f030d6d2da9a42e35cc066fbff2390de0e6076c2318e7d62000d17026fa91206adb1ff631eff0ff6af5d670ef81e3d206e45a0
+  metadata.gz: b613588fb06e7bc82af707823e7a1b69b95a3fa670f337577c310bcdcd149b1a58610ae4673ac65b5d7d1415536d9e2c231b9265dbaf3b084060108a45b77e06
+  data.tar.gz: 1d7aaf0819fdf911705d0b18dfc480915a2869bbe994db13d9f91d43a861d14b1a9235f0823ff9d0c4cfb5f08f38267dc39ed49f8ef7544136622f8167069ad8

data/README.md

@@ -73,7 +73,7 @@ See Command line Usage for full customization, below are some examples. Alter th
 Roads can be generated by providing a positive integer to the `roads=` argument. Roads are randomly seeded to begin
 and start at an axis (but not the same axis).
 
-A* pathfinding with a priority queue is used to generate the roads. The heuristic uses manhattan distance, and favours existing roads and similar elevations in adjacent tiles. 
+A* pathfinding with a priority queue, along with prim's algorithn and a minimum spanning tree is used to generate the roads. The heuristic uses manhattan distance, and favours existing roads and similar elevations in adjacent tiles. 
 
 Roads can be configured to include/exclude generating paths thorugh water, mountains and flora.
 

data/lib/town_generator.rb

@@ -8,6 +8,7 @@ require 'map_config'
 #
 # Generates building tile items using Poisson Disk Sampling for the given tiles
 # Roads are generated between the buildings and between towns using A* pathfinding
+# and a minimum tree spanning algorithm
 #
 class TownGenerator
   attr_reader :sample_area, :road_generator
@@ -81,25 +82,66 @@ class TownGenerator
   end
 
   def generate_town_roads(points, town_num, verbose)
-    # TODO: slow, bad (complete graph) will update to use minimum tree spanning algorithm instead
     puts "generating town #{town_num} roads..." if verbose
 
+    generate_roads_from_connected_pairs(build_minimum_spanning_tree(points, populate_distances_between_each_point(points)))
+  end
+
+  def generate_roads_from_connected_pairs(connected_pairs)
+    connected_pairs.each do |edge|
+      road_to_building_one = place_in_front_or_behind(edge.first)
+      road_to_building_two = place_in_front_or_behind(edge.last)
+
+      next if road_to_building_one.nil? || road_to_building_two.nil?
+
+      road_generator.generate_roads_from_coordinate_list(road_to_building_one.concat(road_to_building_two), false)
+    end
+  end
+
+  def build_minimum_spanning_tree(points, distances)
     connected_pairs = Set.new
+    visited = Set.new([points.first]) # Create a set to keep track of visited nodes
+    until visited.size == points.size
+      edge = find_minimum_edge(distances, visited)
+      connected_pairs.add(edge)
+      visited.add(edge.last)
+    end
+    connected_pairs
+  end
+
+  def populate_distances_between_each_point(points)
+    distances = {}
     points.each_with_index do |point_one, idx_one|
       points[idx_one + 1..].each do |point_two|
-        next if connected_pairs.include?([point_one, point_two]) || connected_pairs.include?([point_two, point_one])
+        distance = calculate_distance(point_one, point_two)
+        distances[[point_one, point_two]] = distance
+        distances[[point_two, point_one]] = distance
+      end
+    end
+    distances
+  end
 
-        road_to_building_one = place_in_front_or_behind(point_one)
-        road_to_building_two = place_in_front_or_behind(point_two)
+  def calculate_distance(point1, point2)
+    Math.sqrt((point1.y - point2.y)**2 + (point1.x - point2.x)**2)
+  end
 
-        connected_pairs.add([point_one, point_two])
-        connected_pairs.add([point_two, point_one])
+  def find_minimum_edge(distances, visited)
+    # method to find the minimum edge connecting visited and unvisited nodes
+    min_edge = nil
+    min_distance = Float::INFINITY
 
-        next if road_to_building_one.nil? || road_to_building_two.nil?
+    visited.each do |visited_node|
+      distances.each do |edge, distance|
+        next if visited.include?(edge.last) || edge.first != visited_node
 
-        road_generator.generate_roads_from_coordinate_list(road_to_building_one.concat(road_to_building_two), false)
+        if distance < min_distance
+          min_distance = distance
+          min_edge = edge
+        end
       end
     end
+
+    min_edge
   end
 
   def place_in_front_or_behind(point)
@@ -116,24 +158,8 @@ class TownGenerator
 
     puts 'generating roads between towns...' if verbose
 
-    connected_pairs = Set.new
-    town_centroids = {}
-
-    @all_town_points.each_with_index do |town_one, idx_one|
-      find_town_centroid(town_one)
-
-      @all_town_points[idx_one + 1..].each do |town_two|
-        next if connected_pairs.include?([town_one, town_two]) || connected_pairs.include?([town_two, town_one])
-
-        town_one_center_x, town_one_center_y = (town_centroids[town_one] ||= find_town_centroid(town_one))
-        town_two_center_x, town_two_center_y = (town_centroids[town_two] ||= find_town_centroid(town_two))
-
-        road_generator.generate_roads_from_coordinate_list([town_one_center_x, town_one_center_y, town_two_center_x, town_two_center_y], false)
-
-        connected_pairs.add([town_one, town_two])
-        connected_pairs.add([town_two, town_one])
-      end
-    end
+    centroids = @all_town_points.map { |town_points| find_town_centroid(town_points) }
+    generate_roads_from_connected_pairs(build_minimum_spanning_tree(centroids, populate_distances_between_each_point(centroids)))
   end
 
   def find_town_centroid(points)
@@ -149,6 +175,6 @@ class TownGenerator
     average_x = total_x / num_coordinates.to_f
     average_y = total_y / num_coordinates.to_f
 
-    [average_x, average_y]
+    OpenStruct.new(x: average_x, y: average_y)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-perlin-2D-map-generator
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Tyler Matthews (matthewstyler)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-15 00:00:00.000000000 Z
+date: 2023-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: perlin
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: 13.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: 13.1.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.56.0
+        version: 1.58.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.56.0
+        version: 1.58.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement