steering_behaviors 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog for steering-behaviors
 
+## 1.0.2, 31 July 2013
+* Bugfixes in ortho/bside; cleanup of align/match
+
 ## 1.0.1, 31 July 2013
 * Some mild optimizations in Vector (caching, Pi calcs)
 

data/lib/steering_behaviors/align.rb

@@ -17,10 +17,9 @@ class SteeringBehaviors::Align
   #   -
   #
   def self.steer(hunter_kinematic, quarry_kinematic)
-    course_diff = ( ( quarry_kinematic.heading_vec.radians - hunter_kinematic.heading_vec.radians + 3*Math::PI ) % (2*Math::PI) ) - Math::PI
+    desired_velocity = quarry_kinematic.heading_vec * hunter_kinematic.velocity_vec.length
 
-    target_local = SteeringBehaviors::Vector.new(course_diff * hunter_kinematic.speed, 0)
-    target_local.rotate!(hunter_kinematic.heading_vec.radians)
+    return desired_velocity - hunter_kinematic.velocity_vec
   end
 
 end

data/lib/steering_behaviors/broadside.rb

@@ -27,7 +27,9 @@ class SteeringBehaviors::Broadside
 
     best_hdg_vec = (da < db ? option_a : option_b)
 
-    desired_velocity = best_hdg_vec * hunter_kinematic.velocity_vec.length
+    desired_velocity = best_hdg_vec.normalize * hunter_kinematic.velocity_vec.length
+
+    return desired_velocity - hunter_kinematic.velocity_vec
   end
 
 end

data/lib/steering_behaviors/match.rb

@@ -17,12 +17,9 @@ class SteeringBehaviors::Match
   #   - the steering force
   #
   def self.steer(hunter_kinematic, quarry_kinematic)
-    course_diff = ( ( quarry_kinematic.heading_vec.radians - hunter_kinematic.heading_vec.radians + 3*Math::PI ) % (2*Math::PI) ) - Math::PI
+    desired_velocity = quarry_kinematic.heading_vec * quarry_kinematic.velocity_vec.length
 
-    speed_diff = quarry_kinematic.speed - hunter_kinematic.speed
-
-    target_local = SteeringBehaviors::Vector.new(course_diff * quarry_kinematic.speed, speed_diff)
-    target_local.rotate!(hunter_kinematic.heading_vec.radians)
+    return desired_velocity - hunter_kinematic.velocity_vec
   end
 
 end

data/lib/steering_behaviors/orthogonal.rb

@@ -26,6 +26,8 @@ class SteeringBehaviors::Orthogonal
     best_hdg_vec = (da < db ? option_a : option_b)
 
     desired_velocity = best_hdg_vec * hunter_kinematic.velocity_vec.length
+
+    return desired_velocity - hunter_kinematic.velocity_vec
   end
 
 end

data/lib/steering_behaviors/steering.rb

@@ -16,9 +16,8 @@ class SteeringBehaviors::Steering
   #   - +kinematic+ -> the kinematic thing
   #   - +steering_force+ -> force vector supplied by a steering behavior
   #   - +delta+ -> time delta (in seconds) used for scaling the result
-  #   - +accelerative+ -> whether you want the steering to change the thing's velocity (default true)
   #
-  def self.feel_the_force(kinematic, steering_force, delta, accelerative=true) #, mobile, position)
+  def self.feel_the_force(kinematic, steering_force, delta)
     acceleration = steering_force / kinematic.mass
 
     # Compute the new, proposed velocity vector.

metadata

@@ -2,7 +2,7 @@
 name: steering_behaviors
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Chris Powell