gosu_extensions 0.1.26 → 0.1.27

data/VERSION

@@ -1 +1 @@
-0.1.26
+0.1.27

data/lib/core/control.rb

@@ -20,8 +20,8 @@ class Control
   #
   def handle
     return if @controllable.destroyed?
-    @mapping.each do |key, command|
-      @controllable.send(command) if @window.button_down? key
+    @mapping.each do |key, send_params|
+      @controllable.send(*send_params) if @window.button_down? key
     end
   end
   

data/lib/gosu_extensions.rb

@@ -14,13 +14,13 @@ rescue LoadError => e
   raise e
 end
 
-require 'resources'
-
 $:.unshift File.join(File.dirname(__FILE__), '/extensions')
 require 'module'
 require 'numeric'
 
 $:.unshift File.join(File.dirname(__FILE__), '/core')
+require 'resources'
+
 require 'vector_utilities'
 require 'initializer_hooks'
 

data/lib/traits/attachable.rb

@@ -6,7 +6,7 @@ module Attachable extend Trait
   
   def move_relative pod
     self.position = pod.relative_position self
-    self.rotation = pod.rotation
+    self.rotation = pod.rotation unless self.kind_of? Turnable
   end
   
 end

data/lib/traits/moveable.rb

@@ -4,13 +4,13 @@
 #
 module Moveable extend Trait
   
-  Accelerate = :accelerate
-  Left       = :move_left
-  Right      = :move_right
-  Up         = :move_up
-  Down       = :move_down
-  Backwards  = :backwards
-  # Jump       = :jump
+  def self::Accelerate strength = 1.0; [:accelerate, strength] end
+  def self::Left       strength = 1.0; [:move_left,  strength] end
+  def self::Right      strength = 1.0; [:move_right, strength] end
+  def self::Up         strength = 1.0; [:move_up,    strength] end
+  def self::Down       strength = 1.0; [:move_down,  strength] end
+  def self::Backwards  strength = 1.0; [:backwards,  strength] end
+  # TODO Jump       = :jump
   
   def self.included klass
     klass.extend ClassMethods
@@ -128,24 +128,24 @@ module Moveable extend Trait
   
   # Methods for controls.
   #
-  def accelerate strength = 1
+  def accelerate strength = 1.0
     self.speed += self.rotation_vector * strength/SUBSTEPS
   end
-  def backwards strength = 1
-    accelerate -0.5*strength
-  end
-  def move_left strength = 1
+  def move_left strength = 1.0
     self.speed += CP::Vec2.new(-strength.to_f/SUBSTEPS, 0) 
   end
-  def move_right strength = 1
+  def move_right strength = 1.0
     self.speed += CP::Vec2.new(strength.to_f/SUBSTEPS, 0) 
   end
-  def move_up strength = 1
+  def move_up strength = 1.0
     self.speed += CP::Vec2.new(0, -strength.to_f/SUBSTEPS) 
   end
-  def move_down strength = 1
+  def move_down strength = 1.0
     self.speed += CP::Vec2.new(0, strength.to_f/SUBSTEPS) 
   end
+  def backwards strength = 1.0
+    accelerate -0.5*strength
+  end
   # def jump strength = 100
   #   self.speed += CP::Vec2.new(0, -strength.to_f/SUBSTEPS) if self.current_speed <= 1
   # end

data/lib/traits/shooter.rb

@@ -97,6 +97,7 @@ module Shooter extend Trait
     sometimes :loading, self.shooting_rate do
       projectile = self.shot.shoot_from self
       projectile.rotation = self.muzzle_rotation
+      # projectile.velocity = self.muzzle_rotation.normalize
       projectile.speed = self.muzzle_velocity * projectile.velocity + self.speed
     end
   end

data/lib/traits/turnable.rb

@@ -2,6 +2,7 @@
 #
 module Turnable extend Trait
   
+  
   Left  = :turn_left
   Right = :turn_right
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 26
-  version: 0.1.26
+  - 27
+  version: 0.1.27
 platform: ruby
 authors: 
 - Florian Hanke