gosu_extensions 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/gosu_extensions.rb

@@ -36,11 +36,11 @@ require 'shot'
 require 'targetable'
 require 'turnable'
 require 'controllable'
+require 'moveable'
+require 'short_lived'
 
 $:.unshift File.join(File.dirname(__FILE__), '/units')
 require 'thing'
-require 'moveable'
-require 'short_lived'
 
 require 'controls'
 require 'game_window'

data/lib/traits/damaging.rb

@@ -1,7 +1,8 @@
 # Use this for a thing that damages.
 #
 # Example:
-#   class Rocket < ShortLived
+#   class Rocket
+#     it_is ShortLived
 #     it_is Damaging
 #   end
 #

data/lib/{units → traits}/moveable.rb

@@ -2,7 +2,7 @@
 #
 # TODO moveable should only have active components, like accelerate etc. Positioning etc. should go to Thing.
 #
-class Moveable < Thing
+module Moveable
   
   Accelerate = :accelerate
   Left       = :move_left
@@ -12,7 +12,11 @@ class Moveable < Thing
   Backwards  = :backwards
   # Jump       = :jump
   
-  class << self
+  def self.included klass
+    klass.extend ClassMethods
+  end
+  
+  module ClassMethods
     
     # Initial setting.
     #
@@ -76,9 +80,7 @@ class Moveable < Thing
     @shape.body.v
   end
   def current_speed
-    # TODO use built-in function
-    #
-    Math.sqrt(speed.x**2 + speed.y**2)
+    speed.length
   end
   
   # Directly set the rotation of our Moveable.

data/lib/{units → traits}/short_lived.rb

@@ -1,4 +1,8 @@
-class ShortLived < Moveable
+module ShortLived
+  
+  def self.included klass
+    klass.extend ClassMethods
+  end
   
   def initialize window
     super window
@@ -8,7 +12,7 @@ class ShortLived < Moveable
     end
   end
   
-  class << self
+  module ClassMethods
     
     def lifetime lifetime = nil, &block
       block = lambda { lifetime } unless block_given?

data/lib/units/thing.rb

@@ -4,6 +4,10 @@ class Thing
   include InitializerHooks
   include ItIsA
   
+  # TODO Move this.
+  #
+  it_is Moveable
+  
   attr_writer :layer
   attr_reader :window, :shape
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Florian Hanke
@@ -75,8 +75,8 @@ files:
 - lib/traits/targeting.rb
 - lib/traits/targeting/closest.rb
 - lib/traits/turnable.rb
-- lib/units/moveable.rb
-- lib/units/short_lived.rb
+- lib/traits/moveable.rb
+- lib/traits/short_lived.rb
 - lib/units/thing.rb
 - lib/vector_utilities.rb
 - lib/waves.rb